@sasjs/cli 6.13.2 → 6.14.0

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

@@ -322,12 +322,23 @@ const handle = async (request, url) => {
     await R.ensureReady()
 
     if (path.endsWith('/SASjsApi/info')) {
+      // The documented body field for field, with the values @sasjs/api's
+      // BROWSER_INFO states for this host: `cors` is the document's CorsType
+      // (`enable` | `disable`), both ports are null because a static origin has
+      // no listener, and `localLoginEnabled` is false because there is no
+      // account to sign in to - true would render a login form with no route
+      // behind it. `version` is `dev`, the fallback a server reports when it
+      // carries no build stamp. This block goes when the release carrying the
+      // package's own info service lands; until then the two answers agree.
       return json({
         mode: 'desktop',
-        cors: 'disabled',
-        whiteList: [],
-        protocol: 'browser',
-        runTimes: ['js']
+        cors: 'disable',
+        httpPort: null,
+        httpsPort: null,
+        runTimes: ['js'],
+        authProviders: [],
+        localLoginEnabled: false,
+        version: 'dev'
       })
     }
 

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

@@ -399,6 +399,14 @@ var EXECUTABLE_TYPES = [
 var patchIndexHtml = function (html, version) {
     var warnings = [];
     var patched = html;
+    // States where this page's API comes from, for anything in the page that
+    // wants to say so: the server's own interface reads it to describe the host
+    // it is running on, and a browser host is a different thing to explain than a
+    // server process. Absence means the server answered the page.
+    if (!/<meta\s+name=["']sasjs-host["']/i.test(patched))
+        patched = patched.replace(/<head(\s[^>]*)?>/i, function (head) {
+            return "".concat(head, "\n    <meta name=\"sasjs-host\" content=\"browser\" />");
+        });
     if (/<sasjs[^>]*>/i.test(patched)) {
         patched = patched.replace(/(<sasjs[^>]*?)\sserverurl="[^"]*"/i, '$1 serverurl=""');
         patched = patched.replace(/(<sasjs[^>]*?)\sloginmechanism="[^"]*"/i, '$1 loginmechanism="Default"');

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

@@ -367,6 +367,23 @@ describe('browser-hosted build', function () {
             }
         });
     }); });
+    it('states in the page that the API is answered here', 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())];
+                case 1:
+                    _a.sent();
+                    html = fs_1.default.readFileSync(path_1.default.join(out(), 'index.html'), 'utf8');
+                    // The interface reads this to tell a browser host from a server: the API
+                    // cannot, because a browser host answers the same routes and the same
+                    // /SASjsApi/info shape. Only the host knows, so the host says.
+                    expect(html).toContain('<meta name="sasjs-host" content="browser" />');
+                    expect(html.indexOf('sasjs-host')).toBeLessThan(html.indexOf('</head>'));
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('replays every script tag a page loads, not just a bundled entry point', function () { return __awaiter(void 0, void 0, void 0, function () {
         var html, tag, specs;
         return __generator(this, function (_a) {

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

@@ -89,6 +89,7 @@ var apiBrowserBuild = function () {
 var loadWorker = function () {
     jest.resetModules();
     var handlers = {};
+    var refusingWrites = false;
     var self = {
         location: { origin: origin },
         addEventListener: function (type, fn) {
@@ -107,6 +108,28 @@ var loadWorker = function () {
         if (path.includes('api-browser'))
             return require(apiBrowserBuild());
         require('../assets/runtime-core.js');
+        // The corpus needs the same drive with its writes refused, without building
+        // a second site. The flag is flipped after the case has seeded, because a
+        // store that refused during seeding could not be seeded - the package seeds
+        // its refusing store through the constructor for the same reason.
+        var base = self.SASjsMockRuntime.driveStore;
+        var refused = function () {
+            return Promise.reject(new Error('the store refused the write'));
+        };
+        self.SASjsMockRuntime.driveStore = {
+            read: function (file) { return base.read(file); },
+            exists: function (file) { return base.exists(file); },
+            stat: function (file) { return base.stat(file); },
+            list: function (folder) { return base.list(folder); },
+            remove: function (file) { return base.remove(file); },
+            move: function (from, to) { return base.move(from, to); },
+            write: function (file, contents) {
+                return refusingWrites ? refused() : base.write(file, contents);
+            },
+            mkdirp: function (folder) {
+                return refusingWrites ? refused() : base.mkdirp(folder);
+            }
+        };
     };
     require('../assets/sw.js');
     global.fetch = jest.fn(function (url) { return __awaiter(void 0, void 0, void 0, function () {
@@ -150,7 +173,16 @@ var loadWorker = function () {
         var event = { waitUntil: function () { } };
         (handlers[type] || []).forEach(function (fn) { return fn(event); });
     };
-    return { runtime: runtime, dispatch: dispatch, message: message, lifecycle: lifecycle, self: self };
+    return {
+        runtime: runtime,
+        dispatch: dispatch,
+        message: message,
+        lifecycle: lifecycle,
+        self: self,
+        refuseWrites: function (value) {
+            refusingWrites = value;
+        }
+    };
 };
 var jsonResponse = function (body) { return ({
     ok: true,
@@ -724,13 +756,35 @@ describe('service worker host', function () {
             switch (_f.label) {
                 case 0:
                     dispatch = seeded().dispatch;
-                    return [4 /*yield*/, dispatch('/SASjsApi/info')];
+                    return [4 /*yield*/, dispatch('/SASjsApi/info')
+                        // the documented body, field for field, in the values @sasjs/api's
+                        // BROWSER_INFO states: a property the document does not state, or a login
+                        // form told there are accounts when there are none, is this host describing
+                        // an API the server does not serve
+                    ];
                 case 1:
                     info = _f.sent();
+                    // the documented body, field for field, in the values @sasjs/api's
+                    // BROWSER_INFO states: a property the document does not state, or a login
+                    // form told there are accounts when there are none, is this host describing
+                    // an API the server does not serve
                     _a = expect;
                     return [4 /*yield*/, info.json()];
                 case 2:
-                    _a.apply(void 0, [_f.sent()]).toEqual(expect.objectContaining({ protocol: 'browser', runTimes: ['js'] }));
+                    // the documented body, field for field, in the values @sasjs/api's
+                    // BROWSER_INFO states: a property the document does not state, or a login
+                    // form told there are accounts when there are none, is this host describing
+                    // an API the server does not serve
+                    _a.apply(void 0, [_f.sent()]).toEqual({
+                        mode: 'desktop',
+                        cors: 'disable',
+                        httpPort: null,
+                        httpsPort: null,
+                        runTimes: ['js'],
+                        authProviders: [],
+                        localLoginEnabled: false,
+                        version: 'dev'
+                    });
                     return [4 /*yield*/, dispatch('/SASjsApi/drive/folder?_folderPath=' +
                             encodeURIComponent("".concat(appLoc, "/services/public")))];
                 case 3:
@@ -1459,6 +1513,7 @@ describe('service worker host', function () {
                             return [4 /*yield*/, seedDrive(worker.runtime, testCase)];
                         case 1:
                             _f.sent();
+                            worker.refuseWrites(Boolean(testCase.unwritable));
                             _a = httpFor(testCase), requestPath = _a.path, init = _a.init;
                             return [4 /*yield*/, worker.dispatch(requestPath, init)];
                         case 2:

package/package.json

@@ -71,9 +71,9 @@
   },
   "dependencies": {
     "@sasjs/adapter": "5.1.3",
-    "@sasjs/api": "0.2.1",
+    "@sasjs/api": "0.23.0",
     "@sasjs/core": "6.1.1",
-    "@sasjs/lint": "5.0.0",
+    "@sasjs/lint": "5.0.1",
     "@sasjs/utils": "4.9.0",
     "axios": "1.20.0",
     "chalk": "4.1.2",
@@ -124,5 +124,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "6.13.2"
+  "version": "6.14.0"
 }