@sasjs/cli 6.13.1 → 6.13.3

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/spec/runtime-core.spec.js

@@ -175,7 +175,8 @@ describe('browser runtime', function () {
                     expect(result.error).toBeNull();
                     parsed = JSON.parse(result.webout);
                     expect(parsed.users).toEqual([{ name: 'ann' }, { name: 'bob' }]);
-                    expect(parsed.SYSDATE).toMatch(/^\d{2}[A-Z]{3}\d{4}$/);
+                    // &SYSDATE is DATE7 - ddMMMyy - which is what %mm_webout writes
+                    expect(parsed.SYSDATE).toMatch(/^\d{2}[A-Z]{3}\d{2}$/);
                     expect(parsed.MF_GETUSER).toEqual('DEMO');
                     expect(parsed.SYSPROCESSNAME).toEqual('Browser');
                     expect(parsed.SYSSCPL).toEqual('browser');

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/build/commands/deploy/spec/cbd.spec.js

@@ -215,7 +215,7 @@ describe('sasjs cbd with server type SASJS', function () {
                                                 {
                                                     name: 'appinit',
                                                     type: 'service',
-                                                    code: getCode(appinit)
+                                                    code: getCode((0, utils_1.removeHeader)(appinit))
                                                 },
                                                 {
                                                     name: 'getdata.js',
@@ -225,7 +225,7 @@ describe('sasjs cbd with server type SASJS', function () {
                                                 {
                                                     name: 'getdata',
                                                     type: 'service',
-                                                    code: getCode(getdata)
+                                                    code: getCode((0, utils_1.removeHeader)(getdata))
                                                 }
                                             ]
                                         }

package/package.json

@@ -70,11 +70,11 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@sasjs/adapter": "^5.1.3",
-    "@sasjs/api": "0.2.1",
-    "@sasjs/core": "^6.1.1",
-    "@sasjs/lint": "5.0.0",
-    "@sasjs/utils": "^4.7.0",
+    "@sasjs/adapter": "5.1.3",
+    "@sasjs/api": "0.17.5",
+    "@sasjs/core": "6.1.1",
+    "@sasjs/lint": "5.0.1",
+    "@sasjs/utils": "4.9.0",
     "axios": "1.20.0",
     "chalk": "4.1.2",
     "dotenv": "18.0.8",
@@ -124,5 +124,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "6.13.1"
+  "version": "6.13.3"
 }