@sasjs/cli 6.26.0 → 6.27.0

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

@@ -698,63 +698,50 @@ const directorySource = {
 }
 
 /**
- * The app streams this host published: the site itself.
+ * The app stream, over the drive this site carries.
  *
- * The index is the package's, so the contract is the package's - an app is its
- * id, one app per `appLoc`, and unpublish takes the id (sasjs/server#544). The id
- * is fixed here rather than minted: this host publishes exactly one app, the
- * folder the site was built for, and a stable id is a handle a test and a
- * reviewer can both name.
+ * The package owns the index and every rule about it: what a publish must say,
+ * when an id is minted and when a redeploy keeps it, what the listing answers,
+ * how an app's files are found, what a removal removes. This host owns only the
+ * bytes - the drive store, which is persisted with the rest of the drive, so an
+ * app published in a mock survives a reload exactly as it would on a server.
  *
- * The folder is the identity, so unpublishing the app the site was built for
- * answers with that app; any other id is the documented 404. The static files
- * stay where they are - a worker cannot delete the site it is served from - so
- * this is a record of the publication, not a filesystem operation.
+ * Nothing is published until a deploy publishes something, which is what makes
+ * the mock honest: a `sasjs deploy` against it, or a bundle posted to
+ * `/SASjsApi/drive/deploy`, is listed and served here the way it is on a server.
+ * The folder the site itself was built for is deliberately not seeded as an app:
+ * its files are this site's static build, not a deployment in the drive, so a
+ * tile for it would open a 404.
  */
