@sasjs/cli 6.17.0 → 6.18.0

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

@@ -31,6 +31,31 @@
     if (DEBUG) console.log('[sasjs-mock]', ...args)
   }
 
+  /**
+   * A file's contents, as text or as base64 with a flag.
+   *
+   * An upload is a file, not a string: a PNG, a workbook or an .sas7bdat read
+   * with `text()` arrives as replacement characters, and the drive would store
+   * the damage under a success status. The bytes are decoded as UTF-8 strictly -
+   * if that fails, they are not text by any reading a browser would accept - and
+   * carried as base64, which the worker turns back into the bytes the drive
+   * keeps.
+   */
+  const contentsOf = async (value) => {
+    const bytes = new Uint8Array(await value.arrayBuffer())
+
+    try {
+      return { csv: new TextDecoder('utf-8', { fatal: true }).decode(bytes) }
+    } catch (error) {
+      let binary = ''
+      const chunk = 0x8000
+      for (let i = 0; i < bytes.length; i += chunk)
+        binary += String.fromCharCode.apply(null, bytes.subarray(i, i + chunk))
+
+      return { csv: btoa(binary), binary: true }
+    }
+  }
+
   const readBody = async (body) => {
     const params = {}
     const tables = []
@@ -39,12 +64,16 @@
     if (typeof FormData !== 'undefined' && body instanceof FormData) {
       for (const [key, value] of body.entries()) {
         if (typeof value === 'string') params[key] = value
-        else
+        else {
+          const contents = await contentsOf(value)
+
           tables.push({
             name: key,
             filename: value.name || key + '.csv',
-            csv: await value.text()
+            csv: contents.csv,
+            ...(contents.binary ? { binary: true } : {})
           })
+        }
       }
       return { params, tables }
     }

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

@@ -574,7 +574,15 @@ const readJsonBody = async (request) => {
         name: table.name || `table${index + 1}`,
         filename:
           table.filename || `${table.name || 'table' + (index + 1)}.csv`,
-        contents: table.csv === undefined ? '' : table.csv
+        // A file the bridge could not read as UTF-8 travels as base64 with a
+        // flag: writing its text would replace the bytes and store the damage
+        // under a success status, which is what a binary upload used to do.
+        contents:
+          table.csv === undefined
+            ? ''
+            : table.binary
+              ? toBytes(table.csv)
+              : table.csv
       }))
     }
   }

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

