@sasjs/cli 6.31.0 → 6.32.0

package/build/commands/build/internal/mockSite/assets/api-console.js

@@ -23,13 +23,34 @@
   'use strict'
 
   /**
-   * The site's root, from the page's own URL: the console sits at `<base>/api/`,
-   * and half a URL (no trailing slash) is the shape a person types.
+   * The site's root.
+   *
+   * Taken from the worker that controls this page, `<base>/sw.js`: that is the
+   * one statement of the base the page carries, and it holds wherever the console
+   * sits - a copy under `<base>/tools/api-console/` still calls the site's own
+   * API rather than a folder that happens to be two levels up. Only a worker
+   * whose root covers this page counts, since a page can be controlled by another
+   * site's worker, and one registered below the page names a folder inside it. A
+   * page with no such worker falls back to its own URL, one level below the root.
    */
   const base = (function () {
-    const path = location.pathname.replace(/\/index\.html$/, '/')
-    const cut = /\/api\/?$/.exec(path)
-    return cut ? path.slice(0, cut.index + 1) : '/'
+    // this page's own folder, however it was typed: with the page, with the
+    // file, or without the trailing slash
+    let dir = location.pathname
+    if (/\/index\.html?$/.test(dir)) dir = dir.replace(/index\.html?$/, '')
+    if (!dir.endsWith('/')) dir += '/'
+    const parent = dir.replace(/[^/]+\/$/, '')
+
+    const script =
+      navigator.serviceWorker && navigator.serviceWorker.controller
+        ? navigator.serviceWorker.controller.scriptURL
+        : ''
+    if (script) {
+      const swPath = new URL(script).pathname
+      const root = /\/sw\.js$/.test(swPath) ? swPath.replace(/sw\.js$/, '') : ''
+      if (root && parent.startsWith(root)) return root
+    }
+    return parent || '/'
   })()
 
   const apiUrl = (path) => base + String(path).replace(/^\/+/, '')
@@ -76,7 +97,7 @@
    * Starts the demo backend for this page.
    *
    * The application's boot loader registers the worker; a visitor who lands on
-   * `/api/` first has no loader, and every request would reach the static host
+   * `/api-console/` first has no loader, and every request would reach the static host
    * and 404. So: register it beside the site, wait for it to control this page,
    * then load `host/persist.js`, which is what hands the worker the drive this
    * browser already has and keeps whatever this page changes.
@@ -692,6 +713,14 @@
         )
     })
 
+  /** Where a reset returns to: this page, without the flag but with the route. */
+  const resetTarget = () => {
+    const query = new URLSearchParams(location.search)
+    query.delete('reset')
+    const rest = query.toString()
+    return location.pathname + (rest ? '?' + rest : '')
+  }
+
   /**
    * `?reset=1` starts the demo again from the state the build ships.
    *
@@ -719,7 +748,9 @@
         'The demo could not be reset: ' + ((e && e.message) || e)
       return true
     }
-    location.replace(base + 'api/')
+    // back to this page, with the flag gone: the console's folder is the page's
+    // own, so a build that moves the folder cannot strand the redirect
+    location.replace(resetTarget())
     return true
   }
 
@@ -755,6 +786,10 @@
     if (chosen) select(chosen)
   }
 
+  // the redirect itself cannot be observed in a page that does not navigate; the
+  // choice of target can, and it is what a folder move would break
+  window.SASjsApiConsole = { resetTarget }
+
   start().catch((e) => {
     const list = el('routes')
     if (list) list.textContent = 'The console could not start: ' + e.message

package/build/commands/build/internal/mockSite/assets/api-index.html

@@ -9,7 +9,7 @@
       The API console for a browser-hosted build.
 
       Static, and deliberately so: no bundler, no framework, no network of its
-      own beyond the API it is documenting. It is served from <base>/api/ and
+      own beyond the API it is documenting. It is served from <base>/api-console/ and
       every request it makes is the same request an application makes, so the
       service worker answers it and the answer is the mock's real answer.
 

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

@@ -1732,22 +1732,6 @@ const handle = async (request, url) => {
   return response
 }
 
-// The console's own files under `/api/`, replaced at build time from the list the
-// builder writes the folder from, so the two cannot drift apart.
-const API_CONSOLE_FILES = [
-  'index.html',
-  'console.js',
-  'console.css',
-  'operations.json'
-]
-
-const CONSOLE_FILE = new RegExp(
-  '^/api/(' +
-    API_CONSOLE_FILES.map((name) => name.replace(/\./g, '\\.')).join('|') +
-    ')$',
-  'i'
-)
-
 self.addEventListener('fetch', (event) => {
   const url = new URL(event.request.url)
   if (url.origin !== self.location.origin) return
@@ -1780,20 +1764,13 @@ self.addEventListener('fetch', (event) => {
   // listing is the server's web route, and an interface that lists apps asks for
   // it on every visit.
   //
-  // `/api` and `/api/` on their own are the console page - `api/index.html`,
-  // which this build writes - so the worker stays out of the way there and the
-  // static host answers it. Every other `/api/...` is an API call on the short
-  // spelling, which routeRequest canonicalises to `/SASjsApi`.
+  // `/api` and `/api/` on their own are left to the static host: a site's own
+  // application can answer that route (this framework's server interface does),
+  // and the worker has no business putting an API answer in front of it. Every
+  // other `/api/...` is an API call on the short spelling, which routeRequest
+  // canonicalises to `/SASjsApi`.
   if (/^\/api\/?$/i.test(path)) return
 
-  // And the console's own files, which live under that prefix: a path naming one
-  // of them is the page's, not an API call, so the static host answers it. Named
-  // one by one on purpose - an extension test would also pass through
-  // `/api/admin/logs/foo.log`, which is a real call on the short spelling. The
-  // list is replaced at build time with the one the builder writes the folder
-  // from, so a file added there cannot arrive here as an API path.
-  if (CONSOLE_FILE.test(path)) return
-
   if (!/^\/(SASjsApi|SASLogon|AppStream|api|app)(\/|$)/i.test(path)) return
   event.respondWith(handle(event.request, url))
 })

package/build/commands/build/internal/mockSite/mockSite.d.ts

@@ -14,7 +14,7 @@ export interface MockSiteResult {
      * large folder or file. Zero when the site ships no snapshot.
      */
     snapshotShards: number;