-const SITE_APP_ID = '6f1c1c1e-6a1e-4c4a-9d1a-1b2c3d4e5f60'
-
-let appStreamPromise
-const appStreamService = () => {
-  if (!appStreamPromise)
-    appStreamPromise = (async () => {
-      let appLoc
-      try {
-        const config = await (await fetch('host/mock-config.json')).json()
-        appLoc = config && config.appLoc
-      } catch (e) {
-        appLoc = undefined
-      }
+const APP_STREAM = API.createAppStreamService(
+  API.createDriveAppStreamStore(API.createDriveService(DRIVE_STORE))
+)
 
-      return API.createAppStreamService(
-        new API.MemoryAppStreamStore(
-          appLoc
-            ? [
-                {
-                  id: SITE_APP_ID,
-                  name: API.defaultAppName(appLoc),
-                  appLoc,
-                  streamWebFolder: 'web',
-                  publishedAt: new Date(0).toISOString()
-                }
-              ]
-            : []
-        )
-      )
-    })()
-  return appStreamPromise
+/**
+ * The app stream's own web surface: the landing page, the listing, an app's
+ * files and the removal of one.
+ *
+ * Mounted at the short spelling, which is what the interface links to; the
+ * canonical one is translated to it below, so both answer.
+ *
+ * `basePath` is the site's own folder plus that spelling, and the paths handed
+ * to the package include the folder too - the package builds an app's URL, its
+ * tiles and its logo links from `basePath`, so a surface mounted at `/app` on a
+ * site served from `/demo` would answer a listing whose every link pointed at
+ * the site root. Both sides take the same base and the answers land inside the
+ * folder.
+ */
+let appStreamWeb
+const appStreamSurface = () => {
+  if (!appStreamWeb)
+    appStreamWeb = API.createAppStreamWebService(
+      APP_STREAM,
+      API.createDriveService(DRIVE_STORE),
+      { basePath: `${BASE}${SHORT_APP_STREAM_PATH}` }
+    )
+  return appStreamWeb
 }
 
-/** The package's service, built once the config names the folder. */
-const APP_STREAM = new Proxy(
-  {},
-  {
-    get:
-      (_target, method) =>
-      (...args) =>
-        appStreamService().then((service) => service[method](...args))
-  }
-)
-
 /**
  * The page at `/`.
  *
@@ -1247,18 +1234,10 @@ const routeRequest = async (request, url) => {
     //
     // `/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.
+    // short paths existed asks for it. `/AppStream` itself redirects to `/app`,
+    // exactly as the server redirects it, and every request under either prefix
+    // is handed to the package as the short one - so a mock lists and serves what
+    // it published at the same URLs, with the same headers, as a server.
     const stream = withoutBase(url.pathname)
 
     if (/^\/AppStream$/i.test(stream))
@@ -1267,31 +1246,31 @@ const routeRequest = async (request, url) => {
         headers: { location: `${BASE}${SHORT_APP_STREAM_PATH}` }
       })
 
-    if (
-      /^\/(app|AppStream)\/?$/i.test(stream) ||
-      /^\/(app|AppStream)\/index\.html$/i.test(stream)
-    )
-      return new Response(
-        [
-          '<!doctype html><html><head><meta charset="utf-8">',
-          '<title>App Stream</title></head><body>',
-          '<h1>SASjs App Stream</h1>',
-          '<p>This browser host serves no apps: nothing is published on a static site.</p>',
-          '</body></html>'
-        ].join(''),
-        { status: 200, headers: { 'content-type': 'text/html; charset=utf-8' } }
-      )
+    if (/^\/(app|AppStream)(\/|$)/i.test(stream)) {
+      // the path the surface matches on includes the site's folder, which is what
+      // it builds the answers' URLs from; `/AppStream` is translated to the short
+      // spelling so a client built before it existed reaches the same surface
+      const page = await appStreamSurface().request({
+        method: request.method,
+        path: url.pathname.replace(
+          /\/AppStream(?=\/|$)/i,
+          SHORT_APP_STREAM_PATH
+        )
+      })
 
-    if (/^\/(app|AppStream)\/apps\.json$/i.test(stream))
-      return json({ apps: [] })
+      // a removal changes the index, which lives in the drive: persisted in the
+      // same breath as any other change, or a reload would bring the app back
+      if (request.method !== 'GET') await persistChanges()
 
-    if (/^\/(app|AppStream)\//i.test(stream)) {
-      return json(
-        {
-          message:
-            'This browser host serves no apps: nothing is published on a static site.'
-        },
-        404
+      const headers = Object.assign({}, page.headers)
+      // a location the package states is already inside the folder, because the
+      // base it built it from carries it
+      if (page.location) headers.location = page.location
+      if (page.contentType) headers['content-type'] = page.contentType
+
+      return new Response(
+        page.body === undefined || page.body === null ? null : page.body,
+        { status: page.status, headers }
       )
     }
 
@@ -1339,6 +1318,13 @@ const routeRequest = async (request, url) => {
     const answer = await API.dispatch(SERVICES, routeId, apiRequest)
     if (request.method !== 'GET') await persistChanges()
 
+    // A deploy that published an app states its URL against the package's own
+    // default mount. This site may be served from a folder, so the answer has to
+    // name the URL a reader can actually open - the folder the surface above is
+    // mounted under, which is the same base its links are built from.
+    if (BASE && answer.body && answer.body.app && answer.body.app.url)
+      answer.body.app.url = `${BASE}${answer.body.app.url}`
+
     // the shell is a page, not a file the caller named: the document states
     // text/html for it, and the extension of `/` says nothing
     if (routeId === 'GET /')

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

@@ -955,8 +955,8 @@ describe('service worker host', function () {
                 }
             });
         }); });
-        it('imports the fixture directory, and unpublishes the site itself', function () { return __awaiter(void 0, void 0, void 0, function () {
-            var dispatch, synced, _a, siteAppId, unpublished, removed, other;
+        it('imports the fixture directory', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var dispatch, synced, _a;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -969,28 +969,6 @@ describe('service worker host', function () {
                         return [4 /*yield*/, synced.json()];
                     case 2:
                         _a.apply(void 0, [_b.sent()]).toEqual({ userCount: 0, groupCount: 0 });
-                        siteAppId = '6f1c1c1e-6a1e-4c4a-9d1a-1b2c3d4e5f60';
-                        return [4 /*yield*/, dispatch('/SASjsApi/drive/deploy', {
-                                method: 'DELETE',
-                                headers: { 'content-type': 'application/json' },
-                                body: JSON.stringify({ id: siteAppId })
-                            })];
-                    case 3:
-                        unpublished = _b.sent();
-                        expect(unpublished.status).toBe(200);
-                        return [4 /*yield*/, unpublished.json()];
-                    case 4:
-                        removed = _b.sent();
-                        expect(removed.status).toBe('success');
-                        expect(removed.app.id).toBe(siteAppId);
-                        return [4 /*yield*/, dispatch('/SASjsApi/drive/deploy', {
-                                method: 'DELETE',
-                                headers: { 'content-type': 'application/json' },
-                                body: JSON.stringify({ id: '00000000-0000-4000-8000-000000000000' })
-                            })];
-                    case 5:
-                        other = _b.sent();
-                        expect(other.status).toBe(404);
                         return [2 /*return*/];
                 }
             });