@@ -648,9 +648,9 @@ function buildMockSite(target) {
     return __awaiter(this, void 0, void 0, function () {
         var projectDir, appLocRaw, appLoc, buildFolder, webSourceRaw, webFolder, outputFolder, streamConfig, excluded, _a, seed, skipped, jsPrograms, sasPrograms, driveEntries, webFileCount, hostFolder, _b, _c, asset, hostVersion, swPath, snapshotSource, hasSnapshot, indexPath, _d, patched, warnings;
         var e_8, _e;
-        var _f, _g, _h, _j;
-        return __generator(this, function (_k) {
-            switch (_k.label) {
+        var _f, _g, _h, _j, _k;
+        return __generator(this, function (_l) {
+            switch (_l.label) {
                 case 0:
                     projectDir = process.projectDir || process.cwd();
                     appLocRaw = target.appLoc;
@@ -662,7 +662,7 @@ function buildMockSite(target) {
                         path_1.default.join(projectDir, 'sasjsbuild');
                     return [4 /*yield*/, (0, utils_1.folderExists)(buildFolder)];
                 case 1:
-                    if (!(_k.sent())) {
+                    if (!(_l.sent())) {
                         throw new Error("Build folder not found: ".concat(buildFolder, ". Run `sasjs compile` first."));
                     }
                     webSourceRaw = (_f = target.streamConfig) === null || _f === void 0 ? void 0 : _f.webSourcePath;
@@ -672,7 +672,7 @@ function buildMockSite(target) {
                     webFolder = path_1.default.resolve(projectDir, webSourceRaw);
                     return [4 /*yield*/, (0, utils_1.folderExists)(webFolder)];
                 case 2:
-                    if (!(_k.sent())) {
+                    if (!(_l.sent())) {
                         throw new Error("Web source folder not found: ".concat(webFolder, ". Check streamConfig.webSourcePath - build the frontend first."));
                     }
                     if (!fs_1.default.existsSync(path_1.default.join(webFolder, 'index.html'))) {
@@ -693,21 +693,20 @@ function buildMockSite(target) {
                     jsPrograms = countPrograms(seed, '.js');
                     sasPrograms = countPrograms(seed, '.sas');
                     driveEntries = Object.keys(seed).length;
-                    // A build holding SAS and no JavaScript is a SAS target: its services cannot
-                    // run here, and seeding them would produce a site whose buttons answer 400.
-                    // A build holding NEITHER is a frontend host - the app is the whole thing and
-                    // the worker answers its API - which is what an interface with no services
-                    // compiles to, and the case this site is built for.
+                    // A build whose services are SAS is still a site worth having, and it is built:
+                    // the programs are seeded on the drive, where a visitor can open them in Studio
+                    // and read them - which is how a deployment's own backend code is inspected
+                    // without a SAS licence and without a login. What they cannot do is run here,
+                    // so the build says so rather than letting a Run button be the surprise.
                     if (jsPrograms === 0 && sasPrograms > 0) {
-                        throw new Error("No .js programs in ".concat(buildFolder, "/services, /jobs or /tests, but ").concat(sasPrograms, " SAS program(s). This target builds SAS code, which cannot run in a browser. ") +
-                            'Build a target whose services are JavaScript (typically a mocks project).');
+                        (_h = process.logger) === null || _h === void 0 ? void 0 : _h.warn("".concat(sasPrograms, " SAS program(s) and no JavaScript in ").concat(buildFolder, ": they are placed on the drive to read, and cannot run in a browser."));
                     }
                     // No PROGRAMS is a different thing again: a compile that produced nothing, or
                     // a stale sasjsbuild from an unrelated command - `sasjs doc` leaves a folder
                     // behind that is not a program folder but does reach the drive, so the count
                     // that decides this is of programs, not of files.
                     if (jsPrograms + sasPrograms === 0) {
-                        (_h = process.logger) === null || _h === void 0 ? void 0 : _h.warn("No compiled programs in ".concat(buildFolder, ": this site ships with an empty drive. ") +
+                        (_j = process.logger) === null || _j === void 0 ? void 0 : _j.warn("No compiled programs in ".concat(buildFolder, ": this site ships with an empty drive. ") +
                             'That is expected for an interface with no services; for anything else, check that compile wrote the target.');
                     }
                     // The package supplies the drive rules the worker answers with, so an install
@@ -720,7 +719,7 @@ function buildMockSite(target) {
                             'or check that @sasjs/api still publishes build/browser.js.');
                     }
                     if (skipped.length) {
-                        (_j = process.logger) === null || _j === void 0 ? void 0 : _j.warn("Left ".concat(skipped.length, " file(s) off the mock drive, over the ").concat(megabytes(exports.MAX_BINARY_SEED_BYTES), " per-file or ").concat(megabytes(exports.MAX_SEED_BYTES), " total the browser build seeds: ") +
+                        (_k = process.logger) === null || _k === void 0 ? void 0 : _k.warn("Left ".concat(skipped.length, " file(s) off the mock drive, over the ").concat(megabytes(exports.MAX_BINARY_SEED_BYTES), " per-file or ").concat(megabytes(exports.MAX_SEED_BYTES), " total the browser build seeds: ") +
                             "".concat(skipped
                                 .slice(0, 3)
                                 .map(function (file) {
@@ -767,7 +766,7 @@ function buildMockSite(target) {
                 case 3:
                     // 2. the linter, bundled from the installed packages so the code routes answer
                     // with the rules this CLI resolved rather than a second implementation
-                    _k.sent();
+                    _l.sent();
                     // sw.js sits at the site root: a worker can only control the folder it is
                     // served from, and the app has to be controlled from /
                     fs_1.default.copyFileSync(path_1.default.join(ASSETS_FOLDER, 'sw.js'), path_1.default.join(outputFolder, 'sw.js'));

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

@@ -210,6 +210,32 @@ describe('page-side bridge', function () {
             }
         });
     }); });
+    it('carries a binary file as base64 rather than as damaged text', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var fetchImpl, XHR, bytes, form, xhr, _a, init, payload;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    fetchImpl = jest.fn(function () { return __awaiter(void 0, void 0, void 0, function () { return __generator(this, function (_a) {
+                        return [2 /*return*/, jsonResponse('{"status":"success"}')];
+                    }); }); });
+                    XHR = loadBridge(fetchImpl).XHR;
+                    bytes = new Uint8Array([
+                        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a
+                    ]);
+                    form = new FormData();
+                    form.append('file', new Blob([bytes], { type: 'image/png' }), 'logo.png');
+                    xhr = new XHR();
+                    return [4 /*yield*/, run(xhr, 'POST', '/SASjsApi/drive/file', form)];
+                case 1:
+                    _b.sent();
+                    _a = __read(fetchImpl.mock.calls[0], 2), init = _a[1];
+                    payload = JSON.parse(init.body);
+                    expect(payload.tables[0].binary).toBe(true);
+                    expect(payload.tables[0].csv).toBe(btoa('‰PNG\r\n\n'));
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('parses the response when the app asked for json', function () { return __awaiter(void 0, void 0, void 0, function () {
         var XHR, xhr;
         return __generator(this, function (_a) {

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

@@ -667,25 +667,32 @@ describe('browser-hosted build', function () {
             }
         });
     }); });
-    it('refuses a target whose services are SAS, and keeps the previous site', function () { return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, (0, mockSite_1.buildMockSite)(target())];
-                case 1:
-                    _a.sent();
-                    write(path_1.default.join(out(), 'stale.txt'), 'previous');
+    /**
+     * A SAS backend does not run in a browser, but the programs are still worth
+     * shipping: the drive holds them, so a visitor can open them in Studio and
+     * read what a deployment's services do. The build warns and carries on.
+     */
+    it('builds a target whose services are SAS, and warns they cannot run', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var warn, result, seed;
+        var _a;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
                     fs_1.default.rmSync(path_1.default.join(root, 'sasjsbuild', 'services'), {
                         recursive: true,
                         force: true
                     });
                     write(path_1.default.join(root, 'sasjsbuild', 'services', 'public', 'getdata.sas'), '%put sas;\n');
-                    return [4 /*yield*/, expect((0, mockSite_1.buildMockSite)(target())).rejects.toThrow(/No \.js programs/)
-                        // the failure is not allowed to take the last good site with it
-                    ];
-                case 2:
-                    _a.sent();
-                    // the failure is not allowed to take the last good site with it
-                    expect(fs_1.default.readFileSync(path_1.default.join(out(), 'stale.txt'), 'utf8')).toBe('previous');
+                    warn = jest.spyOn((_a = process.logger) !== null && _a !== void 0 ? _a : console, 'warn');
+                    return [4 /*yield*/, (0, mockSite_1.buildMockSite)(target())];
+                case 1:
+                    result = _b.sent();
+                    expect(result.jsPrograms).toBe(0);
+                    expect(result.driveEntries).toBeGreaterThan(0);
+                    expect(warn).toHaveBeenCalledWith(expect.stringContaining('cannot run in a browser'));
+                    seed = readSeed();
+                    expect(Object.keys(seed.files).some(function (key) { return key.endsWith('/getdata.sas'); })).toBe(true);
+                    warn.mockRestore();
                     return [2 /*return*/];
             }
         });

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

@@ -1139,6 +1139,46 @@ describe('service worker host', function () {
             });
         }); });
     });
+    it('writes a binary upload as its bytes, not as the text it decodes to', function () { return __awaiter(void 0, void 0, void 0, function () {
+        var dispatch, image, created, read, _a, _b;
+        return __generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    dispatch = seeded().dispatch;
+                    image = new Uint8Array([
+                        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a
+                    ]);
+                    return [4 /*yield*/, dispatch('/SASjsApi/drive/file', {
+                            method: 'POST',
+                            headers: { 'content-type': 'application/json' },
+                            body: JSON.stringify({
+                                params: { filePath: '/Public/logo.png' },
+                                tables: [
+                                    {
+                                        name: 'file',
+                                        filename: 'logo.png',
+                                        csv: btoa(String.fromCharCode.apply(null, Array.from(image))),
+                                        binary: true
+                                    }
+                                ]
+                            })
+                        })];
+                case 1:
+                    created = _c.sent();
+                    expect(created.status).toBe(200);
+                    return [4 /*yield*/, dispatch('/SASjsApi/drive/file?_filePath=' + encodeURIComponent('/Public/logo.png'))];
+                case 2:
+                    read = _c.sent();
+                    expect(read.status).toBe(200);
+                    _a = expect;
+                    _b = Uint8Array.bind;
+                    return [4 /*yield*/, read.arrayBuffer()];
+                case 3:
+                    _a.apply(void 0, [new (_b.apply(Uint8Array, [void 0, _c.sent()]))()]).toEqual(image);
+                    return [2 /*return*/];
+            }
+        });
+    }); });
     it('answers 404 for a drive file the drive does not hold', function () { return __awaiter(void 0, void 0, void 0, function () {
         var dispatch, response, _a;
         return __generator(this, function (_b) {

package/package.json

@@ -125,5 +125,5 @@
     "ws": "8.21.0",
     "nanoid": "3.3.18"
   },
-  "version": "6.17.0"
+  "version": "6.18.0"
 }