@webqit/webflo 0.11.39 → 0.11.40

package/src/runtime-pi/xURL.js

@@ -2,94 +2,89 @@
 /**
  * @imports
  */
-import _isArray from '@webqit/util/js/isArray.js';
-import _isObject from '@webqit/util/js/isObject.js';
-import { wwwFormUnserialize, wwwFormSerialize } from './util.js';
+import { _isObject, _isArray } from '@webqit/util/js/index.js';
+import { params } from './util-url.js';
 
 /**
  * ---------------------------
  * The xURL Mixin
  * ---------------------------
  */
-const xURL = whatwagURL => {
-	const URL = class extends whatwagURL {
-		
-		// constructor
-		constructor(...args) {
-			super(...args);
-			var query = wwwFormUnserialize(this.search);
-			const updateSearch = query => {
-				// "query" was updated. So we update "search"
-				var search = wwwFormSerialize(query);
-				search = search ? '?' + search : '';
-				if (search !== this.search) {
-					this.search = search;
+export default class xURL extends URL {
+	
+	// constructor
+	constructor(...args) {
+		super(...args);
+		var query = params.parse(this.search);
+		const updateSearch = query => {
+			// "query" was updated. So we update "search"
+			var search = params.stringify(query);
+			search = search ? '?' + search : '';
+			if (search !== this.search) {
+				this.search = search;
+			}
+		};
+		this.__query = {
+			value: query,
+			proxy: new Proxy(query, {
+				set(t, n, v) {
+					t[n] = v;
+					updateSearch(t);
+					return true;
+				},
+				deleteProperty(t, n) {
+					delete t[n];
+					updateSearch(t);
+					return true;
 				}
-			};
-			this.__query = {
-				value: query,
-				proxy: new Proxy(query, {
-					set(t, n, v) {
-						t[n] = v;
-						updateSearch(t);
-						return true;
-					},
-					deleteProperty(t, n) {
-						delete t[n];
-						updateSearch(t);
-						return true;
-					}
-				})
-			};
-		}
+			})
+		};
+	}
 
-		// Set search
-		set search(value) {
-			super.search = value;
-			// "search" was updated. So we update "query"
-			var query = wwwFormUnserialize(value);
-			if (!_strictEven(query, this.query)) {
-				this.query = query;
-			}
+	// Set search
+	set search(value) {
+		super.search = value;
+		// "search" was updated. So we update "query"
+		var query = params.parse(value);
+		if (!_strictEven(query, this.query)) {
+			this.query = query;
 		}
+	}
 
-		// Get search
-		get search() {
-			return super.search;
-		}
+	// Get search
+	get search() {
+		return super.search;
+	}
 
-		// Get query
-		get query() {
-			return this.__query.proxy;
-		}
+	// Get query
+	get query() {
+		return this.__query.proxy;
+	}
 
-	};
-	// ----------
-    URL.Observable = class extends URL {
-	
-		constructor() {
-			super(...arguments);
-			const { Observer } = WebQit;
-			Observer.accessorize(this, [
-				'protocol', 
-				'username',
-				'password',
-				'host',
-				'hostname',
-				'port',
-				'origin',
-				'pathname',
-				'search',
-				'query',
-				'hash',
-				'href',
-			]);
-		}
-	
-	};
-    // ----------
-	return URL;
-}
+};
+// ----------
+xURL.Observable = class extends xURL {
+
+	constructor() {
+		super(...arguments);
+		const { Observer } = WebQit;
+		Observer.accessorize(this, [
+			'protocol', 
+			'username',
+			'password',
+			'host',
+			'hostname',
+			'port',
+			'origin',
+			'pathname',
+			'search',
+			'query',
+			'hash',
+			'href',
+		]);
+	}
+
+};
 
 /**
  * ---------------------------
@@ -108,4 +103,3 @@ var _strictEven = (a, b) => {
 	return a === b;
 };
 
-export default xURL;

package/src/runtime-pi/xfetch.js

@@ -1,14 +1,23 @@
 
+/**
+ * @imports
+ */
+import { formatMessage } from './util-http.js';
+
 /**
  * The xfetch Mixin
  */
-const xfetch = (whatwagFetch, xRequest = null) => {
-    return (url, init = {}) => {
-        if (init.body && (typeof init.body === 'object') && xRequest) {
-            return whatwagFetch(new xRequest(url, init));
-        }
-        return whatwagFetch(url, init);
+const xfetch = async (url, init = {}) => {
+    if (init.body) {
+        const [ body, headers ] = formatMessage(init.body);
+        init = { ...init, body, headers: { ...headers, ...(init.headers || {}), } };
+    }
+    let response = await fetch(url, init), encoding;
+    if (init.decompress === false && (encoding = response.headers.get('Content-Encoding'))) {
+        let recompressedBody = response.body.pipeThrough(new CompressionStream(encoding));
+        response = new Response(recompressedBody, response);
     }
+    return response;
 };
 
 export default xfetch;

package/src/runtime-pi/xxHttpMessage.js

@@ -0,0 +1,102 @@
+
+/**
+ * @imports
+ */
+import { _isTypeObject } from '@webqit/util/js/index.js';
+import xFormData from './xFormData.js';
+
+/**
+ * The _Request Mixin
+ */
+const xxHttpMessage = (whatwagHttpMessage, xHeaders) => {
+    const HttpMessage = class extends whatwagHttpMessage {
+        
+        constructor(input, init, meta) {
+            // ------------
+            if (init.headers) { init = { ...init, headers: new xHeaders(init.headers) }; }
+            super(input, init);
+            if (meta.headers) { this.headers.json(meta.headers); }
+            // ------------
+            let attrs = {};
+            Object.defineProperty(this, '_attrs', { get: () => attrs });
+            Object.defineProperty(this, 'meta', { get: () => meta });
+        }
+
+        get attrs() {
+            return this._attrs || {};
+        }
+
+        clone() {
+            return new this.constructor(super.clone());
+        }
+
+        get headers() {
+            xHeaders.compat(super.headers);
+            return super.headers;
+        }
+
+        get url() {
+            return 'url' in this.attrs ? this.attrs.url : super.url;
+        }
+
+        async arrayBuffer() {
+            if (this.meta.type === 'ArrayBuffer') { return this.meta.body; }
+            return super.arrayBuffer();
+        }
+
+        async blob() {
+            if (this.meta.type === 'Blob') { return this.meta.body; }
+            return super.blob();
+        }
+
+        async formData() {
+            let formData;
+            if (this.meta.type === 'FormData' && this.meta.body instanceof FormData) {
+                formData = this.meta.body;
+            } else { formData = await super.formData(); }
+            if (formData) { xFormData.compat(formData); }
+            return formData;
+        }
+
+        async json() {
+            if (this.meta.type === 'json' && _isTypeObject(this.meta.body)) { return this.meta.body; }
+            return super.json();
+        }
+
+        async text() {
+            if (this.meta.type === 'json' && !_isTypeObject(this.meta.body)) { return this.meta.body; }
+            return super.text();
+        }
+                
+        // Resolve
+        jsonfy(force = false) {
+            if (!this.meta.jsonfied || force) {
+                this.meta.jsonfied = new Promise(async (resolve, reject) => {
+                    let jsonfied;
+                    let contentType = this.headers.get('Content-Type') || '';
+                    try {
+                        if (contentType === 'application/x-www-form-urlencoded' || contentType.startsWith('multipart/form-data')) {
+                            const formData = await this.formData();
+                            jsonfied = formData?.json();
+                        } else if (contentType === 'application/json') {
+                            jsonfied = await this.json();
+                        } else if (contentType === 'text/plain') {
+                            jsonfied = await this.text();
+                        }
+                        resolve(jsonfied);
+                    } catch(e) {
+                        reject(e);
+                    }
+                });
+            }
+            return this.meta.jsonfied;
+        }
+
+    };
+    // ----------
+    HttpMessage.Headers = xHeaders;
+    // ----------
+    return HttpMessage;
+}
+
+export default xxHttpMessage;

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

@@ -1,27 +0,0 @@
-
-const {
-    URL,
-    fetch,
-    Headers,
-    Request,
-    Response,
-    FormData,
-    ReadableStream,
-    File,
-    Blob
-} = globalThis;
-
-/**
- * @exports
- */
-export {
-    URL,
-    fetch,
-    Headers,
-    Request,
-    Response,
-    FormData,
-    ReadableStream,
-    File,
-    Blob,
-}

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

@@ -1,35 +0,0 @@
-
-/**
- * @imports
- */
-import { URL } from 'url';
-import { FormData, File, Blob } from 'formdata-node';
-import fetch, { Request, Response, Headers } from 'node-fetch';
-import { FormDataEncoder } from 'form-data-encoder';
-import { Readable } from "stream";
-
-/**
- * The NavigationEvent class
- */
-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,
-    Request,
-    Response,
-    FormData,
-    Readable as ReadableStream,
-    File,
-    Blob,
-}

package/src/runtime-pi/util.js

@@ -1,162 +0,0 @@
-
-/**
- * @imports
- */
-import { _isString, _isObject, _isNumeric, _isArray } from '@webqit/util/js/index.js';
-import { _beforeLast, _afterLast } from '@webqit/util/str/index.js';
-import { _from as _arrFrom } from '@webqit/util/arr/index.js';
-if (typeof URLPattern === 'undefined') {
-    await import('urlpattern-polyfill');
-}
-
-/**
- * ---------------
- * @wwwFormPathUnserializeCallback
- * ---------------
- */
-
-export function wwwFormPathUnserializeCallback(form, wwwFormPath, callback, touch = false) {
-    if (_isString(wwwFormPath) && wwwFormPath.endsWith(']')) {
-        var index = _beforeLast(_afterLast(wwwFormPath, '['), ']') || 0;
-        if (_isNumeric(index)) {
-            index = parseInt(index);
-        }
-        wwwFormPath = _beforeLast(wwwFormPath, '[') || 0;
-        if (_isNumeric(wwwFormPath)) {
-            wwwFormPath = parseInt(wwwFormPath);
-        }
-        return wwwFormPathUnserializeCallback(form, wwwFormPath, (_form, _wwwFormPath) => {
-            if (!_form[_wwwFormPath]) {
-                if (!touch) {
-                    return callback();
-                }
-                _form[_wwwFormPath] = _isNumeric(index) ? [] : {};
-            }
-            return callback(_form[_wwwFormPath], index);
-        }, touch);
-    } else {
-        return callback(form, wwwFormPath);
-    }
-}
-
-export function wwwFormSet(form, wwwFormPath, value, append = true) {
-    wwwFormPathUnserializeCallback(form, wwwFormPath, (_form, _key) => {
-        if (_isNumeric(_key)) {
-            _key = _key || _isArray(_form) 
-                ? _form.length 
-                : Object.keys(_form).filter(_isNumeric).length;
-            _arrFrom(value, false).forEach((_value, i) => {
-                _form[_key + i] = _value;
-            });
-        } else {
-            _form[_key] = append && (_key in _form) ? _arrFrom(_form[_key], false).concat(value) : value;
-        }
-    }, true);
-}
-
-export function wwwFormGet(form, wwwFormPath) {
-    return wwwFormPathUnserializeCallback(form, wwwFormPath, function(_form, _key) {
-        if (arguments.length) {
-            return _form[_key]
-        }
-    }, false);
-}
-
-export function wwwFormUnserialize(str, target = {}, delim = '&') {
-    str = str || '';
-    (str.startsWith('?') ? str.substr(1) : str)
-        .split(delim).filter(q => q).map(q => q.split('=').map(q => q.trim()))
-        .forEach(q => wwwFormSet(target, q[0], decodeURIComponent(q[1])));
-    return target;
-}
-
-/**
- * ---------------
- * @wwwFormPathSerialize
- * ---------------
- */
-
-export function wwwFormPathSerializeCallback(wwwFormPath, value, callback, shouldSerialize = null) {
-    if ((_isObject(value) || _isArray(value)) && (!shouldSerialize || shouldSerialize(value, wwwFormPath))) {
-        var isArr = _isArray(value);
-        Object.keys(value).forEach(key => {
-            wwwFormPathSerializeCallback(`${wwwFormPath}[${key}]`, value[key], callback, shouldSerialize);
-        });
-    } else {
-        callback(wwwFormPath, !value && value !== 0 ? '' : value);
-    }
-}
-
-export function wwwFormSerialize(form, delim = '&', shouldSerialize = null) {
-    var q = [];
-    Object.keys(form).forEach(key => {
-        wwwFormPathSerializeCallback(key, form[key], (_wwwFormPath, _value) => {
-            q.push(`${_wwwFormPath}=${encodeURIComponent(_value)}`);
-        }, shouldSerialize);
-    });
-    return q.join(delim);
-}
-
-export const path = {
-    join(/* path segments */) {
-        // Split the inputs into a list of path commands.
-        var parts = [], backsteps = 0;
-        for (var i = 0, l = arguments.length; i < l; i++) {
-            parts = parts.concat(arguments[i].split("/"));
-        }
-        // Interpret the path commands to get the new resolved path.
-        var newParts = [];
-        for (i = 0, l = parts.length; i < l; i++) {
-            var part = parts[i];
-            // Remove leading and trailing slashes
-            // Also remove "." segments
-            if (!part || part === ".") continue;
-            // Interpret ".." to pop the last segment
-            if (part === "..") {
-                if (!newParts.length) backsteps ++;
-                else newParts.pop();
-            }
-            // Push new path segments.
-            else newParts.push(part);
-        }
-        // Preserve the initial slash if there was one.
-        if (parts[0] === "") newParts.unshift("");
-        // Turn back into a single string path.
-        return '../'.repeat(backsteps) + newParts.join("/") || (newParts.length ? "/" : ".");
-    },
-  
-    // A simple function to get the dirname of a path
-    // Trailing slashes are ignored. Leading slash is preserved.
-    dirname(path) {
-        return this.join(path, "..");
-    }
-};
-
-export const urlPattern = (pattern, baseUrl = null) => ({
-    pattern: new URLPattern(pattern, baseUrl),
-    isPattern() {
-        return Object.keys(this.pattern.keys || {}).some(compName => this.pattern.keys[compName].length);
-    },
-    test(...args) { return this.pattern.test(...args) }, 
-    exec(...args) {
-        let components = this.pattern.exec(...args);
-        if (!components) return;
-        components.vars = Object.keys(this.pattern.keys).reduce(({ named, unnamed }, compName) => {
-            this.pattern.keys[compName].forEach(key => {
-                let value = components[compName].groups[key.name];
-                if (typeof key.name === 'number') {
-                    unnamed.push(value);
-                } else {
-                    named[key.name] = value;
-                }
-            });
-            return { named, unnamed };
-        }, { named: {}, unnamed: [] });
-        components.render = str => {
-            return str.replace(/\$(\$|[0-9A-Z]+)/gi, (a, b) => {
-                return b === '$' ? '$' : (_isNumeric(b) ? components.vars.unnamed[b - 1] : components.vars.named[b]) || '';
-            });
-        }
-        return components;
-    }
-});

package/src/runtime-pi/xHttpEvent.js

@@ -1,101 +0,0 @@
-
-/**
- * @imports
- */
-import { _isEmpty } from '@webqit/util/js/index.js';
-
-/**
- * The xHttpEvent Mixin
- */
-const xHttpEvent = (Request, Response, URL) => {
-
-    const HttpEvent = class {
-
-        /**
-         * Initializes a new HttpEvent instance.
-         * 
-         * @param Request       _request 
-         * @param Object        _detail
-         * @param Object        _sessionFactory
-         */
-        constructor(_request, _detail, _sessionFactory) {
-            this._request = _request;
-            this._detail = _detail || {};
-            this._sessionFactory = _sessionFactory;
-            // -------
-            this.Request = Request;
-            this.Response = Response;
-            this.URL = URL;
-            // -------
-            this.port = {
-                listeners: [],
-                post(message) { 
-                    const promises = this.listeners.map(listener => listener(message))
-                        .filter(returnValue => returnValue instanceof Promise);
-                    if (process.length) return Promise.all(promises);
-                },
-                listen(listener) { this.listeners.push(listener); },
-            }
-        }
-
-        // url
-        get url() {
-            if (!this._url) {
-                this._url = new this.URL(this._request.url);
-            }
-            return this._url;
-        }
-
-        // request
-        get request() {
-            return this._request;
-        }
-
-        // detail
-        get detail() {
-            return this._detail;
-        }
-
-        // Session
-        get session() {
-            if (!this._session) {
-                this._session = this.sessionFactory().get();
-            }
-            return this._session;
-        }
-
-        // Session factory
-        sessionFactory(...args) {
-            return this._sessionFactory(...args);
-        }
-
-        // Redirect Response
-        redirect(url, code = 302) {
-            return new this.Response(null, { status: code, headers: { Location: url } });
-        }
-
-        // "with()"
-        with(url, init = {}, _url = null) {
-            let request;
-            if (url instanceof Request) {
-                if (!_isEmpty(init)) {
-                    request = new Request(url, init);
-                } else {
-                    request = url;
-                }
-                if (_url) {
-                    request.attrs.url = `${this.url.origin}${_url}`;
-                }
-            } else {
-                request = new Request(this._request, init);
-                request.attrs.url = `${this.url.origin}${url}`;
-                request.attrs.referrer = this.request.url;
-            }            
-            return new HttpEvent(request, this.detail);
-        }
-
-    }
-    return HttpEvent;
-}
-
-export default xHttpEvent;