@sasjs/cli 6.15.0 → 6.17.0

package/build/commands/build/internal/mockSite/spec/sw.spec.js

@@ -35,17 +35,6 @@ 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;
@@ -62,13 +51,26 @@ var __read = (this && this.__read) || function (o, n) {
     }
     return ar;
 };
+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 };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = __importDefault(require("path"));
 var api_1 = require("@sasjs/api");
+var os_1 = __importDefault(require("os"));
 var yazl_1 = __importDefault(require("yazl"));
+var mockSite_1 = require("../mockSite");
 /**
  * The other half of the parity claim: the service worker is what turns an
  * /SASjsApi/ request into a response, so its framing (webout body, the _debug
@@ -87,6 +89,19 @@ var drivePath = function (relative) {
 var apiBrowserBuild = function () {
     return path_1.default.join(path_1.default.dirname(require.resolve('@sasjs/api')), '..', '..', 'build', 'browser.js');
 };
+/**
+ * The lint bundle the site ships, built once for the suite from the installed
+ * packages - the same call `sasjs build` makes, so the worker under test answers
+ * the code routes with the code the site carries.
+ */
+var lintBundlePath;
+var lintBundle = function () {
+    if (!lintBundlePath) {
+        lintBundlePath = path_1.default.join(os_1.default.tmpdir(), "sasjs-lint-".concat(process.pid, ".js"));
+        (0, mockSite_1.buildLintBundle)(lintBundlePath);
+    }
+    return lintBundlePath;
+};
 var loadWorker = function () {
     jest.resetModules();
     var handlers = {};
@@ -108,6 +123,13 @@ var loadWorker = function () {
             return;
         if (path.includes('api-browser'))
             return require(apiBrowserBuild());
+        if (path.includes('lint-browser')) {
+            // the bundle assigns globalThis.SASjsCode, and this harness keeps the
+            // worker's `self` apart from the module global
+            require(lintBundle());
+            self.SASjsCode = global.SASjsCode;
+            return;
+        }
         require('../assets/runtime-core.js');
         // The corpus needs the same drive with its writes refused, without building
         // a second site. The flag is flipped after the case has seeded, because a
@@ -133,10 +155,20 @@ var loadWorker = function () {
         };
     };
     require('../assets/sw.js');
-    global.fetch = jest.fn(function (url) { return __awaiter(void 0, void 0, void 0, function () {
+    global.fetch = jest.fn(function (input) { return __awaiter(void 0, void 0, void 0, function () {
+        var target;
         var _a;
         return __generator(this, function (_b) {
-            return [2 /*return*/, String(url).includes('vfs-seed')
+            target = typeof input === 'string' ? input : (input && input.url) || String(input);
+            // a navigation back to the site root: the static host's copy of the page
+            if (new URL(target, origin).pathname === '/')
+                return [2 /*return*/, new Response('<html><body>static page</body></html>', {
+                        status: 200,
+                        headers: { 'content-type': 'text/html' }
+                    })];
+            if (target.includes('index.html'))
+                return [2 /*return*/, new Response('<!doctype html><html><head><title>App</title></head><body>home</body></html>', { status: 200, headers: { 'content-type': 'text/html' } })];
+            return [2 /*return*/, target.includes('vfs-seed')
                     ? jsonResponse({
                         files: (_a = {},
                             _a[drivePath('services/public/getdata.js')] = '_webout = "seeded";',
@@ -699,85 +731,204 @@ describe('service worker host', function () {
                 }
             });
         }); });
-        it('answers the documented 501 for the capabilities a static origin lacks', function () { return __awaiter(void 0, void 0, void 0, function () {
-            var dispatch, cases, cases_1, cases_1_1, _a, method, url, capability, response, _b, e_1_1, _c, _d, url, response, _e, e_2_1;
-            var e_1, _f, e_2, _g;
-            return __generator(this, function (_h) {
-                switch (_h.label) {
+        it('answers the Admin reports from the worker activity log', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var dispatch, empty, _a, afterFirst, _b, listed, lines, infoLines, diagnostics, report, logs, _c, tail, tailBody, wrongName, missing;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
                         dispatch = seeded().dispatch;
-                        cases = [
-                            ['GET', '/SASjsApi/admin/diagnostics', 'admin service'],
-                            ['GET', '/SASjsApi/admin/logs', 'admin service'],
-                            ['GET', '/SASjsApi/admin/logs/app.log', 'admin service'],
-                            [
-                                'POST',
-                                '/SASjsApi/authConfig/synchroniseWithLDAP',
-                                'directory service'
-                            ]
-                        ];
-                        _h.label = 1;
+                        return [4 /*yield*/, dispatch('/SASjsApi/admin/diagnostics')];
                     case 1:
-                        _h.trys.push([1, 7, 8, 9]);
-                        cases_1 = __values(cases), cases_1_1 = cases_1.next();
-                        _h.label = 2;
+                        empty = _d.sent();
+                        _a = expect;
+                        return [4 /*yield*/, empty.json()];
                     case 2:
-                        if (!!cases_1_1.done) return [3 /*break*/, 6];
-                        _a = __read(cases_1_1.value, 3), method = _a[0], url = _a[1], capability = _a[2];
-                        return [4 /*yield*/, dispatch(url, { method: method })];
+                        _a.apply(void 0, [(_d.sent()).logs]).toEqual({
+                            folder: 'worker memory',
+                            fileCount: 0,
+                            totalBytes: 0,
+                            newestFile: null,
+                            newestModified: null
+                        });
+                        return [4 /*yield*/, dispatch('/SASjsApi/admin/logs')];
                     case 3:
-                        response = _h.sent();
-                        expect(response.status).toBe(501);
+                        afterFirst = _d.sent();
                         _b = expect;
-                        return [4 /*yield*/, response.json()];
+                        return [4 /*yield*/, afterFirst.json()];
                     case 4:
-                        _b.apply(void 0, [(_h.sent()).message]).toContain(capability);
-                        _h.label = 5;
+                        _b.apply(void 0, [(_d.sent()).files.length]).toBe(1);
+                        // the file's mtime is the last write, not the moment a report was read:
+                        // /info was the request immediately before this listing
+                        return [4 /*yield*/, dispatch('/SASjsApi/info')];
                     case 5:
-                        cases_1_1 = cases_1.next();
-                        return [3 /*break*/, 2];
-                    case 6: return [3 /*break*/, 9];
+                        // the file's mtime is the last write, not the moment a report was read:
+                        // /info was the request immediately before this listing
+                        _d.sent();
+                        return [4 /*yield*/, dispatch('/SASjsApi/admin/logs')];
+                    case 6: return [4 /*yield*/, (_d.sent()).json()];
                     case 7:
-                        e_1_1 = _h.sent();
-                        e_1 = { error: e_1_1 };
-                        return [3 /*break*/, 9];
-                    case 8:
-                        try {
-                            if (cases_1_1 && !cases_1_1.done && (_f = cases_1.return)) _f.call(cases_1);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                        return [7 /*endfinally*/];
+                        listed = (_d.sent())
+                            .files[0];
+                        return [4 /*yield*/, dispatch('/SASjsApi/admin/logs/app.log?lines=20')];
+                    case 8: return [4 /*yield*/, (_d.sent()).json()];
                     case 9:
-                        _h.trys.push([9, 15, 16, 17]);
-                        _c = __values(['/SASjsApi/code/lint', '/SASjsApi/code/format']), _d = _c.next();
-                        _h.label = 10;
+                        lines = (_d.sent()).content.split('\n');
+                        infoLines = lines.filter(function (line) {
+                            return line.includes('GET /SASjsApi/info 200');
+                        });
+                        expect(infoLines.length).toBe(1);
+                        expect(infoLines[0].startsWith(listed.modified)).toBe(true);
+                        return [4 /*yield*/, dispatch('/SASjsApi/admin/diagnostics')];
                     case 10:
-                        if (!!_d.done) return [3 /*break*/, 14];
-                        url = _d.value;
-                        return [4 /*yield*/, dispatch(url, runRequest({ code: 'data a;' }))];
+                        diagnostics = _d.sent();
+                        expect(diagnostics.status).toBe(200);
+                        return [4 /*yield*/, diagnostics.json()];
                     case 11:
-                        response = _h.sent();
-                        expect(response.status).toBe(501);
-                        _e = expect;
-                        return [4 /*yield*/, response.json()];
+                        report = _d.sent();
+                        expect(report.server.mode).toBe('browser');
+                        expect(report.filesystem).toBeNull();
+                        expect(report.logs.fileCount).toBe(1);
+                        expect(typeof report.memory.heapTotalBytes).toBe('number');
+                        return [4 /*yield*/, dispatch('/SASjsApi/admin/logs')];
                     case 12:
-                        _e.apply(void 0, [(_h.sent()).message]).toContain('code service');
-                        _h.label = 13;
+                        logs = _d.sent();
+                        _c = expect;
+                        return [4 /*yield*/, logs.json()];
                     case 13:
-                        _d = _c.next();
-                        return [3 /*break*/, 10];
-                    case 14: return [3 /*break*/, 17];
+                        _c.apply(void 0, [(_d.sent()).files.map(function (file) { return file.name; })]).toEqual([
+                            'app.log'
+                        ]);
+                        return [4 /*yield*/, dispatch('/SASjsApi/admin/logs/app.log?lines=5')];
+                    case 14:
+                        tail = _d.sent();
+                        return [4 /*yield*/, tail.json()];
                     case 15:
-                        e_2_1 = _h.sent();
-                        e_2 = { error: e_2_1 };
-                        return [3 /*break*/, 17];
+                        tailBody = _d.sent();
+                        expect(tail.status).toBe(200);
+                        expect(tailBody.content).toContain('GET /SASjsApi/info 200');
+                        return [4 /*yield*/, dispatch('/SASjsApi/admin/logs/secret.txt')];
                     case 16:
-                        try {
-                            if (_d && !_d.done && (_g = _c.return)) _g.call(_c);
-                        }
-                        finally { if (e_2) throw e_2.error; }
+                        wrongName = _d.sent();
+                        expect(wrongName.status).toBe(400);
+                        return [4 /*yield*/, dispatch('/SASjsApi/admin/logs/other.log')];
+                    case 17:
+                        missing = _d.sent();
+                        expect(missing.status).toBe(404);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('imports the fixture directory, and unpublishes the site itself', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var dispatch, synced, _a, unpublished, _b, other;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        dispatch = seeded().dispatch;
+                        return [4 /*yield*/, dispatch('/SASjsApi/authConfig/synchroniseWithLDAP', { method: 'POST' })];
+                    case 1:
+                        synced = _c.sent();
+                        expect(synced.status).toBe(200);
+                        _a = expect;
+                        return [4 /*yield*/, synced.json()];
+                    case 2:
+                        _a.apply(void 0, [_c.sent()]).toEqual({ userCount: 0, groupCount: 0 });
+                        return [4 /*yield*/, dispatch('/SASjsApi/drive/deploy', {
+                                method: 'DELETE',
+                                headers: { 'content-type': 'application/json' },
+                                body: JSON.stringify({
+                                    streamServiceName: 'Test',
+                                    appLoc: appLoc
+                                })
+                            })];
+                    case 3:
+                        unpublished = _c.sent();
+                        expect(unpublished.status).toBe(200);
+                        _b = expect;
+                        return [4 /*yield*/, unpublished.json()];
+                    case 4:
+                        _b.apply(void 0, [_c.sent()]).toEqual({ status: 'success' });
+                        return [4 /*yield*/, dispatch('/SASjsApi/drive/deploy', {
+                                method: 'DELETE',
+                                headers: { 'content-type': 'application/json' },
+                                body: JSON.stringify({
+                                    streamServiceName: 'Other',
+                                    appLoc: '/Public/app/other'
+                                })
+                            })];
+                    case 5:
+                        other = _c.sent();
+                        expect(other.status).toBe(404);
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('lints and formats a buffer with the bundled linter', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var dispatch, linted, diagnostics, formatted, _a;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        dispatch = seeded().dispatch;
+                        return [4 /*yield*/, dispatch('/SASjsApi/code/lint', runRequest({ code: 'data a;\nrun;\n' }))];
+                    case 1:
+                        linted = _b.sent();
+                        expect(linted.status).toBe(200);
+                        return [4 /*yield*/, linted.json()];
+                    case 2:
+                        diagnostics = _b.sent();
+                        expect(Array.isArray(diagnostics)).toBe(true);
+                        expect(diagnostics.length).toBeGreaterThan(0);
+                        expect(diagnostics[0].message).toContain('Doxygen');
+                        return [4 /*yield*/, dispatch('/SASjsApi/code/format', runRequest({ code: 'data a;set b;run;' }))];
+                    case 3:
+                        formatted = _b.sent();
+                        expect(formatted.status).toBe(200);
+                        _a = expect;
+                        return [4 /*yield*/, formatted.text()];
+                    case 4:
+                        _a.apply(void 0, [_b.sent()]).toContain('@brief');
+                        return [2 /*return*/];
+                }
+            });
+        }); });
+        it('serves the build page at the home route, and falls back when it fails', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var worker, response, _a, runtime, original, fallback, body;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        worker = seeded();
+                        return [4 /*yield*/, worker.dispatch('/')];
+                    case 1:
+                        response = _b.sent();
+                        expect(response.status).toBe(200);
+                        expect(response.headers.get('content-type')).toContain('text/html');
+                        _a = expect;
+                        return [4 /*yield*/, response.text()];
+                    case 2:
+                        _a.apply(void 0, [_b.sent()]).toContain('<body>home</body>');
+                        runtime = worker.self.SASjsMockRuntime;
+                        original = runtime.ensureReady;
+                        runtime.ensureReady = function () { return __awaiter(void 0, void 0, void 0, function () {
+                            return __generator(this, function (_a) {
+                                throw new Error('home route exploded');
+                            });
+                        }); };
+                        _b.label = 3;
+                    case 3:
+                        _b.trys.push([3, , 6, 7]);
+                        return [4 /*yield*/, worker.dispatch('/')];
+                    case 4:
+                        fallback = _b.sent();
+                        expect(fallback.status).toBe(200);
+                        return [4 /*yield*/, fallback.text()];
+                    case 5:
+                        body = _b.sent();
+                        expect(body).toContain('static page');
+                        expect(body).not.toContain('home route exploded');
+                        return [3 /*break*/, 7];
+                    case 6:
+                        runtime.ensureReady = original;
                         return [7 /*endfinally*/];
-                    case 17: return [2 /*return*/];
+                    case 7: return [2 /*return*/];
                 }
             });
         }); });
@@ -1006,6 +1157,46 @@ describe('service worker host', function () {
             }
         });
     }); });
+    it('answers the app stream as the server does, with nothing in it', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var dispatch, listing, _a, root, landing, _b, app, _c;
+        return __generator(this, function (_d) {
+            switch (_d.label) {
+                case 0:
+                    dispatch = seeded().dispatch;
+                    return [4 /*yield*/, dispatch('/AppStream/apps.json')];
+                case 1:
+                    listing = _d.sent();
+                    expect(listing.status).toBe(200);
+                    _a = expect;
+                    return [4 /*yield*/, listing.json()];
+                case 2:
+                    _a.apply(void 0, [_d.sent()]).toEqual({ apps: [] });
+                    return [4 /*yield*/, dispatch('/AppStream')];
+                case 3:
+                    root = _d.sent();
+                    expect(root.status).toBe(301);
+                    expect(root.headers.get('location')).toBe('/AppStream/');
+                    return [4 /*yield*/, dispatch('/AppStream/')];
+                case 4:
+                    landing = _d.sent();
+                    expect(landing.status).toBe(200);
+                    expect(landing.headers.get('content-type')).toContain('text/html');
+                    _b = expect;
+                    return [4 /*yield*/, landing.text()];
+                case 5:
+                    _b.apply(void 0, [_d.sent()]).toContain('serves no apps');
+                    return [4 /*yield*/, dispatch('/AppStream/Demo/')];
+                case 6:
+                    app = _d.sent();
+                    expect(app.status).toBe(404);
+                    _c = expect;
+                    return [4 /*yield*/, app.json()];
+                case 7:
+                    _c.apply(void 0, [(_d.sent()).message]).toContain('serves no apps');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('leaves a request to another origin alone', function () {
         var dispatch = seeded().dispatch;
         expect(dispatch('https://other.example.com/SASjsApi/info')).toBeUndefined();
@@ -1856,7 +2047,7 @@ describe('service worker host', function () {
         }); });
     });
     describe('conformance corpus', function () {
-        var e_3, _a;
+        var e_1, _a;
         /**
          * The corpus is what "the same API" means: the cases @sasjs/api runs against
          * its own services, and against a live sasjs/server, run here against this
@@ -1865,7 +2056,7 @@ describe('service worker host', function () {
          * used to have - and it is a test rather than a review.
          */
         var httpFor = function (testCase) {
-            var e_4, _a;
+            var e_2, _a;
             var _b;
             var _c = __read(testCase.route.split(' '), 2), method = _c[0], routePath = _c[1];
             var query = new URLSearchParams();
@@ -1876,12 +2067,12 @@ describe('service worker host', function () {
                         query.set(key, String(value));
                 }
             }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
             finally {
                 try {
                     if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
                 }
-                finally { if (e_4) throw e_4.error; }
+                finally { if (e_2) throw e_2.error; }
             }
             var suffix = query.toString() ? "?".concat(query) : '';
             var init = { method: method };
@@ -1912,8 +2103,8 @@ describe('service worker host', function () {
          * does.
          */
         var seedDrive = function (runtime, testCase) { return __awaiter(void 0, void 0, void 0, function () {
-            var text, _a, _b, _c, file, contents, _d, _e, _f, file, contents, e_5_1;
-            var e_6, _g, e_5, _h;
+            var text, _a, _b, _c, file, contents, _d, _e, _f, file, contents, e_3_1;
+            var e_4, _g, e_3, _h;
             return __generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
@@ -1925,12 +2116,12 @@ describe('service worker host', function () {
                                     text["/sasjs/drive/files".concat(file)] = contents;
                             }
                         }
-                        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
                             }
-                            finally { if (e_6) throw e_6.error; }
+                            finally { if (e_4) throw e_4.error; }
                         }
                         return [4 /*yield*/, runtime.load(text)];
                     case 1:
@@ -1953,14 +2144,14 @@ describe('service worker host', function () {
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_5_1 = _j.sent();
-                        e_5 = { error: e_5_1 };
+                        e_3_1 = _j.sent();
+                        e_3 = { error: e_3_1 };
                         return [3 /*break*/, 9];
                     case 8:
                         try {
                             if (_e && !_e.done && (_h = _d.return)) _h.call(_d);
                         }
-                        finally { if (e_5) throw e_5.error; }
+                        finally { if (e_3) throw e_3.error; }
                         return [7 /*endfinally*/];
                     case 9: return [2 /*return*/];
                 }
@@ -2028,12 +2219,12 @@ describe('service worker host', function () {
                 _loop_1(testCase);
             }
         }
-        catch (e_3_1) { e_3 = { error: e_3_1 }; }
+        catch (e_1_1) { e_1 = { error: e_1_1 }; }
         finally {
             try {
                 if (DRIVE_CORPUS_1_1 && !DRIVE_CORPUS_1_1.done && (_a = DRIVE_CORPUS_1.return)) _a.call(DRIVE_CORPUS_1);
             }
-            finally { if (e_3) throw e_3.error; }
+            finally { if (e_1) throw e_1.error; }
         }
     });
 });

package/package.json

@@ -78,6 +78,7 @@
     "axios": "1.20.0",
     "chalk": "4.1.2",
     "dotenv": "18.0.8",
+    "esbuild": "0.28.2",
     "js-base64": "3.9.4",
     "jsdom": "26.0.0",
     "lodash.uniqby": "4.7.0",
@@ -124,5 +125,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "6.15.0"
+  "version": "6.17.0"
 }