@sasjs/cli 6.9.0 → 6.10.1

package/README.md

@@ -1,11 +1,6 @@
 # SASjs CLI
 
-[![npm package][npm-image]][npm-url]
-[![Github Workflow][githubworkflow-image]][githubworkflow-url]
-[![npm](https://img.shields.io/npm/dt/@sasjs/cli)](<>)
-![GitHub top language](https://img.shields.io/github/languages/top/sasjs/cli)
-[![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/sasjs/cli)](https://github.com/sasjs/cli/issues?q=is%3Aissue+is%3Aclosed)
-[![GitHub issues](https://img.shields.io/github/issues-raw/sasjs/cli)](https://github.com/sasjs/cli/issues)
+[![npm package][npm-image]][npm-url] [![Github Workflow][githubworkflow-image]][githubworkflow-url] [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/sasjs/cli/badge)](https://scorecard.dev/viewer/?uri=github.com/sasjs/cli) [![npm](https://img.shields.io/npm/dt/@sasjs/cli)](<>) ![GitHub top language](https://img.shields.io/github/languages/top/sasjs/cli) [![GitHub closed issues](https://img.shields.io/github/issues-closed-raw/sasjs/cli)](https://github.com/sasjs/cli/issues?q=is%3Aissue+is%3Aclosed) [![GitHub issues](https://img.shields.io/github/issues-raw/sasjs/cli)](https://github.com/sasjs/cli/issues)
 
 [npm-image]: https://img.shields.io/npm/v/@sasjs/cli.svg
 [npm-url]: http://npmjs.org/package/@sasjs/cli

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

@@ -954,6 +954,25 @@ const resolveProgram = (program) => {
   return null
 }
 
+/**
+ * The header file a session starts with. sasjs/server seeds this exact line
+ * into a JS session (controllers/internal/Session.ts), so a service that
+ * declares no type answers text/html rather than leaving the choice to the
+ * browser - a mock build matches that here.
+ *
+ * The trailing newline is part of it: the server writes it for a JS session
+ * (`'content-type: text/html; charset=utf-8\n'` in Session.ts, as against the
+ * SAS 9 session's seed with no newline), and it is what keeps a service that
+ * appends a header without a leading newline on its own line - otherwise the two
+ * concatenate into one unusable value.
+ *
+ * It is a default, not a declaration: the worker ignores it for a byte body,
+ * so a service that writes bytes and names no type is still an undeclared
+ * download rather than being labelled text/html. The worker reads the value
+ * from HEADERS_SEED below, so the seed and the rule cannot drift.
+ */
+const SEEDED_HEADERS = 'content-type: text/html; charset=utf-8\n'
+
 const runProgram = ({ program, code, params = {}, tables = [] }) => {
   const payloadCode = code
   const codePath = program ? resolveProgram(program) : null
@@ -977,7 +996,7 @@ const runProgram = ({ program, code, params = {}, tables = [] }) => {
   const headersPath = `${sessionDir}/stpsrv_header.txt`
   const tokenFile = `${sessionDir}/reqHeaders.txt`
   FILES.set(weboutPath, '')
-  FILES.set(headersPath, '')
+  FILES.set(headersPath, SEEDED_HEADERS)
   FILES.set(tokenFile, '')
 
   const varStatements = Object.entries(params)
@@ -1338,6 +1357,9 @@ const api = {
   list: (folder) => listFolder(folder),
   read: (file) => readDriveFile(file),
   tree: () => buildTree(),
+  // the content type a session's header file is seeded with, so the worker can
+  // tell a default from a declaration rather than carrying a second literal
+  HEADERS_SEED: SEEDED_HEADERS,
   // the format the snapshot download stamps, so persist.js writes the number
   // this runtime reads rather than a second literal
   DRIVE_FORMAT

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

@@ -101,6 +101,14 @@ const parseHeaders = (content) => {
   return headers
 }
 
+/**
+ * The content type a session's header file is seeded with - the server's
+ * default, not something the service asked for. The runtime owns the seed line,
+ * so the value is taken from it rather than repeated here: a byte body that
+ * carries only this type is an undeclared download, not a text/html one.
+ */
+const SEEDED_HEADERS = String(R.HEADERS_SEED)
+
 /**
  * The reply a run produces: the webout, in the shape and under the name the
  * service asked for. A debug reply is the webout framed with the log, so it
@@ -114,6 +122,12 @@ const weboutResponse = (result, debug) => {
 
   const headers = parseHeaders(result.headers)
   if (result.binary) {
+    // the seed is a default, so a byte body that leaves the seeded file untouched
+    // declares nothing: it keeps the type an undeclared download gets. Compared as
+    // the raw text rather than as the parsed value, so a service that declares
+    // this same content type itself keeps it - only the untouched seed is dropped.
+    if (String(result.headers) === SEEDED_HEADERS)
+      delete headers['content-type']
     if (!headers['content-type'])
       headers['content-type'] = 'application/octet-stream'
     return new Response(toBytes(result.webout), { status: 200, headers })

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

@@ -175,23 +175,27 @@ describe('browser runtime', function () {
                     expect(parsed.SYSPROCESSNAME).toEqual('Browser');
                     expect(parsed.SYSSCPL).toEqual('browser');
                     // The content type is the point: the block sets it, so the worker hands the
-                    // app JSON rather than a string. The mock seeds the file empty (the server
-                    // seeds text/html), so the block's record is the only one here.
+                    // app JSON rather than a string. The session seed is text/html, so this
+                    // record has to come last for the last-line-wins rule to land on JSON.
                     expect(result.headers).toContain('content-type: application/json');
+                    expect(result.headers.trim().split('\n').pop()).toEqual('content-type: application/json');
                     return [2 /*return*/];
             }
         });
     }); });
-    it('leaves the headers alone for a service that only assigns _webout', function () { return __awaiter(void 0, void 0, void 0, function () {
+    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) {
             runtime = loadRuntime();
             result = runtime.run({ code: "_webout = '<h1>raw</h1>'" });
             expect(result.error).toBeNull();
             expect(result.webout).toEqual('<h1>raw</h1>');
-            // Unchanged behaviour: a raw assignment declares no type here, and the
-            // worker's binary fallback depends on this file staying empty.
-            expect(result.headers).toEqual('');
+            // A service that declares nothing answers text/html on a server, so the
+            // mock starts from the same line rather than from an empty file. The worker
+            // treats this value as undeclared for a byte body, which is why the seed
+            // does not turn a download into text/html.
+            expect(result.headers).toEqual('content-type: text/html; charset=utf-8\n');
+            expect(runtime.HEADERS_SEED).toEqual('content-type: text/html; charset=utf-8\n');
             return [2 /*return*/];
         });
     }); });

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