@@ -1023,6 +1001,61 @@ describe('service worker host', function () {
                 }
             });
         }); });
+        it('keeps an app’s URL and tiles inside the folder the site is served from', function () { return __awaiter(void 0, void 0, void 0, function () {
+            var worker, archive, form, published, app, listing, apps, landing, _a, page, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        worker = loadWorker('/demo');
+                        return [4 /*yield*/, zipOf({
+                                'services/web/index.html': '<h1>Deployed</h1>'
+                            })];
+                    case 1:
+                        archive = _c.sent();
+                        form = new FormData();
+                        form.set('appLoc', '/Public/apps/demo');
+                        form.set('streamWebFolder', 'web');
+                        form.set('file', new Blob([new Uint8Array(archive)]), 'deploy.zip');
+                        return [4 /*yield*/, worker.dispatch('/demo/SASjsApi/drive/deploy/upload', { method: 'POST', body: form })];
+                    case 2:
+                        published = _c.sent();
+                        expect(published.status).toBe(200);
+                        return [4 /*yield*/, published.json()];
+                    case 3:
+                        app = (_c.sent()).app;
+                        // The package builds an app's URL - and the landing page's links - from the
+                        // base it was mounted on. Mounted at `/app` on a site served from `/demo`,
+                        // every one of them would point at the site root and 404, so this asserts
+                        // the mount and the requests carry the same folder.
+                        expect(app.url).toBe("/demo/app/".concat(app.id, "/"));
+                        return [4 /*yield*/, worker.dispatch('/demo/app/apps.json')];
+                    case 4:
+                        listing = _c.sent();
+                        return [4 /*yield*/, listing.json()];
+                    case 5:
+                        apps = (_c.sent()).apps;
+                        expect(apps.map(function (entry) { return entry.url; })).toEqual([
+                            "/demo/app/".concat(app.id, "/")
+                        ]);
+                        return [4 /*yield*/, worker.dispatch('/demo/app/')];
+                    case 6:
+                        landing = _c.sent();
+                        _a = expect;
+                        return [4 /*yield*/, landing.text()];
+                    case 7:
+                        _a.apply(void 0, [_c.sent()]).toContain("href=\"/demo/app/".concat(app.id, "/\""));
+                        return [4 /*yield*/, worker.dispatch("/demo/app/".concat(app.id, "/"))];
+                    case 8:
+                        page = _c.sent();
+                        expect(page.status).toBe(200);
+                        _b = expect;
+                        return [4 /*yield*/, page.text()];
+                    case 9:
+                        _b.apply(void 0, [_c.sent()]).toContain('<h1>Deployed</h1>');
+                        return [2 /*return*/];
+                }
+            });
+        }); });
         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, aliased, _c;
             var _d;
@@ -1502,120 +1535,211 @@ describe('service worker host', function () {
             }
         });
     }); });
