@webqit/webflo 0.9.0-0 → 0.9.2

package/package.json

@@ -12,7 +12,7 @@
     "vanila-javascript"
   ],
   "homepage": "https://webqit.io/tooling/webflo",
-  "version": "0.9.0-0",
+  "version": "0.9.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -37,7 +37,7 @@
   "dependencies": {
     "@octokit/webhooks": "^7.15.1",
     "@webqit/backpack": "^0.0.37",
-    "@webqit/oohtml-ssr": "^1.0.2",
+    "@webqit/oohtml-ssr": "^1.0.3",
     "@webqit/util": "^0.8.9",
     "client-sessions": "^0.8.0",
     "form-data-encoder": "^1.6.0",

package/src/runtime-pi/client/Runtime.js

@@ -22,8 +22,8 @@ const FormData = xFormData(whatwag.FormData);
 const ReadableStream = whatwag.ReadableStream;
 const RequestHeaders = xRequestHeaders(whatwag.Headers);
 const ResponseHeaders = xResponseHeaders(whatwag.Headers);
-const Request = xRequest(whatwag.Request, RequestHeaders, FormData);
-const Response = xResponse(whatwag.Response, ResponseHeaders, FormData);
+const Request = xRequest(whatwag.Request, RequestHeaders, FormData, whatwag.Blob);
+const Response = xResponse(whatwag.Response, ResponseHeaders, FormData, whatwag.Blob);
 const fetch = xfetch(whatwag.fetch);
 const HttpEvent = xHttpEvent(Request, Response, URL);
 
@@ -101,7 +101,7 @@ export default class Runtime {
 			if (!anchor.target && !anchor.download && (!anchor.origin || anchor.origin === this.location.origin)) {
 				if (e.metaKey || e.altKey || e.ctrlKey || e.shiftKey) return;
 				// Publish everything, including hash
-				this.go(Url.copy(anchor), { src: anchor, srcType: 'link', });
+				this.go(Url.copy(anchor), {}, { src: anchor, srcType: 'link', });
 				// URLs with # will cause a natural navigation
 				// even if pointing to a different page, a natural navigation will still happen
 				// because with the Observer.set() above, window.document.location.href would have become
@@ -144,7 +144,11 @@ export default class Runtime {
 					actionEl.search = wwwFormSerialize(query);
 					formData = null;
 				}
-				this.go(Url.copy(actionEl), { ...submitParams, body: formData, src: form, srcType: 'form', });
+				this.go(Url.copy(actionEl), {
+					method: submitParams.method,
+					body: formData,
+					headers: { contentType: submitParams.enctype },
+				}, { ...submitParams, src: form, srcType: 'form', });
 				// URLs with # will cause a natural navigation
 				// even if pointing to a different page, a natural navigation will still happen
 				// because with the Observer.set() above, window.document.location.href would have become

package/src/runtime-pi/client/RuntimeClient.js

@@ -83,7 +83,7 @@ export default class RuntimeClient {
 			window.document.setState({ page: data }, { update: 'merge' });
 			window.document.body.setAttribute('template', 'page/' + httpEvent.url.pathname.split('/').filter(a => a).map(a => a + '+-').join('/'));
             await new Promise(res => (window.document.templatesReadyState === 'complete' && res(), window.document.addEventListener('templatesreadystatechange', res)));
-			return true;
+			return window;
 		});
 	}
 
@@ -97,16 +97,13 @@ export default class RuntimeClient {
 	async scrollIntoView(httpEvent) {
 		if (!(httpEvent.detail.src instanceof Element)) return;
 		await new Promise(res => setTimeout(res, 10));
-		let viewportTop;
+		let viewportTop, urlTarget;
 		if (httpEvent.url.hash && (urlTarget = document.querySelector(httpEvent.url.hash))) {
 			urlTarget.scrollIntoView();
 		} else if (viewportTop = Array.from(document.querySelectorAll('[data-viewport-top]')).pop()) {
 			viewportTop.focus();
 		} else {
-			document.documentElement.classList.add('scroll-reset');
 			document.body.scrollIntoView();
-			await new Promise(res => setTimeout(res, 600));
-			document.documentElement.classList.remove('scroll-reset');
 		}
 	}
 

package/src/runtime-pi/server/Runtime.js

@@ -28,8 +28,8 @@ const FormData = xFormData(whatwag.FormData);
 const ReadableStream = whatwag.ReadableStream;
 const RequestHeaders = xRequestHeaders(whatwag.Headers);
 const ResponseHeaders = xResponseHeaders(whatwag.Headers);
-const Request = xRequest(whatwag.Request, RequestHeaders, FormData);
-const Response = xResponse(whatwag.Response, ResponseHeaders, FormData);
+const Request = xRequest(whatwag.Request, RequestHeaders, FormData, whatwag.Blob);
+const Response = xResponse(whatwag.Response, ResponseHeaders, FormData, whatwag.Blob);
 const fetch = xfetch(whatwag.fetch);
 const HttpEvent = xHttpEvent(Request, Response, URL);
 

package/src/runtime-pi/server/RuntimeClient.js

@@ -70,7 +70,7 @@ export default class RuntimeClient {
     // Renderer
     async render(httpEvent, router, response) {
         let data = await response.json();
-        return router.route('render', httpEvent, data, async (httpEvent, data) => {
+        let rendering = await router.route('render', httpEvent, data, async (httpEvent, data) => {
             var renderFile, pathnameSplit = httpEvent.url.pathname.split('/');
             while ((renderFile = Path.join(this.cx.CWD, this.cx.layout.PUBLIC_DIR, './' + pathnameSplit.join('/'), 'index.html')) 
             && (this.renderFileCache[renderFile] === false/* false on previous runs */ || !Fs.existsSync(renderFile))) {
@@ -95,8 +95,9 @@ export default class RuntimeClient {
             window.document.setState({ page: data, url: httpEvent.url }, { update: 'merge' });
             window.document.body.setAttribute('template', 'page/' + httpEvent.url.pathname.split('/').filter(a => a).map(a => a + '+-').join('/'));
             await new Promise(res => setTimeout(res, 10));
-            return window.print();
+            return window;
         });
+        return rendering + '';
     }
 
 }

package/src/runtime-pi/server/whatwag.js

@@ -8,29 +8,26 @@ import fetch, { Request, Response, Headers } from 'node-fetch';
 import { FormDataEncoder } from 'form-data-encoder';
 import { Readable } from "stream";
 
-/**
- * Patch MessageStream with formData()
- */
-const _streamFormDataPatch = MessageStream => class extends MessageStream {
-    // formData() polyfill
-    async formData() { return null;  }
-};
-
 /**
  * The NavigationEvent class
  */
-const Request2 = _streamFormDataPatch(Request);
-const Response2 = _streamFormDataPatch(Response);
+if (!Request.prototype.formData) {
+    Request.prototype.formData = async function() { return null }
+}
+if (!Response.prototype.formData) {
+    Response.prototype.formData = async function() { return null }
+}
 FormData.encode = formData => {
     const encoder = new FormDataEncoder(formData);
     return [ Readable.from(encoder.encode()), encoder.headers ];
 };
+
 export {
     URL,
     fetch,
     Headers,
-    Request2 as Request,
-    Response2 as Response,
+    Request,
+    Response,
     FormData,
     Readable as ReadableStream,
     File,

package/src/runtime-pi/xHttpMessage.js

@@ -123,7 +123,7 @@ const xHttpMessage = (whatwagHttpMessage, Headers, FormData) => {
 }
 
 export default xHttpMessage;
-export function encodeBody(body, FormData) {
+export function encodeBody(body, FormData, Blob) {
     const detailsObj = { body, input: body };
     const encodeFormData = (detailsObj, formData) => {
         if (!FormData.encode) return;
@@ -170,7 +170,7 @@ export function encodeBody(body, FormData) {
             detailsObj.body = JSON.stringify(body);
             detailsObj.headers = {
                 contentType: 'application/json',
-                contentLength: Buffer.byteLength(detailsObj.body, 'utf8'), // Buffer.from(string).length
+                contentLength: (new Blob([ detailsObj.body ])).size, // Buffer.byteLength(detailsObj.body, 'utf8') isn't cross-environment
             };
         }
         detailsObj.resolved = body;

package/src/runtime-pi/xRequest.js

@@ -7,7 +7,7 @@ import xHttpMessage, { encodeBody } from './xHttpMessage.js';
 /**
  * The xRequest Mixin
  */
-const xRequest = (whatwagRequest, Headers, FormData) => class extends xHttpMessage(whatwagRequest, Headers, FormData) {
+const xRequest = (whatwagRequest, Headers, FormData, Blob) => class extends xHttpMessage(whatwagRequest, Headers, FormData) {
         
     constructor(input, init = {}) {
         init = { ...init };
@@ -30,7 +30,7 @@ const xRequest = (whatwagRequest, Headers, FormData) => class extends xHttpMessa
         }
         // Init can contain "already-parsed request content"
         if (('body' in init)) {
-            bodyAttrs = encodeBody(init.body, FormData);
+            bodyAttrs = encodeBody(init.body, FormData, Blob);
             init.body = bodyAttrs.body;
         }
         let isNavigateMode;

package/src/runtime-pi/xResponse.js

@@ -7,13 +7,13 @@ import xHttpMessage, { encodeBody } from './xHttpMessage.js';
 /**
  * The xResponse Mixin
  */
-const xResponse = (whatwagResponse, Headers, FormData) => class extends xHttpMessage(whatwagResponse, Headers, FormData) {
+const xResponse = (whatwagResponse, Headers, FormData, Blob) => class extends xHttpMessage(whatwagResponse, Headers, FormData) {
 
     // construct
     constructor(body = null, init = {}) {
         let bodyAttrs = {}, isResponseInput;
         if (arguments.length) {
-            if ((body instanceof whatwagResponse)) {
+            if (body instanceof whatwagResponse) {
                 isResponseInput = body;
                 // Inherit init
                 init = { status: body.status, statusText: body.statusText, headers: body.headers, ...init };
@@ -22,13 +22,14 @@ const xResponse = (whatwagResponse, Headers, FormData) => class extends xHttpMes
                 bodyAttrs = body.bodyAttrs || {};
                 body = body.body;
             } else {
-                bodyAttrs = encodeBody(body, FormData);
+                bodyAttrs = encodeBody(body, FormData, Blob);
                 body = bodyAttrs.body;
             }
         }
         super(body, init, bodyAttrs);
         if (isResponseInput) {
             // Through the backdoor
+            this.attrs.url = isResponseInput.url;
             this.attrs.ok = isResponseInput.ok;
             this.attrs.status = isResponseInput.status; // In case it was earlier deleted
             this.attrs.type = isResponseInput.type;