@sasjs/cli 6.19.3 → 6.20.0

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

@@ -125,8 +125,11 @@
     xhr.dispatchEvent(new ProgressEvent('loadend'))
   }
 
+  // `/api` is the short spelling of the API and `/SASjsApi` the canonical one:
+  // the build bridges both, so a caller that uses either reaches the mock.
   const isSasjs = (url) =>
-    typeof url === 'string' && url.indexOf('/SASjsApi/') >= 0
+    typeof url === 'string' &&
+    (url.indexOf('/SASjsApi/') >= 0 || url.indexOf('/api/') >= 0)
 
   const proto = XMLHttpRequest.prototype
   const nativeOpen = proto.open

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

@@ -327,6 +327,15 @@ const RUNTIME = new BrowserRuntime()
  */
 const BASE = (self.location.pathname || '').replace(/\/sw\.js.*$/, '')
 
+/**
+ * The short spelling of the App Stream landing page.
+ *
+ * It is the default: the interface links to `/app`, and sasjs/server serves it
+ * there while keeping `/AppStream` as a redirect. The worker mirrors that, so a
+ * link the interface builds reaches the same page on the static demo.
+ */
+const SHORT_APP_STREAM_PATH = '/app'
+
 const withoutBase = (pathname) =>
   BASE && pathname.startsWith(BASE)
     ? pathname.slice(BASE.length) || '/'
