@webqit/webflo 0.11.39 → 0.11.41

package/src/runtime-pi/xFormData.js

@@ -2,59 +2,23 @@
 /**
  * @imports
  */
-import { _isTypeObject, _isNumeric } from '@webqit/util/js/index.js';
-import { _before } from '@webqit/util/str/index.js';
-import { wwwFormSet, wwwFormPathSerializeCallback } from './util.js';
+import { formData } from './util-http.js';
 
  /**
   * The _Headers Mixin
   */
-const xFormData = whatwagFormData => class extends whatwagFormData {
+export default class xFormData extends FormData {
 
-    tee(callback = null) {
-        const formData1 = new this.constructor, formData2 = new this.constructor;
-        for (var [ name, value ] of this.entries()) {
-            const formDataType = formDataType(value);
-            if ((callback && callback(value, name, formDataType)) || (!callback && !formDataType)) {
-                formData1.append(name, value);
-            } else {
-                formData2.append(name, value);
-            }
-        }
-        return [ formData1, formData2 ];
+    json(data = {}) {
+        const result = formData.call(this, ...arguments);
+        return result[0];
     }
 
-    json(data = {}, callback = null) {
-        if (arguments.length) {
-            Object.keys(data).forEach(key => {
-                wwwFormPathSerializeCallback(key, data[key], (_wwwFormPath, _value) => {
-                    if (!callback || callback(_wwwFormPath, _value, _isTypeObject(_value))) {
-                        this.append(_wwwFormPath, _value);
-                    }
-                }, value => !formDataType(value));
-            });
-            return;
-        }
-        var jsonBuild; // We'll dynamically determine if this should be an array or an object
-        for (var [ name, value ] of this.entries()) {
-            if (!jsonBuild) {
-                jsonBuild = _isNumeric(_before(name, '[')) ? [] : {};
-            }
-            wwwFormSet(jsonBuild, name, value);
+    static compat(formData) {
+        if (formData instanceof this) return formData;
+        if (formData instanceof FormData) {
+            return Object.setPrototypeOf(formData, new this);
         }
-        return jsonBuild;
     }
 
-}
-
-export default xFormData;
-
-export const formDataType = (value, list = null) => {
-    if (!_isTypeObject(value)) {
-        return;
-    }
-    const toStringTag = value[Symbol.toStringTag];
-    return (list || [
-        'Uint8Array', 'Uint16Array', 'Uint32Array', 'ArrayBuffer', 'Blob', 'File', 'FormData', 'Stream'
-    ]).reduce((_toStringTag, type) => _toStringTag || (toStringTag === type ? type : null), null);
-};
+}

package/src/runtime-pi/xHeaders.js

@@ -1,22 +1,15 @@
 
-/**
- * @imports
- */
-import { _after, _beforeLast } from "@webqit/util/str/index.js";
-import { _isString, _getType, _isObject, _isFunction } from "@webqit/util/js/index.js";
-import { _isTypeObject } from '@webqit/util/js/index.js';
-
 /**
  * The xHeaders Mixin
  */
-const xHeaders = whatwagHeaders => class extends whatwagHeaders {
+export default class xHeaders extends Headers {
 
     // construct
     constructor(definition = {}) {
         const cookies = definition.cookies;
         delete definition.cookies;
         // -----------------        
-        if (definition instanceof whatwagHeaders) {
+        if (definition instanceof Headers) {
             // It's another Headers instance
             super(definition);
         } else {
@@ -140,8 +133,6 @@ const xHeaders = whatwagHeaders => class extends whatwagHeaders {
 
 }
 
-export default xHeaders;
-
 function getAllPropertyDescriptors(obj) {
     if (!obj) {
         return Object.create(null);

package/src/runtime-pi/xRequest.js

@@ -2,46 +2,47 @@
 /**
  * @imports
  */
-import xHttpMessage, { encodeBody } from './xHttpMessage.js';
+import { formatMessage } from './util-http.js';
+import mxHttpMessage from './xxHttpMessage.js';
+import xRequestHeaders from './xRequestHeaders.js';
 
 /**
  * The xRequest Mixin
  */
-const xRequest = (whatwagRequest, Headers, FormData, Blob) => class extends xHttpMessage(whatwagRequest, Headers, FormData) {
+export default class xRequest extends mxHttpMessage(Request, xRequestHeaders) {
         
     constructor(input, init = {}) {
-        init = { ...init };
-        let bodyAttrs = {};
-        if ((input instanceof whatwagRequest)) {
+        let meta = {};
+        if ((input instanceof Request)) {
             // On method change...
             if (init.method && input.method !== init.method.toUpperCase() && [ 'GET', 'HEAD' ].includes(init.method.toUpperCase())) {
                 // Body must not be inherited.
                 input = input.url;
+                init = { ...init };
                 // We should now simply copy attributes
                 [ 'headers', 'mode', 'credentials', 'cache', 'redirect', 'referrer', 'integrity' ].forEach(attr => {
-                    if (!(attr in init)) {
-                        init[attr] = input[attr];
-                    }
+                    if (!(attr in init)) { init[attr] = input[attr]; }
                 });
-            } else {
-                // Inherit bodyAttrs
-                bodyAttrs = input.bodyAttrs || {};
             }
         }
-        // Init can contain "already-parsed request content"
-        if (('body' in init)) {
-            bodyAttrs = encodeBody(init.body, FormData, Blob);
-            init.body = bodyAttrs.body;
-        }
         let isNavigateMode;
-        if (init.mode === 'navigate') {
-            isNavigateMode = true;
-            init = { ...init };
-            delete init.mode;
+        if (!(init instanceof Request)) {
+            // Init can contain "already-parsed request content"
+            if (('body' in init) && !(init.headers instanceof Headers)) {
+                const [ body, headers, type ] = formatMessage(init.body);
+                meta = { type, body: init.body };
+                init = { ...init, body, headers: { ...headers, ...(init.headers || {}), } };
+            }
+            if (init.mode === 'navigate') {
+                isNavigateMode = true;
+                init = { ...init };
+                delete init.mode;
+            }
         }
-        super(input, init, bodyAttrs);
+        // ---------------
+        super(input, init, meta);
+        // ---------------
         if (isNavigateMode) {
-            // Through the backdoor
             this.attrs.mode = 'navigate';
         }
     }
@@ -50,16 +51,11 @@ const xRequest = (whatwagRequest, Headers, FormData, Blob) => class extends xHtt
         return 'mode' in this.attrs ? this.attrs.mode : super.mode;
     }
 
-    get cache() {
-        return 'cache' in this.attrs ? this.attrs.cache : super.cache;
-    }
-
-    get destination() {
-        return 'destination' in this.attrs ? this.attrs.destination : super.destination;
-    }
-
-    get referrer() {
-        return 'referrer' in this.attrs ? this.attrs.referrer : super.referrer;
+    static compat(request) {
+        if (request instanceof this) return request;
+        if (request instanceof Request) {
+            return Object.setPrototypeOf(request, new this);
+        }
     }
 
     static async rip(request) {
@@ -72,13 +68,4 @@ const xRequest = (whatwagRequest, Headers, FormData, Blob) => class extends xHtt
         return [ request.url, requestInit ];
     }
 
-    static compat(request) {
-        if (request instanceof this) return request;
-        if (request instanceof whatwagRequest) {
-            return Object.setPrototypeOf(request, new this);
-        }
-    }
-
-};
-
-export default xRequest;
+}

package/src/runtime-pi/xRequestHeaders.js

@@ -4,34 +4,14 @@
  */
 import { _after } from "@webqit/util/str/index.js";
 import { _from as _arrFrom } from "@webqit/util/arr/index.js";
-import { _getType, _isObject } from "@webqit/util/js/index.js";
-import { wwwFormUnserialize } from './util.js';
+import { params } from './util-url.js';
 import xHeaders from './xHeaders.js';
 import xCookies from './Cookies.js';
 
-/**
- * Cookies
- */
-class Cookies extends xCookies {
-
-    parse(str) {
-        return wwwFormUnserialize(str, {}, ';');
-    }
-    
-    parseEntry(str) {
-        return str.trim().split('=');
-    }
-
-    stringifyEntry(cookieBody) {
-        return cookieBody;
-    }
-
-}
-
 /**
  * The xHeaders Mixin
  */
-const xRequestHeaders = NativeHeaders => class extends xHeaders(NativeHeaders) {
+export default class xRequestHeaders extends xHeaders {
     
     get cookieHeaderName() {
         return 'Cookie';
@@ -109,4 +89,21 @@ const xRequestHeaders = NativeHeaders => class extends xHeaders(NativeHeaders) {
 
 }
 
-export default xRequestHeaders;
+/**
+ * Cookies
+ */
+class Cookies extends xCookies {
+
+    parse(str) {
+        return params.parse(str, ';');
+    }
+    
+    parseEntry(str) {
+        return str.trim().split('=');
+    }
+
+    stringifyEntry(cookieBody) {
+        return cookieBody;
+    }
+
+}

package/src/runtime-pi/xResponse.js

@@ -2,31 +2,37 @@
 /**
  * @imports
  */
-import xHttpMessage, { encodeBody } from './xHttpMessage.js';
+import { formatMessage } from './util-http.js';
+import mxHttpMessage from './xxHttpMessage.js';
+import xResponseHeaders from './xResponseHeaders.js';
 
 /**
  * The xResponse Mixin
  */
-const xResponse = (whatwagResponse, Headers, FormData, Blob) => class extends xHttpMessage(whatwagResponse, Headers, FormData) {
+export default class xResponse extends mxHttpMessage(Response, xResponseHeaders) {
 
     // construct
-    constructor(body = null, init = {}) {
-        let bodyAttrs = {}, isResponseInput;
+    constructor(body = undefined, init = {}) {
+        let meta = {}, isResponseInput;
         if (arguments.length) {
-            if (body instanceof whatwagResponse) {
+            if (body instanceof Response) {
                 isResponseInput = body;
                 // Inherit init
                 init = { status: body.status, statusText: body.statusText, headers: body.headers, ...init };
                 if (body.status === 0) delete init.status;
-                // Inherit bodyAttrs and body
-                bodyAttrs = body.bodyAttrs || {};
+                // Inherit meta and body
+                meta = body.meta || {};
                 body = body.body;
-            } else {
-                bodyAttrs = encodeBody(body, FormData, Blob);
-                body = bodyAttrs.body;
+            } else if (!(init.headers instanceof Headers)) {
+                let headers, type, _body = body;
+                [ body, headers, type ] = formatMessage(body);
+                meta = { type, body: _body };
+                init = { ...init, headers: { ...headers, ...(init.headers || {}), } };
             }
         }
-        super(body, init, bodyAttrs);
+        // ---------------
+        super(body, init, meta);
+        // ---------------
         if (isResponseInput) {
             // Through the backdoor
             this.attrs.url = isResponseInput.url;
@@ -59,11 +65,9 @@ const xResponse = (whatwagResponse, Headers, FormData, Blob) => class extends xH
 
     static compat(response) {
         if (response instanceof this) return response;
-        if (response instanceof whatwagResponse) {
+        if (response instanceof Response) {
             return Object.setPrototypeOf(response, new this);
         }
     }
 
-};
-
-export default xResponse;
+}

package/src/runtime-pi/xResponseHeaders.js

@@ -4,53 +4,13 @@
  */
 import { _after, _beforeLast } from "@webqit/util/str/index.js";
 import { _isString, _getType, _isObject } from "@webqit/util/js/index.js";
-import _Headers from './xHeaders.js';
+import xHeaders from './xHeaders.js';
 import xCookies from './Cookies.js';
 
-/**
- * Cookies
- */
-class Cookies extends xCookies {
-
-    parse(cookieStr) {
-        const obj = {};
-        cookieStr && cookieStr.split(',').forEach(str => {
-            let [ cookieName, definition ] = this.parseEntry(str);
-            obj[cookieName] = definition;
-        });
-        return obj;
-    }
-
-    parseEntry(str) {
-        let [ cookieDefinition, attrsStr ] = str.split(';');
-        let [ cookieName, cookieValue ] = cookieDefinition.trim().split('=');
-        let attrs = { value: cookieValue, };
-        attrsStr && (attrsStr || '').split(/\;/g).map(attrStr => attrStr.trim().split('=')).forEach(attrsArr => {
-            attrs[attrsArr[0][0].toLowerCase() + attrsArr[0].substring(1).replace('-', '')] = attrsArr.length === 1 ? true : attrsArr[1];
-        });
-        return [ cookieName, attrs ];
-    }
-
-    stringifyEntry(cookieBody) {
-        if (_isObject(cookieBody)) {
-            let attrsArr = [ cookieBody.value ];
-            for (let attrName in cookieBody) {
-                if (attrName === 'value') continue;
-                let _attrName = attrName[0].toUpperCase() + attrName.substring(1);
-                if (_attrName === 'MaxAge') { _attrName = 'Max-Age' };
-                attrsArr.push(cookieBody[attrName] === true ? _attrName : `${_attrName}=${cookieBody[attrName]}`);
-            }
-            cookieBody = attrsArr.join(';');
-        }
-        return cookieBody;
-    }
-
-}
-
 /**
  * The _Headers Mixin
  */
-const _ResponseHeaders = NativeHeaders => class extends _Headers(NativeHeaders) {
+export default class xResponseHeaders extends xHeaders {
 
     get cookieHeaderName() {
         return 'Set-Cookie';
@@ -116,4 +76,42 @@ const _ResponseHeaders = NativeHeaders => class extends _Headers(NativeHeaders)
 
 }
 
-export default _ResponseHeaders;
+/**
+ * Cookies
+ */
+class Cookies extends xCookies {
+
+    parse(cookieStr) {
+        const obj = {};
+        cookieStr && cookieStr.split(',').forEach(str => {
+            let [ cookieName, definition ] = this.parseEntry(str);
+            obj[cookieName] = definition;
+        });
+        return obj;
+    }
+
+    parseEntry(str) {
+        let [ cookieDefinition, attrsStr ] = str.split(';');
+        let [ cookieName, cookieValue ] = cookieDefinition.trim().split('=');
+        let attrs = { value: cookieValue, };
+        attrsStr && (attrsStr || '').split(/\;/g).map(attrStr => attrStr.trim().split('=')).forEach(attrsArr => {
+            attrs[attrsArr[0][0].toLowerCase() + attrsArr[0].substring(1).replace('-', '')] = attrsArr.length === 1 ? true : attrsArr[1];
+        });
+        return [ cookieName, attrs ];
+    }
+
+    stringifyEntry(cookieBody) {
+        if (_isObject(cookieBody)) {
+            let attrsArr = [ cookieBody.value ];
+            for (let attrName in cookieBody) {
+                if (attrName === 'value') continue;
+                let _attrName = attrName[0].toUpperCase() + attrName.substring(1);
+                if (_attrName === 'MaxAge') { _attrName = 'Max-Age' };
+                attrsArr.push(cookieBody[attrName] === true ? _attrName : `${_attrName}=${cookieBody[attrName]}`);
+            }
+            cookieBody = attrsArr.join(';');
+        }
+        return cookieBody;
+    }
+
+}

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;