@sasjs/cli 6.19.0 → 6.19.1

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

@@ -1475,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/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/package.json

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