-    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) {
+    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_1_1, _d, _e, path_3, landing, e_2_1, root, archive, form, published, app, _f, _g, path_4, listing, _h, e_3_1, _j, _k, path_5, page, _l, e_4_1, folder, _m, refused, missing, removed, _o, after, _p, gone;
+        var e_1, _q, e_2, _r, e_3, _s, e_4, _t;
+        return __generator(this, function (_u) {
+            switch (_u.label) {
                 case 0:
                     dispatch = seeded().dispatch;
-                    _p.label = 1;
+                    _u.label = 1;
                 case 1:
-                    _p.trys.push([1, 7, 8, 9]);
+                    _u.trys.push([1, 7, 8, 9]);
                     _a = __values(['/app/apps.json', '/AppStream/apps.json']), _b = _a.next();
-                    _p.label = 2;
+                    _u.label = 2;
                 case 2:
                     if (!!_b.done) return [3 /*break*/, 6];
                     path_2 = _b.value;
                     return [4 /*yield*/, dispatch(path_2)];
                 case 3:
-                    listing = _p.sent();
+                    listing = _u.sent();
                     expect(listing.status).toBe(200);
                     _c = expect;
                     return [4 /*yield*/, listing.json()];
                 case 4:
-                    _c.apply(void 0, [_p.sent()]).toEqual({ apps: [] });
-                    _p.label = 5;
+                    _c.apply(void 0, [_u.sent()]).toEqual({ apps: [] });
+                    _u.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_1 = _u.sent();
                     e_1 = { error: e_1_1 };
                     return [3 /*break*/, 9];
                 case 8:
                     try {
-                        if (_b && !_b.done && (_l = _a.return)) _l.call(_a);
+                        if (_b && !_b.done && (_q = _a.return)) _q.call(_a);
                     }
                     finally { if (e_1) throw e_1.error; }
                     return [7 /*endfinally*/];
                 case 9:
-                    _p.trys.push([9, 15, 16, 17]);
+                    _u.trys.push([9, 14, 15, 16]);
                     _d = __values(['/app', '/app/', '/app/index.html']), _e = _d.next();
-                    _p.label = 10;
+                    _u.label = 10;
                 case 10:
-                    if (!!_e.done) return [3 /*break*/, 14];
+                    if (!!_e.done) return [3 /*break*/, 13];
                     path_3 = _e.value;
                     return [4 /*yield*/, dispatch(path_3)];
                 case 11:
-                    landing = _p.sent();
+                    landing = _u.sent();
                     expect(landing.status).toBe(200);
                     expect(landing.headers.get('content-type')).toContain('text/html');
-                    _f = expect;
-                    return [4 /*yield*/, landing.text()];
+                    _u.label = 12;
                 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();
+                case 13: return [3 /*break*/, 16];
+                case 14:
+                    e_2_1 = _u.sent();
                     e_2 = { error: e_2_1 };
-                    return [3 /*break*/, 17];
-                case 16:
+                    return [3 /*break*/, 16];
+                case 15:
                     try {
-                        if (_e && !_e.done && (_m = _d.return)) _m.call(_d);
+                        if (_e && !_e.done && (_r = _d.return)) _r.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();
+                case 16: return [4 /*yield*/, dispatch('/AppStream')];
+                case 17:
+                    root = _u.sent();
                     expect(root.status).toBe(301);
                     expect(root.headers.get('location')).toBe('/app');
-                    return [4 /*yield*/, dispatch('/AppStream/')];
+                    return [4 /*yield*/, zipOf({
+                            'services/web/index.html': '<h1>Demo</h1>'
+                        })];
+                case 18:
+                    archive = _u.sent();
+                    form = new FormData();
+                    form.set('appLoc', '/Public/apps/demo');
+                    form.set('streamWebFolder', 'web');
+                    form.set('file', new Blob([new Uint8Array(archive)]), 'deploy.zip');
+                    return [4 /*yield*/, dispatch('/SASjsApi/drive/deploy/upload', {
+                            method: 'POST',
+                            body: form
+                        })];
                 case 19:
-                    canonicalLanding = _p.sent();
-                    expect(canonicalLanding.status).toBe(200);
-                    _g = expect;
-                    return [4 /*yield*/, canonicalLanding.text()];
+                    published = _u.sent();
+                    expect(published.status).toBe(200);
+                    return [4 /*yield*/, published.json()];
                 case 20:
-                    _g.apply(void 0, [_p.sent()]).toContain('serves no apps');
-                    _p.label = 21;
+                    app = (_u.sent()).app;
+                    expect(app.name).toBe('demo');
+                    expect(app.url).toBe("/app/".concat(app.id, "/"));
+                    _u.label = 21;
                 case 21:
-                    _p.trys.push([21, 27, 28, 29]);
-                    _h = __values(['/app/Demo/', '/AppStream/Demo/']), _j = _h.next();
-                    _p.label = 22;
+                    _u.trys.push([21, 27, 28, 29]);
+                    _f = __values(['/app/apps.json', '/AppStream/apps.json']), _g = _f.next();
+                    _u.label = 22;
                 case 22:
-                    if (!!_j.done) return [3 /*break*/, 26];
-                    path_4 = _j.value;
+                    if (!!_g.done) return [3 /*break*/, 26];
+                    path_4 = _g.value;
                     return [4 /*yield*/, dispatch(path_4)];
                 case 23:
-                    app = _p.sent();
-                    expect(app.status).toBe(404);
-                    _k = expect;
-                    return [4 /*yield*/, app.json()];
+                    listing = _u.sent();
+                    _h = expect;
+                    return [4 /*yield*/, listing.json()];
                 case 24:
-                    _k.apply(void 0, [(_p.sent()).message]).toContain('serves no apps');
-                    _p.label = 25;
+                    _h.apply(void 0, [(_u.sent()).apps[0]]).toMatchObject({
+                        id: app.id,
+                        name: 'demo',
+                        url: "/app/".concat(app.id, "/")
+                    });
+                    _u.label = 25;
                 case 25:
-                    _j = _h.next();
+                    _g = _f.next();
                     return [3 /*break*/, 22];
                 case 26: return [3 /*break*/, 29];
                 case 27:
-                    e_3_1 = _p.sent();
+                    e_3_1 = _u.sent();
                     e_3 = { error: e_3_1 };
                     return [3 /*break*/, 29];
                 case 28:
                     try {
-                        if (_j && !_j.done && (_o = _h.return)) _o.call(_h);
+                        if (_g && !_g.done && (_s = _f.return)) _s.call(_f);
                     }
                     finally { if (e_3) throw e_3.error; }
                     return [7 /*endfinally*/];
-                case 29: return [2 /*return*/];
+                case 29:
+                    _u.trys.push([29, 35, 36, 37]);
+                    _j = __values([
+                        "/app/".concat(app.id, "/"),
+                        "/app/".concat(app.id, "/index.html"),
+                        "/AppStream/".concat(app.id, "/")
+                    ]), _k = _j.next();
+                    _u.label = 30;
+                case 30:
+                    if (!!_k.done) return [3 /*break*/, 34];
+                    path_5 = _k.value;
+                    return [4 /*yield*/, dispatch(path_5)];
+                case 31:
+                    page = _u.sent();
+                    expect(page.status).toBe(200);
+                    _l = expect;
+                    return [4 /*yield*/, page.text()];
+                case 32:
+                    _l.apply(void 0, [_u.sent()]).toContain('<h1>Demo</h1>');
+                    _u.label = 33;
+                case 33:
+                    _k = _j.next();
+                    return [3 /*break*/, 30];
+                case 34: return [3 /*break*/, 37];
+                case 35:
+                    e_4_1 = _u.sent();
+                    e_4 = { error: e_4_1 };
+                    return [3 /*break*/, 37];
+                case 36:
+                    try {
+                        if (_k && !_k.done && (_t = _j.return)) _t.call(_j);
+                    }
+                    finally { if (e_4) throw e_4.error; }
+                    return [7 /*endfinally*/];
+                case 37: return [4 /*yield*/, dispatch("/app/".concat(app.id))];
+                case 38:
+                    folder = _u.sent();
+                    expect(folder.status).toBe(301);
+                    expect(folder.headers.get('location')).toBe("/app/".concat(app.id, "/"));
+                    _m = expect;
+                    return [4 /*yield*/, folder.text()];
+                case 39:
+                    _m.apply(void 0, [_u.sent()]).toBe('');
+                    return [4 /*yield*/, dispatch('/app/apps.json', {
+                            method: 'POST',
+                            headers: { 'content-type': 'application/json' },
+                            body: '{}'
+                        })];
+                case 40:
+                    refused = _u.sent();
+                    expect(refused.status).toBe(405);
+                    expect(refused.headers.get('allow')).toBe('GET');
+                    return [4 /*yield*/, dispatch('/app/00000000-0000-4000-8000-000000000000/')];
+                case 41:
+                    missing = _u.sent();
+                    expect(missing.status).toBe(404);
+                    return [4 /*yield*/, dispatch('/SASjsApi/drive/deploy', {
+                            method: 'DELETE',
+                            headers: { 'content-type': 'application/json' },
+                            body: JSON.stringify({ id: app.id })
+                        })];
+                case 42:
+                    removed = _u.sent();
+                    expect(removed.status).toBe(200);
+                    _o = expect;
+                    return [4 /*yield*/, removed.json()];
+                case 43:
+                    _o.apply(void 0, [(_u.sent()).app.id]).toBe(app.id);
+                    return [4 /*yield*/, dispatch('/app/apps.json')];
+                case 44:
+                    after = _u.sent();
+                    _p = expect;
+                    return [4 /*yield*/, after.json()];
+                case 45:
+                    _p.apply(void 0, [_u.sent()]).toEqual({ apps: [] });
+                    return [4 /*yield*/, dispatch("/app/".concat(app.id, "/"))];
+                case 46:
+                    gone = _u.sent();
+                    expect(gone.status).toBe(404);
+                    return [2 /*return*/];
             }
         });
     }); });
