@webqit/fetch-plus 0.1.1 → 0.1.2

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.2",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -35,12 +35,12 @@
     "@webqit/util": "^0.8.16"
   },
   "peerDependencies": {
-    "@webqit/observer": "^3.8.14",
-    "@webqit/port-plus": "^0.1.6"
+    "@webqit/observer": "^3.8.16",
+    "@webqit/port-plus": "^0.1.7"
   },
   "devDependencies": {
-    "@webqit/observer": "^3.8.14",
-    "@webqit/port-plus": "^0.1.6",
+    "@webqit/observer": "^3.8.16",
+    "@webqit/port-plus": "^0.1.7",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "esbuild": "^0.20.2",

package/src/FormDataPlus.js

@@ -6,7 +6,8 @@ import { dataType, _meta, _wq } from './core.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 } = {}) {

package/src/HeadersPlus.js

@@ -5,7 +5,8 @@ import { _after } from '@webqit/util/str/index.js';
 export class HeadersPlus extends upgradeMixin(Headers) {
 
     static upgradeInPlace(headers) {
-        Object.setPrototypeOf(headers, HeadersPlus.prototype);
+        if (headers instanceof HeadersPlus) return headers;
+        return Object.setPrototypeOf(headers, HeadersPlus.prototype);
     }
 
     set(name, value) {

package/src/LiveResponse.js

@@ -211,7 +211,7 @@ export class LiveResponse extends EventTarget {
             this.#body = $body;
 
             // Must come after all property assignments above because it fires events
-            Observer.defineProperty(this, 'body', { get: () => this.#body, enumerable: true, configurable: true });
+            Observer.defineProperty(this, 'body', { get: () => this.#body, enumerable: false, configurable: true });
 
             const readyStateInternals = getReadyStateInternals.call(this);
             readyStateInternals.live.state = true;
@@ -477,7 +477,7 @@ export function getReadyStateInternals() {
     const portPlusMeta = _meta(this);
     if (!portPlusMeta.has('readystate_registry')) {
         const $ref = (o) => {
-            o.promise = new Promise((res, rej) => (o.resolve = res, o.reject = rej));
+            o.promise = new Promise((res, rej) => (o.resolve = () => res(this), o.reject = rej));
             return o;
         };
         portPlusMeta.set('readystate_registry', {

package/src/RequestPlus.js

@@ -9,8 +9,10 @@ export class RequestPlus extends messageParserMixin(Request) {
     }
 
     static upgradeInPlace(request) {
+        if (request instanceof RequestPlus) return request;
         Object.setPrototypeOf(request, RequestPlus.prototype);
         HeadersPlus.upgradeInPlace(request.headers);
+        return request;
     }
 
     static from(url, { memoize = false, ...init } = {}) {

package/src/ResponsePlus.js

@@ -9,8 +9,10 @@ export class ResponsePlus extends messageParserMixin(Response) {
     }
 
     static upgradeInPlace(response) {
+        if (response instanceof ResponsePlus) return response;
         Object.setPrototypeOf(response, ResponsePlus.prototype);
         HeadersPlus.upgradeInPlace(response.headers);
+        return response;
     }
 
     static from(body, { memoize = false, ...init } = {}) {

package/src/core.js

@@ -3,7 +3,7 @@ import { _wq as $wq } from '@webqit/util/js/index.js';
 import { FormDataPlus } from './FormDataPlus.js';
 
 export const _wq = (target, ...args) => $wq(target, 'fetch+', ...args);
-export const _meta = (target) => $wq(target, 'fetch+', 'meta');
+export const _meta = (target, ...args) => $wq(target, 'fetch+', 'meta', ...args);
 
 export function messageParserMixin(superClass) {
     return class extends superClass {