@sasjs/cli 6.7.0 → 6.8.0

package/build/commands/job/internal/execute/viya.js

@@ -44,12 +44,14 @@ exports.getContextName = getContextName;
 var displayResult_1 = require("../../../../utils/displayResult");
 var file_1 = require("../../../../utils/file");
 var fetchLogFileContent_1 = require("../../../shared/fetchLogFileContent");
+var logcheck_1 = require("../../../../utils/logcheck");
+var utils_1 = require("../../../../utils/utils");
 var path_1 = __importDefault(require("path"));
 var node_1 = require("@sasjs/adapter/node");
-var utils_1 = require("@sasjs/utils");
-var utils_2 = require("../../../../utils/");
+var utils_2 = require("@sasjs/utils");
+var utils_3 = require("../../../../utils/");
 var command_1 = require("../../../../types/command");
-var utils_3 = require("../utils");
+var utils_4 = require("../utils");
 /**
  * Triggers existing job for execution on Viya server.
  * @param {object} sasjs - configuration object of SAS adapter.
@@ -90,23 +92,23 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
                     if (!source) return [3 /*break*/, 5];
                     if (!(0, file_1.isJsonFile)(source))
                         throw 'Source file has to be JSON.';
-                    return [4 /*yield*/, (0, utils_1.fileExists)(source).catch(function (_) {
+                    return [4 /*yield*/, (0, utils_2.fileExists)(source).catch(function (_) {
                             throw 'Error while checking if source file exists.';
                         })];
                 case 3:
                     _c.sent();
-                    return [4 /*yield*/, (0, utils_1.readFile)(source).catch(function (_) {
+                    return [4 /*yield*/, (0, utils_2.readFile)(source).catch(function (_) {
                             throw 'Error while reading source file.';
                         })];
                 case 4:
                     source = _c.sent();
                     macroVars = JSON.parse(source);
-                    if (!(0, utils_1.isMacroVars)(macroVars)) {
+                    if (!(0, utils_2.isMacroVars)(macroVars)) {
                         throw "Provided source is not valid. An example of valid source:\n{ macroVars: { name1: 'value1', name2: 'value2' } }";
                     }
                     _c.label = 5;
                 case 5: return [4 /*yield*/, sasjs
-                        .startComputeJob(jobPath, null, { contextName: contextName }, authConfig, waitForJob || !!logFile, pollOptions, true, macroVars === null || macroVars === void 0 ? void 0 : macroVars.macroVars, undefined, (0, utils_2.persistTokensRefreshedByAdapter)(target))
+                        .startComputeJob(jobPath, null, { contextName: contextName }, authConfig, waitForJob || !!logFile, pollOptions, true, macroVars === null || macroVars === void 0 ? void 0 : macroVars.macroVars, undefined, (0, utils_3.persistTokensRefreshedByAdapter)(target))
                         .catch(function (err) { return __awaiter(_this, void 0, void 0, function () {
                         var logData;
                         var _a, _b;
@@ -121,7 +123,7 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
                                 case 1:
                                     logData = _c.sent();
                                     // save log
-                                    return [4 /*yield*/, (0, utils_3.saveLog)(logData, logFile, jobPath)];
+                                    return [4 /*yield*/, (0, utils_4.saveLog)(logData, logFile, jobPath)];
                                 case 2:
                                     // save log
                                     _c.sent();
@@ -129,11 +131,11 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
                                 case 3:
                                     (0, displayResult_1.displayError)(err);
                                     // terminate process with status code 2
-                                    (0, utils_2.terminateProcess)(2);
+                                    (0, utils_3.terminateProcess)(2);
                                     _c.label = 4;
                                 case 4:
                                     if (!(err === null || err === void 0 ? void 0 : err.log)) return [3 /*break*/, 6];
-                                    return [4 /*yield*/, (0, utils_3.saveLog)(err.log, logFile, jobPath)
+                                    return [4 /*yield*/, (0, utils_4.saveLog)(err.log, logFile, jobPath)
                                         // handle use case when job wasn't found
                                     ];
                                 case 5:
@@ -174,13 +176,13 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
                     _c.sent();
                     _c.label = 8;
                 case 8:
-                    if (!(submittedJob && submittedJob.links)) return [3 /*break*/, 21];
+                    if (!(submittedJob && submittedJob.links)) return [3 /*break*/, 22];
                     if (!result)
                         result = true;
-                    if (!(output || logFile)) return [3 /*break*/, 20];
+                    if (!(output || logFile)) return [3 /*break*/, 21];
                     _c.label = 9;
                 case 9:
-                    _c.trys.push([9, 19, , 20]);
+                    _c.trys.push([9, 20, , 21]);
                     outputJson = JSON.stringify(submittedJob, null, 2);
                     if (!(typeof output === 'string')) return [3 /*break*/, 14];
                     currentDirPath = path_1.default.isAbsolute(output)
@@ -192,14 +194,14 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
                     folderPath = outputPath.split(path_1.default.sep);
                     folderPath.pop();
                     parentFolderPath = folderPath.join(path_1.default.sep);
-                    return [4 /*yield*/, (0, utils_1.folderExists)(parentFolderPath)];
+                    return [4 /*yield*/, (0, utils_2.folderExists)(parentFolderPath)];
                 case 10:
                     if (!!(_c.sent())) return [3 /*break*/, 12];
-                    return [4 /*yield*/, (0, utils_1.createFolder)(parentFolderPath)];
+                    return [4 /*yield*/, (0, utils_2.createFolder)(parentFolderPath)];
                 case 11:
                     _c.sent();
                     _c.label = 12;
-                case 12: return [4 /*yield*/, (0, utils_1.createFile)(outputPath, outputJson)];
+                case 12: return [4 /*yield*/, (0, utils_2.createFile)(outputPath, outputJson)];
                 case 13:
                     _c.sent();
                     (0, displayResult_1.displaySuccess)("Output saved to: ".concat(outputPath));
@@ -212,50 +214,53 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
                     }
                     _c.label = 15;
                 case 15:
-                    if (!(logFile && !pollOptions.streamLog)) return [3 /*break*/, 18];
+                    if (!(logFile && !pollOptions.streamLog)) return [3 /*break*/, 19];
                     logObj = submittedJob.links.find(function (link) { return link.rel === 'log' && link.method === 'GET'; });
-                    if (!logObj) return [3 /*break*/, 18];
+                    if (!logObj) return [3 /*break*/, 19];
                     logUrl = target.serverUrl + logObj.href;
                     logCount = submittedJob.logStatistics.lineCount;
                     return [4 /*yield*/, (0, fetchLogFileContent_1.fetchLogFileContent)(sasjs, authConfig.access_token, logUrl, logCount)];
                 case 16:
                     logData = _c.sent();
-                    return [4 /*yield*/, (0, utils_3.saveLog)(logData, logFile, jobPath)];
+                    return [4 /*yield*/, (0, utils_4.saveLog)(logData, logFile, jobPath)];
                 case 17:
                     _c.sent();
-                    _c.label = 18;
+                    return [4 /*yield*/, (0, logcheck_1.checkLog)(typeof logData === 'string' ? logData : (0, utils_1.parseLogLines)(logData), jobPath)];
                 case 18:
-                    result = submittedJob;
-                    return [3 /*break*/, 20];
+                    _c.sent();
+                    _c.label = 19;
                 case 19:
+                    result = submittedJob;
+                    return [3 /*break*/, 21];
+                case 20:
                     error_1 = _c.sent();
                     // handle use case when submitted job can't be parsed
                     result = false;
                     (0, displayResult_1.displayError)(null, 'An error has occurred when parsing an output of the job.');
-                    return [3 /*break*/, 20];
-                case 20:
+                    return [3 /*break*/, 21];
+                case 21:
                     // wait for job state and return status(0,1,2) based on it
                     if (waitForJob && submittedJob.state) {
                         switch (submittedJob.state) {
                             case 'completed':
-                                (0, utils_2.terminateProcess)(0);
+                                (0, utils_3.terminateProcess)(0);
                             case 'warning':
                                 // if ignoreWarnings flag is present, process will be terminated with
                                 // status code 0, otherwise status code will be 1
-                                (0, utils_2.terminateProcess)(ignoreWarnings ? 0 : 1);
+                                (0, utils_3.terminateProcess)(ignoreWarnings ? 0 : 1);
                             case 'error':
-                                (0, utils_2.terminateProcess)(2);
+                                (0, utils_3.terminateProcess)(2);
                             default:
                                 break;
                         }
                     }
-                    return [3 /*break*/, 22];
-                case 21:
+                    return [3 /*break*/, 23];
+                case 22:
                     if (result) {
-                        (0, utils_2.terminateProcess)(command_1.ReturnCode.InternalError);
+                        (0, utils_3.terminateProcess)(command_1.ReturnCode.InternalError);
                     }
-                    _c.label = 22;
-                case 22:
+                    _c.label = 23;
+                case 23:
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.info("This job was executed in ".concat((endTime - startTime) / 1000, " seconds"));
                     return [2 /*return*/, result];
             }
@@ -271,7 +276,7 @@ function executeJobViya(sasjs, authConfig, jobPath, target, waitForJob, output,
 function getContextName(target) {
     var _a;
     // default execution context of @sasjs/cli
-    var defaultContextName = utils_2.contextName;
+    var defaultContextName = utils_3.contextName;
     // get gontext name from target
     if (target === null || target === void 0 ? void 0 : target.contextName)
         return target.contextName;
@@ -311,14 +316,14 @@ function displayStatus(submittedJob_1, statusFile_1) {
                     folderPath = statusFile.split(path_1.default.sep);
                     folderPath.pop();
                     parentFolderPath = folderPath.join(path_1.default.sep);
-                    return [4 /*yield*/, (0, utils_1.folderExists)(parentFolderPath)];
+                    return [4 /*yield*/, (0, utils_2.folderExists)(parentFolderPath)];
                 case 1:
                     if (!!(_a.sent())) return [3 /*break*/, 3];
-                    return [4 /*yield*/, (0, utils_1.createFolder)(parentFolderPath)];
+                    return [4 /*yield*/, (0, utils_2.createFolder)(parentFolderPath)];
                 case 2:
                     _a.sent();
                     _a.label = 3;
-                case 3: return [4 /*yield*/, (0, utils_1.createFile)(statusFile, status)
+                case 3: return [4 /*yield*/, (0, utils_2.createFile)(statusFile, status)
                     // display file path to status file
                 ];
                 case 4:

package/build/commands/job/jobCommand.js

@@ -62,6 +62,7 @@ var targetCommand_1 = require("../../types/command/targetCommand");
 var utils_2 = require("../../utils");
 var getLogFilePath_1 = require("../../utils/getLogFilePath");
 var prefixAppLoc_1 = require("../../utils/prefixAppLoc");
+var logcheck_1 = require("../../utils/logcheck");
 var execute_1 = require("./internal/execute");
 var node_1 = __importDefault(require("@sasjs/adapter/node"));
 var JobSubCommand;
@@ -126,6 +127,11 @@ var executeParseOptions = {
         alias: 'v',
         default: false,
         description: "If present, CLI will return status 0, 1 or 2 together with HTTP response summaries. If set to 'bleached', HTTP response summaries will be logged without extra colors."
+    },
+    logcheck: {
+        type: 'boolean',
+        default: undefined,
+        description: 'Check the SAS log this job returned, and fail when logCheck in sasjsconfig.json says so. --no-logcheck switches both the report and the verdict off.'
     }
 };
 var JobCommand = /** @class */ (function (_super) {
@@ -160,6 +166,7 @@ var JobCommand = /** @class */ (function (_super) {
             return __generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
+                        (0, logcheck_1.setLogCheckMode)((0, logcheck_1.logCheckModeOf)(this.parsed.logcheck));
                         returnStatusOnly = !!this.parsed.returnStatusOnly;
                         if (returnStatusOnly) {
                             process.logger.warn('--returnStatusOnly (-r) flag is deprecated.');
@@ -257,6 +264,8 @@ var JobCommand = /** @class */ (function (_super) {
                                 .catch(function (err) {
                                 var _a;
                                 // handle job execution failure
+                                if ((0, logcheck_1.isLogCheckFailure)(err))
+                                    return command_1.ReturnCode.LogCheckError;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];
@@ -293,6 +302,8 @@ var JobCommand = /** @class */ (function (_super) {
                                 .catch(function (err) {
                                 var _a;
                                 // handle job execution failure
+                                if ((0, logcheck_1.isLogCheckFailure)(err))
+                                    return command_1.ReturnCode.LogCheckError;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];
@@ -334,6 +345,8 @@ var JobCommand = /** @class */ (function (_super) {
                                 .catch(function (err) {
                                 var _a;
                                 // handle job execution failure
+                                if ((0, logcheck_1.isLogCheckFailure)(err))
+                                    return command_1.ReturnCode.LogCheckError;
                                 (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error executing job: ', err);
                                 return command_1.ReturnCode.InternalError;
                             })];

package/build/commands/job/spec/executeLogOrder.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/build/commands/job/spec/executeLogOrder.spec.js

@@ -0,0 +1,119 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        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 node_1 = __importDefault(require("@sasjs/adapter/node"));
+var jobUtils = __importStar(require("../internal/utils"));
+var logcheck = __importStar(require("../../../utils/logcheck"));
+var sas9_1 = require("../internal/execute/sas9");
+/**
+ * A run that fails the log check is the run whose log someone wants to read, so
+ * the file has to be written before the check can throw - otherwise `--log`
+ * produces nothing exactly when it is needed.
+ */
+describe('job execute log handling', function () {
+    beforeEach(function () {
+        process.logger = {
+            success: jest.fn(),
+            info: jest.fn(),
+            warn: jest.fn(),
+            error: jest.fn()
+        };
+    });
+    it('writes the log before a failing check can throw', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var sasjs, saveSpy, checkSpy;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    sasjs = new node_1.default();
+                    jest.spyOn(sasjs, 'request').mockResolvedValue({
+                        status: 200,
+                        log: 'ERROR 22-322: Syntax error',
+                        result: {}
+                    });
+                    saveSpy = jest
+                        .spyOn(jobUtils, 'saveLog')
+                        .mockResolvedValue(undefined);
+                    checkSpy = jest
+                        .spyOn(logcheck, 'checkLog')
+                        .mockRejectedValue(new Error('SAS log check failed'));
+                    return [4 /*yield*/, expect((0, sas9_1.executeJobSas9)(sasjs, {}, 'job/path', 'job.log')).rejects.toThrow('SAS log check failed')];
+                case 1:
+                    _a.sent();
+                    expect(saveSpy).toHaveBeenCalledWith('ERROR 22-322: Syntax error', 'job.log', 'job/path');
+                    expect(saveSpy.mock.invocationCallOrder[0]).toBeLessThan(checkSpy.mock.invocationCallOrder[0]);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/build/commands/job/spec/jobCommand.spec.js

@@ -106,6 +106,7 @@ var utils_1 = require("@sasjs/utils");
 var SasjsUtilsFilesModule = __importStar(require("@sasjs/utils/file"));
 var configUtils = __importStar(require("../../../utils/config"));
 var command_1 = require("../../../types/command");
+var logcheck_1 = require("../../../utils/logcheck");
 var utilsModule = __importStar(require("../internal/utils"));
 var defaultArgs = ['node', 'sasjs', 'job', 'execute'];
 var targetViya = new utils_1.Target({
@@ -149,6 +150,37 @@ describe('JobCommand', function () {
         beforeEach(function () {
             setupMocksForViya();
         });
+        afterEach(function () { return (0, logcheck_1.setLogCheckMode)('auto'); });
+        it('should return the logcheck code when the log check failed the job', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var args, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        jest
+                            .spyOn(viyaExecuteModule, 'executeJobViya')
+                            .mockImplementation(function () {
+                            return Promise.reject(new logcheck_1.LogCheckFailure('2 errors'));
+                        });
+                        args = __spreadArray(__spreadArray([], __read(defaultArgs), false), [jobPath], false);
+                        _a = expect;
+                        return [4 /*yield*/, new jobCommand_1.JobCommand(args).execute()];
+                    case 1:
+                        _a.apply(void 0, [_b.sent()]).toEqual(command_1.ReturnCode.LogCheckError);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('should switch the log check off for --no-logcheck', function () { return __awaiter(void 0, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, executeCommandWrapper([jobPath, '--no-logcheck'])];
+                    case 1:
+                        _a.sent();
+                        expect((0, logcheck_1.getLogCheckMode)()).toEqual('off');
+                        return [2 /*return*/];
+                }
+            });
+        }); });
         it('should parse sasjs job execute command', function () { return __awaiter(void 0, void 0, void 0, function () {
             var _a;
             return __generator(this, function (_b) {

package/build/commands/logcheck/logCheckConfig.d.ts

@@ -14,6 +14,17 @@ export declare const DEFAULT_FOLDER = "sasjsresults";
  * @param source - the file it came from, named in the error message.
  */
 export declare const parseLogCheckSection: (section: unknown, source?: string) => LogCheckConfig;
+/**
+ * Where a project's config may be, in the order they are tried.
+ *
+ * `sasjs/sasjsconfig.json` is the SASjs convention and the one the rest of the
+ * CLI reads, so it wins. A `sasjsconfig.json` at the project root is still
+ * honoured, because a folder holding a single log and a hand-written config is
+ * exactly the case this command is meant to serve - but the two are never
+ * confused for each other, and the convention cannot be shadowed by a stray
+ * file next to it.
+ */
+export declare const configCandidates: (projectDir: string) => string[];
 /**
  * Reads the `logCheck` policy from the project's `sasjsconfig.json`.
  *

package/build/commands/logcheck/logCheckConfig.js

@@ -46,6 +46,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 __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -75,7 +86,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toPosix = exports.globToRegExp = exports.isIgnoredPath = exports.matchesSegments = exports.matchesPath = exports.mergeConfig = exports.readLogCheckConfig = exports.parseLogCheckSection = exports.DEFAULT_FOLDER = exports.CONFIG_KEY = void 0;
+exports.toPosix = exports.globToRegExp = exports.isIgnoredPath = exports.matchesSegments = exports.matchesPath = exports.mergeConfig = exports.readLogCheckConfig = exports.configCandidates = exports.parseLogCheckSection = exports.DEFAULT_FOLDER = exports.CONFIG_KEY = void 0;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("@sasjs/utils");
 var types_1 = require("./types");
@@ -102,7 +113,7 @@ var parseLogCheckSection = function (section, source) {
     if (typeof section !== 'object' || Array.isArray(section)) {
         throw new Error("The `".concat(exports.CONFIG_KEY, "` property in ").concat(source, " must be an object."));
     }
-    var _a = section, failOn = _a.failOn, maxWarnings = _a.maxWarnings, ignoreCodes = _a.ignoreCodes, ignorePaths = _a.ignorePaths, folder = _a.folder;
+    var _a = section, failOn = _a.failOn, maxWarnings = _a.maxWarnings, ignoreCodes = _a.ignoreCodes, ignorePaths = _a.ignorePaths, folder = _a.folder, autoCheck = _a.autoCheck;
     if (failOn !== undefined) {
         if (!failOnValues.includes(failOn)) {
             throw new Error("The `".concat(exports.CONFIG_KEY, ".failOn` property in ").concat(source, " must be one of ").concat(failOnValues.join(', '), " - received `").concat(String(failOn), "`."));
@@ -123,6 +134,12 @@ var parseLogCheckSection = function (section, source) {
     if (ignorePaths !== undefined) {
         config.ignorePaths = stringList(ignorePaths, "".concat(exports.CONFIG_KEY, ".ignorePaths"), source);
     }
+    if (autoCheck !== undefined) {
+        if (typeof autoCheck !== 'boolean') {
+            throw new Error("The `".concat(exports.CONFIG_KEY, ".autoCheck` property in ").concat(source, " must be true or false - received `").concat(String(autoCheck), "`."));
+        }
+        config.autoCheck = autoCheck;
+    }
     if (folder !== undefined) {
         if (typeof folder !== 'string' || !folder.trim()) {
             throw new Error("The `".concat(exports.CONFIG_KEY, ".folder` property in ").concat(source, " must be a non-empty string."));
@@ -132,6 +149,21 @@ var parseLogCheckSection = function (section, source) {
     return config;
 };
 exports.parseLogCheckSection = parseLogCheckSection;
+/**
+ * Where a project's config may be, in the order they are tried.
+ *
+ * `sasjs/sasjsconfig.json` is the SASjs convention and the one the rest of the
+ * CLI reads, so it wins. A `sasjsconfig.json` at the project root is still
+ * honoured, because a folder holding a single log and a hand-written config is
+ * exactly the case this command is meant to serve - but the two are never
+ * confused for each other, and the convention cannot be shadowed by a stray
+ * file next to it.
+ */
+var configCandidates = function (projectDir) { return [
+    path_1.default.join(projectDir, 'sasjs', 'sasjsconfig.json'),
+    path_1.default.join(projectDir, 'sasjsconfig.json')
+]; };
+exports.configCandidates = configCandidates;
 /**
  * Reads the `logCheck` policy from the project's `sasjsconfig.json`.
  *
@@ -140,39 +172,67 @@ exports.parseLogCheckSection = parseLogCheckSection;
  * whole point of checking a log somebody else produced.
  */
 var readLogCheckConfig = function () { return __awaiter(void 0, void 0, void 0, function () {
-    var projectDir, configPath, raw, parsed, section, config, resultsFolder;
-    var _a, _b, _c, _d;
-    return __generator(this, function (_e) {
-        switch (_e.label) {
+    var projectDir, _a, _b, configPath, raw, e_1_1;
+    var e_1, _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 projectDir = process.projectDir || process.cwd();
-                configPath = path_1.default.join(projectDir, 'sasjsconfig.json');
-                return [4 /*yield*/, (0, utils_1.readFile)(configPath).catch(function () { return undefined; })];
+                _d.label = 1;
             case 1:
-                raw = _e.sent();
-                if (!raw)
-                    return [2 /*return*/, __assign(__assign({}, types_1.defaultLogCheckConfig), { ignoreCodes: [], ignorePaths: [] })];
+                _d.trys.push([1, 6, 7, 8]);
+                _a = __values((0, exports.configCandidates)(projectDir)), _b = _a.next();
+                _d.label = 2;
+            case 2:
+                if (!!_b.done) return [3 /*break*/, 5];
+                configPath = _b.value;
+                return [4 /*yield*/, (0, utils_1.readFile)(configPath).catch(function () { return undefined; })];
+            case 3:
+                raw = _d.sent();
+                if (raw)
+                    return [2 /*return*/, readConfigAt(configPath, raw)];
+                _d.label = 4;
+            case 4:
+                _b = _a.next();
+                return [3 /*break*/, 2];
+            case 5: return [3 /*break*/, 8];
+            case 6:
+                e_1_1 = _d.sent();
+                e_1 = { error: e_1_1 };
+                return [3 /*break*/, 8];
+            case 7:
                 try {
-                    parsed = JSON.parse(raw);
+                    if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                 }
-                catch (error) {
-                    throw new Error("Could not parse ".concat(configPath, ": ").concat(error.message));
-                }
-                section = (_b = (_a = parsed === null || parsed === void 0 ? void 0 : parsed.config) === null || _a === void 0 ? void 0 : _a[exports.CONFIG_KEY]) !== null && _b !== void 0 ? _b : parsed === null || parsed === void 0 ? void 0 : parsed[exports.CONFIG_KEY];
-                config = (0, exports.parseLogCheckSection)(section, configPath);
-                // A project may have moved its results folder; the bare command follows it,
-                // unless the logCheck section names a folder of its own.
-                if (!config.folder) {
-                    resultsFolder = (_d = (_c = parsed === null || parsed === void 0 ? void 0 : parsed.config) === null || _c === void 0 ? void 0 : _c.sasjsResultsFolder) !== null && _d !== void 0 ? _d : parsed === null || parsed === void 0 ? void 0 : parsed.sasjsResultsFolder;
-                    if (typeof resultsFolder === 'string' && resultsFolder.trim()) {
-                        config.folder = resultsFolder.trim();
-                    }
-                }
-                return [2 /*return*/, config];
+                finally { if (e_1) throw e_1.error; }
+                return [7 /*endfinally*/];
+            case 8: return [2 /*return*/, __assign(__assign({}, types_1.defaultLogCheckConfig), { ignoreCodes: [], ignorePaths: [] })];
         }
     });
 }); };
 exports.readLogCheckConfig = readLogCheckConfig;
+/** Parses one config document into the policy - see {@link readLogCheckConfig}. */
+var readConfigAt = function (configPath, raw) {
+    var _a, _b, _c, _d;
+    var parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch (error) {
+        throw new Error("Could not parse ".concat(configPath, ": ").concat(error.message));
+    }
+    var section = (_b = (_a = parsed === null || parsed === void 0 ? void 0 : parsed.config) === null || _a === void 0 ? void 0 : _a[exports.CONFIG_KEY]) !== null && _b !== void 0 ? _b : parsed === null || parsed === void 0 ? void 0 : parsed[exports.CONFIG_KEY];
+    var config = (0, exports.parseLogCheckSection)(section, configPath);
+    // A project may have moved its results folder; the bare command follows it,
+    // unless the logCheck section names a folder of its own.
+    if (!config.folder) {
+        var resultsFolder = (_d = (_c = parsed === null || parsed === void 0 ? void 0 : parsed.config) === null || _c === void 0 ? void 0 : _c.sasjsResultsFolder) !== null && _d !== void 0 ? _d : parsed === null || parsed === void 0 ? void 0 : parsed.sasjsResultsFolder;
+        if (typeof resultsFolder === 'string' && resultsFolder.trim()) {
+            config.folder = resultsFolder.trim();
+        }
+    }
+    return config;
+};
 /**
  * Layers the command line over the config file. Suppressions are added, never
  * replaced: a flag silences one more code for one run, it does not un-silence

package/build/commands/logcheck/renderLogCheck.d.ts

@@ -84,6 +84,7 @@ export declare const toJson: (summary: LogCheckSummary, config: LogCheckConfig)
     config: {
         failOn: import("./types").FailOn;
         maxWarnings: number | null;
+        autoCheck: boolean;
         ignoreCodes: string[];
         ignorePaths: string[];
     };

package/build/commands/logcheck/renderLogCheck.js

@@ -346,6 +346,7 @@ var toJson = function (summary, config) {
         config: {
             failOn: config.failOn,
             maxWarnings: (_a = config.maxWarnings) !== null && _a !== void 0 ? _a : null,
+            autoCheck: config.autoCheck === true,
             ignoreCodes: config.ignoreCodes,
             ignorePaths: config.ignorePaths
         },