-    /** True when the site carries the API console at <base>/api/. */
+    /** True when the site carries the API console at <base>/api-console/. */
     apiConsole: boolean;
     /** True when a recorded SAS session was shipped, for .sas runs to answer. */
     sasTranscript: boolean;

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

@@ -1008,7 +1008,15 @@ var patchIndexHtml = function (html, version, basePath, outputFolder) {
     }
     return { patched: patched, warnings: warnings };
 };
-/** The files the console consists of, under `<output>/api`. */
+/**
+ * The folder the console lives in, under the site root.
+ *
+ * Not `api`: an application can answer `/api` itself - this framework's own server
+ * interface does - and a page there would collide with its route, so a site
+ * refresh on that screen would land on the console instead of the application.
+ */
+var API_CONSOLE_DIR = 'api-console';
+/** The files the console consists of, under `<output>/api-console`. */
 var API_CONSOLE_FILES = [
     'index.html',
     'console.js',
@@ -1016,7 +1024,7 @@ var API_CONSOLE_FILES = [
     'operations.json'
 ];
 /**
- * The API console: a page at `<base>/api/` that lists every operation the API
+ * The API console: a page at `<base>/api-console/` that lists every operation the API
  * document declares and sends them against this host.
  *
  * The route table is the same one the worker answers from (`ROUTES` from
@@ -1028,8 +1036,8 @@ var API_CONSOLE_FILES = [
  * a visit costs the demo nothing until someone types the URL.
  */
 var writeApiConsole = function (outputFolder, version) {
-    var folder = path_1.default.join(outputFolder, 'api');
-    // `<base>/api/` is this build's, not the project's: a site that ships its own
+    var folder = path_1.default.join(outputFolder, API_CONSOLE_DIR);
+    // `<base>/api-console/` is this build's, not the project's: a site that ships its own
     // files there would have them replaced without a word, so it keeps them and
     // the console is left out
     var taken = API_CONSOLE_FILES.filter(function (file) {
@@ -1040,7 +1048,7 @@ var writeApiConsole = function (outputFolder, version) {
             written: false,
             operations: 0,
             warning: "The site already carries ".concat(taken
-                .map(function (file) { return 'api/' + file; })
+                .map(function (file) { return API_CONSOLE_DIR + '/' + file; })
                 .join(', '), ", so the API console was not written. ") +
                 'Move those files, or set streamConfig.mockApi to false to silence this.'
         };
@@ -1260,10 +1268,7 @@ function buildMockSite(target) {
                         .readFileSync(swPath, 'utf8')
                         .replace("importScripts('host/runtime-core.js')", "importScripts('host/runtime-core.js?v=".concat(hostVersion, "')"))
                         .replace("importScripts('host/api-browser.js')", "importScripts('host/api-browser.js?v=".concat(hostVersion, "')"))
-                        .replace("importScripts('host/lint-browser.js')", "importScripts('host/lint-browser.js?v=".concat(hostVersion, "')"))
-                        // the console's file list, from the one place that writes the folder: a
-                        // second copy here would let a new file be served as an API path
-                        .replace(/const API_CONSOLE_FILES = \[[^\]]*\]/, "const API_CONSOLE_FILES = ".concat(JSON.stringify(API_CONSOLE_FILES))));
+                        .replace("importScripts('host/lint-browser.js')", "importScripts('host/lint-browser.js?v=".concat(hostVersion, "')")));
                     snapshotSource = path_1.default.join(buildFolder, 'mock-snapshot.json');
                     hasSnapshot = fs_1.default.existsSync(snapshotSource);
                     snapshotShards = 0;

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

@@ -675,7 +675,7 @@ describe('the API console', function () {
                 case 0:
                     jest.resetModules();
                     document.body.innerHTML = bodyOf(page());
-                    history.replaceState({}, '', '/api/?route=' + encodeURIComponent('GET /SASjsApi/user'));
+                    history.replaceState({}, '', '/api-console/?route=' + encodeURIComponent('GET /SASjsApi/user'));
                     global.fetch = jest.fn(function (url) { return __awaiter(void 0, void 0, void 0, function () {
                         return __generator(this, function (_a) {
                             return [2 /*return*/, String(url).includes('operations.json')
@@ -699,7 +699,7 @@ describe('the API console', function () {
                     return [3 /*break*/, 1];
                 case 4:
                     expect(document.getElementById('title').textContent).toBe('GET /SASjsApi/user');
-                    history.replaceState({}, '', '/api/');
+                    history.replaceState({}, '', '/api-console/');
                     return [2 /*return*/];
             }
         });
@@ -1093,7 +1093,7 @@ describe('the API console', function () {
                     // jsdom does not navigate, and the redirect is the last thing the page does:
                     // what matters here is that the drive was reset before it
                     return [4 /*yield*/, loadConsole(function () {
-                            history.replaceState({}, '', '/api/?reset=1');
+                            history.replaceState({}, '', '/api-console/?reset=1');
                             window.SASjsMock = { reset: reset };
                         })];
                 case 1:
@@ -1105,7 +1105,7 @@ describe('the API console', function () {
                     _a.sent();
                     expect(reset).toHaveBeenCalled();
                     expect(sessionStorage.length).toBe(0);
-                    history.replaceState({}, '', '/api/');
+                    history.replaceState({}, '', '/api-console/');
                     return [2 /*return*/];
             }
         });
@@ -1125,7 +1125,7 @@ describe('the API console', function () {
                     return [4 /*yield*/, loadConsole(function () {
                             // no host bridge on this page at all
                             delete window.SASjsMock;
-                            history.replaceState({}, '', '/api/?reset=1');
+                            history.replaceState({}, '', '/api-console/?reset=1');
                         })];
                 case 1:
                     _a.sent();
@@ -1136,7 +1136,7 @@ describe('the API console', function () {
                     _a.sent();
                     expect(global.indexedDB.deleteDatabase).toHaveBeenCalledWith('sasjs-mock-host');
                     expect(document.getElementById('routes').textContent).toContain('still holds the drive');
-                    history.replaceState({}, '', '/api/');
+                    history.replaceState({}, '', '/api-console/');
                     delete global.indexedDB;
                     return [2 /*return*/];
             }
@@ -1152,7 +1152,7 @@ describe('the API console', function () {
                     }); }); });
                     sessionStorage.setItem('mock-console-token', 'kept');
                     return [4 /*yield*/, loadConsole(function () {
-                            history.replaceState({}, '', '/api/?reset=0');
+                            history.replaceState({}, '', '/api-console/?reset=0');
                             window.SASjsMock = { reset: reset };
                         })];
                 case 1:
@@ -1162,7 +1162,7 @@ describe('the API console', function () {
                     _a.sent();
                     expect(reset).not.toHaveBeenCalled();
                     expect(sessionStorage.getItem('mock-console-token')).toBe('kept');
-                    history.replaceState({}, '', '/api/');
+                    history.replaceState({}, '', '/api-console/');
                     return [2 /*return*/];
             }
         });
@@ -1331,6 +1331,72 @@ describe('the API console', function () {
             }
         });
     }); });
+    it('says so, rather than reloading again, when the worker never claims the page', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var error, host, i;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    error = jest.spyOn(console, 'error').mockImplementation(function () { });
+                    host = withServiceWorker();
+                    sessionStorage.setItem('mock-console-reloaded', '1');
+                    return [4 /*yield*/, loadConsole()];
+                case 1:
+                    _a.sent();
+                    i = 0;
+                    _a.label = 2;
+                case 2:
+                    if (!(i < 200)) return [3 /*break*/, 5];
+                    if (error.mock.calls.some(function (call) { return /take control/.test(String(call[0])); }))
+                        return [3 /*break*/, 5];
+                    return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 25); })];
+                case 3:
+                    _a.sent();
+                    _a.label = 4;
+                case 4:
+                    i++;
+                    return [3 /*break*/, 2];
+                case 5:
+                    expect(error.mock.calls.some(function (call) { return /take control/.test(String(call[0])); })).toBe(true);
+                    expect(host.sw.register).toHaveBeenCalled();
+                    error.mockRestore();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('returns to its own page after a reset, wherever that page is', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var deleted, page;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    deleted = [];
+                    global.indexedDB = {
+                        deleteDatabase: function (name) {
+                            deleted.push(name);
+                            var request = {};
+                            setTimeout(function () { return request.onsuccess && request.onsuccess(); }, 5);
+                            return request;
+                        }
+                    };
+                    return [4 /*yield*/, loadConsole(function () {
+                            delete window.SASjsMock;
+                            history.replaceState({}, '', '/demo/api-console/?reset=1&route=GET%20%2FSASjsApi%2Fuser');
+                        })];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, settle(function () { return deleted.length > 0; })];
+                case 2:
+                    _a.sent();
+                    page = window.SASjsApiConsole;
+                    expect(page).toBeDefined();
+                    // the folder is the page's, the flag goes, and the route the visitor was on
+                    // stays: a reset should not cost them the deep link
+                    expect(page.resetTarget()).toBe('/demo/api-console/?route=GET+%2FSASjsApi%2Fuser');
+                    delete global.indexedDB;
+                    history.replaceState({}, '', '/api-console/');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('drops the token when the visitor goes back to the demo administrator', function () { return __awaiter(void 0, void 0, void 0, function () {
         var calls, back;
         return __generator(this, function (_a) {

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

@@ -66,7 +66,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @jest-environment jsdom
- * @jest-environment-options {"url": "http://localhost/demo/api/"}
+ * @jest-environment-options {"url": "http://localhost/demo/api-console/"}
  */
 var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
@@ -74,11 +74,10 @@ var path_1 = __importDefault(require("path"));
  * The console under a base path.
  *
  * `mockWebBasePath` is a supported option (a site published at `/demo`), and the
- * console derives everything from its own URL: the API calls come from
- * `location.pathname` with `/api/` cut off, and the worker is registered beside
- * the site. Both are right at the origin root by accident there - this file runs
- * the same page at `/demo/api/`, where the wrong derivation is silent: the page
- * still renders, and every call goes to a path the host does not answer.
+ * console works out its root from the worker it registered - `<base>/sw.js` - with
+ * its own URL as the fallback. This file runs the page at `/demo/api-console/`,
+ * where a wrong derivation is silent: the page still renders, and every call goes
+ * to a path the host does not answer.
  */
 var assets = path_1.default.join(__dirname, '..', 'assets');
 var page = function () { return fs_1.default.readFileSync(path_1.default.join(assets, 'api-index.html'), 'utf8'); };
@@ -136,6 +135,119 @@ describe('the API console under a base path', function () {
     afterEach(function () {
         delete navigator.serviceWorker;
     });
+    it('takes the root from the worker that covers it, not from its own folder', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var realCreate, sw, asked;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    // the shapes where the two disagree are the only ones that prove the worker
+                    // is read at all: the site's worker at `/demo/sw.js` controlling a console
+                    // two folders down still names `/demo/`, which the folder alone cannot
+                    document.body.innerHTML = bodyOf(page());
+                    document.head.innerHTML =
+                        '<meta name="sasjs-mock-version" content="3.0.0" />';
+                    global.fetch = jest.fn(function (url) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            return [2 /*return*/, String(url).includes('operations.json')
+                                    ? jsonResponse(operations)
+                                    : jsonResponse({ format: 1, users: [] })];
+                        });
+                    }); });
+                    realCreate = document.createElement.bind(document);
+                    jest.spyOn(document, 'createElement').mockImplementation(function (tag) {
+                        var node = realCreate(tag);
+                        if (String(tag).toLowerCase() === 'script')
+                            setTimeout(function () { return node.dispatchEvent(new Event('load')); }, 0);
+                        return node;
+                    });
+                    sw = {
+                        controller: { scriptURL: 'http://localhost/demo/sw.js' },
+                        register: jest.fn(function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                            return [2 /*return*/, ({})];
+                        }); }); }),
+                        addEventListener: jest.fn()
+                    };
+                    Object.defineProperty(navigator, 'serviceWorker', {
+                        value: sw,
+                        configurable: true
+                    });
+                    history.replaceState({}, '', '/demo/tools/api-console/');
+                    jest.resetModules();
+                    require('../assets/api-console.js');
+                    return [4 /*yield*/, settle(function () {
+                            return global.fetch.mock.calls.some(function (call) {
+                                return String(call[0]).includes('identity.json');
+                            });
+                        })];
+                case 1:
+                    _a.sent();
+                    asked = global.fetch.mock.calls.map(function (call) {
+                        return String(call[0]);
+                    });
+                    // the site's root, not the folder two levels up from the page
+                    expect(asked).toContain('/demo/host/identity.json');
+                    expect(asked.some(function (url) { return url.startsWith('/demo/tools/'); })).toBe(false);
+                    history.replaceState({}, '', '/demo/tools/api-console/');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('ignores a worker that belongs to another site', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var realCreate, sw, asked;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    // a page can be controlled by some other site's worker; its `sw.js` names a
+                    // root that has nothing to do with this console, so the page's own folder has
+                    // to win
+                    document.body.innerHTML = bodyOf(page());
+                    document.head.innerHTML =
+                        '<meta name="sasjs-mock-version" content="3.0.0" />';
+                    global.fetch = jest.fn(function (url) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            return [2 /*return*/, String(url).includes('operations.json')
+                                    ? jsonResponse(operations)
+                                    : jsonResponse({ format: 1, users: [] })];
+                        });
+                    }); });
+                    realCreate = document.createElement.bind(document);
+                    jest.spyOn(document, 'createElement').mockImplementation(function (tag) {
+                        var node = realCreate(tag);
+                        if (String(tag).toLowerCase() === 'script')
+                            setTimeout(function () { return node.dispatchEvent(new Event('load')); }, 0);
+                        return node;
+                    });
+                    sw = {
+                        controller: { scriptURL: 'http://localhost/other/sw.js' },
+                        register: jest.fn(function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                            return [2 /*return*/, ({})];
+                        }); }); }),
+                        addEventListener: jest.fn()
+                    };
+                    Object.defineProperty(navigator, 'serviceWorker', {
+                        value: sw,
+                        configurable: true
+                    });
+                    history.replaceState({}, '', '/demo/api-console/');
+                    jest.resetModules();
+                    require('../assets/api-console.js');
+                    return [4 /*yield*/, settle(function () {
+                            return global.fetch.mock.calls.some(function (call) {
+                                return String(call[0]).includes('identity.json');
+                            });
+                        })];
+                case 1:
+                    _a.sent();
+                    asked = global.fetch.mock.calls.map(function (call) {
+                        return String(call[0]);
+                    });
+                    expect(asked).toContain('/demo/host/identity.json');
+                    expect(asked.some(function (url) { return url.startsWith('/other/'); })).toBe(false);
+                    history.replaceState({}, '', '/demo/api-console/');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('finds the folder from a URL without its trailing slash', function () { return __awaiter(void 0, void 0, void 0, function () {
         var realCreate, sw, asked;
         return __generator(this, function (_a) {
@@ -143,8 +255,8 @@ describe('the API console under a base path', function () {
                 case 0:
                     // `/demo/api` is the shape a person types, and the page used to read that as
                     // the origin root: every call went to /SASjsApi/... and the worker to /sw.js
-                    history.replaceState({}, '', '/demo/api');
-                    expect(location.pathname).toBe('/demo/api');
+                    history.replaceState({}, '', '/demo/api-console');
+                    expect(location.pathname).toBe('/demo/api-console');
                     document.body.innerHTML = bodyOf(page());
                     document.head.innerHTML =
                         '<meta name="sasjs-mock-version" content="2.0.0" />';
@@ -187,7 +299,7 @@ describe('the API console under a base path', function () {
                         return String(call[0]);
                     });
                     expect(asked).toContain('/demo/host/identity.json');
-                    history.replaceState({}, '', '/demo/api/');
+                    history.replaceState({}, '', '/demo/api-console/');
                     return [2 /*return*/];
             }
         });

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

@@ -1051,14 +1051,14 @@ describe('browser-hosted build', function () {
      * the host drift.
      */
     it('ships an API console built from the route table', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var result, folder, shipped, sw, listed, operations, createUser, html, version, appHtml, loader;
+        var result, folder, shipped, sw, operations, createUser, html, version, appHtml, loader;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, (0, mockSite_1.buildMockSite)(target())];
                 case 1:
                     result = _a.sent();
                     expect(result.apiConsole).toBe(true);
-                    folder = path_1.default.join(out(), 'api');
+                    folder = path_1.default.join(out(), 'api-console');
                     shipped = fs_1.default.readdirSync(folder).sort();
                     // every file the folder holds, and the worker's passthrough list is that same
                     // list: a second copy in sw.js would let a new file be answered as an API path
@@ -1069,9 +1069,7 @@ describe('browser-hosted build', function () {
                         'operations.json'
                     ]);
                     sw = fs_1.default.readFileSync(path_1.default.join(out(), 'sw.js'), 'utf8');
-                    listed = /const API_CONSOLE_FILES = (\[[^\]]*\])/.exec(sw);
-                    expect(listed).not.toBeNull();
-                    expect(JSON.parse(listed[1]).sort()).toEqual(shipped);
+                    expect(sw).not.toContain('API_CONSOLE_FILES');
                     operations = JSON.parse(fs_1.default.readFileSync(path_1.default.join(folder, 'operations.json'), 'utf8'));
                     expect(operations.length).toBeGreaterThan(20);
                     createUser = operations.find(function (operation) { return operation.id === 'POST /SASjsApi/user'; });
@@ -1091,12 +1089,12 @@ describe('browser-hosted build', function () {
             }
         });
     }); });
-    it('leaves the console out when the site ships its own api folder, and says so', function () { return __awaiter(void 0, void 0, void 0, function () {
+    it('leaves the console out when the site ships its own console folder, and says so', function () { return __awaiter(void 0, void 0, void 0, function () {
         var own, result;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    own = path_1.default.join(root, 'client', 'dist', 'api');
+                    own = path_1.default.join(root, 'client', 'dist', 'api-console');
                     fs_1.default.mkdirSync(own, { recursive: true });
                     fs_1.default.writeFileSync(path_1.default.join(own, 'index.html'), '<p>ours</p>');
                     return [4 /*yield*/, (0, mockSite_1.buildMockSite)(target())
@@ -1108,9 +1106,9 @@ describe('browser-hosted build', function () {
                     // the project's file is not replaced, and the loss is reported rather than
                     // silent: the build has no way to know which of the two the site wants
                     expect(result.apiConsole).toBe(false);
-                    expect(fs_1.default.readFileSync(path_1.default.join(out(), 'api', 'index.html'), 'utf8')).toBe('<p>ours</p>');
-                    expect(fs_1.default.existsSync(path_1.default.join(out(), 'api', 'console.js'))).toBe(false);
-                    expect(process.logger.warn).toHaveBeenCalledWith(expect.stringContaining('api/index.html'));
+                    expect(fs_1.default.readFileSync(path_1.default.join(out(), 'api-console', 'index.html'), 'utf8')).toBe('<p>ours</p>');
+                    expect(fs_1.default.existsSync(path_1.default.join(out(), 'api-console', 'console.js'))).toBe(false);
+                    expect(process.logger.warn).toHaveBeenCalledWith(expect.stringContaining('api-console/index.html'));
                     return [2 /*return*/];
             }
         });
@@ -1123,7 +1121,7 @@ describe('browser-hosted build', function () {
                 case 1:
                     result = _a.sent();
                     expect(result.apiConsole).toBe(false);
-                    expect(fs_1.default.existsSync(path_1.default.join(out(), 'api'))).toBe(false);
+                    expect(fs_1.default.existsSync(path_1.default.join(out(), 'api-console'))).toBe(false);
                     return [2 /*return*/];
             }
         });

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

@@ -86,7 +86,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var fs_1 = __importDefault(require("fs"));
 var path_1 = __importDefault(require("path"));
 var api_1 = require("@sasjs/api");
 var os_1 = __importDefault(require("os"));
@@ -2566,46 +2565,25 @@ describe('service worker host', function () {
      * The console's own files are the page, not an API call.
      *
      * `/api/...` is the API's short spelling, so the worker answers it - except for
-     * the four files the console is made of, which the static host serves. Getting
-     * that wrong answers the page's own script with an API 404, and the console
-     * renders nothing.
+     * `/api` itself, which a site's own application may answer.
      */
-    it('leaves the API console to the static host, and still answers /api calls', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var worker, source, listed, files, files_1, files_1_1, name_1, log, response;
-        var e_2, _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
+    it('leaves /api to the site, and answers the short spelling below it', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var worker, response;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
                 case 0:
                     worker = seeded();
-                    source = fs_1.default.readFileSync(path_1.default.join(__dirname, '..', 'assets', 'sw.js'), 'utf8');
-                    listed = /const API_CONSOLE_FILES = \[([^\]]*)\]/.exec(source);
-                    expect(listed).not.toBeNull();
-                    files = listed[1]
-                        .split(',')
-                        .map(function (entry) { return entry.trim().replace(/^'|'$/g, ''); })
-                        .filter(Boolean);
-                    expect(files.length).toBeGreaterThan(3);
+                    // a site's own application can answer /api (the server interface does), so the
+                    // worker hands it on; `/api/<something>` is an API call on the short spelling
+                    expect(worker.dispatch('/api')).toBeUndefined();
                     expect(worker.dispatch('/api/')).toBeUndefined();
-                    try {
-                        for (files_1 = __values(files), files_1_1 = files_1.next(); !files_1_1.done; files_1_1 = files_1.next()) {
-                            name_1 = files_1_1.value;
-                            expect(worker.dispatch("/api/".concat(name_1))).toBeUndefined();
-                        }
-                    }
-                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                    finally {
-                        try {
-                            if (files_1_1 && !files_1_1.done && (_a = files_1.return)) _a.call(files_1);
-                        }
-                        finally { if (e_2) throw e_2.error; }
-                    }
-                    return [4 /*yield*/, worker.dispatch('/api/admin/logs/missing.log')];
-                case 1:
-                    log = _b.sent();
-                    expect(log.status).not.toBeUndefined();
+                    // the console has a folder of its own, which is not an API prefix: the static
+                    // host serves it and the worker never sees it
+                    expect(worker.dispatch('/api-console/console.js')).toBeUndefined();
+                    expect(worker.dispatch('/api-console/operations.json')).toBeUndefined();
                     return [4 /*yield*/, worker.dispatch('/api/user')];
-                case 2:
-                    response = _b.sent();
+                case 1:
+                    response = _a.sent();
                     expect(response.status).toBe(200);
                     return [2 /*return*/];
             }
@@ -2630,8 +2608,8 @@ describe('service worker host', function () {
         });
     }); });
     it('publishes, lists, serves and removes an app through the package surface', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var dispatch, _a, _b, path_2, listing, _c, e_3_1, _d, _e, path_3, landing, e_4_1, root, archive, form, published, app, _f, _g, path_4, listing, _h, e_5_1, _j, _k, path_5, page, _l, e_6_1, folder, _m, refused, missing, removed, _o, after, _p, gone;
-        var e_3, _q, e_4, _r, e_5, _s, e_6, _t;
+        var dispatch, _a, _b, path_2, listing, _c, e_2_1, _d, _e, path_3, landing, e_3_1, root, archive, form, published, app, _f, _g, path_4, listing, _h, e_4_1, _j, _k, path_5, page, _l, e_5_1, folder, _m, refused, missing, removed, _o, after, _p, gone;
+        var e_2, _q, e_3, _r, e_4, _s, e_5, _t;
         return __generator(this, function (_u) {
             switch (_u.label) {
                 case 0:
@@ -2658,14 +2636,14 @@ describe('service worker host', function () {
                     return [3 /*break*/, 2];
                 case 6: return [3 /*break*/, 9];
                 case 7:
-                    e_3_1 = _u.sent();
-                    e_3 = { error: e_3_1 };
+                    e_2_1 = _u.sent();
+                    e_2 = { error: e_2_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
                         if (_b && !_b.done && (_q = _a.return)) _q.call(_a);
                     }
-                    finally { if (e_3) throw e_3.error; }
+                    finally { if (e_2) throw e_2.error; }
                     return [7 /*endfinally*/];
                 case 9:
                     _u.trys.push([9, 14, 15, 16]);
@@ -2685,14 +2663,14 @@ describe('service worker host', function () {
                     return [3 /*break*/, 10];
                 case 13: return [3 /*break*/, 16];
                 case 14:
-                    e_4_1 = _u.sent();
-                    e_4 = { error: e_4_1 };
+                    e_3_1 = _u.sent();
+                    e_3 = { error: e_3_1 };
                     return [3 /*break*/, 16];
                 case 15:
                     try {
                         if (_e && !_e.done && (_r = _d.return)) _r.call(_d);
                     }
-                    finally { if (e_4) throw e_4.error; }
+                    finally { if (e_3) throw e_3.error; }
                     return [7 /*endfinally*/];
                 case 16: return [4 /*yield*/, dispatch('/AppStream')];
                 case 17:
@@ -2745,14 +2723,14 @@ describe('service worker host', function () {
                     return [3 /*break*/, 22];
                 case 26: return [3 /*break*/, 29];
                 case 27:
-                    e_5_1 = _u.sent();
-                    e_5 = { error: e_5_1 };
+                    e_4_1 = _u.sent();
+                    e_4 = { error: e_4_1 };
                     return [3 /*break*/, 29];
                 case 28:
                     try {
                         if (_g && !_g.done && (_s = _f.return)) _s.call(_f);
                     }
-                    finally { if (e_5) throw e_5.error; }
+                    finally { if (e_4) throw e_4.error; }
                     return [7 /*endfinally*/];
                 case 29:
                     _u.trys.push([29, 35, 36, 37]);
@@ -2779,14 +2757,14 @@ describe('service worker host', function () {
                     return [3 /*break*/, 30];
                 case 34: return [3 /*break*/, 37];
                 case 35:
-                    e_6_1 = _u.sent();
-                    e_6 = { error: e_6_1 };
+                    e_5_1 = _u.sent();
+                    e_5 = { error: e_5_1 };
                     return [3 /*break*/, 37];
                 case 36:
                     try {
                         if (_k && !_k.done && (_t = _j.return)) _t.call(_j);
                     }
-                    finally { if (e_6) throw e_6.error; }
+                    finally { if (e_5) throw e_5.error; }
                     return [7 /*endfinally*/];
                 case 37: return [4 /*yield*/, dispatch("/app/".concat(app.id))];
                 case 38:
@@ -3735,7 +3713,7 @@ describe('service worker host', function () {
         }); });
     });
     describe('conformance corpus', function () {
-        var e_7, _a, e_8, _b;
+        var e_6, _a, e_7, _b;
         /**
          * 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
@@ -3744,7 +3722,7 @@ describe('service worker host', function () {
          * used to have - and it is a test rather than a review.
          */
         var httpFor = function (testCase) {
-            var e_9, _a;
+            var e_8, _a;
             var _b;
             var _c = __read(testCase.route.split(' '), 2), method = _c[0], routePath = _c[1];
             var query = new URLSearchParams();
@@ -3755,12 +3733,12 @@ describe('service worker host', function () {
                         query.set(key, String(value));
                 }
             }
-            catch (e_9_1) { e_9 = { error: e_9_1 }; }
+            catch (e_8_1) { e_8 = { error: e_8_1 }; }
             finally {
                 try {
                     if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
                 }
-                finally { if (e_9) throw e_9.error; }
+                finally { if (e_8) throw e_8.error; }
             }
             var suffix = query.toString() ? "?".concat(query) : '';
             var init = { method: method };
@@ -3791,8 +3769,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_10_1;
-            var e_11, _g, e_10, _h;
+            var text, _a, _b, _c, file, contents, _d, _e, _f, file, contents, e_9_1;
+            var e_10, _g, e_9, _h;
             return __generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
@@ -3804,12 +3782,12 @@ describe('service worker host', function () {
                                     text["/sasjs/drive/files".concat(file)] = contents;
                             }
                         }
-                        catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                        catch (e_10_1) { e_10 = { error: e_10_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
                             }
-                            finally { if (e_11) throw e_11.error; }
+                            finally { if (e_10) throw e_10.error; }
                         }
                         return [4 /*yield*/, runtime.load(text)];
                     case 1:
@@ -3832,14 +3810,14 @@ describe('service worker host', function () {
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_10_1 = _j.sent();
-                        e_10 = { error: e_10_1 };
+                        e_9_1 = _j.sent();
+                        e_9 = { error: e_9_1 };
                         return [3 /*break*/, 9];
                     case 8:
                         try {
                             if (_e && !_e.done && (_h = _d.return)) _h.call(_d);
                         }
-                        finally { if (e_10) throw e_10.error; }
+                        finally { if (e_9) throw e_9.error; }
                         return [7 /*endfinally*/];
                     case 9: return [2 /*return*/];
                 }
@@ -3950,12 +3928,12 @@ describe('service worker host', function () {
                 _loop_1(testCase);
             }
         }
-        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+        catch (e_6_1) { e_6 = { error: e_6_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_7) throw e_7.error; }
+            finally { if (e_6) throw e_6.error; }
         }
         /** The app a removal case names, as the corpus states it. */
         var CORPUS_APP = {
@@ -4024,7 +4002,7 @@ describe('service worker host', function () {
             return __generator(this, function (_a) {
                 files = {};
                 walk = function (members, prefix) {
-                    var e_12, _a;
+                    var e_11, _a;
                     var _b;
                     try {
                         for (var _c = __values(members || []), _d = _c.next(); !_d.done; _d = _c.next()) {
@@ -4039,12 +4017,12 @@ describe('service worker host', function () {
                                         : String((_b = member.code) !== null && _b !== void 0 ? _b : '');
                         }
                     }
-                    catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                    catch (e_11_1) { e_11 = { error: e_11_1 }; }
                     finally {
                         try {
                             if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                         }
-                        finally { if (e_12) throw e_12.error; }
+                        finally { if (e_11) throw e_11.error; }
                     }
                 };
                 walk(tree === null || tree === void 0 ? void 0 : tree.members, '');
@@ -4061,7 +4039,7 @@ describe('service worker host', function () {
          */
         var deployRequest = function (testCase) { return __awaiter(void 0, void 0, void 0, function () {
             var _a, requestPath, init, body, archive, form, _b, _c, _d, field, value;
-            var e_13, _e;
+            var e_12, _e;
             return __generator(this, function (_f) {
                 switch (_f.label) {
                     case 0:
@@ -4080,12 +4058,12 @@ describe('service worker host', function () {
                                     form.set(field, String(value));
                             }
                         }
-                        catch (e_13_1) { e_13 = { error: e_13_1 }; }
+                        catch (e_12_1) { e_12 = { error: e_12_1 }; }
                         finally {
                             try {
                                 if (_c && !_c.done && (_e = _b.return)) _e.call(_b);
                             }
-                            finally { if (e_13) throw e_13.error; }
+                            finally { if (e_12) throw e_12.error; }
                         }
                         form.set('file', new Blob([new Uint8Array(archive)]), 'deploy.zip');
                         return [2 /*return*/, { requestPath: requestPath, init: { method: 'POST', body: form } }];
@@ -4094,8 +4072,8 @@ describe('service worker host', function () {
         }); };
         var _loop_2 = function (testCase) {
             it(testCase.id, function () { return __awaiter(void 0, void 0, void 0, function () {
-                var worker, _a, requestPath, init, response, listing, ids, _b, _c, path_6, file, e_14_1, _d, _e, path_7, file, e_15_1;
-                var e_14, _f, e_15, _g;
+                var worker, _a, requestPath, init, response, listing, ids, _b, _c, path_6, file, e_13_1, _d, _e, path_7, file, e_14_1;
+                var e_13, _f, e_14, _g;
                 var _h, _j, _k;
                 return __generator(this, function (_l) {
                     switch (_l.label) {
@@ -4147,14 +4125,14 @@ describe('service worker host', function () {
                             return [3 /*break*/, 9];
                         case 12: return [3 /*break*/, 15];
                         case 13:
-                            e_14_1 = _l.sent();
-                            e_14 = { error: e_14_1 };
+                            e_13_1 = _l.sent();
+                            e_13 = { error: e_13_1 };
                             return [3 /*break*/, 15];
                         case 14:
                             try {
                                 if (_c && !_c.done && (_f = _b.return)) _f.call(_b);
                             }
-                            finally { if (e_14) throw e_14.error; }
+                            finally { if (e_13) throw e_13.error; }
                             return [7 /*endfinally*/];
                         case 15:
                             _l.trys.push([15, 20, 21, 22]);
@@ -4173,14 +4151,14 @@ describe('service worker host', function () {
                             return [3 /*break*/, 16];
                         case 19: return [3 /*break*/, 22];
                         case 20:
-                            e_15_1 = _l.sent();
-                            e_15 = { error: e_15_1 };
+                            e_14_1 = _l.sent();
+                            e_14 = { error: e_14_1 };
                             return [3 /*break*/, 22];
                         case 21:
                             try {
                                 if (_e && !_e.done && (_g = _d.return)) _g.call(_d);
                             }
-                            finally { if (e_15) throw e_15.error; }
+                            finally { if (e_14) throw e_14.error; }
                             return [7 /*endfinally*/];
                         case 22: return [2 /*return*/];
                     }
@@ -4213,12 +4191,12 @@ describe('service worker host', function () {
                 _loop_2(testCase);
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_7_1) { e_7 = { error: e_7_1 }; }
         finally {
             try {
                 if (_d && !_d.done && (_b = _c.return)) _b.call(_c);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_7) throw e_7.error; }
         }
     });
     /**
@@ -4230,7 +4208,7 @@ describe('service worker host', function () {
      * are the package's.
      */
     describe('identity and record conformance', function () {
-        var e_16, _a;
+        var e_15, _a;
         /**
          * Boots the worker from a fixture, the way the page does: the case's own
          * identity, and `subject: null` for no implicit caller, so a case that
@@ -4263,7 +4241,7 @@ describe('service worker host', function () {
         };
         /** The request a case describes, as HTTP: path parameters filled, token sent. */
         var httpForCase = function (testCase) {
-            var e_17, _a;
+            var e_16, _a;
             var _b = __read(testCase.route.split(' '), 2), method = _b[0], routePath = _b[1];
             var filled = routePath.replace(/\{(\w+)\}/g, function (_match, name) {
                 return encodeURIComponent(String((testCase.request.params || {})[name]));
@@ -4276,12 +4254,12 @@ describe('service worker host', function () {
                         query.set(key, String(value));
                 }
             }
-            catch (e_17_1) { e_17 = { error: e_17_1 }; }
+            catch (e_16_1) { e_16 = { error: e_16_1 }; }
             finally {
                 try {
                     if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
-                finally { if (e_17) throw e_17.error; }
+                finally { if (e_16) throw e_16.error; }
             }
             var suffix = query.toString() ? "?".concat(query) : '';
             var headers = {};
@@ -4403,12 +4381,12 @@ describe('service worker host', function () {
                 _loop_3(testCase);
             }
         }
-        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+        catch (e_15_1) { e_15 = { error: e_15_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_16) throw e_16.error; }
+            finally { if (e_15) throw e_15.error; }
         }
         it('answers as the fixture administrator when no subject was chosen', function () { return __awaiter(void 0, void 0, void 0, function () {
             var worker, response, rules;

package/build/types/mockWebBasePath.d.ts

@@ -21,7 +21,7 @@ declare module '@sasjs/utils/types/config' {
          */
         mockWebBasePath?: string;
         /**
-         * Whether the mock site carries the API console at `<base>/api/`.
+         * Whether the mock site carries the API console at `<base>/api-console/`.
          *
          * On unless it is set to false: the console is how a demonstration site lets
          * a visitor try the API it is a mock of, and a page nothing links to costs

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sasjs/cli",
-  "version": "6.31.0",
+  "version": "6.32.0",
   "description": "Command line interface for SASjs",
   "engines": {
     "node": "^22.14.0 || >=24.10.0"