@superutils/fetch 1.5.9 → 1.5.10

package/dist/index.js

@@ -12,9 +12,8 @@ import { deferredCallback } from "@superutils/promise";
 
 // src/fetch.ts
 import {
-  fallbackIfFails as fallbackIfFails3,
+  fallbackIfFails as fallbackIfFails4,
   isError,
-  isFn as isFn4,
   isObj as isObj2,
   isPromise,
   isUrlValid
@@ -74,46 +73,8 @@ var getResponse = (url, options = {}) => {
 getResponse.fetch = globalThis.fetch;
 var getResponse_default = getResponse;
 
-// src/mergeOptions.ts
-import { isArr, isFn as isFn3, isObj, objCopy } from "@superutils/core";
-var mergeOptions = (...allOptions) => allOptions.reduce(
-  (merged, options) => {
-    var _a;
-    options = isObj(options) ? options : {};
-    const { headers, interceptors: ints1 = {} } = merged;
-    const { interceptors: ints2 = {} } = options;
-    options.headers && new Headers(options.headers).forEach(
-      (value, key) => headers.set(key, value)
-    );
-    return {
-      ...merged,
-      ...options,
-      errMsgs: objCopy(
-        options.errMsgs,
-        merged.errMsgs,
-        [],
-        "empty"
-      ),
-      headers,
-      interceptors: {
-        error: [...toArr(ints1 == null ? void 0 : ints1.error), ...toArr(ints2 == null ? void 0 : ints2.error)],
-        request: [
-          ...toArr(ints1 == null ? void 0 : ints1.request),
-          ...toArr(ints2 == null ? void 0 : ints2.request)
-        ],
-        response: [
-          ...toArr(ints1 == null ? void 0 : ints1.response),
-          ...toArr(ints2 == null ? void 0 : ints2.response)
-        ],
-        result: [...toArr(ints1 == null ? void 0 : ints1.result), ...toArr(ints2 == null ? void 0 : ints2.result)]
-      },
-      timeout: (_a = options.timeout) != null ? _a : merged.timeout
-    };
-  },
-  { headers: new Headers() }
-);
-var mergeOptions_default = mergeOptions;
-var toArr = (x) => isArr(x) ? x : isFn3(x) ? [x] : [];
+// src/getResult.ts
+import { fallbackIfFails as fallbackIfFails3, isFn as isFn3 } from "@superutils/core";
 
 // src/types/constants.ts
 var ContentType = {
@@ -177,6 +138,170 @@ var FetchError = class _FetchError extends Error {
   }
 };
 
+// src/getResult.ts
+var getResult = async (response, as = "json" /* json */, onDownloadProgress) => {
+  var _a;
+  if (!isFn3(onDownloadProgress) || as === "response" /* response */) {
+    const parseFunc = response[as];
+    const result = !isFn3(parseFunc) ? response : parseFunc.bind(response)();
+    return result;
+  }
+  const reader = (_a = response == null ? void 0 : response.body) == null ? void 0 : _a.getReader();
+  const contentLength = response.headers.get("Content-Length");
+  const total = contentLength ? parseInt(contentLength, 10) : null;
+  const chunks = new Chunks(
+    [],
+    response.headers.get("content-type")
+  );
+  let received = 0;
+  while (reader) {
+    const { done, value } = await reader.read();
+    if (done) break;
+    chunks.value.push(value);
+    received += value.length;
+    fallbackIfFails3(
+      onDownloadProgress,
+      total ? [100 * received / total, received, total] : [null, received, null],
+      null
+    );
+  }
+  switch (as) {
+    case "arrayBuffer" /* arrayBuffer */:
+      return chunks.toArrayBuffer();
+    case "blob" /* blob */:
+      return chunks.toBlob();
+    case "bytes" /* bytes */:
+      return chunks.toBytes();
+    case "formData" /* formData */:
+      return chunks.toFormData();
+    case "text" /* text */:
+      return chunks.toText();
+    case "json" /* json */:
+      break;
+  }
+  return chunks.toJSON();
+};
+var getResult_default = getResult;
+var Chunks = class {
+  /**
+   * @param value The initial array of chunks.
+   * @param contentType The MIME type of the content for Blob/FormData conversion.
+   * @param encoding The character encoding for text decoding. Defaults to 'utf-8'.
+   */
+  constructor(value, contentType = "", encoding = "utf-8") {
+    this.value = value;
+    this.contentType = contentType;
+    this.encoding = encoding;
+    /**
+     * Converts the accumulated data to an ArrayBuffer.
+     */
+    this.toArrayBuffer = () => this.concatChunks().buffer;
+    /**
+     * Converts the accumulated data to a Blob
+     *
+     * @param type content type. Default: `this.contentType`
+     */
+    this.toBlob = (type = this.contentType) => new Blob(this.value, { type });
+    /**
+     * Converts the accumulated data to a single Uint8Array.
+     */
+    this.toBytes = () => this.concatChunks();
+    /**
+     * Decodes the data as text and parses it as JSON.
+     *
+     * @template T The expected type of the JSON result.
+     * @param encoding Optional encoding override.
+     * @returns The parsed JSON object.
+     */
+    this.toJSON = (encoding = this.encoding) => JSON.parse(this.toText(encoding));
+    /**
+     * Decodes the accumulated chunks into a string.
+     *
+     * @param encoding The character encoding to use. Defaults to the instance's `encoding`.
+     */
+    this.toText = (encoding = this.encoding) => new TextDecoder(encoding).decode(this.concatChunks());
+  }
+  /**
+   * Concatenates all accumulated chunks into a single Uint8Array.
+   *
+   * @returns A single Uint8Array containing the merged data.
+   */
+  concatChunks() {
+    const total = this.value.reduce((s, c) => s + c.byteLength, 0);
+    const out = new Uint8Array(total);
+    let off = 0;
+    for (const u of this.value) {
+      out.set(u, off);
+      off += u.byteLength;
+    }
+    return out;
+  }
+  /**
+   * Attempts to convert the accumulated data to FormData.
+   *
+   * If the `contentType` is `application/x-www-form-urlencoded` or the content appears to be
+   * query parameters, it parses them into FormData. Otherwise, it appends the entire
+   * content as a Blob under the key 'file'.
+   *
+   * @param encoding Optional encoding override for text decoding.
+   * @returns A FormData instance containing the data.
+   */
+  toFormData(encoding = this.encoding) {
+    const text = this.toText(encoding);
+    const formData = new FormData();
+    if (this.contentType.includes(
+      ContentType.APPLICATION_X_WWW_FORM_URLENCODED
+    ) || text.includes("=")) {
+      const params = new URLSearchParams(text);
+      for (const [k, v] of params) formData.append(k, v);
+      return formData;
+    }
+    formData.append("file", new Blob([text]));
+    return formData;
+  }
+};
+
+// src/mergeOptions.ts
+import { isArr, isFn as isFn4, isObj, objCopy } from "@superutils/core";
+var mergeOptions = (...allOptions) => allOptions.reduce(
+  (merged, options) => {
+    var _a;
+    options = isObj(options) ? options : {};
+    const { headers, interceptors: ints1 = {} } = merged;
+    const { interceptors: ints2 = {} } = options;
+    options.headers && new Headers(options.headers).forEach(
+      (value, key) => headers.set(key, value)
+    );
+    return {
+      ...merged,
+      ...options,
+      errMsgs: objCopy(
+        options.errMsgs,
+        merged.errMsgs,
+        [],
+        "empty"
+      ),
+      headers,
+      interceptors: {
+        error: [...toArr(ints1 == null ? void 0 : ints1.error), ...toArr(ints2 == null ? void 0 : ints2.error)],
+        request: [
+          ...toArr(ints1 == null ? void 0 : ints1.request),
+          ...toArr(ints2 == null ? void 0 : ints2.request)
+        ],
+        response: [
+          ...toArr(ints1 == null ? void 0 : ints1.response),
+          ...toArr(ints2 == null ? void 0 : ints2.response)
+        ],
+        result: [...toArr(ints1 == null ? void 0 : ints1.result), ...toArr(ints2 == null ? void 0 : ints2.result)]
+      },
+      timeout: (_a = options.timeout) != null ? _a : merged.timeout
+    };
+  },
+  { headers: new Headers() }
+);
+var mergeOptions_default = mergeOptions;
+var toArr = (x) => isArr(x) ? x : isFn4(x) ? [x] : [];
+
 // src/fetch.ts
 var defaultErrorMsgs = Object.freeze({
   aborted: "Request aborted",
@@ -200,7 +325,7 @@ var fetch = (url, options = {}) => {
   (_c = opts.signal) != null ? _c : opts.signal = opts.abortCtrl.signal;
   const { abortCtrl, as: parseAs, headers, onAbort, onTimeout } = opts;
   opts.onAbort = async () => {
-    const err = await fallbackIfFails3(onAbort, [], void 0);
+    const err = await fallbackIfFails4(onAbort, [], void 0);
     return await interceptErr(
       isError(err) ? err : new Error(err),
       url,
@@ -209,7 +334,7 @@ var fetch = (url, options = {}) => {
     );
   };
   opts.onTimeout = async () => {
-    const err = await fallbackIfFails3(onTimeout, [], void 0);
+    const err = await fallbackIfFails4(onTimeout, [], void 0);
     return await interceptErr(
       err != null ? err : new Error(opts.errMsgs.timedout),
       url,
@@ -220,7 +345,7 @@ var fetch = (url, options = {}) => {
   return PromisE_timeout(opts, async () => {
     var _a2, _b2, _c2, _d;
     try {
-      opts.body = await fallbackIfFails3(
+      opts.body = await fallbackIfFails4(
         opts.body,
         [],
         (err) => Promise.reject(err)
@@ -250,7 +375,7 @@ var fetch = (url, options = {}) => {
       const status = response == null ? void 0 : response.status;
       const isSuccess = status >= 200 && status < 300;
       if (!isSuccess) {
-        const jsonError = await fallbackIfFails3(
+        const jsonError = await fallbackIfFails4(
           // try to parse error response as json first
           () => {
             var _a3;
@@ -261,9 +386,12 @@ var fetch = (url, options = {}) => {
         );
         throw new Error(jsonError, { cause: jsonError });
       }
-      const parseFunc = response[parseAs];
-      let result = !isFn4(parseFunc) ? response : parseFunc.bind(response)();
-      if (isPromise(result))
+      let result = getResult_default(
+        response,
+        parseAs,
+        opts.onDownloadProgress
+      );
+      if (isPromise(result)) {
         result = await result.catch(
           (err) => Promise.reject(
             new Error(
@@ -272,6 +400,7 @@ var fetch = (url, options = {}) => {
             )
           )
         );
+      }
       result = await executeInterceptors_default(
         result,
         abortCtrl.signal,

package/package.json

@@ -5,8 +5,8 @@
 	},
 	"description": "A lightweight `fetch` wrapper for browsers and Node.js, designed to simplify data fetching and reduce boilerplate.",
 	"dependencies": {
-		"@superutils/core": "^1.2.10",
-		"@superutils/promise": "^1.3.9"
+		"@superutils/core": "^1.2.11",
+		"@superutils/promise": "^1.3.10"
 	},
 	"files": [
 		"dist",
@@ -53,6 +53,6 @@
 	"module": "./dist/index.js",
 	"type": "module",
 	"types": "./dist/index.d.ts",
-	"version": "1.5.9",
-	"gitHead": "9b77219f98125fd231d24c6e44299de7b99b679e"
+	"version": "1.5.10",
+	"gitHead": "c97c6ce7baebd9de3a314616594e69b435d7b719"
 }