fetch-nodeshim 0.2.1-canary-83f2b69271c3dc3d97aa9c6a60ae2ddbe62a46ae → 0.3.0-canary-4913c1df1c113e5c07d128c574512b23632ce954

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # minifetch
 
-## 0.2.1-canary-83f2b69271c3dc3d97aa9c6a60ae2ddbe62a46ae
+## 0.3.0-canary-4913c1df1c113e5c07d128c574512b23632ce954
+
+### Minor Changes
+
+- Add `Body` mixin as export
+  Submitted by [@kitten](https://github.com/kitten) (See [#6](https://github.com/kitten/fetch-nodeshim/pull/6))
+
+## 0.2.1
 
 ### Patch Changes
 

package/LICENSE.md

@@ -1,6 +1,7 @@
 MIT License
 
 Copyright (c) Phil Pluckthun,
+Copyright (c) 650 Industries, Inc. (aka Expo),
 Copyright (c) 2016 - 2020 Node Fetch Team,
 Copyright (c) Remix Software Inc. 2020-2021,
 Copyright (c) Shopify Inc. 2022-2024

package/dist/minifetch.d.ts

@@ -1,4 +1,7 @@
 import * as buffer from 'node:buffer';
+import * as buffer$1 from 'buffer';
+import * as undici_types from 'undici-types';
+import { Readable } from 'node:stream';
 
 type Or<T, U> = void extends T ? U : T;
 type HeadersInit = string[][] | Record<string, string | ReadonlyArray<string>> | _Headers;
@@ -9,7 +12,7 @@ interface _Iterable<T, TReturn = any, TNext = any>
 interface _AsyncIterable<T, TReturn = any, TNext = any>
   extends Or<AsyncIterable<T, TReturn, TNext>, globalThis.AsyncIterable<T, TReturn, TNext>> {}
 interface _ReadableStream<T = any> extends Or<ReadableStream<T>, globalThis.ReadableStream<T>> {}
-type BodyInit =
+type BodyInit$1 =
   | ArrayBuffer
   | _Blob
   | NodeJS.ArrayBufferView
@@ -47,7 +50,7 @@ interface RequestClass extends Or<typeof Request, typeof globalThis.Request> {
 interface _Request extends Or<Request, globalThis.Request> {}
 declare const _Request: RequestClass;
 interface ResponseClass extends Or<typeof Response, typeof globalThis.Response> {
-  new (body?: BodyInit, init?: _ResponseInit): _Response;
+  new (body?: BodyInit$1, init?: _ResponseInit): _Response;
 }
 interface _Response extends Or<Response, globalThis.Response> {}
 declare const _Response: ResponseClass;
@@ -66,9 +69,29 @@ declare function _fetch(
   requestInit?: _RequestInit
 ): Promise<_Response>;
 
+type BodyInit = Exclude<RequestInit['body'], undefined | null> | FormDataPolyfill | Readable;
+interface FormDataPolyfill extends Readable {
+  getBoundary(): string;
+  getLengthSync(): number;
+  hasKnownLength(): number;
+}
+declare const kBodyInternals: unique symbol;
+declare class Body {
+  private [kBodyInternals];
+  constructor(init: BodyInit | null);
+  get body(): Uint8Array<ArrayBufferLike> | ReadableStream<any> | Readable | null;
+  get bodyUsed(): boolean;
+  arrayBuffer(): Promise<ArrayBuffer | Uint8Array<ArrayBufferLike>>;
+  formData(): Promise<undici_types.FormData>;
+  blob(): Promise<buffer$1.Blob>;
+  json(): Promise<any>;
+  text(): Promise<string>;
+}
+
 export {
   _Blob as Blob,
-  type BodyInit,
+  Body,
+  type BodyInit$1 as BodyInit,
   _File as File,
   _FormData as FormData,
   type FormDataEntryValue,

package/dist/minifetch.js

@@ -10,13 +10,13 @@ var r = require("node:http");
 
 var n = require("node:url");
 
-var o = require("node:util/types");
+var a = require("node:util/types");
 
-var a = require("node:crypto");
+var o = require("node:crypto");
 
-var s = require("node:zlib");
+var s = require("node:buffer");
 
-var i = require("node:buffer");
+var i = require("node:zlib");
 
 function _interopNamespaceDefault(e) {
   var t = Object.create(null);
@@ -47,9 +47,33 @@ var c = _interopNamespaceDefault(s);
 
 var d = _interopNamespaceDefault(i);
 
-var p = "\r\n";
+var p = globalThis.File || c.File;
 
-var y = "-".repeat(2);
+if (void 0 === globalThis.File) {
+  globalThis.File = p;
+}
+
+var y = Blob;
+
+var h = URLSearchParams;
+
+var v = URL;
+
+var b = Request;
+
+var m = Response;
+
+var g = Headers;
+
+var w = FormData;
+
+var T = "\r\n";
+
+var L = "-".repeat(2);
+
+var isReadable = t => e.Readable.isReadable(t);
+
+var isReadableStream = e => "object" == typeof e && "function" == typeof e.getReader && "function" == typeof e.cancel && "function" == typeof e.tee;
 
 var isBlob = e => {
   if ("object" == typeof e && "function" == typeof e.arrayBuffer && "string" == typeof e.type && "function" == typeof e.stream && "function" == typeof e.constructor) {
@@ -61,18 +85,18 @@ var isBlob = e => {
 };
 
 var getFormHeader = (e, t, r) => {
-  var n = `${y}${e}${p}`;
+  var n = `${L}${e}${T}`;
   n += `Content-Disposition: form-data; name="${t}"`;
   if (isBlob(r)) {
-    n += `; filename="${r.name ?? "blob"}"${p}`;
+    n += `; filename="${r.name ?? "blob"}"${T}`;
     n += `Content-Type: ${r.type || "application/octet-stream"}`;
   }
-  return `${n}${p}${p}`;
+  return `${n}${T}${T}`;
 };
 
-var getFormFooter = e => `${y}${e}${y}${p}${p}`;
+var getFormFooter = e => `${L}${e}${L}${T}${T}`;
 
-var h = new TextEncoder;
+var _ = new TextEncoder;
 
 var extractBody = t => {
   var r = null;
@@ -82,12 +106,12 @@ var extractBody = t => {
     n = null;
     s = 0;
   } else if ("string" == typeof t) {
-    var i = h.encode(`${t}`);
+    var i = _.encode(`${t}`);
     r = "text/plain;charset=UTF-8";
     s = i.byteLength;
     n = i;
   } else if ((e => "object" == typeof e && "function" == typeof e.append && "function" == typeof e.delete && "function" == typeof e.get && "function" == typeof e.getAll && "function" == typeof e.has && "function" == typeof e.set && "function" == typeof e.sort && "URLSearchParams" === e[Symbol.toStringTag])(t)) {
-    var f = h.encode(t.toString());
+    var f = _.encode(t.toString());
     n = f;
     s = f.byteLength;
     r = "application/x-www-form-urlencoded;charset=UTF-8";
@@ -98,7 +122,7 @@ var extractBody = t => {
   } else if (t instanceof Uint8Array) {
     n = t;
     s = t.byteLength;
-  } else if (o.isAnyArrayBuffer(t)) {
+  } else if (a.isAnyArrayBuffer(t)) {
     var l = new Uint8Array(t);
     n = l;
     s = l.byteLength;
@@ -106,27 +130,27 @@ var extractBody = t => {
     var u = new Uint8Array(t.buffer, t.byteOffset, t.byteLength);
     n = u;
     s = u.byteLength;
-  } else if ((e => "object" == typeof e && "function" == typeof e.getReader && "function" == typeof e.cancel && "function" == typeof e.tee)(t)) {
+  } else if (isReadableStream(t)) {
     n = t;
   } else if ((e => "object" == typeof e && "function" == typeof e.append && "function" == typeof e.set && "function" == typeof e.get && "function" == typeof e.getAll && "function" == typeof e.delete && "function" == typeof e.keys && "function" == typeof e.values && "function" == typeof e.entries && "function" == typeof e.constructor && "FormData" === e[Symbol.toStringTag])(t)) {
-    var c = `formdata-${a.randomBytes(8).toString("hex")}`;
+    var c = `formdata-${o.randomBytes(8).toString("hex")}`;
     r = `multipart/form-data; boundary=${c}`;
     s = ((e, t) => {
       var r = Buffer.byteLength(getFormFooter(t));
-      for (var [n, o] of e) {
-        r += Buffer.byteLength(getFormHeader(t, n, o)) + (isBlob(o) ? o.size : Buffer.byteLength(`${o}`)) + 2;
+      for (var [n, a] of e) {
+        r += Buffer.byteLength(getFormHeader(t, n, a)) + (isBlob(a) ? a.size : Buffer.byteLength(`${a}`)) + 2;
       }
       return r;
     })(t, c);
     n = e.Readable.from(async function* generatorOfFormData(e, t) {
       var r = new TextEncoder;
-      for (var [n, o] of e) {
-        if (isBlob(o)) {
-          yield r.encode(getFormHeader(t, n, o));
-          yield* o.stream();
-          yield r.encode(p);
+      for (var [n, a] of e) {
+        if (isBlob(a)) {
+          yield r.encode(getFormHeader(t, n, a));
+          yield* a.stream();
+          yield r.encode(T);
         } else {
-          yield r.encode(getFormHeader(t, n, o) + o + p);
+          yield r.encode(getFormHeader(t, n, a) + a + T);
         }
       }
       yield r.encode(getFormFooter(t));
@@ -135,12 +159,12 @@ var extractBody = t => {
     r = `multipart/form-data; boundary=${t.getBoundary()}`;
     s = t.hasKnownLength() ? t.getLengthSync() : null;
     n = t;
-  } else if ((t => e.Readable.isReadable(t))(t)) {
+  } else if (isReadable(t)) {
     n = t;
   } else if ((e => "function" == typeof e[Symbol.asyncIterator] || "function" == typeof e[Symbol.iterator])(t)) {
     n = e.Readable.from(t);
   } else {
-    var d = h.encode(`${t}`);
+    var d = _.encode(`${t}`);
     r = "text/plain;charset=UTF-8";
     n = d;
     s = d.byteLength;
@@ -152,6 +176,8 @@ var extractBody = t => {
   };
 };
 
+var S = Symbol("kBodyInternals");
+
 class InflateStream extends e.Transform {
   constructor(e) {
     super();
@@ -163,7 +189,7 @@ class InflateStream extends e.Transform {
         r();
         return;
       }
-      this._inflate = 8 == (15 & e[0]) ? c.createInflate(this._opts) : c.createInflateRaw(this._opts);
+      this._inflate = 8 == (15 & e[0]) ? d.createInflate(this._opts) : d.createInflateRaw(this._opts);
       this._inflate.on("data", this.push.bind(this));
       this._inflate.on("end", (() => this.push(null)));
       this._inflate.on("error", (e => this.destroy(e)));
@@ -179,26 +205,6 @@ class InflateStream extends e.Transform {
   }
 }
 
-var v = globalThis.File || d.File;
-
-if (void 0 === globalThis.File) {
-  globalThis.File = v;
-}
-
-var b = Blob;
-
-var m = URLSearchParams;
-
-var g = URL;
-
-var w = Request;
-
-var L = Response;
-
-var T = Headers;
-
-var _ = FormData;
-
 var headersOfRawHeaders = e => {
   var t = new Headers;
   for (var r = 0; r < e.length; r += 2) {
@@ -220,7 +226,7 @@ var methodToHttpOption = e => {
 };
 
 var urlToHttpOptions = e => {
-  var t = new g(e);
+  var t = new v(e);
   switch (t.protocol) {
    case "http:":
    case "https:":
@@ -233,8 +239,8 @@ var urlToHttpOptions = e => {
 
 async function _fetch(t, r) {
   var n = (e => null != e && "object" == typeof e && "body" in e)(t);
-  var o = n ? t.url : t;
-  var a = n ? t.body : r?.body || null;
+  var a = n ? t.url : t;
+  var o = n ? t.body : r?.body || null;
   var s = n ? t.signal : r?.signal || void 0;
   var i = (e => {
     switch (e) {
@@ -250,8 +256,8 @@ async function _fetch(t, r) {
       throw new TypeError(`Request constructor: ${e} is not an accepted type. Expected one of follow, manual, error.`);
     }
   })(n ? t.redirect : r?.redirect);
-  var u = new g(o);
-  var d = extractBody(a);
+  var u = new v(a);
+  var c = extractBody(o);
   var p = 0;
   var y = new Headers(r?.headers || (n ? t.headers : void 0));
   var h = {
@@ -261,88 +267,88 @@ async function _fetch(t, r) {
   };
   return await new Promise((function _call(t, r) {
     var n = h.method;
-    var o = ("https:" === h.protocol ? f : l).request(h);
-    o.on("response", (o => {
-      o.setTimeout(0);
+    var a = ("https:" === h.protocol ? f : l).request(h);
+    a.on("response", (a => {
+      a.setTimeout(0);
       var f = {
-        status: o.statusCode,
-        statusText: o.statusMessage,
-        headers: headersOfRawHeaders(o.rawHeaders)
+        status: a.statusCode,
+        statusText: a.statusMessage,
+        headers: headersOfRawHeaders(a.rawHeaders)
       };
-      if (301 === (b = f.status) || 302 === b || 303 === b || 307 === b || 308 === b) {
+      if (301 === (g = f.status) || 302 === g || 303 === g || 307 === g || 308 === g) {
         var l = f.headers.get("Location");
-        var v = null != l ? new g(l, u) : null;
+        var b = null != l ? new v(l, u) : null;
         if ("error" === i) {
           r(new Error("URI requested responds with a redirect, redirect mode is set to error"));
           return;
-        } else if ("manual" === i && null !== v) {
-          f.headers.set("Location", v.toString());
-        } else if ("follow" === i && null !== v) {
+        } else if ("manual" === i && null !== b) {
+          f.headers.set("Location", b.toString());
+        } else if ("follow" === i && null !== b) {
           if (++p > 20) {
             r(new Error(`maximum redirect reached at: ${u}`));
             return;
-          } else if ("http:" !== v.protocol && "https:" !== v.protocol) {
+          } else if ("http:" !== b.protocol && "https:" !== b.protocol) {
             r(new Error("URL scheme must be a HTTP(S) scheme"));
             return;
           }
           if (303 === f.status || (301 === f.status || 302 === f.status) && "POST" === n) {
-            d = extractBody(null);
+            c = extractBody(null);
             h.method = "GET";
             y.delete("Content-Length");
-          } else if (null != d.body && null == d.contentLength) {
+          } else if (null != c.body && null == c.contentLength) {
             r(new Error("Cannot follow redirect with a streamed body"));
             return;
           } else {
-            d = extractBody(a);
+            c = extractBody(o);
           }
-          Object.assign(h, urlToHttpOptions(u = v));
+          Object.assign(h, urlToHttpOptions(u = b));
           return _call(t, r);
         }
       }
-      var b;
+      var g;
       var destroy = e => {
         s?.removeEventListener("abort", destroy);
         if (e) {
-          o.destroy(s?.aborted ? s.reason : e);
+          a.destroy(s?.aborted ? s.reason : e);
           r(s?.aborted ? s.reason : e);
         }
       };
       s?.addEventListener("abort", destroy);
-      var m = o;
-      var w = f.headers.get("Content-Encoding")?.toLowerCase();
+      var w = a;
+      var T = f.headers.get("Content-Encoding")?.toLowerCase();
       if ("HEAD" === n || 204 === f.status || 304 === f.status) {
-        m = null;
-      } else if (null != w) {
-        f.headers.set("Content-Encoding", w);
-        m = e.pipeline(m, (t => {
+        w = null;
+      } else if (null != T) {
+        f.headers.set("Content-Encoding", T);
+        w = e.pipeline(w, (t => {
           switch (t) {
            case "br":
-            return c.createBrotliDecompress({
-              flush: c.constants.BROTLI_OPERATION_FLUSH,
-              finishFlush: c.constants.BROTLI_OPERATION_FLUSH
+            return d.createBrotliDecompress({
+              flush: d.constants.BROTLI_OPERATION_FLUSH,
+              finishFlush: d.constants.BROTLI_OPERATION_FLUSH
             });
 
            case "gzip":
            case "x-gzip":
-            return c.createGunzip({
-              flush: c.constants.Z_SYNC_FLUSH,
-              finishFlush: c.constants.Z_SYNC_FLUSH
+            return d.createGunzip({
+              flush: d.constants.Z_SYNC_FLUSH,
+              finishFlush: d.constants.Z_SYNC_FLUSH
             });
 
            case "deflate":
            case "x-deflate":
             return new InflateStream({
-              flush: c.constants.Z_SYNC_FLUSH,
-              finishFlush: c.constants.Z_SYNC_FLUSH
+              flush: d.constants.Z_SYNC_FLUSH,
+              finishFlush: d.constants.Z_SYNC_FLUSH
             });
 
            default:
             return new e.PassThrough;
           }
-        })(w), destroy);
+        })(T), destroy);
       }
       t(function createResponse(e, t, r) {
-        var n = new L(e, t);
+        var n = new m(e, t);
         Object.defineProperty(n, "url", {
           value: r.url
         });
@@ -357,23 +363,23 @@ async function _fetch(t, r) {
           });
         }
         return n;
-      }(m, f, {
+      }(w, f, {
         type: "default",
         url: u.toString(),
         redirected: p > 0
       }));
     }));
-    o.on("error", r);
+    a.on("error", r);
     if (!y.has("Accept")) {
       y.set("Accept", "*/*");
     }
-    if (d.contentType) {
-      y.set("Content-Type", d.contentType);
+    if (c.contentType) {
+      y.set("Content-Type", c.contentType);
     }
-    if (null == d.body && ("POST" === n || "PUT" === n)) {
+    if (null == c.body && ("POST" === n || "PUT" === n)) {
       y.set("Content-Length", "0");
-    } else if (null != d.body && null != d.contentLength) {
-      y.set("Content-Length", `${d.contentLength}`);
+    } else if (null != c.body && null != c.contentLength) {
+      y.set("Content-Length", `${c.contentLength}`);
     }
     ((e, t) => {
       if ("function" == typeof e.setHeaders) {
@@ -383,15 +389,15 @@ async function _fetch(t, r) {
           e.setHeader(r, n);
         }
       }
-    })(o, y);
-    if (null == d.body) {
-      o.end();
-    } else if (d.body instanceof Uint8Array) {
-      o.write(d.body);
-      o.end();
+    })(a, y);
+    if (null == c.body) {
+      a.end();
+    } else if (c.body instanceof Uint8Array) {
+      a.write(c.body);
+      a.end();
     } else {
-      var v = d.body instanceof e.Stream ? d.body : e.Readable.fromWeb(d.body);
-      e.pipeline(v, o, (e => {
+      var b = c.body instanceof e.Stream ? c.body : e.Readable.fromWeb(c.body);
+      e.pipeline(b, a, (e => {
         if (e) {
           r(e);
         }
@@ -400,21 +406,70 @@ async function _fetch(t, r) {
   }));
 }
 
-exports.Blob = b;
+exports.Blob = y;
+
+exports.Body = class Body {
+  constructor(e) {
+    this[S] = extractBody(e);
+  }
+  get body() {
+    return this[S].body;
+  }
+  get bodyUsed() {
+    var {body: t} = this[S];
+    if (isReadable(t)) {
+      return e.Readable.isDisturbed(t);
+    } else if (isReadableStream(t)) {
+      return t.locked;
+    } else {
+      return !1;
+    }
+  }
+  async arrayBuffer() {
+    var {body: e} = this[S];
+    return a.isAnyArrayBuffer(e) ? e : new m(this.body).arrayBuffer();
+  }
+  async formData() {
+    var {body: e, contentLength: t, contentType: r} = this[S];
+    var n = {};
+    if (t) {
+      n["Content-Length"] = t;
+    }
+    if (r) {
+      n["Content-Type"] = r;
+    }
+    return new m(e, {
+      headers: n
+    }).formData();
+  }
+  async blob() {
+    var {contentType: e} = this[S];
+    return new y([ await this.arrayBuffer() ], {
+      type: e ?? void 0
+    });
+  }
+  async json() {
+    var e = await this.text();
+    return JSON.parse(e);
+  }
+  async text() {
+    return (new TextDecoder).decode(await this.arrayBuffer());
+  }
+};
 
-exports.File = v;
+exports.File = p;
 
-exports.FormData = _;
+exports.FormData = w;
 
-exports.Headers = T;
+exports.Headers = g;
 
-exports.Request = w;
+exports.Request = b;
 
-exports.Response = L;
+exports.Response = m;
 
-exports.URL = g;
+exports.URL = v;
 
-exports.URLSearchParams = m;
+exports.URLSearchParams = h;
 
 exports.default = _fetch;