@@ -2507,7 +2631,7 @@ describe('service worker host', function () {
         }); });
     });
     describe('conformance corpus', function () {
-        var e_4, _a;
+        var e_5, _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
@@ -2516,7 +2640,7 @@ describe('service worker host', function () {
          * used to have - and it is a test rather than a review.
          */
         var httpFor = function (testCase) {
-            var e_5, _a;
+            var e_6, _a;
             var _b;
             var _c = __read(testCase.route.split(' '), 2), method = _c[0], routePath = _c[1];
             var query = new URLSearchParams();
@@ -2527,12 +2651,12 @@ describe('service worker host', function () {
                         query.set(key, String(value));
                 }
             }
-            catch (e_5_1) { e_5 = { error: e_5_1 }; }
+            catch (e_6_1) { e_6 = { error: e_6_1 }; }
             finally {
                 try {
                     if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
                 }
-                finally { if (e_5) throw e_5.error; }
+                finally { if (e_6) throw e_6.error; }
             }
             var suffix = query.toString() ? "?".concat(query) : '';
             var init = { method: method };
@@ -2563,8 +2687,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_6_1;
-            var e_7, _g, e_6, _h;
+            var text, _a, _b, _c, file, contents, _d, _e, _f, file, contents, e_7_1;
+            var e_8, _g, e_7, _h;
             return __generator(this, function (_j) {
                 switch (_j.label) {
                     case 0:
@@ -2576,12 +2700,12 @@ describe('service worker host', function () {
                                     text["/sasjs/drive/files".concat(file)] = contents;
                             }
                         }
-                        catch (e_7_1) { e_7 = { error: e_7_1 }; }
+                        catch (e_8_1) { e_8 = { error: e_8_1 }; }
                         finally {
                             try {
                                 if (_b && !_b.done && (_g = _a.return)) _g.call(_a);
                             }
-                            finally { if (e_7) throw e_7.error; }
+                            finally { if (e_8) throw e_8.error; }
                         }
                         return [4 /*yield*/, runtime.load(text)];
                     case 1:
@@ -2604,14 +2728,14 @@ describe('service worker host', function () {
                         return [3 /*break*/, 3];
                     case 6: return [3 /*break*/, 9];
                     case 7:
-                        e_6_1 = _j.sent();
-                        e_6 = { error: e_6_1 };
+                        e_7_1 = _j.sent();
+                        e_7 = { error: e_7_1 };
                         return [3 /*break*/, 9];
                     case 8:
                         try {
                             if (_e && !_e.done && (_h = _d.return)) _h.call(_d);
                         }
-                        finally { if (e_6) throw e_6.error; }
+                        finally { if (e_7) throw e_7.error; }
                         return [7 /*endfinally*/];
                     case 9: return [2 /*return*/];
                 }
@@ -2679,12 +2803,12 @@ describe('service worker host', function () {
                 _loop_1(testCase);
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_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_4) throw e_4.error; }
+            finally { if (e_5) throw e_5.error; }
         }
     });
     /**
@@ -2696,7 +2820,7 @@ describe('service worker host', function () {
      * are the package's.
      */
     describe('identity and record conformance', function () {
-        var e_8, _a;
+        var e_9, _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
@@ -2729,7 +2853,7 @@ describe('service worker host', function () {
         };
         /** The request a case describes, as HTTP: path parameters filled, token sent. */
         var httpForCase = function (testCase) {
-            var e_9, _a;
+            var e_10, _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]));
@@ -2742,12 +2866,12 @@ describe('service worker host', function () {
                         query.set(key, String(value));
                 }
             }
-            catch (e_9_1) { e_9 = { error: e_9_1 }; }
+            catch (e_10_1) { e_10 = { error: e_10_1 }; }
             finally {
                 try {
                     if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
-                finally { if (e_9) throw e_9.error; }
+                finally { if (e_10) throw e_10.error; }
             }
             var suffix = query.toString() ? "?".concat(query) : '';
             var headers = {};
@@ -2869,12 +2993,12 @@ describe('service worker host', function () {
                 _loop_2(testCase);
             }
         }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
+        catch (e_9_1) { e_9 = { error: e_9_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_8) throw e_8.error; }
+            finally { if (e_9) throw e_9.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/package.json

@@ -70,7 +70,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@sasjs/adapter": "5.2.6",
+    "@sasjs/adapter": "6.0.2",
     "@sasjs/api": "0.27.0",
     "@sasjs/core": "7.1.12",
     "@sasjs/lint": "5.1.1",
@@ -125,5 +125,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "6.26.0"
+  "version": "6.27.0"
 }