@sasjs/cli 6.28.0 → 6.29.0

package/build/commands/create/spec/angularAppFiles.js

@@ -7,7 +7,6 @@ exports.angularAppFiles = {
         { fileName: 'package.json' },
         { fileName: 'package-lock.json' },
         { fileName: 'tsconfig.json' },
-        { fileName: 'tslint.json' },
         { fileName: 'angular.json' },
         { fileName: 'tsconfig.app.json' },
         { fileName: 'README.md' }
@@ -50,7 +49,6 @@ exports.angularAppFiles = {
                     files: [
                         { fileName: 'app.component.html' },
                         { fileName: 'app.component.scss' },
-                        { fileName: 'app.component.spec.ts' },
                         { fileName: 'app.component.ts' },
                         { fileName: 'app.module.ts' },
                         { fileName: 'app-routing.module.ts' },
@@ -64,7 +62,6 @@ exports.angularAppFiles = {
                             folderName: 'sasjs-ui',
                             files: [
                                 { fileName: 'sasjs-ui.component.html' },
-                                { fileName: 'sasjs-ui.component.spec.ts' },
                                 { fileName: 'sasjs-ui.component.scss' },
                                 { fileName: 'sasjs-ui.component.ts' }
                             ],
@@ -75,7 +72,6 @@ exports.angularAppFiles = {
                             files: [
                                 { fileName: 'data.component.html' },
                                 { fileName: 'data.component.scss' },
-                                { fileName: 'data.component.spec.ts' },
                                 { fileName: 'data.component.ts' }
                             ],
                             subFolders: []
@@ -85,7 +81,6 @@ exports.angularAppFiles = {
                             files: [
                                 { fileName: 'home-page.component.html' },
                                 { fileName: 'home-page.component.scss' },
-                                { fileName: 'home-page.component.spec.ts' },
                                 { fileName: 'home-page.component.ts' }
                             ],
                             subFolders: []
@@ -111,8 +106,11 @@ exports.angularAppFiles = {
             ]
         },
         {
+            // The docs folder is a submodule, and its pages are the submodule's own
+            // (a docsify site today, an index.html before that). The folder is what
+            // this asserts; naming a page here breaks on the submodule's next change.
             folderName: 'docs',
-            files: [{ fileName: 'index.html' }],
+            files: [],
             subFolders: []
         }
     ]

package/build/commands/deploy/spec/cbd.spec.js

@@ -115,7 +115,7 @@ describe('sasjs cbd with server type SASJS', function () {
         });
     }); });
     it("should deploy compile and build to sasjs/server", function () { return __awaiter(void 0, void 0, void 0, function () {
-        var deployMock, _a, customTarget, macroCorePath, mf_getuser, _b, mp_jsonout, ms_webout, webout, mocksPath, appinitJSPath, getdataJSPath, appinitJSContents, getdataJSContents, depsInserts, appinit, getdata, getCode;
+        var deployMock, _a, customTarget, macroCorePath, mf_getuser, _b, mp_jsonout, ms_webout, webout, mocksPath, appinitJSPath, getdataJSPath, springsJSONPath, appinitJSContents, getdataJSContents, springsJSONContents, depsInserts, appinit, getdata, getCode;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -183,12 +183,16 @@ describe('sasjs cbd with server type SASJS', function () {
                     mocksPath = path_1.default.join(__dirname, appName, 'sasjs', 'mocks');
                     appinitJSPath = path_1.default.join(mocksPath, 'services', 'common', 'appinit.js');
                     getdataJSPath = path_1.default.join(mocksPath, 'services', 'common', 'getdata.js');
+                    springsJSONPath = path_1.default.join(mocksPath, 'services', 'common', 'springs.json');
                     return [4 /*yield*/, (0, utils_1.readFile)(appinitJSPath)];
                 case 11:
                     appinitJSContents = _c.sent();
                     return [4 /*yield*/, (0, utils_1.readFile)(getdataJSPath)];
                 case 12:
                     getdataJSContents = _c.sent();
+                    return [4 /*yield*/, (0, utils_1.readFile)(springsJSONPath)];
+                case 13:
+                    springsJSONContents = _c.sent();
                     depsInserts = "\n\n* Service Variables start;\n\n\n* Service Variables end;\n* SAS Macros start;\n\n\n\n* SAS Macros end;\n* SAS Includes start;\n\n* SAS Includes end;\n* Binary Files start;\n\n* Binary Files end;\n\n\n* Service start;\n";
                     appinit = "/**\n  @file appinit.sas\n  @brief Initialisation service - runs on app startup\n  @details  This is always the first service called when the app is opened.\n\n  <h4> SAS Macros </h4>\n\n**/\n\nproc sql;\ncreate table areas as select distinct area\n  from mydb.springs;\n\n%webout(OPEN)\n%webout(OBJ,areas)\n%webout(CLOSE)\n\n";
                     getdata = "/**\n  @file getdata.sas\n  @brief Get Data service - runs on app startup\n  @details  This is always the first service called when the app is opened.\n\n  <h4> SAS Macros </h4>\n\n**/\n\n%webout(FETCH)\n\nproc sql;\ncreate table springs as select * from mydb.springs\n  where area in (select area from work.areas);\n\n%webout(OPEN)\n%webout(OBJ,springs)\n%webout(CLOSE)\n\n";
@@ -228,6 +232,12 @@ describe('sasjs cbd with server type SASJS', function () {
                                                     name: 'getdata',
                                                     type: 'service',
                                                     code: getCode((0, utils_1.removeHeader)(getdata))
+                                                },
+                                                {
+                                                    name: 'springs.json',
+                                                    type: 'file',
+                                                    encoding: 'base64',
+                                                    code: (0, js_base64_1.encode)(springsJSONContents)
                                                 }
                                             ]
                                         }

package/build/commands/shared/createLintConfigFile.js

@@ -1,4 +1,15 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __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) {
@@ -43,18 +54,29 @@ exports.createLintConfigFile = void 0;
 var path_1 = __importDefault(require("path"));
 var lint_1 = require("@sasjs/lint");
 var utils_1 = require("@sasjs/utils");
+/**
+ * Where the settings of a `.sasjslint` are documented.
+ *
+ * The file is read as strict JSON, so it cannot carry comments - the same
+ * problem `sasjsconfig.json` answers with `$schema`, and the same address
+ * pattern (`sasjs init` writes https://cli.sasjs.io/sasjsconfig-schema.json).
+ * An editor that understands JSON schemas then completes the settings and
+ * shows each one's description as it is typed.
+ */
+var lintSchemaUrl = 'https://cli.sasjs.io/sasjslint-schema.json';
 /**
  * Creates a SASjs Lint configuration file.
  * Its name will be of the form '.sasjslint'
  * @param {string} parentFolderName- the name of the project folder.
  */
 var createLintConfigFile = function (parentFolderName) { return __awaiter(void 0, void 0, void 0, function () {
-    var configDestinationPath;
+    var configDestinationPath, config;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
                 configDestinationPath = path_1.default.join(process.projectDir, parentFolderName, '.sasjslint');
-                return [4 /*yield*/, (0, utils_1.createFile)(configDestinationPath, JSON.stringify(lint_1.DefaultLintConfiguration, null, 2))];
+                config = __assign({ $schema: lintSchemaUrl }, lint_1.DefaultLintConfiguration);
+                return [4 /*yield*/, (0, utils_1.createFile)(configDestinationPath, JSON.stringify(config, null, 2))];
             case 1:
                 _a.sent();
                 return [2 /*return*/];

package/build/commands/shared/spec/createLintConfigFile.spec.d.ts

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

package/build/commands/shared/spec/createLintConfigFile.spec.js

@@ -0,0 +1,132 @@
+"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 __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var promises_1 = require("fs/promises");
+var os = __importStar(require("os"));
+var path = __importStar(require("path"));
+var lint_1 = require("@sasjs/lint");
+var utils_1 = require("@sasjs/utils");
+var createLintConfigFile_1 = require("../createLintConfigFile");
+/**
+ * The file this writes is the first thing a new project has to edit, and the
+ * only place its settings are described: it is read as strict JSON, so it cannot
+ * carry comments, and `$schema` is what gives an editor the description of each
+ * setting where it is written.
+ */
+describe('createLintConfigFile', function () {
+    var originalProjectDir = process.projectDir;
+    var projectDir;
+    beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    projectDir = path.join(os.tmpdir(), "sasjs-lint-config-".concat(Date.now(), "-").concat(Math.random().toString(36).slice(2)));
+                    return [4 /*yield*/, (0, utils_1.createFolder)(projectDir)];
+                case 1:
+                    _a.sent();
+                    process.projectDir = projectDir;
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    afterEach(function () {
+        process.projectDir = originalProjectDir;
+    });
+    it('writes every default setting, with the schema', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var written, _a, _b, _schema, settings;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0: return [4 /*yield*/, (0, createLintConfigFile_1.createLintConfigFile)('.')];
+                case 1:
+                    _c.sent();
+                    _b = (_a = JSON).parse;
+                    return [4 /*yield*/, (0, promises_1.readFile)(path.join(projectDir, '.sasjslint'), 'utf-8')];
+                case 2:
+                    written = _b.apply(_a, [_c.sent()]);
+                    expect(written.$schema).toEqual('https://cli.sasjs.io/sasjslint-schema.json');
+                    _schema = written.$schema, settings = __rest(written, ["$schema"]);
+                    expect(settings).toEqual(lint_1.DefaultLintConfiguration);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+});

package/build/utils/test.js

@@ -585,9 +585,11 @@ var verifyPackageJsonContent = function () {
                 case 2:
                     packageJsonContent = _a.sent();
                     packageJson = JSON.parse(packageJsonContent);
-                    expect(parentFolderName.includes('minimal')
-                        ? packageJson.devDependencies
-                        : packageJson.dependencies).toEqual(expect.objectContaining({ '@sasjs/core': expect.anything() }));
+                    // Which map the seed app declares its SASjs dependency in is the seed's
+                    // business - a web app carries @sasjs/core as a devDependency (it compiles
+                    // the macros in) while the jobs template installs it as a dependency. What
+                    // this asserts is that the template brings the macros with it at all.
+                    expect(__assign(__assign({}, packageJson.devDependencies), packageJson.dependencies)).toEqual(expect.objectContaining({ '@sasjs/core': expect.anything() }));
                     return [2 /*return*/];
             }
         });

package/package.json

@@ -125,5 +125,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "6.28.0"
+  "version": "6.29.0"
 }