@sasjs/cli 6.18.0 → 6.19.1

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

@@ -114,8 +114,15 @@
     stamp = ''
   }
 
+  // Registered relative to the page, and scoped to the directory it sits in:
+  // the site is served from the origin root on one host and from a folder on
+  // another (a demonstration site beside its own docs), and the worker's scope
+  // has to follow the page rather than assume the root.
   navigator.serviceWorker
-    .register('/sw.js' + stamp, { scope: '/', updateViaCache: 'none' })
+    .register(new URL('sw.js' + stamp, location.href).href, {
+      scope: './',
+      updateViaCache: 'none'
+    })
     .then(function () {
       return navigator.serviceWorker.ready
     })

package/build/commands/build/internal/mockSite/assets/runtime-core.js

@@ -32,7 +32,7 @@
  * encoding returns a string for either, as node does.
  */
 
-if (typeof importScripts === 'function') importScripts('/host/md5.js')
+if (typeof importScripts === 'function') importScripts('host/md5.js')
 
 // ---------------------------------------------------------------- posix path
 const P = {
@@ -841,8 +841,8 @@ const DRIVE_ROOT = '/sasjs/drive'
 // Rewritten at boot from host/mock-config.json, which the mock build writes.
 let APP_LOC = '/Public/app'
 let DRIVE_APP = `${DRIVE_ROOT}/files${APP_LOC}`
-const SEED_PATH = '/host/vfs-seed.json'
-const SNAPSHOT_PATH = '/host/vfs-snapshot.json'
+let SEED_PATH = 'host/vfs-seed.json'
+const SNAPSHOT_PATH = 'host/vfs-snapshot.json'
 
 /**
  * The drive storage format, stamped into the seed and the snapshot. The markers
@@ -864,13 +864,18 @@ const DRIVE_FORMAT = 1
  */
 const loadMockConfig = async () => {
   try {
-    const res = await fetch('/host/mock-config.json', { cache: 'no-store' })
+    const res = await fetch('host/mock-config.json', { cache: 'no-store' })
     if (!res.ok) return
     const cfg = await res.json()
     if (cfg && typeof cfg.appLoc === 'string' && cfg.appLoc.trim()) {
       APP_LOC = '/' + cfg.appLoc.replace(/^\/+/, '').replace(/\/+$/, '')
       DRIVE_APP = `${DRIVE_ROOT}/files${APP_LOC}`
     }
+    // the build names the seed it wrote; the default above covers a site built
+    // before the config carried it
+    if (cfg && typeof cfg.seedPath === 'string' && cfg.seedPath.trim()) {
+      SEED_PATH = cfg.seedPath
+    }
   } catch (e) {
     /* keep the defaults */
   }
@@ -887,7 +892,7 @@ let weboutSentinels = null
 
 const loadWeboutPrelude = async () => {
   try {
-    const res = await fetch('/host/webout-prelude.json', { cache: 'no-store' })
+    const res = await fetch('host/webout-prelude.json', { cache: 'no-store' })
     if (!res.ok) return
     const cfg = await res.json()
     if (cfg && typeof cfg.template === 'string') {
@@ -1470,9 +1475,16 @@ const api = {
   // Called by the host with the persisted drive; skips seeding entirely.
   load: (files) => {
     started = true
+    // The site's configuration and the webout() block are host files, not drive
+    // contents, so a restore needs them exactly as a seed does: only the seed
+    // used to load them, and every service written with webout() then failed
+    // with "webout is not defined" for a visitor the drive had been restored
+    // for. The drive itself is loaded synchronously, so callers that read it
+    // straight away still can; the promise is what a worker awaits.
+    const hostFiles = Promise.all([loadMockConfig(), loadWeboutPrelude()])
     const info = loadSnapshot(files)
-    ready = Promise.resolve(info)
-    if (resolveBoot) resolveBoot(info)
+    ready = hostFiles.then(() => info)
+    if (resolveBoot) resolveBoot(ready)
     return ready
   },
   seed: () => {

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

@@ -33,9 +33,9 @@
  * services are the package's; this file supplies the transport, the worker's own
  * activity, and the browser's answers to questions a server asks its process.
  */
-importScripts('/host/runtime-core.js')
-importScripts('/host/api-browser.js')
-importScripts('/host/lint-browser.js')
+importScripts('host/runtime-core.js')
+importScripts('host/api-browser.js')
+importScripts('host/lint-browser.js')
 
 const R = self.SASjsMockRuntime
 
@@ -317,6 +317,21 @@ const tablesOf = (files) => {
 
 const RUNTIME = new BrowserRuntime()
 
+/**
+ * The folder this site is served from.
+ *
+ * Empty at the origin root, `/demo` where a host publishes the demonstration
+ * site beside its own docs. The worker sits at `<base>/sw.js`, so its own
+ * location names the base and the route table can keep matching the paths the
+ * document states.
+ */
+const BASE = (self.location.pathname || '').replace(/\/sw\.js.*$/, '')
+
+const withoutBase = (pathname) =>
+  BASE && pathname.startsWith(BASE)
+    ? pathname.slice(BASE.length) || '/'
+    : pathname
+
 // ------------------------------------------------------------- host reports
 // The Admin routes ask a host what it is doing. A browser has no process, but it
 // does have a page, a heap and this worker's own activity, so the reports are
@@ -448,7 +463,7 @@ const registry = () => {
     registryPromise = (async () => {
       let appLoc
       try {
-        const config = await (await fetch('/host/mock-config.json')).json()
+        const config = await (await fetch('host/mock-config.json')).json()
         appLoc = config && config.appLoc
       } catch (e) {
         appLoc = undefined
@@ -477,7 +492,7 @@ const contentVersion = (text) => {
 
 const homeService = API.createHomeService(async () => {
   try {
-    const response = await fetch('/index.html', { cache: 'no-store' })
+    const response = await fetch('index.html', { cache: 'no-store' })
     if (!response.ok) return undefined
     const html = await response.text()
     return { html, version: contentVersion(html) }
@@ -860,7 +875,7 @@ const contentsResponse = (answer, path) => {
 }
 
 const routeRequest = async (request, url) => {
-  const path = url.pathname.replace(/\/+$/, '') || '/'
+  const path = withoutBase(url.pathname).replace(/\/+$/, '') || '/'
   const query = {}
   for (const [k, v] of url.searchParams.entries()) query[k] = v
 
@@ -881,13 +896,14 @@ const routeRequest = async (request, url) => {
     // serve nothing at `/AppStream/<name>/` here, and a listing that named it
     // would offer a tile that 404s.
     // `path` has its trailing slashes stripped, and these four answers differ by
-    // exactly that, so they are decided on the request's own pathname.
-    const stream = url.pathname
+    // exactly that, so they are decided on the request's own pathname - minus
+    // the folder the site is served from, which the four patterns do not name.
+    const stream = withoutBase(url.pathname)
 
     if (/^\/AppStream$/i.test(stream))
       return new Response(null, {
         status: 301,
-        headers: { location: '/AppStream/' }
+        headers: { location: `${BASE}/AppStream/` }
       })
 
     if (
@@ -1012,13 +1028,14 @@ const handle = async (request, url) => {
 self.addEventListener('fetch', (event) => {
   const url = new URL(event.request.url)
   if (url.origin !== self.location.origin) return
+  const path = withoutBase(url.pathname)
 
   // The site's own page is answered by the home route, but a navigation must
   // never be at the API's mercy: if that route throws or answers an error, the
   // request falls back to the static host, which holds the same index.html. A
   // broken API route can cost a client its data; it must not cost the app its
   // page.
-  if (url.pathname === '/') {
+  if (path === '/') {
     event.respondWith(
       (async () => {
         try {
@@ -1039,7 +1056,7 @@ self.addEventListener('fetch', (event) => {
   // JSON. `/AppStream` is one of those: the package serves app deployments, but
   // the listing is the server's web route, and an interface that lists apps asks
   // for it on every visit.
-  if (!/^\/(SASjsApi|SASLogon|AppStream)(\/|$)/i.test(url.pathname)) return
+  if (!/^\/(SASjsApi|SASLogon|AppStream)(\/|$)/i.test(path)) return
   event.respondWith(handle(event.request, url))
 })
 

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

@@ -530,6 +530,30 @@ var EXECUTABLE_TYPES = [
     'text/javascript',
     'application/javascript'
 ];
+/**
+ * The folder the site is published under, as a path with no trailing slash.
+ *
+ * Empty for the origin root, which is the ordinary case. A host that serves the
+ * demonstration site beside its documentation (a GitHub Pages site whose root is
+ * the docs) names the folder here, and every path the build emits follows it.
+ */
+var normaliseBasePath = function (value) {
+    if (!value)
+        return '';
+    var base = String(value).trim();
+    if (!base.startsWith('/'))
+        base = '/' + base;
+    base = base.replace(/\/+$/, '');
+    var segments = base.split('/').slice(1);
+    if (!segments.length ||
+        segments.some(function (segment) {
+            return !/^[A-Za-z0-9._~-]+$/.test(segment) ||
+                segment === '.' ||
+                segment === '..';
+        }))
+        throw new Error("mockWebBasePath is not a folder path: ".concat(JSON.stringify(value), ". Use a path such as \"/demo\", or leave it unset for the origin root."));
+    return base;
+};
 /**
  * Tells the interface that this page is answered by the browser host.
  *
@@ -566,12 +590,16 @@ var markBrowserHost = function (html, warnings) {
  * loader. Both changes are reported when the expected markup is absent, rather
  * than producing a site that silently talks to a real server.
  */
-var patchIndexHtml = function (html, version) {
+var patchIndexHtml = function (html, version, basePath) {
+    if (basePath === void 0) { basePath = ''; }
     var warnings = [];
     var patched = html;
     patched = markBrowserHost(patched, warnings);
     if (/<sasjs[^>]*>/i.test(patched)) {
-        patched = patched.replace(/(<sasjs[^>]*?)\sserverurl="[^"]*"/i, '$1 serverurl=""');
+        // the app talks to the origin root by default; on a site published under a
+        // folder it has to name that folder, or its API calls leave the worker's
+        // scope and meet the static host
+        patched = patched.replace(/(<sasjs[^>]*?)\sserverurl="[^"]*"/i, "$1 serverurl=\"".concat(basePath, "\""));
         patched = patched.replace(/(<sasjs[^>]*?)\sloginmechanism="[^"]*"/i, '$1 loginmechanism="Default"');
     }
     else {
@@ -646,11 +674,11 @@ var patchIndexHtml = function (html, version) {
  */
 function buildMockSite(target) {
     return __awaiter(this, void 0, void 0, function () {
-        var projectDir, appLocRaw, appLoc, buildFolder, webSourceRaw, webFolder, outputFolder, streamConfig, excluded, _a, seed, skipped, jsPrograms, sasPrograms, driveEntries, webFileCount, hostFolder, _b, _c, asset, hostVersion, swPath, snapshotSource, hasSnapshot, indexPath, _d, patched, warnings;
+        var projectDir, appLocRaw, appLoc, buildFolder, basePath, webSourceRaw, webFolder, outputFolder, streamConfig, excluded, _a, seed, skipped, jsPrograms, sasPrograms, driveEntries, webFileCount, hostFolder, _b, _c, asset, hostVersion, swPath, snapshotSource, hasSnapshot, indexPath, _d, patched, warnings;
         var e_8, _e;
-        var _f, _g, _h, _j, _k;
-        return __generator(this, function (_l) {
-            switch (_l.label) {
+        var _f, _g, _h, _j, _k, _l;
+        return __generator(this, function (_m) {
+            switch (_m.label) {
                 case 0:
                     projectDir = process.projectDir || process.cwd();
                     appLocRaw = target.appLoc;
@@ -662,23 +690,24 @@ function buildMockSite(target) {
                         path_1.default.join(projectDir, 'sasjsbuild');
                     return [4 /*yield*/, (0, utils_1.folderExists)(buildFolder)];
                 case 1:
-                    if (!(_l.sent())) {
+                    if (!(_m.sent())) {
                         throw new Error("Build folder not found: ".concat(buildFolder, ". Run `sasjs compile` first."));
                     }
-                    webSourceRaw = (_f = target.streamConfig) === null || _f === void 0 ? void 0 : _f.webSourcePath;
+                    basePath = normaliseBasePath((_f = target.streamConfig) === null || _f === void 0 ? void 0 : _f.mockWebBasePath);
+                    webSourceRaw = (_g = target.streamConfig) === null || _g === void 0 ? void 0 : _g.webSourcePath;
                     if (!webSourceRaw) {
                         throw new Error('No built web app. Set streamConfig.webSourcePath on the target (for example ./client/dist), and build the frontend first.');
                     }
                     webFolder = path_1.default.resolve(projectDir, webSourceRaw);
                     return [4 /*yield*/, (0, utils_1.folderExists)(webFolder)];
                 case 2:
-                    if (!(_l.sent())) {
+                    if (!(_m.sent())) {
                         throw new Error("Web source folder not found: ".concat(webFolder, ". Check streamConfig.webSourcePath - build the frontend first."));
                     }
                     if (!fs_1.default.existsSync(path_1.default.join(webFolder, 'index.html'))) {
                         throw new Error("".concat(webFolder, " does not contain an index.html - is streamConfig.webSourcePath pointing at the built app?"));
                     }
-                    outputFolder = ((_g = target.streamConfig) === null || _g === void 0 ? void 0 : _g.mockWebFolder)
+                    outputFolder = ((_h = target.streamConfig) === null || _h === void 0 ? void 0 : _h.mockWebFolder)
                         ? path_1.default.resolve(projectDir, target.streamConfig.mockWebFolder)
                         : path_1.default.join(buildFolder, 'mock');
                     assertSafeOutputFolder(outputFolder, projectDir, buildFolder, webFolder);
@@ -699,14 +728,14 @@ function buildMockSite(target) {
                     // without a SAS licence and without a login. What they cannot do is run here,
                     // so the build says so rather than letting a Run button be the surprise.
                     if (jsPrograms === 0 && sasPrograms > 0) {
-                        (_h = process.logger) === null || _h === void 0 ? void 0 : _h.warn("".concat(sasPrograms, " SAS program(s) and no JavaScript in ").concat(buildFolder, ": they are placed on the drive to read, and cannot run in a browser."));
+                        (_j = process.logger) === null || _j === void 0 ? void 0 : _j.warn("".concat(sasPrograms, " SAS program(s) and no JavaScript in ").concat(buildFolder, ": they are placed on the drive to read, and cannot run in a browser."));
                     }
                     // No PROGRAMS is a different thing again: a compile that produced nothing, or
                     // a stale sasjsbuild from an unrelated command - `sasjs doc` leaves a folder
                     // behind that is not a program folder but does reach the drive, so the count
                     // that decides this is of programs, not of files.
                     if (jsPrograms + sasPrograms === 0) {
-                        (_j = process.logger) === null || _j === void 0 ? void 0 : _j.warn("No compiled programs in ".concat(buildFolder, ": this site ships with an empty drive. ") +
+                        (_k = process.logger) === null || _k === void 0 ? void 0 : _k.warn("No compiled programs in ".concat(buildFolder, ": this site ships with an empty drive. ") +
                             'That is expected for an interface with no services; for anything else, check that compile wrote the target.');
                     }
                     // The package supplies the drive rules the worker answers with, so an install
@@ -719,7 +748,7 @@ function buildMockSite(target) {
                             'or check that @sasjs/api still publishes build/browser.js.');
                     }
                     if (skipped.length) {
-                        (_k = process.logger) === null || _k === void 0 ? void 0 : _k.warn("Left ".concat(skipped.length, " file(s) off the mock drive, over the ").concat(megabytes(exports.MAX_BINARY_SEED_BYTES), " per-file or ").concat(megabytes(exports.MAX_SEED_BYTES), " total the browser build seeds: ") +
+                        (_l = process.logger) === null || _l === void 0 ? void 0 : _l.warn("Left ".concat(skipped.length, " file(s) off the mock drive, over the ").concat(megabytes(exports.MAX_BINARY_SEED_BYTES), " per-file or ").concat(megabytes(exports.MAX_SEED_BYTES), " total the browser build seeds: ") +
                             "".concat(skipped
                                 .slice(0, 3)
                                 .map(function (file) {
@@ -766,7 +795,7 @@ function buildMockSite(target) {
                 case 3:
                     // 2. the linter, bundled from the installed packages so the code routes answer
                     // with the rules this CLI resolved rather than a second implementation
-                    _l.sent();
+                    _m.sent();
                     // sw.js sits at the site root: a worker can only control the folder it is
                     // served from, and the app has to be controlled from /
                     fs_1.default.copyFileSync(path_1.default.join(ASSETS_FOLDER, 'sw.js'), path_1.default.join(outputFolder, 'sw.js'));
@@ -802,9 +831,9 @@ function buildMockSite(target) {
                     swPath = path_1.default.join(outputFolder, 'sw.js');
                     fs_1.default.writeFileSync(swPath, fs_1.default
                         .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, "')")));
+                        .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, "')")));
                     snapshotSource = path_1.default.join(buildFolder, 'mock-snapshot.json');
                     hasSnapshot = fs_1.default.existsSync(snapshotSource);
                     if (hasSnapshot) {
@@ -814,7 +843,7 @@ function buildMockSite(target) {
                     fs_1.default.writeFileSync(path_1.default.join(hostFolder, 'vfs-seed.json'), JSON.stringify({ format: exports.DRIVE_FORMAT, files: seed }));
                     fs_1.default.writeFileSync(path_1.default.join(hostFolder, 'mock-config.json'), JSON.stringify({
                         appLoc: appLoc,
-                        seedPath: '/host/vfs-seed.json',
+                        seedPath: 'host/vfs-seed.json',
                         driveEntries: driveEntries,
                         jsPrograms: jsPrograms,
                         programFolders: PROGRAM_FOLDERS,
@@ -822,7 +851,7 @@ function buildMockSite(target) {
                         builtAt: new Date().toISOString()
                     }, null, 2));
                     indexPath = path_1.default.join(outputFolder, 'index.html');
-                    _d = patchIndexHtml(fs_1.default.readFileSync(indexPath, 'utf8'), hostVersion), patched = _d.patched, warnings = _d.warnings;
+                    _d = patchIndexHtml(fs_1.default.readFileSync(indexPath, 'utf8'), hostVersion, basePath), patched = _d.patched, warnings = _d.warnings;
                     fs_1.default.writeFileSync(indexPath, patched);
                     warnings.forEach(function (warning) { var _a; return (_a = process.logger) === null || _a === void 0 ? void 0 : _a.warn(warning); });
                     return [2 /*return*/, {

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

@@ -125,7 +125,10 @@ var loadBoot = function (specs, options) {
             stored[key] = value;
         }
     };
-    global.location = { reload: function () { return timeline.push('reload'); } };
+    global.location = {
+        href: options.href || 'http://localhost:8123/',
+        reload: function () { return timeline.push('reload'); }
+    };
     jest.spyOn(console, 'error').mockImplementation(function () { });
     require('../assets/boot.js');
     var claim = function () {
@@ -162,7 +165,7 @@ describe('the boot loader', function () {
         delete global.sessionStorage;
         delete global.location;
     });
-    it("registers the worker at the site root, at the build's version", function () { return __awaiter(void 0, void 0, void 0, function () {
+    it("registers the worker beside the page, at the build's version", function () { return __awaiter(void 0, void 0, void 0, function () {
         var registered;
         return __generator(this, function (_a) {
             switch (_a.label) {
@@ -170,15 +173,36 @@ describe('the boot loader', function () {
                     registered = loadBoot([]).registered;
                     return [4 /*yield*/, settle()
                         // a cached sw.js would keep a returning visitor on the previous build's
-                        // worker, so the URL carries the host version and the check skips the cache
+                        // worker, so the URL carries the host version and the check skips the cache.
+                        // The scope is the page's own folder: the site is served from the origin
+                        // root on one host and from /demo beside its docs on another.
                     ];
                 case 1:
                     _a.sent();
                     // a cached sw.js would keep a returning visitor on the previous build's
-                    // worker, so the URL carries the host version and the check skips the cache
+                    // worker, so the URL carries the host version and the check skips the cache.
+                    // The scope is the page's own folder: the site is served from the origin
+                    // root on one host and from /demo beside its docs on another.
                     expect(registered).toEqual([
-                        '/sw.js?v=abc123 ' +
-                            JSON.stringify({ scope: '/', updateViaCache: 'none' })
+                        'http://localhost:8123/sw.js?v=abc123 ' +
+                            JSON.stringify({ scope: './', updateViaCache: 'none' })
+                    ]);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('registers the worker under the folder the page is served from', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var registered;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    registered = loadBoot([], { href: 'http://localhost:8123/demo/' }).registered;
+                    return [4 /*yield*/, settle()];
+                case 1:
+                    _a.sent();
+                    expect(registered).toEqual([
+                        'http://localhost:8123/demo/sw.js?v=abc123 ' +
+                            JSON.stringify({ scope: './', updateViaCache: 'none' })
                     ]);
                     return [2 /*return*/];
             }
@@ -328,7 +352,7 @@ describe('the boot loader', function () {
                     return [4 /*yield*/, settle()];
                 case 1:
                     _a.sent();
-                    expect(registered[0]).toMatch(/^\/sw\.js /);
+                    expect(registered[0]).toMatch(/\/sw\.js \{/);
                     return [2 /*return*/];
             }
         });
@@ -447,7 +471,10 @@ describe('the boot loader', function () {
                     global.navigator = {};
                     global.window = {};
                     global.sessionStorage = { getItem: function () { return null; }, setItem: function () { } };
-                    global.location = { reload: function () { } };
+                    global.location = {
+                        href: 'http://localhost:8123/',
+                        reload: function () { }
+                    };
                     jest.spyOn(console, 'error').mockImplementation(function () { });
                     require('../assets/boot.js');
                     return [4 /*yield*/, settle()];

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

@@ -208,9 +208,9 @@ describe('browser-hosted build', function () {
                     sw = fs_1.default.readFileSync(path_1.default.join(out(), 'sw.js'), 'utf8');
                     // both imports carry the host version: a worker caches what it imports, so
                     // a rebuild that changes either file has to change the URL
-                    expect(sw).toMatch(/importScripts\('\/host\/runtime-core\.js\?v=[0-9a-f]{10}'\)/);
-                    expect(sw).toMatch(/importScripts\('\/host\/api-browser\.js\?v=[0-9a-f]{10}'\)/);
-                    expect(sw).toMatch(/importScripts\('\/host\/lint-browser\.js\?v=[0-9a-f]{10}'\)/);
+                    expect(sw).toMatch(/importScripts\('host\/runtime-core\.js\?v=[0-9a-f]{10}'\)/);
+                    expect(sw).toMatch(/importScripts\('host\/api-browser\.js\?v=[0-9a-f]{10}'\)/);
+                    expect(sw).toMatch(/importScripts\('host\/lint-browser\.js\?v=[0-9a-f]{10}'\)/);
                     expect(sw).not.toContain("importScripts('/host/runtime-core.js')");
                     return [2 /*return*/];
             }
@@ -366,6 +366,35 @@ describe('browser-hosted build', function () {
             }
         });
     }); });
+    it('serves the site under a folder when the target names one', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var html;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, mockSite_1.buildMockSite)(target({ mockWebBasePath: '/demo' }))];
+                case 1:
+                    _a.sent();
+                    html = fs_1.default.readFileSync(path_1.default.join(out(), 'index.html'), 'utf8');
+                    expect(html).toContain('serverurl="/demo"');
+                    // the loader and the host's files stay relative to the page, so the same
+                    // build works at the origin root and under the folder
+                    expect(html).toContain('<script src="host/boot.js?v=');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('refuses a base path that is not a folder path', function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, expect((0, mockSite_1.buildMockSite)(target({ mockWebBasePath: '/demo?x=1' }))).rejects.toThrow(/mockWebBasePath/)];
+                case 1:
+                    _a.sent();
+                    return [4 /*yield*/, expect((0, mockSite_1.buildMockSite)(target({ mockWebBasePath: '../escape' }))).rejects.toThrow(/mockWebBasePath/)];
+                case 2:
+                    _a.sent();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('points the app at itself and installs the boot loader', function () { return __awaiter(void 0, void 0, void 0, function () {
         var html;
         return __generator(this, function (_a) {

package/build/commands/build/internal/mockSite/spec/runtime-core.spec.js

@@ -66,6 +66,19 @@ var jsonResponse = function (body) { return ({
         return [2 /*return*/, body];
     }); }); }
 }); };
+/** The webout() block the build ships, with its sentinels still in place. */
+var weboutPrelude = function () { return ({
+    sentinels: mockSite_1.WEBOUT_SENTINELS,
+    template: (0, utils_1.getWeboutPrelude)({
+        weboutPath: mockSite_1.WEBOUT_SENTINELS.weboutPath,
+        headersPath: mockSite_1.WEBOUT_SENTINELS.headersPath,
+        program: mockSite_1.WEBOUT_SENTINELS.program,
+        debug: mockSite_1.WEBOUT_SENTINELS.debug,
+        username: mockSite_1.WEBOUT_SENTINELS.username,
+        userId: mockSite_1.WEBOUT_SENTINELS.userId,
+        apiServerUrl: mockSite_1.WEBOUT_SENTINELS.apiServerUrl
+    })
+}); };
 var seedDrive = function (runtime, files, prelude) { return __awaiter(void 0, void 0, void 0, function () {
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -151,18 +164,7 @@ describe('browser runtime', function () {
                     // values runtime-core fills per run. Without it a service written with
                     // webout() fails in a mock build with "webout is not defined", which is the
                     // gap this closes.
-                    return [4 /*yield*/, seedDrive(runtime, {}, {
-                            sentinels: mockSite_1.WEBOUT_SENTINELS,
-                            template: (0, utils_1.getWeboutPrelude)({
-                                weboutPath: mockSite_1.WEBOUT_SENTINELS.weboutPath,
-                                headersPath: mockSite_1.WEBOUT_SENTINELS.headersPath,
-                                program: mockSite_1.WEBOUT_SENTINELS.program,
-                                debug: mockSite_1.WEBOUT_SENTINELS.debug,
-                                username: mockSite_1.WEBOUT_SENTINELS.username,
-                                userId: mockSite_1.WEBOUT_SENTINELS.userId,
-                                apiServerUrl: mockSite_1.WEBOUT_SENTINELS.apiServerUrl
-                            })
-                        })];
+                    return [4 /*yield*/, seedDrive(runtime, {}, weboutPrelude())];
                 case 1:
                     // A mock build ships the same block the server generates, with sentinel
                     // values runtime-core fills per run. Without it a service written with
@@ -189,6 +191,43 @@ describe('browser runtime', function () {
             }
         });
     }); });
+    it('restores a persisted drive with the host files, so webout() still runs', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var runtime, result, byName;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    runtime = loadRuntime();
+                    global.fetch = jest.fn(function (url) { return __awaiter(void 0, void 0, void 0, function () {
+                        return __generator(this, function (_a) {
+                            if (url.includes('mock-config'))
+                                return [2 /*return*/, jsonResponse({ appLoc: appLoc })];
+                            if (url.includes('webout-prelude'))
+                                return [2 /*return*/, jsonResponse(weboutPrelude())];
+                            return [2 /*return*/, { ok: false, json: function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                                        return [2 /*return*/, ({})];
+                                    }); }); } }];
+                        });
+                    }); });
+                    return [4 /*yield*/, runtime.load((_a = {},
+                            _a[drivePath('services/public/svc.js')] = "\nwebout('OPEN')\nwebout('OBJ', 'users', [{ name: 'ann' }])\nwebout('CLOSE')",
+                            _a))
+                        // the first failure on a restored drive was this one: the block is a host
+                        // file, so webout() was not defined at all
+                    ];
+                case 1:
+                    _b.sent();
+                    result = runtime.run({
+                        program: "".concat(appLoc, "/services/public/svc.js")
+                    });
+                    expect(result.error).toBeNull();
+                    expect(JSON.parse(result.webout).users).toEqual([{ name: 'ann' }]);
+                    byName = runtime.run({ program: 'public/svc' });
+                    expect(byName.error).toBeNull();
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('seeds the headers the way a JS session does, for a service that only assigns _webout', function () { return __awaiter(void 0, void 0, void 0, function () {
         var runtime, result;
         return __generator(this, function (_a) {

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

@@ -102,12 +102,14 @@ var lintBundle = function () {
     }
     return lintBundlePath;
 };
-var loadWorker = function () {
+var loadWorker = function (base) {
+    if (base === void 0) { base = ''; }
     jest.resetModules();
     var handlers = {};
     var refusingWrites = false;
     var self = {
-        location: { origin: origin },
+        // the worker's own location names the folder the site is served from
+        location: { origin: origin, pathname: "".concat(base, "/sw.js") },
         addEventListener: function (type, fn) {
             handlers[type] = handlers[type] || [];
             handlers[type].push(fn);
@@ -890,6 +892,58 @@ describe('service worker host', function () {
                 }
             });
         }); });
+        it('answers every route under the folder the site is published in', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var worker, info, _a, page, folder, stream, landing, apps, _b;
+            var _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
+                    case 0:
+                        worker = loadWorker('/demo');
+                        worker.runtime.load((_c = {},
+                            _c[drivePath('services/public/getdata.js')] = '_webout = "seeded";',
+                            _c));
+                        return [4 /*yield*/, worker.dispatch('/demo/SASjsApi/info')];
+                    case 1:
+                        info = _d.sent();
+                        expect(info.status).toBe(200);
+                        _a = expect;
+                        return [4 /*yield*/, info.json()];
+                    case 2:
+                        _a.apply(void 0, [(_d.sent()).mode]).toBe('desktop');
+                        return [4 /*yield*/, worker.dispatch('/demo/')];
+                    case 3:
+                        page = _d.sent();
+                        expect(page.status).toBe(200);
+                        expect(page.headers.get('content-type')).toContain('text/html');
+                        return [4 /*yield*/, worker.dispatch('/demo')];
+                    case 4:
+                        folder = _d.sent();
+                        expect(folder.status).toBe(200);
+                        expect(folder.headers.get('content-type')).toContain('text/html');
+                        return [4 /*yield*/, worker.dispatch('/demo/AppStream')];
+                    case 5:
+                        stream = _d.sent();
+                        expect(stream.status).toBe(301);
+                        expect(stream.headers.get('location')).toBe('/demo/AppStream/');
+                        return [4 /*yield*/, worker.dispatch('/demo/AppStream/')];
+                    case 6:
+                        landing = _d.sent();
+                        expect(landing.status).toBe(200);
+                        expect(landing.headers.get('content-type')).toContain('text/html');
+                        return [4 /*yield*/, worker.dispatch('/demo/AppStream/apps.json')];
+                    case 7:
+                        apps = _d.sent();
+                        expect(apps.status).toBe(200);
+                        _b = expect;
+                        return [4 /*yield*/, apps.json()];
+                    case 8:
+                        _b.apply(void 0, [_d.sent()]).toEqual({ apps: [] });
+                        // a path outside the folder is not the site's to answer
+                        expect(worker.dispatch('/other/SASjsApi/info')).toBeUndefined();
+                        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) {

package/package.json

@@ -125,5 +125,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "6.18.0"
+  "version": "6.19.1"
 }