@webqit/fetch-plus 0.1.1 → 0.1.3

package/package.json

@@ -11,7 +11,7 @@
   ],
   "homepage": "https://fetch-plus.netlify.app/",
   "icon": "https://webqit.io/icon.svg",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -21,9 +21,7 @@
     "url": "https://github.com/webqit/fetch-plus/issues"
   },
   "type": "module",
-  "exports": {
-    ".": "./src/index.js"
-  },
+  "main": "./src/index.js",
   "scripts": {
     "test": "mocha --extension .test.js --recursive --timeout 5000 --exit",
     "build": "esbuild main=src/index.browser.js --bundle --minify --sourcemap --outdir=dist",
@@ -35,12 +33,14 @@
     "@webqit/util": "^0.8.16"
   },
   "peerDependencies": {
-    "@webqit/observer": "^3.8.14",
-    "@webqit/port-plus": "^0.1.6"
+    "@webqit/observer": "^3.8.17",
+    "@webqit/port-plus": "^0.1.9",
+    "@webqit/url-plus": "^0.1.3"
   },
   "devDependencies": {
-    "@webqit/observer": "^3.8.14",
-    "@webqit/port-plus": "^0.1.6",
+    "@webqit/observer": "^3.8.17",
+    "@webqit/port-plus": "^0.1.9",
+    "@webqit/url-plus": "^0.1.3",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "esbuild": "^0.20.2",

package/src/FormDataPlus.js

@@ -1,55 +1,64 @@
 import { _before } from '@webqit/util/str/index.js';
 import { _isNumeric } from '@webqit/util/js/index.js';
-import { URLSearchParamsPlus } from './URLSearchParamsPlus.js';
-import { dataType, _meta, _wq } from './core.js';
+import { URLSearchParamsPlus } from '@webqit/url-plus';
+import { dataType, _meta, _wq } from './messageParserMixin.js';
 
 export class FormDataPlus extends FormData {
 
     static upgradeInPlace(formData) {
-        Object.setPrototypeOf(formData, FormDataPlus.prototype);
+        if (formData instanceof FormDataPlus) return formData;
+        return Object.setPrototypeOf(formData, FormDataPlus.prototype);
     }
 
-    static json(data = {}, { recursive = true, getIsJsonfiable = false } = {}) {
+    static json(data = {}, { encodeLiterals = true, meta = false } = {}) {
         const formData = new FormDataPlus;
-        let isJsonfiable = true;
+        let isDirectlySerializable = true;
 
         URLSearchParamsPlus.reduceValue(data, '', (value, contextPath, suggestedKeys = undefined) => {
             if (suggestedKeys) {
                 const isJson = dataType(value) === 'json';
-                isJsonfiable = isJsonfiable && isJson;
+                isDirectlySerializable = isDirectlySerializable && isJson;
                 return isJson && suggestedKeys;
             }
 
-            if (recursive && [true, false, null].includes(value)) {
+            if (encodeLiterals && [true, false, null].includes(value)) {
                 value = new Blob([value + ''], { type: 'application/json' });
             }
 
             formData.append(contextPath, value);
         });
 
-        if (getIsJsonfiable) return [formData, isJsonfiable];
+        if (meta) return { result: formData, isDirectlySerializable };
         return formData;
     }
 
-    async json({ recursive = true, getIsJsonfiable = false } = {}) {
-        let isJsonfiable = true;
+    async json({ decodeLiterals = true, meta = false } = {}) {
+        let isDirectlySerializable = true;
         let json;
 
         for (let [name, value] of this.entries()) {
             if (!json) json = _isNumeric(_before(name, '[')) ? [] : {};
 
             let type = dataType(value);
-            if (recursive && ['Blob', 'File'].includes(type) && value.type === 'application/json') {
-                let _value = await value.text();
-                value = JSON.parse(_value);
-                type = 'json';
+            if (decodeLiterals
+                && ['Blob', 'File'].includes(type)
+                && value.type === 'application/json'
+                && [4, 5].includes(value.size)) {
+                let _value = JSON.parse(await value.text());
+                if ([null, true, false].includes(_value)) {
+                    value = _value;
+                    type = 'json';
+                }
             }
 
-            isJsonfiable = isJsonfiable && type === 'json';
+            isDirectlySerializable = isDirectlySerializable && type === 'json';
+            if (/^[+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][+-]?\d+)?$/.test(value)) {
+                value = Number(value);
+            }
             URLSearchParamsPlus.set(json, name, value);
         }
 
-        if (getIsJsonfiable) return [json, isJsonfiable];
+        if (meta) return { result: json, isDirectlySerializable };
         return json;
     }
 }

package/src/HeadersPlus.js

@@ -2,47 +2,44 @@ import { _isObject, _isTypeObject } from '@webqit/util/js/index.js';
 import { _from as _arrFrom } from '@webqit/util/arr/index.js';
 import { _after } from '@webqit/util/str/index.js';
 
-export class HeadersPlus extends upgradeMixin(Headers) {
+export class HeadersPlus extends Headers {
 
     static upgradeInPlace(headers) {
-        Object.setPrototypeOf(headers, HeadersPlus.prototype);
+        if (headers instanceof HeadersPlus) return headers;
+        return Object.setPrototypeOf(headers, HeadersPlus.prototype);
     }
 
     set(name, value) {
         // Format "Set-Cookie" response header
-        if (/^Set-Cookie$/i.test(name) && _isObject(value)) {
-            value = renderCookieObjToString(value);
+        if (/^Set-Cookie$/i.test(name)) {
+            if (Array.isArray(value)) {
+                this.delete(name); // IMPORTANT
+                for (const v of value) this.append(name, v);
+                return;
+            }
+            if (_isObject(value)) {
+                value = renderCookieObjToString(value);
+            }
         }
 
         // Format "Cookie" request header
-        if (/Cookie/i.test(name) && _isTypeObject(value)) {
-            value = [].concat(value).map(renderCookieObjToString).join(';');
+        if (/Cookie/i.test(name)) {
+            value = renderCookieInput(value);
         }
 
         // Format "Content-Range" response header?
-        if (/^Content-Range$/i.test(name) && Array.isArray(value)) {
-            if (value.length < 2 || !value[0].includes('-')) {
-                throw new Error(`A Content-Range array must be in the format: [ 'start-end', 'total' ]`);
-            }
-            value = `bytes ${value.join('/')}`;
+        if (/^Content-Range$/i.test(name)) {
+            value = renderContentRangeInput(value);
         }
 
         // Format "Range" request header?
         if (/^Range$/i.test(name)) {
-            let rangeArr = [];
-            _arrFrom(value).forEach((range, i) => {
-                let rangeStr = Array.isArray(range) ? range.join('-') : range + '';
-                if (i === 0 && !rangeStr.includes('bytes=')) {
-                    rangeStr = `bytes=${rangeStr}`;
-                }
-                rangeArr.push(rangeStr);
-            });
-            value = rangeArr.join(', ');
+            value = renderRangeInput(value);
         }
 
         // Format "Accept" request header?
-        if (/^Accept$/i.test(name) && Array.isArray(value)) {
-            value = value.join(',');
+        if (/^Accept$/i.test(name)) {
+            value = renderAcceptInput(value);
         }
 
         return super.set(name, value);
@@ -50,22 +47,49 @@ export class HeadersPlus extends upgradeMixin(Headers) {
 
     append(name, value) {
         // Format "Set-Cookie" response header
-        if (/^Set-Cookie$/i.test(name) && _isObject(value)) {
-            value = renderCookieObjToString(value);
+        if (/^Set-Cookie$/i.test(name)) {
+            if (Array.isArray(value)) {
+                for (const v of value) this.append(name, v);
+                return;
+            }
+            if (_isObject(value)) {
+                value = renderCookieObjToString(value);
+            }
+        }
+
+        // Format "Cookie" request header
+        if (/Cookie/i.test(name)) {
+            value = renderCookieInput(value);
+        }
+
+        // Format "Content-Range" response header?
+        if (/^Content-Range$/i.test(name)) {
+            value = renderContentRangeInput(value);
+        }
+
+        // Format "Range" request header?
+        if (/^Range$/i.test(name)) {
+            value = renderRangeInput(value);
+        }
+
+        // Format "Accept" request header?
+        if (/^Accept$/i.test(name)) {
+            value = renderAcceptInput(value);
         }
+
         return super.append(name, value);
     }
 
-    get(name, parsed = false) {
+    get(name, structured = false) {
         let value = super.get(name);
 
         // Parse "Set-Cookie" response header
-        if (/^Set-Cookie$/i.test(name) && parsed) {
+        if (/^Set-Cookie$/i.test(name) && structured) {
             value = this.getSetCookie()/*IMPORTANT*/.map((str) => {
-                const [cookieDefinition, attrsStr] = str.split(';');
+                const [cookieDefinition, ...attrs] = str.split(';');
                 const [name, value] = cookieDefinition.split('=').map((s) => s.trim());
                 const cookieObj = { name, value: /*decodeURIComponent*/(value), };
-                attrsStr && attrsStr.split(/\;/g).map(attrStr => attrStr.trim().split('=')).forEach(attrsArr => {
+                attrs.map((attrStr) => attrStr.trim().split('=')).forEach(attrsArr => {
                     cookieObj[attrsArr[0][0].toLowerCase() + attrsArr[0].substring(1).replace('-', '')] = attrsArr.length === 1 ? true : attrsArr[1];
                 });
                 return cookieObj;
@@ -73,7 +97,7 @@ export class HeadersPlus extends upgradeMixin(Headers) {
         }
 
         // Parse "Cookie" request header
-        if (/^Cookie$/i.test(name) && parsed) {
+        if (/^Cookie$/i.test(name) && structured) {
             value = value?.split(';').map((str) => {
                 const [name, value] = str.split('=').map((s) => s.trim());
                 return { name, value: /*decodeURIComponent*/(value), };
@@ -81,58 +105,66 @@ export class HeadersPlus extends upgradeMixin(Headers) {
         }
 
         // Parse "Content-Range" response header?
-        if (/^Content-Range$/i.test(name) && value && parsed) {
+        if (/^Content-Range$/i.test(name) && value && structured) {
             value = _after(value, 'bytes ').split('/');
         }
 
         // Parse "Range" request header?
-        if (/^Range$/i.test(name) && parsed) {
+        if (/^Range$/i.test(name) && structured) {
             value = !value ? [] : _after(value, 'bytes=').split(',').map((rangeStr) => {
                 const range = rangeStr.trim().split('-').map((s) => s ? parseInt(s, 10) : null);
-                range.render = (totalLength) => {
-                    if (range[1] === null) {
-                        range[1] = totalLength - 1;
+                range.resolveAgainst = (totalLength) => {
+                    const offsets = [...range];
+                    if (offsets[1] === null) {
+                        offsets[1] = totalLength - 1;
+                    } else {
+                        offsets[1] = Math.min(offsets[1], totalLength) - 1;
                     }
-                    if (range[0] === null) {
-                        range[0] = range[1] ? totalLength - range[1] - 1 : 0;
+                    if (offsets[0] === null) {
+                        offsets[0] = offsets[1] ? totalLength - offsets[1] - 1 : 0;
                     }
-                    return range
+                    return offsets;
                 };
-                range.isValid = (currentStart, totalLength) => {
+                range.canResolveAgainst = (currentStart, totalLength) => {
+                    const offsets = [
+                        typeof range[0] === 'number' ? range[0] : currentStart,
+                        typeof range[1] === 'number' ? range[1] : totalLength - 1
+                    ];
                     // Start higher than end or vice versa?
-                    if (range[0] > range[1] || range[1] < range[0]) return false;
+                    if (offsets[0] > offsets[1]) return false;
                     // Stretching beyond valid start/end?
-                    if (range[0] < currentStart || range[1] > totalLength) return false;
+                    if (offsets[0] < currentStart || offsets[1] >= totalLength) return false;
                     return true;
                 };
+                range.toString = () => {
+                    return rangeStr;
+                };
                 return range;
             });
         }
 
         // Parse "Accept" request header?
-        if (/^Accept$/i.test(name) && value && parsed) {
+        if (/^Accept$/i.test(name) && value && structured) {
             const parseSpec = (spec) => {
                 const [mime, q] = spec.trim().split(';').map((s) => s.trim());
                 return [mime, parseFloat((q || 'q=1').replace('q=', ''))];
             };
-            const list = value.split(',')
+            const $value = value;
+            value = value.split(',')
                 .map((spec) => parseSpec(spec))
                 .sort((a, b) => a[1] > b[1] ? -1 : 1) || [];
-            const $value = value;
-            value = {
-                match(mime) {
-                    if (!mime) return 0;
-                    const splitMime = (mime) => mime.split('/').map((s) => s.trim());
-                    const $mime = splitMime(mime + '');
-                    return list.reduce((prev, [entry, q]) => {
-                        if (prev) return prev;
-                        const $entry = splitMime(entry);
-                        return [0, 1].every((i) => (($mime[i] === $entry[i]) || $mime[i] === '*' || $entry[i] === '*')) ? q : 0;
-                    }, 0);
-                },
-                toString() {
-                    return $value;
-                }
+            value.match = (mime) => {
+                if (!mime) return 0;
+                const splitMime = (mime) => mime.split('/').map((s) => s.trim());
+                const $mime = splitMime(mime + '');
+                return value.reduce((prev, [entry, q]) => {
+                    if (prev) return prev;
+                    const $entry = splitMime(entry);
+                    return [0, 1].every((i) => (($mime[i] === $entry[i]) || $mime[i] === '*' || $entry[i] === '*')) ? q : 0;
+                }, 0);
+            };
+            value.toString = () => {
+                return $value;
             };
         }
 
@@ -150,3 +182,44 @@ export function renderCookieObjToString(cookieObj) {
     }
     return attrsArr.join('; ');
 }
+
+function renderCookieInput(value) {
+    if (_isTypeObject(value)) {
+        value = [].concat(value).map(renderCookieObjToString).join('; ');
+    }
+    return value;
+}
+
+function renderRangeInput(value) {
+    let rangeArr = [];
+    _arrFrom(value).forEach((range, i) => {
+        let rangeStr = Array.isArray(range) ? range.map((n) => [null, undefined].includes(n) ? '' : n).join('-') : range + '';
+        if (i === 0 && !rangeStr.includes('bytes=')) {
+            rangeStr = `bytes=${rangeStr}`;
+        }
+        rangeArr.push(rangeStr);
+    });
+    return rangeArr.join(', ');
+}
+
+function renderContentRangeInput(value) {
+    if (Array.isArray(value)) {
+        if (value.length < 2 || !value[0].includes('-')) {
+            throw new Error(`A Content-Range array must be in the format: [ 'start-end', 'total' ]`);
+        }
+        value = `bytes ${value.join('/')}`;
+    }
+    return value;
+}
+
+function renderAcceptInput(value) {
+    if (Array.isArray(value)) {
+        value = value.map(
+            (s) => Array.isArray(s) ? s.map(
+                (s, i) => i === 1 && (s = parseFloat(s), true) ? (s === 1 ? '' : `;q=${s}`) : s.trim()
+            ).join('') : s.trim()
+        ).join(',');
+    }
+    return value;
+}
+