@@ -239,6 +239,92 @@ describe('service worker host', function () {
             }
         });
     }); });
+    it('keeps a header appended without a leading newline on its own line', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var dispatch, response, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    dispatch = streaming([
+                        "fs.appendFileSync(_SASJS_WEBOUT_HEADERS, 'Content-type: application/json')",
+                        "_webout = '{}'"
+                    ].join('\n')).dispatch;
+                    return [4 /*yield*/, dispatch(downloadPath())];
+                case 1:
+                    response = _b.sent();
+                    expect(response.headers.get('content-type')).toBe('application/json');
+                    _a = expect;
+                    return [4 /*yield*/, response.text()];
+                case 2:
+                    _a.apply(void 0, [_b.sent()]).toBe('{}');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('keeps a declared type that happens to equal the seed', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var dispatch, response;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    dispatch = streaming([
+                        "fs.writeFileSync(_SASJS_WEBOUT_HEADERS, 'content-type: text/html; charset=utf-8')",
+                        'fs.writeFileSync(weboutPath, Uint8Array.from([1, 2, 3]))'
+                    ].join('\n')).dispatch;
+                    return [4 /*yield*/, dispatch(downloadPath())];
+                case 1:
+                    response = _a.sent();
+                    expect(response.headers.get('content-type')).toBe('text/html; charset=utf-8');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('answers text/html for a service that declares no type, as a server does', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var dispatch, response, _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    dispatch = seeded().dispatch;
+                    return [4 /*yield*/, dispatch('/SASjsApi/stp/execute?_program=' +
+                            encodeURIComponent("".concat(appLoc, "/services/public/getdata")))
+                        // The session header file is seeded with the server's line, so a service
+                        // that assigns _webout and stops answers with a content type instead of
+                        // leaving the choice to the browser.
+                    ];
+                case 1:
+                    response = _b.sent();
+                    // The session header file is seeded with the server's line, so a service
+                    // that assigns _webout and stops answers with a content type instead of
+                    // leaving the choice to the browser.
+                    expect(response.headers.get('content-type')).toBe('text/html; charset=utf-8');
+                    _a = expect;
+                    return [4 /*yield*/, response.text()];
+                case 2:
+                    _a.apply(void 0, [_b.sent()]).toBe('seeded');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
+    it('keeps a declared text/html on a byte body, and ignores only the seed', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var dispatch, response;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    dispatch = streaming([
+                        "fs.appendFileSync(_SASJS_WEBOUT_HEADERS, '\\nContent-type: text/html')",
+                        'fs.writeFileSync(weboutPath, Uint8Array.from([1, 2, 3]))'
+                    ].join('\n')).dispatch;
+                    return [4 /*yield*/, dispatch(downloadPath())
+                        // only the seeded value is treated as undeclared; the same type written by
+                        // the service is a declaration and is applied
+                    ];
+                case 1:
+                    response = _a.sent();
+                    // only the seeded value is treated as undeclared; the same type written by
+                    // the service is a declaration and is applied
+                    expect(response.headers.get('content-type')).toBe('text/html');
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('keeps a debug reply text, as the body is the framed log', function () { return __awaiter(void 0, void 0, void 0, function () {
         var dispatch, response, _a;
         return __generator(this, function (_b) {

package/package.json

@@ -72,8 +72,8 @@
   "dependencies": {
     "@sasjs/adapter": "^5.1.3",
     "@sasjs/core": "^6.1.1",
-    "@sasjs/lint": "4.9.0",
-    "@sasjs/utils": "^4.4.0",
+    "@sasjs/lint": "5.0.0",
+    "@sasjs/utils": "^4.7.0",
     "axios": "1.20.0",
     "chalk": "4.1.2",
     "dotenv": "18.0.8",
@@ -123,5 +123,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "6.9.0"
+  "version": "6.10.1"
 }