@webqit/webflo 0.20.5 → 0.20.7-next.0

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.20.5",
+  "version": "0.20.7-next.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -48,6 +48,7 @@
     "@webqit/use-live": "^0.5.41",
     "@webqit/util": "^0.8.11",
     "dotenv": "^16.4.7",
+    "esbuild": "^0.14.38",
     "mime-types": "^2.1.33",
     "simple-git": "^2.20.1",
     "urlpattern-polyfill": "^4.0.3"
@@ -56,7 +57,6 @@
     "chai": "^4.3.6",
     "chokidar": "^4.0.3",
     "coveralls": "^3.1.1",
-    "esbuild": "^0.14.38",
     "fast-glob": "^3.3.3",
     "jsdom": "^27.0.1",
     "markdown-it-mathjax3": "^4.3.2",

package/src/build-pi/esbuild-plugin-uselive-transform 2.js

@@ -0,0 +1,42 @@
+import Fs from 'fs/promises';
+import { parse, compile, matchPrologDirective, serialize } from '@webqit/use-live';
+
+export function UseLiveTransform() {
+    return {
+        name: 'uselive-transform',
+        setup(build) {
+            build.onLoad({ filter: /\.(js|mjs|ts|jsx|tsx)$/ }, async (args) => {
+                const code = await Fs.readFile(args.path, 'utf8');
+                
+                // Super dirty detection
+                if (matchPrologDirective(code)) {
+                    // Actual check...
+
+                    let ast;
+                    try { ast = parse(code, parserParams); } catch (e) { console.error(args.path, '\nUseLive transform error:', e); }
+                    
+                    if (ast?.isLiveProgram || ast?.hasLiveFunctions) {
+                        const result = await compile(parserParams.sourceType+'-file', ast, {
+                            liveMode: ast.isLiveProgram, // Regarding top-level
+                            fileName: args.path,
+                        });
+                        return { contents: serialize(result), loader: 'js' };
+                    }
+                }
+
+                return { contents: code, loader: 'default' };
+            });
+        }
+    };
+}
+
+export const parserParams = {
+    ecmaVersion: 'latest',
+    sourceType: 'module',
+    executionMode: 'RegularProgram', // 'LiveProgram'
+    allowReturnOutsideFunction: true,
+    allowAwaitOutsideFunction: true,
+    allowSuperOutsideMethod: false,
+    preserveParens: false,
+    locations: true,
+};

package/src/runtime-pi/webflo-fetch/LiveResponse.js

@@ -339,7 +339,7 @@ export class LiveResponse extends EventTarget {
                 redirected: response.redirected,
                 url: response.url,
             });
-            if (this.test(response) === 'LiveResponse') {
+            if (this.constructor.test(response) === 'LiveResponse') {
                 response.addEventListener('replace', () => execReplaceWith(response), { signal: this.#abortController.signal });
                 return await response.whileLive(true);
             }

package/src/runtime-pi/webflo-fetch/index.js

@@ -153,7 +153,14 @@ export const response = {
         }
     },
     prototype: {
-        status: { get: function () { return _wq(this, 'meta').get('status') || responseOriginals.prototype.status.get.call(this); } },
+        status: {
+            get: function () {
+                return _wq(this, 'meta').get('status')
+                    || this instanceof Response
+                    ? responseOriginals.prototype.status.get.call(this)
+                    : this.status;
+            }
+        },
         carry: { get: function () { return _wq(this, 'meta').get('carry'); } },
         parse: { value: async function () { return await parseHttpMessage(this); } },
         clone: {

package/src/runtime-pi/webflo-fetch/util.js

@@ -22,7 +22,7 @@ export function dataType(value) {
         'Uint8Array', 'Uint16Array', 'Uint32Array', 'ArrayBuffer', 'Blob', 'File', 'FormData', 'Stream', 'ReadableStream'
     ].reduce((_toStringTag, type) => _toStringTag || (toStringTag === type ? type : null), null);
     if (type) return type;
-    if ((_isObject(value) && _isPlainObject(value)) || (Array.isArray(value) && _isPlainArray(value)) || 'toString' in value) {
+    if ((_isObject(value)) || (Array.isArray(value) && _isPlainArray(value)) || 'toString' in value) {
         return 'json';
     }
 }

package/src/runtime-pi/webflo-messaging/WQSockPort.js

@@ -6,14 +6,12 @@ import { _wq } from '../../util.js';
 
 export class WQSockPort extends WQMessagePort {
 
-    static WebSocket = typeof WebSocket !== 'undefined' ? WebSocket : null;
-
     #socket;
     #cleanups = [];
 
     constructor(instanceOrConnectionID) {
         super();
-        this.#socket = typeof instanceOrConnectionID === 'string' ? new this.constructor.WebSocket(`/${instanceOrConnectionID}`) : instanceOrConnectionID;
+        this.#socket = typeof instanceOrConnectionID === 'string' ? new WebSocket(`/${instanceOrConnectionID}`) : instanceOrConnectionID;
         const meta = _wq(this, 'meta');
         Object.defineProperty(this, 'wqLifecycle', {
             value: {

package/src/runtime-pi/webflo-messaging/wq-message-port.js

@@ -294,6 +294,7 @@ export function postRequest(data, callback, options = {}) {
     const { signal, once } = eventOptions2;
     const messageChannel = new MessageChannel;
     messageChannel.port1.start();
+    toWQPort(messageChannel.port1);
     messageChannel.port1.addEventListener('message', (e) => callback(e), { signal, once });
     return this.postMessage(data, { ...$options, transfer: [messageChannel.port2].concat(transfer) });
 }

package/src/runtime-pi/webflo-server/WebfloServer.js

@@ -65,7 +65,6 @@ export class WebfloServer extends WebfloRuntime {
             await this.enterDevMode();
         } else {
             await this.buildRoutes({ server: true });
-            await this.bundleAssetsIfPending(true);
         }
 
         // ----------
@@ -564,7 +563,7 @@ export class WebfloServer extends WebfloRuntime {
         const finalizeResponse = (response) => {
             // Qualify Service-Worker responses
             if (httpEvent.request.headers.get('Service-Worker') === 'script') {
-                scopeObj.response.headers.set('Service-Worker-Allowed', this.config.WORKER.scope || '/');
+                response.headers.set('Service-Worker-Allowed', this.config.WORKER.scope || '/');
             }
             const responseMeta = _wq(response, 'meta');
             responseMeta.set('filename', scopeObj.filename);