@@ -575,6 +584,19 @@ const payloadTooLarge = (limit) => {
  */
 const readJsonBody = async (request) => {
   const body = await readJson(request)
+
+  // The bridge forwards a JSON body as `json` - a request the page made with
+  // `JSON.stringify` has no fields for the envelope it wraps everything in, so
+  // the payload is the whole point of the message. Reading only `params` here
+  // dropped it: `code/execute` and `code/lint` arrived with no code.
+  if (
+    body &&
+    typeof body === 'object' &&
+    body.json &&
+    typeof body.json === 'object'
+  )
+    return { body: body.json, files: [] }
+
   if (
     body &&
     typeof body === 'object' &&
@@ -876,6 +898,11 @@ const contentsResponse = (answer, path) => {
 
 const routeRequest = async (request, url) => {
   const path = withoutBase(url.pathname).replace(/\/+$/, '') || '/'
+  // `/api` is the short spelling of the API, and `/SASjsApi` the canonical one:
+  // both are answered, so the alias is stripped once here and everything below -
+  // the route lookup, the drive routes' plain-text refusals, the log - works
+  // from one path.
+  const apiPath = path.replace(/^\/api(?=\/|$)/i, '/SASjsApi')
   const query = {}
   for (const [k, v] of url.searchParams.entries()) query[k] = v
 
@@ -888,27 +915,31 @@ const routeRequest = async (request, url) => {
     // every visit. Unanswered, those requests reach the static host and the page
     // parses this site's index.html as JSON.
     //
-    // The answers mirror the server's, because a caller cannot tell the two
-    // hosts apart otherwise: `/AppStream` redirects to `/AppStream/`, the landing
-    // page is served, and only a name under it is missing. The listing is empty
-    // rather than read from `registry()`, which records this deployment's own
-    // folder so the delete route has something to remove: the stream really does
-    // 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 - minus
-    // the folder the site is served from, which the four patterns do not name.
+    // `/app` is the spelling the interface links to and the server serves; the
+    // canonical `/AppStream` still answers, because a client built before the
+    // short paths existed asks for it. The answers are the same either way, so
+    // `/AppStream` redirects to `/app` - exactly as the server redirects it -
+    // and the landing page, the listing and the missing-name refusal are decided
+    // on both.
+    //
+    // The listing is empty rather than read from `registry()`, which records this
+    // deployment's own folder so the delete route has something to remove: the
+    // stream really does serve nothing at `/app/<name>/` here, and a listing that
+    // named it would offer a tile that 404s.
+    // `path` has its trailing slashes stripped, and the landing answers differ by
+    // exactly that, so they are decided on the request's own pathname - minus the
+    // folder the site is served from, which the patterns do not name.
     const stream = withoutBase(url.pathname)
 
     if (/^\/AppStream$/i.test(stream))
       return new Response(null, {
         status: 301,
-        headers: { location: `${BASE}/AppStream/` }
+        headers: { location: `${BASE}${SHORT_APP_STREAM_PATH}` }
       })
 
     if (
-      /^\/AppStream\/$/i.test(stream) ||
-      /^\/AppStream\/index\.html$/i.test(stream)
+      /^\/(app|AppStream)\/?$/i.test(stream) ||
+      /^\/(app|AppStream)\/index\.html$/i.test(stream)
     )
       return new Response(
         [
@@ -921,9 +952,10 @@ const routeRequest = async (request, url) => {
         { status: 200, headers: { 'content-type': 'text/html; charset=utf-8' } }
       )
 
-    if (/^\/AppStream\/apps\.json$/i.test(stream)) return json({ apps: [] })
+    if (/^\/(app|AppStream)\/apps\.json$/i.test(stream))
+      return json({ apps: [] })
 
-    if (/^\/AppStream\//i.test(stream)) {
+    if (/^\/(app|AppStream)\//i.test(stream)) {
       return json(
         {
           message:
@@ -935,8 +967,9 @@ const routeRequest = async (request, url) => {
 
     // The package's own matcher, so a route is recognised however its path is
     // cased and its parameters are read the way the document states them.
-    const matched = API.findRoute(request.method, path)
-    if (!matched) return json({ message: 'Not part of the API: ' + path }, 404)
+    const matched = API.findRoute(request.method, apiPath)
+    if (!matched)
+      return json({ message: 'Not part of the API: ' + apiPath }, 404)
 
     const routeId = matched.route.id
     const subject = await subjectOf(request, query)
@@ -988,8 +1021,21 @@ const routeRequest = async (request, url) => {
     return json(answer.body, answer.status)
   } catch (e) {
     const message = (e && e.stack) || String(e)
-    logEntry(`${request.method} ${path} ERROR ${(e && e.message) || message}`)
-    broadcast({ type: 'sasjs-host-error', path, message })
+    const status = (e && e.status) || 500
+    const refusal = status >= 400 && status < 500
+
+    // A 4xx is an ANSWER: the API decided, the caller was told, and a client
+    // that expected it (Studio creates its default program and accepts the 409)
+    // has already handled it. Broadcasting it put four console errors on a page
+    // whose only fault was opening a file that was already there. A 5xx is the
+    // host failing, and that is worth reporting to the page.
+    logEntry(
+      `${request.method} ${path} ${refusal ? 'refused' : 'ERROR'} ${
+        (e && e.message) || message
+      }`
+    )
+
+    if (!refusal) broadcast({ type: 'sasjs-host-error', path, message })
     // A refusal the API decided on carries its status and, where the route
     // answers an envelope, the body to send. The drive's routes send the message
     // itself as plain text - the server answers them with `res.status(code)
@@ -997,7 +1043,7 @@ const routeRequest = async (request, url) => {
     // envelope the other routes already answer with.
     if (API.isApiError(e)) {
       if (e.body !== undefined) return json(e.body, e.status)
-      if (path.includes('/SASjsApi/drive/')) return text(e.message, e.status)
+      if (apiPath.includes('/SASjsApi/drive/')) return text(e.message, e.status)
       return json({ message: e.message }, e.status)
     }
     return json(
@@ -1053,10 +1099,17 @@ self.addEventListener('fetch', (event) => {
   // The host's own paths are answered here, including one the table does not
   // have - falling through to the static host would put the SPA's index.html
   // behind a typo in a caller's URL, or behind a listing an interface parses as
-  // 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(path)) return
+  // JSON. `/app` 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.
+  //
+  // `/api` and `/api/` on their own are the API's documentation page - a file
+  // the build copies into the site - 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`.
+  if (/^\/api\/?$/i.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/spec/intercept.spec.js

@@ -173,13 +173,34 @@ describe('page-side bridge', function () {
             fetchImpl = jest.fn();
             XHR = loadBridge(fetchImpl).XHR;
             xhr = new XHR();
-            xhr.open('GET', '/api/health');
+            xhr.open('GET', '/health');
             xhr.send();
             expect(xhr.sentWith).toBeUndefined();
             expect(fetchImpl).not.toHaveBeenCalled();
             return [2 /*return*/];
         });
     }); });
+    it('bridges the short API spelling as well as the canonical one', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var fetchImpl, XHR, xhr, _a, url;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    fetchImpl = jest.fn(function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, jsonResponse('{"status":"ok"}')];
+                    }); }); });
+                    XHR = loadBridge(fetchImpl).XHR;
+                    xhr = new XHR();
+                    return [4 /*yield*/, run(xhr, 'GET', '/api/info')];
+                case 1:
+                    _b.sent();
+                    _a = __read(fetchImpl.mock.calls[0], 1), url = _a[0];
+                    expect(url).toBe('/api/info');
+                    expect(xhr.status).toBe(200);
+                    expect(xhr.responseText).toBe('{"status":"ok"}');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('converts a multipart body to JSON and replays the response onto the XHR', function () { return __awaiter(void 0, void 0, void 0, function () {
         var fetchImpl, XHR, form, xhr, _a, init;
         return __generator(this, function (_b) {
@@ -286,7 +307,7 @@ describe('page-side bridge', function () {
         expect(second.XHR.prototype).not.toBe(first.XHR.prototype);
         expect(Object.getPrototypeOf(second.XHR.prototype)).toBe(FakeXHR.prototype);
         var xhr = new second.XHR();
-        xhr.open('GET', '/api/health');
+        xhr.open('GET', '/health');
         xhr.send();
         expect(xhr.nativeSendCount).toBe(1);
     });

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

@@ -35,6 +35,17 @@ 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;
@@ -51,17 +62,6 @@ 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 };
 };
@@ -115,9 +115,14 @@ var loadWorker = function (base) {
             handlers[type].push(fn);
         },
         skipWaiting: function () { },
-        clients: { claim: function () { }, matchAll: function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
-                return [2 /*return*/, []];
-            }); }); } }
+        // a test can put a client here to observe what the host broadcasts; with
+        // none, a message reaches nobody and nothing can be asserted about it
+        clients: {
+            claim: function () { },
+            matchAll: function () { return __awaiter(void 0, void 0, void 0, function () { var _a; return __generator(this, function (_b) {
+                return [2 /*return*/, (_a = global.__mockHostClients) !== null && _a !== void 0 ? _a : []];
+            }); }); }
+        }
     };
     global.self = self;
     global.importScripts = function (path) {
@@ -893,51 +898,59 @@ 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) {
+            var worker, info, _a, page, folder, stream, landing, apps, _b, aliased, _c;
+            var _d;
+            return __generator(this, function (_e) {
+                switch (_e.label) {
                     case 0:
                         worker = loadWorker('/demo');
-                        worker.runtime.load((_c = {},
-                            _c[drivePath('services/public/getdata.js')] = '_webout = "seeded";',
-                            _c));
+                        worker.runtime.load((_d = {},
+                            _d[drivePath('services/public/getdata.js')] = '_webout = "seeded";',
+                            _d));
                         return [4 /*yield*/, worker.dispatch('/demo/SASjsApi/info')];
                     case 1:
-                        info = _d.sent();
+                        info = _e.sent();
                         expect(info.status).toBe(200);
                         _a = expect;
                         return [4 /*yield*/, info.json()];
                     case 2:
-                        _a.apply(void 0, [(_d.sent()).mode]).toBe('desktop');
+                        _a.apply(void 0, [(_e.sent()).mode]).toBe('desktop');
                         return [4 /*yield*/, worker.dispatch('/demo/')];
                     case 3:
-                        page = _d.sent();
+                        page = _e.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();
+                        folder = _e.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();
+                        stream = _e.sent();
                         expect(stream.status).toBe(301);
-                        expect(stream.headers.get('location')).toBe('/demo/AppStream/');
-                        return [4 /*yield*/, worker.dispatch('/demo/AppStream/')];
+                        expect(stream.headers.get('location')).toBe('/demo/app');
+                        return [4 /*yield*/, worker.dispatch('/demo/app')];
                     case 6:
-                        landing = _d.sent();
+                        landing = _e.sent();
                         expect(landing.status).toBe(200);
                         expect(landing.headers.get('content-type')).toContain('text/html');
-                        return [4 /*yield*/, worker.dispatch('/demo/AppStream/apps.json')];
+                        return [4 /*yield*/, worker.dispatch('/demo/app/apps.json')];
                     case 7:
-                        apps = _d.sent();
+                        apps = _e.sent();
                         expect(apps.status).toBe(200);
                         _b = expect;
                         return [4 /*yield*/, apps.json()];
                     case 8:
-                        _b.apply(void 0, [_d.sent()]).toEqual({ apps: [] });
+                        _b.apply(void 0, [_e.sent()]).toEqual({ apps: [] });
+                        return [4 /*yield*/, worker.dispatch('/demo/api/info')];
+                    case 9:
+                        aliased = _e.sent();
+                        expect(aliased.status).toBe(200);
+                        _c = expect;
+                        return [4 /*yield*/, aliased.json()];
+                    case 10:
+                        _c.apply(void 0, [(_e.sent()).mode]).toBe('desktop');
                         // a path outside the folder is not the site's to answer
                         expect(worker.dispatch('/other/SASjsApi/info')).toBeUndefined();
                         return [2 /*return*/];
@@ -1233,6 +1246,83 @@ describe('service worker host', function () {
             }
         });
     }); });
+    /**
+     * A refusal is the API's answer, and the page that asked gets it. Reporting it
+     * as a host error put console errors on screens that had handled the refusal
+     * themselves - Studio's 409 being the one that started this.
+     */
+    it('reports a host failure to the page, and stays quiet about a refusal', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var worker, messages, write, hostErrors, failed, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    worker = seeded();
+                    messages = [];
+                    global.__mockHostClients = [
+                        { postMessage: function (message) { return messages.push(message); } }
+                    ];
+                    write = function () {
+                        var form = new FormData();
+                        form.set('file', new Blob(['x']), 'new.txt');
+                        return worker.dispatch('/SASjsApi/drive/file?_filePath=' +
+                            encodeURIComponent('/Public/new.txt'), { method: 'POST', body: form });
+                    };
+                    hostErrors = function () {
+                        return messages.filter(function (message) { return message.type === 'sasjs-host-error'; }).length;
+                    };
+                    // a drive that cannot be written: a failure of the host, not an answer
+                    worker.refuseWrites(true);
+                    return [4 /*yield*/, write()];
+                case 1:
+                    failed = _c.sent();
+                    expect(failed.status).toBeGreaterThanOrEqual(500);
+                    expect(hostErrors()).toBe(1);
+                    // a create over a file that is already there: the API answered, and the
+                    // caller handles it
+                    messages.length = 0;
+                    worker.refuseWrites(false);
+                    _a = expect;
+                    return [4 /*yield*/, write()];
+                case 2:
+                    _a.apply(void 0, [(_c.sent()).status]).toBe(200);
+                    _b = expect;
+                    return [4 /*yield*/, write()];
+                case 3:
+                    _b.apply(void 0, [(_c.sent()).status]).toBe(409);
+                    expect(hostErrors()).toBe(0);
+                    delete global.__mockHostClients;
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('keeps the payload of a JSON body the page bridge forwarded', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var dispatch, body, response, findings;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    dispatch = seeded().dispatch;
+                    body = JSON.stringify({
+                        params: {},
+                        tables: [],
+                        json: { code: 'data _null_;\n  x = 1; \nrun;\n', filePath: '/a.sas' }
+                    });
+                    return [4 /*yield*/, dispatch('/SASjsApi/code/lint', {
+                            method: 'POST',
+                            headers: { 'content-type': 'application/json' },
+                            body: body
+                        })];
+                case 1:
+                    response = _a.sent();
+                    expect(response.status).toBe(200);
+                    return [4 /*yield*/, response.json()];
+                case 2:
+                    findings = _a.sent();
+                    expect(Array.isArray(findings)).toBe(true);
+                    expect(JSON.stringify(findings)).toContain('trailing spaces');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('answers 404 for a drive file the drive does not hold', function () { return __awaiter(void 0, void 0, void 0, function () {
         var dispatch, response, _a;
         return __generator(this, function (_b) {
@@ -1251,42 +1341,157 @@ 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) {
+    it('answers the app stream on the short path, and the canonical one as an alias', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var dispatch, _a, _b, path_2, listing, _c, e_1_1, _d, _e, path_3, landing, _f, e_2_1, root, canonicalLanding, _g, _h, _j, path_4, app, _k, e_3_1;
+        var e_1, _l, e_2, _m, e_3, _o;
+        return __generator(this, function (_p) {
+            switch (_p.label) {
                 case 0:
                     dispatch = seeded().dispatch;
-                    return [4 /*yield*/, dispatch('/AppStream/apps.json')];
+                    _p.label = 1;
                 case 1:
-                    listing = _d.sent();
-                    expect(listing.status).toBe(200);
-                    _a = expect;
-                    return [4 /*yield*/, listing.json()];
+                    _p.trys.push([1, 7, 8, 9]);
+                    _a = __values(['/app/apps.json', '/AppStream/apps.json']), _b = _a.next();
+                    _p.label = 2;
                 case 2:
-                    _a.apply(void 0, [_d.sent()]).toEqual({ apps: [] });
-                    return [4 /*yield*/, dispatch('/AppStream')];
+                    if (!!_b.done) return [3 /*break*/, 6];
+                    path_2 = _b.value;
+                    return [4 /*yield*/, dispatch(path_2)];
                 case 3:
-                    root = _d.sent();
-                    expect(root.status).toBe(301);
-                    expect(root.headers.get('location')).toBe('/AppStream/');
-                    return [4 /*yield*/, dispatch('/AppStream/')];
+                    listing = _p.sent();
+                    expect(listing.status).toBe(200);
+                    _c = expect;
+                    return [4 /*yield*/, listing.json()];
                 case 4:
-                    landing = _d.sent();
+                    _c.apply(void 0, [_p.sent()]).toEqual({ apps: [] });
+                    _p.label = 5;
+                case 5:
+                    _b = _a.next();
+                    return [3 /*break*/, 2];
+                case 6: return [3 /*break*/, 9];
+                case 7:
+                    e_1_1 = _p.sent();
+                    e_1 = { error: e_1_1 };
+                    return [3 /*break*/, 9];
+                case 8:
+                    try {
+                        if (_b && !_b.done && (_l = _a.return)) _l.call(_a);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                    return [7 /*endfinally*/];
+                case 9:
+                    _p.trys.push([9, 15, 16, 17]);
+                    _d = __values(['/app', '/app/', '/app/index.html']), _e = _d.next();
+                    _p.label = 10;
+                case 10:
+                    if (!!_e.done) return [3 /*break*/, 14];
+                    path_3 = _e.value;
+                    return [4 /*yield*/, dispatch(path_3)];
+                case 11:
+                    landing = _p.sent();
                     expect(landing.status).toBe(200);
                     expect(landing.headers.get('content-type')).toContain('text/html');
-                    _b = expect;
+                    _f = 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();
+                case 12:
+                    _f.apply(void 0, [_p.sent()]).toContain('serves no apps');
+                    _p.label = 13;
+                case 13:
+                    _e = _d.next();
+                    return [3 /*break*/, 10];
+                case 14: return [3 /*break*/, 17];
+                case 15:
+                    e_2_1 = _p.sent();
+                    e_2 = { error: e_2_1 };
+                    return [3 /*break*/, 17];
+                case 16:
+                    try {
+                        if (_e && !_e.done && (_m = _d.return)) _m.call(_d);
+                    }
+                    finally { if (e_2) throw e_2.error; }
+                    return [7 /*endfinally*/];
+                case 17: return [4 /*yield*/, dispatch('/AppStream')];
+                case 18:
+                    root = _p.sent();
+                    expect(root.status).toBe(301);
+                    expect(root.headers.get('location')).toBe('/app');
+                    return [4 /*yield*/, dispatch('/AppStream/')];
+                case 19:
+                    canonicalLanding = _p.sent();
+                    expect(canonicalLanding.status).toBe(200);
+                    _g = expect;
+                    return [4 /*yield*/, canonicalLanding.text()];
+                case 20:
+                    _g.apply(void 0, [_p.sent()]).toContain('serves no apps');
+                    _p.label = 21;
+                case 21:
+                    _p.trys.push([21, 27, 28, 29]);
+                    _h = __values(['/app/Demo/', '/AppStream/Demo/']), _j = _h.next();
+                    _p.label = 22;
+                case 22:
+                    if (!!_j.done) return [3 /*break*/, 26];
+                    path_4 = _j.value;
+                    return [4 /*yield*/, dispatch(path_4)];
+                case 23:
+                    app = _p.sent();
                     expect(app.status).toBe(404);
-                    _c = expect;
+                    _k = expect;
                     return [4 /*yield*/, app.json()];
-                case 7:
-                    _c.apply(void 0, [(_d.sent()).message]).toContain('serves no apps');
+                case 24:
+                    _k.apply(void 0, [(_p.sent()).message]).toContain('serves no apps');
+                    _p.label = 25;
+                case 25:
+                    _j = _h.next();
+                    return [3 /*break*/, 22];
+                case 26: return [3 /*break*/, 29];
+                case 27:
+                    e_3_1 = _p.sent();
+                    e_3 = { error: e_3_1 };
+                    return [3 /*break*/, 29];
+                case 28:
+                    try {
+                        if (_j && !_j.done && (_o = _h.return)) _o.call(_h);
+                    }
+                    finally { if (e_3) throw e_3.error; }
+                    return [7 /*endfinally*/];
+                case 29: return [2 /*return*/];
+            }
+        });
+    }); });
+    it('answers the API on /api as well as on /SASjsApi', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var dispatch, canonical, short, _a, _b, _c, missing, _d;
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    dispatch = seeded().dispatch;
+                    return [4 /*yield*/, dispatch('/SASjsApi/info')];
+                case 1:
+                    canonical = _e.sent();
+                    return [4 /*yield*/, dispatch('/api/info')];
+                case 2:
+                    short = _e.sent();
+                    expect(short.status).toBe(200);
+                    _b = expect;
+                    return [4 /*yield*/, short.json()];
+                case 3:
+                    _c = (_a = _b.apply(void 0, [_e.sent()])).toEqual;
+                    return [4 /*yield*/, canonical.json()];
+                case 4:
+                    _c.apply(_a, [_e.sent()]);
+                    return [4 /*yield*/, dispatch('/api/drive/file?_filePath=' + encodeURIComponent('/missing.txt'))];
+                case 5:
+                    missing = _e.sent();
+                    expect(missing.status).toBe(404);
+                    expect(missing.headers.get('content-type')).toContain('text/plain');
+                    _d = expect;
+                    return [4 /*yield*/, missing.text()];
+                case 6:
+                    _d.apply(void 0, [_e.sent()]).toBe("File doesn't exist.");
+                    // The documentation page is a file the build copies into the site, so the
+                    // worker leaves `/api` and `/api/` to the static host instead of answering
+                    // them as routes.
+                    expect(dispatch('/api')).toBeUndefined();
+                    expect(dispatch('/api/')).toBeUndefined();
                     return [2 /*return*/];
             }
         });
@@ -2141,7 +2346,7 @@ describe('service worker host', function () {
         }); });
     });
     describe('conformance corpus', function () {
-        var e_1, _a;
+        var e_4, _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
@@ -2150,7 +2355,7 @@ describe('service worker host', function () {
          * used to have - and it is a test rather than a review.
          */
         var httpFor = function (testCase) {
-            var e_2, _a;
+            var e_5, _a;
             var _b;
             var _c = __read(testCase.route.split(' '), 2), method = _c[0], routePath = _c[1];
             var query = new URLSearchParams();
@@ -2161,12 +2366,12 @@ describe('service worker host', function () {
                         query.set(key, String(value));
                 }
             }
-            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            catch (e_5_1) { e_5 = { error: e_5_1 }; }
             finally {
                 try {
                     if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
                 }
-                finally { if (e_2) throw e_2.error; }
+                finally { if (e_5) throw e_5.error; }
             }
             var suffix = query.toString() ? "?".concat(query) : '';
             var init = { method: method };
@@ -2197,8 +2402,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_3_1;
-            var e_4, _g, e_3, _h;
+            var text, _a, _b, _c, file, contents, _d, _e, _f, file, contents, e_6_1;
+            var e_7, _g, e_6, _h;
             return __generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
@@ -2210,12 +2415,12 @@ describe('service worker host', function () {
                                     text["/sasjs/drive/files".concat(file)] = contents;
                             }
                         }
-                        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
                             }
-                            finally { if (e_4) throw e_4.error; }
+                            finally { if (e_7) throw e_7.error; }
                         }
                         return [4 /*yield*/, runtime.load(text)];
                     case 1:
@@ -2238,14 +2443,14 @@ describe('service worker host', function () {
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_3_1 = _j.sent();
-                        e_3 = { error: e_3_1 };
+                        e_6_1 = _j.sent();
+                        e_6 = { error: e_6_1 };
                         return [3 /*break*/, 9];
                     case 8:
                         try {
                             if (_e && !_e.done && (_h = _d.return)) _h.call(_d);
                         }
-                        finally { if (e_3) throw e_3.error; }
+                        finally { if (e_6) throw e_6.error; }
                         return [7 /*endfinally*/];
                     case 9: return [2 /*return*/];
                 }
@@ -2313,12 +2518,12 @@ describe('service worker host', function () {
                 _loop_1(testCase);
             }
         }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
+        catch (e_4_1) { e_4 = { error: e_4_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_1) throw e_1.error; }
+            finally { if (e_4) throw e_4.error; }
         }
     });
 });

package/package.json

@@ -125,5 +125,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "6.19.3"
+  "version": "6.20.0"
 }