@sasjs/cli 6.4.1 → 6.4.3

package/build/commands/deploy/internal/executeDeployScriptSas9.js

@@ -76,7 +76,8 @@ function executeDeployScriptSas9(deployScriptName, target, linesToExecute, logFi
                 case 2:
                     executionResult = _f.sent();
                     if (!executionResult) {
-                        return [2 /*return*/, (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error('Error getting execution log')];
+                        (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error("Deployment failed: the runner returned no execution log for ".concat(deployScriptName, "."));
+                        throw new Error("Deployment failed.");
                     }
                     logContent = completedWithError
                         ? executionResult.result

package/build/commands/deploy/internal/executeDeployScriptSasjs.js

@@ -53,7 +53,7 @@ var _1 = require(".");
  */
 function executeDeployScriptSasjs(deployScriptName, target, linesToExecute, logFilePath, streamConfig) {
     return __awaiter(this, void 0, void 0, function () {
-        var authConfig, _a, sasjs, completedWithError, executionResult, logContent, webAppStreamUrl;
+        var authConfig, _a, sasjs, completedWithError, executionResult, webAppStreamUrl;
         var _b, _c, _d, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -82,14 +82,12 @@ function executeDeployScriptSasjs(deployScriptName, target, linesToExecute, logF
                             .catch(function (err) {
                             var errorString = (0, _1.formatErrorString)(err);
                             process.logger.error('executeScript Error:', errorString);
+                            completedWithError = true;
                             return errorString;
                         })];
                 case 5:
                     executionResult = _f.sent();
-                    logContent = completedWithError
-                        ? executionResult.result
-                        : executionResult;
-                    return [4 /*yield*/, (0, utils_1.createFile)(logFilePath, logContent !== null && logContent !== void 0 ? logContent : '')];
+                    return [4 /*yield*/, (0, utils_1.createFile)(logFilePath, executionResult !== null && executionResult !== void 0 ? executionResult : '')];
                 case 6:
                     _f.sent();
                     if (completedWithError) {

package/build/commands/deploy/internal/spec/executeDeployScriptSas9.spec.d.ts

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

package/build/commands/deploy/internal/spec/executeDeployScriptSas9.spec.js

@@ -0,0 +1,229 @@
+"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 path_1 = __importDefault(require("path"));
+var utils_1 = require("@sasjs/utils");
+var configUtils = __importStar(require("../../../../utils/config"));
+var executeDeployScriptSas9_1 = require("../executeDeployScriptSas9");
+var errorLogContents = "ERROR: Expecting an arithmetic operator.\nERROR: %ABORT statement is not valid in open code.";
+/**
+ * A stored process error as the adapter surfaces it - JobExecutionError
+ * carries the SAS log in `result`. Reproduced here as a plain object so the
+ * test does not depend on the adapter's node entry re-exporting the class.
+ */
+var jobExecutionError = function (result) {
+    return Object.assign(new Error('Error Code 500: This request completed with errors.'), {
+        name: 'JobExecutionError',
+        errorCode: 500,
+        errorMessage: 'This request completed with errors.',
+        result: result
+    });
+};
+describe('executeDeployScriptSas9', function () {
+    var logFilePath = path_1.default.join(__dirname, 'sasjsbuild', 'mysas9deploy.log');
+    var deployScriptName = 'mysas9deploy.sas';
+    var linesToExecute = ['proc sql;', 'quit;'];
+    var target = new utils_1.Target({
+        name: 'sas9',
+        serverUrl: 'https://sas.example.com:8343',
+        appLoc: '/Public/app',
+        serverType: utils_1.ServerType.Sas9
+    });
+    var executeScript;
+    beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            process.logger = new utils_1.Logger();
+            jest.spyOn(process.logger, 'success').mockImplementation(function () { });
+            jest.spyOn(process.logger, 'error').mockImplementation(function () { });
+            jest.spyOn(process.logger, 'info').mockImplementation(function () { });
+            jest.spyOn(process.logger, 'log').mockImplementation(function () { });
+            executeScript = jest.fn();
+            jest.spyOn(configUtils, 'getSASjsAndAuthConfig').mockResolvedValue({
+                sasjs: { executeScript: executeScript },
+                authConfigSas9: {
+                    userName: 'sasjsuser',
+                    password: (0, utils_1.encodeToBase64)('secret')
+                }
+            });
+            return [2 /*return*/];
+        });
+    }); });
+    it('should write the execution log and report success', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a;
+        var _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    executeScript.mockResolvedValue('NOTE: Services deployed.');
+                    return [4 /*yield*/, (0, executeDeployScriptSas9_1.executeDeployScriptSas9)(deployScriptName, target, linesToExecute, logFilePath)];
+                case 1:
+                    _d.sent();
+                    expect(executeScript).toHaveBeenCalledWith({
+                        linesOfCode: linesToExecute,
+                        authConfigSas9: { userName: 'sasjsuser', password: 'secret' }
+                    });
+                    _a = expect;
+                    return [4 /*yield*/, (0, utils_1.readFile)(logFilePath)];
+                case 2:
+                    _a.apply(void 0, [_d.sent()]).toEqual('NOTE: Services deployed.');
+                    expect((_b = process.logger) === null || _b === void 0 ? void 0 : _b.success).toHaveBeenCalledWith("Deployment completed! Log is available at ".concat(logFilePath));
+                    expect((_c = process.logger) === null || _c === void 0 ? void 0 : _c.error).not.toHaveBeenCalled();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should write the SAS log, report the log path and fail the deploy when the job errors', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a;
+        var _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    executeScript.mockRejectedValue(jobExecutionError(errorLogContents));
+                    return [4 /*yield*/, expect((0, executeDeployScriptSas9_1.executeDeployScriptSas9)(deployScriptName, target, linesToExecute, logFilePath)).rejects.toThrow('Deployment failed.')];
+                case 1:
+                    _d.sent();
+                    _a = expect;
+                    return [4 /*yield*/, (0, utils_1.readFile)(logFilePath)];
+                case 2:
+                    _a.apply(void 0, [_d.sent()]).toEqual(errorLogContents);
+                    expect((_b = process.logger) === null || _b === void 0 ? void 0 : _b.error).toHaveBeenCalledWith("Deployment failed with errors! Log is available at ".concat(logFilePath));
+                    expect((_c = process.logger) === null || _c === void 0 ? void 0 : _c.success).not.toHaveBeenCalled();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should fail the deploy when the SASjs runner is missing, with the runner message and no stale success line', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var runnerError;
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    runnerError = jobExecutionError('');
+                    runnerError.message =
+                        "Error Code 500: SASJS runner not found. Here's the link (https://cli.sasjs.io/auth/#sasjs-runner) to the SAS code for registering the SASjs runner";
+                    executeScript.mockRejectedValue(runnerError);
+                    return [4 /*yield*/, expect((0, executeDeployScriptSas9_1.executeDeployScriptSas9)(deployScriptName, target, linesToExecute, logFilePath)).rejects.toThrow('Deployment failed.')];
+                case 1:
+                    _c.sent();
+                    expect((_a = process.logger) === null || _a === void 0 ? void 0 : _a.error).toHaveBeenCalledWith(expect.stringContaining('SASJS runner not found'));
+                    expect((_b = process.logger) === null || _b === void 0 ? void 0 : _b.success).not.toHaveBeenCalled();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should still fail the deploy when a non-job error is raised', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    executeScript.mockRejectedValue(new Error('socket hang up'));
+                    return [4 /*yield*/, expect((0, executeDeployScriptSas9_1.executeDeployScriptSas9)(deployScriptName, target, linesToExecute, logFilePath)).rejects.toThrow('Deployment failed.')];
+                case 1:
+                    _c.sent();
+                    expect((_a = process.logger) === null || _a === void 0 ? void 0 : _a.error).toHaveBeenCalledWith(expect.stringContaining('socket hang up'));
+                    expect((_b = process.logger) === null || _b === void 0 ? void 0 : _b.success).not.toHaveBeenCalled();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should fail the deploy when the runner returns no execution log', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    executeScript.mockResolvedValue(undefined);
+                    return [4 /*yield*/, expect((0, executeDeployScriptSas9_1.executeDeployScriptSas9)(deployScriptName, target, linesToExecute, logFilePath)).rejects.toThrow('Deployment failed.')];
+                case 1:
+                    _c.sent();
+                    expect((_a = process.logger) === null || _a === void 0 ? void 0 : _a.error).toHaveBeenCalledWith("Deployment failed: the runner returned no execution log for ".concat(deployScriptName, "."));
+                    expect((_b = process.logger) === null || _b === void 0 ? void 0 : _b.success).not.toHaveBeenCalled();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should print the web app URL for a streaming target', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    executeScript.mockResolvedValue('NOTE: Services deployed.');
+                    return [4 /*yield*/, (0, executeDeployScriptSas9_1.executeDeployScriptSas9)(deployScriptName, target, linesToExecute, logFilePath, { streamWeb: true, streamServiceName: 'clickme' })];
+                case 1:
+                    _b.sent();
+                    expect((_a = process.logger) === null || _a === void 0 ? void 0 : _a.info).toHaveBeenCalledWith("Web app is available at ".concat(target.serverUrl, "/SASStoredProcess/?_PROGRAM=").concat(encodeURI(target.appLoc), "/services/clickme"));
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/build/commands/deploy/internal/spec/executeDeployScriptSasjs.spec.d.ts

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

package/build/commands/deploy/internal/spec/executeDeployScriptSasjs.spec.js

@@ -0,0 +1,159 @@
+"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 path_1 = __importDefault(require("path"));
+var utils_1 = require("@sasjs/utils");
+var configUtils = __importStar(require("../../../../utils/config"));
+var utilsModule = __importStar(require("../../../../utils/utils"));
+var executeDeployScriptSasjs_1 = require("../executeDeployScriptSasjs");
+describe('executeDeployScriptSasjs', function () {
+    var logFilePath = path_1.default.join(__dirname, 'sasjsbuild', 'sasjsdeploy.log');
+    var deployScriptName = 'sasjsdeploy.sas';
+    var linesToExecute = ['data _null_;', 'run;'];
+    var target = new utils_1.Target({
+        name: 'sasjs',
+        serverUrl: 'http://localhost:5000',
+        appLoc: '/Public/app',
+        serverType: utils_1.ServerType.Sasjs
+    });
+    var executeScript;
+    beforeEach(function () {
+        process.logger = new utils_1.Logger();
+        jest.spyOn(process.logger, 'success').mockImplementation(function () { });
+        jest.spyOn(process.logger, 'error').mockImplementation(function () { });
+        jest.spyOn(process.logger, 'info').mockImplementation(function () { });
+        jest.spyOn(process.logger, 'log').mockImplementation(function () { });
+        jest
+            .spyOn(utilsModule, 'isSasJsServerInServerMode')
+            .mockResolvedValue(false);
+        executeScript = jest.fn();
+        jest.spyOn(configUtils, 'getSASjs').mockReturnValue({
+            executeScript: executeScript
+        });
+    });
+    it('should write the execution log and report success', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a;
+        var _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    executeScript.mockResolvedValue('NOTE: Services deployed.');
+                    return [4 /*yield*/, (0, executeDeployScriptSasjs_1.executeDeployScriptSasjs)(deployScriptName, target, linesToExecute, logFilePath)];
+                case 1:
+                    _d.sent();
+                    _a = expect;
+                    return [4 /*yield*/, (0, utils_1.readFile)(logFilePath)];
+                case 2:
+                    _a.apply(void 0, [_d.sent()]).toEqual('NOTE: Services deployed.');
+                    expect((_b = process.logger) === null || _b === void 0 ? void 0 : _b.success).toHaveBeenCalledWith("Deployment completed! Log is available at ".concat(logFilePath));
+                    expect((_c = process.logger) === null || _c === void 0 ? void 0 : _c.error).not.toHaveBeenCalled();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should write the error to the log and fail the deploy when the runner errors', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a;
+        var _b, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    executeScript.mockRejectedValue(new Error('Error executing script: job failed'));
+                    return [4 /*yield*/, expect((0, executeDeployScriptSasjs_1.executeDeployScriptSasjs)(deployScriptName, target, linesToExecute, logFilePath)).rejects.toThrow('Deployment failed.')];
+                case 1:
+                    _d.sent();
+                    _a = expect;
+                    return [4 /*yield*/, (0, utils_1.readFile)(logFilePath)];
+                case 2:
+                    _a.apply(void 0, [_d.sent()]).toContain('Error executing script: job failed');
+                    expect((_b = process.logger) === null || _b === void 0 ? void 0 : _b.error).toHaveBeenCalledWith("Deployment failed with errors! Log is available at ".concat(logFilePath));
+                    expect((_c = process.logger) === null || _c === void 0 ? void 0 : _c.success).not.toHaveBeenCalled();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('should print the web app URL for a streaming target', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    executeScript.mockResolvedValue('NOTE: Services deployed.');
+                    return [4 /*yield*/, (0, executeDeployScriptSasjs_1.executeDeployScriptSasjs)(deployScriptName, target, linesToExecute, logFilePath, { streamWeb: true, streamServiceName: 'clickme' })];
+                case 1:
+                    _b.sent();
+                    expect((_a = process.logger) === null || _a === void 0 ? void 0 : _a.info).toHaveBeenCalledWith("Web app is available at ".concat(target.serverUrl, "/AppStream/clickme"));
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/build/commands/help/help.js

@@ -52,7 +52,8 @@ function printHelpText() {
                     description: [
                         "Creates the 'sasjs' folder and doxy subfolder (with content files + configuration) for docs",
                         "- Inserted in the current working directory.",
-                        "- If an existing NPM project, package.json is updated with the @sasjs/core dependency."
+                        "- If an existing NPM project, package.json is updated with the @sasjs/core dependency.",
+                        "- Aborts without changing anything if this folder already contains sasjs/sasjsconfig.json."
                     ]
                 },
                 {

package/build/commands/init/init.d.ts

@@ -1,7 +1,22 @@
+export declare class AlreadyInitialisedError extends Error {
+    constructor(message: string);
+}
 export declare function init(): Promise<void>;
+/**
+ * Creates the macro folder that the generated `macroFolders` points at.
+ * `sasjs compile` fails with ENOENT when that folder is absent, so an
+ * initialised project compiles before the user has written a macro.
+ * The folder carries a `.gitkeep` because git does not track empty directories -
+ * without it the folder disappears on clone and compilation breaks again.
+ * @param {string} parentFolderName- the name of the project folder.
+ */
+export declare const createMacroFolder: (parentFolderName: string) => Promise<void>;
 /**
  * Creates a SASjs configuration file.
  * Its name will be of the form 'sasjsconfig.json'
+ * The target's `serverUrl` is empty rather than a placeholder URL: an empty
+ * value reads as "not configured yet", while any non-empty placeholder has to
+ * pass URL validation every time the config is read.
  * @param {string} parentFolderName- the name of the project folder.
  */
 export declare const createConfigFile: (parentFolderName: string) => Promise<void>;

package/build/commands/init/init.js

@@ -1,4 +1,19 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 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) {
@@ -39,49 +54,104 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConfigFile = void 0;
+exports.createConfigFile = exports.createMacroFolder = exports.AlreadyInitialisedError = void 0;
 exports.init = init;
 var path_1 = __importDefault(require("path"));
 var utils_1 = require("../../utils/utils");
 var utils_2 = require("@sasjs/utils");
 var createLintConfigFile_1 = require("../shared/createLintConfigFile");
+var AlreadyInitialisedError = /** @class */ (function (_super) {
+    __extends(AlreadyInitialisedError, _super);
+    function AlreadyInitialisedError(message) {
+        var _this = _super.call(this, message) || this;
+        _this.name = 'AlreadyInitialisedError';
+        // The build targets ES5, where extending a built-in does not repair the
+        // prototype chain - without this, `instanceof` is false at runtime.
+        Object.setPrototypeOf(_this, AlreadyInitialisedError.prototype);
+        return _this;
+    }
+    return AlreadyInitialisedError;
+}(Error));
+exports.AlreadyInitialisedError = AlreadyInitialisedError;
 function init() {
     return __awaiter(this, void 0, void 0, function () {
-        var parentFolderName, lintConfigPath;
+        var parentFolderName, existingConfigPath, lintConfigPath;
         var _a;
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     (_a = process.logger) === null || _a === void 0 ? void 0 : _a.info('Initialising SASjs...');
                     parentFolderName = '.';
-                    return [4 /*yield*/, (0, utils_1.setupNpmProject)(parentFolderName)];
+                    existingConfigPath = path_1.default.join(process.projectDir, parentFolderName, 'sasjs', 'sasjsconfig.json');
+                    return [4 /*yield*/, (0, utils_2.fileExists)(existingConfigPath)];
                 case 1:
+                    if (_b.sent()) {
+                        throw new AlreadyInitialisedError('This folder is already a SASjs project (sasjs/sasjsconfig.json exists). Aborting without making changes.');
+                    }
+                    return [4 /*yield*/, (0, utils_1.setupNpmProject)(parentFolderName)];
+                case 2:
                     _b.sent();
                     return [4 /*yield*/, (0, utils_1.setupGitIgnore)(parentFolderName)];
-                case 2:
+                case 3:
                     _b.sent();
                     return [4 /*yield*/, (0, utils_1.setupDoxygen)(parentFolderName)];
-                case 3:
+                case 4:
                     _b.sent();
                     return [4 /*yield*/, (0, exports.createConfigFile)(parentFolderName)];
-                case 4:
+                case 5:
+                    _b.sent();
+                    return [4 /*yield*/, (0, exports.createMacroFolder)(parentFolderName)];
+                case 6:
                     _b.sent();
                     lintConfigPath = path_1.default.join(process.projectDir, parentFolderName, '.sasjslint');
                     return [4 /*yield*/, (0, utils_2.fileExists)(lintConfigPath)];
-                case 5:
-                    if (!!(_b.sent())) return [3 /*break*/, 7];
+                case 7:
+                    if (!!(_b.sent())) return [3 /*break*/, 9];
                     return [4 /*yield*/, (0, createLintConfigFile_1.createLintConfigFile)(parentFolderName)];
-                case 6:
+                case 8:
                     _b.sent();
-                    _b.label = 7;
-                case 7: return [2 /*return*/];
+                    _b.label = 9;
+                case 9: return [2 /*return*/];
             }
         });
     });
 }
+/**
+ * Creates the macro folder that the generated `macroFolders` points at.
+ * `sasjs compile` fails with ENOENT when that folder is absent, so an
+ * initialised project compiles before the user has written a macro.
+ * The folder carries a `.gitkeep` because git does not track empty directories -
+ * without it the folder disappears on clone and compilation breaks again.
+ * @param {string} parentFolderName- the name of the project folder.
+ */
+var createMacroFolder = function (parentFolderName) { return __awaiter(void 0, void 0, void 0, function () {
+    var macroFolderPath, gitKeepPath;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                macroFolderPath = path_1.default.join(process.projectDir, parentFolderName, 'sasjs', 'macros');
+                return [4 /*yield*/, (0, utils_2.createFolder)(macroFolderPath)];
+            case 1:
+                _a.sent();
+                gitKeepPath = path_1.default.join(macroFolderPath, '.gitkeep');
+                return [4 /*yield*/, (0, utils_2.fileExists)(gitKeepPath)];
+            case 2:
+                if (!!(_a.sent())) return [3 /*break*/, 4];
+                return [4 /*yield*/, (0, utils_2.createFile)(gitKeepPath, '')];
+            case 3:
+                _a.sent();
+                _a.label = 4;
+            case 4: return [2 /*return*/];
+        }
+    });
+}); };
+exports.createMacroFolder = createMacroFolder;
 /**
  * Creates a SASjs configuration file.
  * Its name will be of the form 'sasjsconfig.json'
+ * The target's `serverUrl` is empty rather than a placeholder URL: an empty
+ * value reads as "not configured yet", while any non-empty placeholder has to
+ * pass URL validation every time the config is read.
  * @param {string} parentFolderName- the name of the project folder.
  */
 var createConfigFile = function (parentFolderName) { return __awaiter(void 0, void 0, void 0, function () {
@@ -97,7 +167,7 @@ var createConfigFile = function (parentFolderName) { return __awaiter(void 0, vo
                         {
                             name: 'mytarget',
                             serverType: 'SASJS',
-                            serverUrl: ' ',
+                            serverUrl: '',
                             appLoc: '/Public/apps/myapp'
                         }
                     ]

package/build/commands/init/initCommand.js

@@ -85,8 +85,15 @@ var InitCommand = /** @class */ (function (_super) {
                             return command_1.ReturnCode.Success;
                         })
                             .catch(function (err) {
-                            var _a;
-                            (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error('Error initialising SASjs: ', err);
+                            var _a, _b;
+                            // Refusing an already-initialised folder is an expected outcome, not a
+                            // crash: report it on one line, and exit with a code a script can tell
+                            // apart from a genuine failure.
+                            if (err instanceof init_1.AlreadyInitialisedError) {
+                                (_a = process.logger) === null || _a === void 0 ? void 0 : _a.error(err.message);
+                                return command_1.ReturnCode.AlreadyInitialised;
+                            }
+                            (_b = process.logger) === null || _b === void 0 ? void 0 : _b.error('Error initialising SASjs: ', err);
                             return command_1.ReturnCode.InternalError;
                         })];
                     case 1: return [2 /*return*/, _a.sent()];