@labeg/tfetch 0.4.0 → 0.6.0

package/dist/contructors/TsFetch.js

@@ -10,7 +10,6 @@ export class TsFetch {
     // eslint-disable-next-line max-lines-per-function, max-statements, complexity
     async send(options) {
         const { url, body, returnType, ...otherInits } = options;
-        const headers = options.headers ?? this.setHeaders();
         const input = url;
         /**
          * Setup cache
@@ -28,6 +27,32 @@ export class TsFetch {
             }
             this.requestCache.set(cacheKey, []);
         }
+        /**
+         * Prepare headers
+         */
+        let sendBody = void 0;
+        const headers = this.setHeaders();
+        if (body instanceof ArrayBuffer ||
+            body instanceof Uint8Array ||
+            body instanceof Blob ||
+            body instanceof FormData ||
+            // NodeJS.ArrayBufferView
+            body instanceof URLSearchParams ||
+            body === null ||
+            typeof body === "string") {
+            // Fetch add needed headers self
+            sendBody = body;
+        }
+        else if (typeof body === "object") {
+            headers.set("content-type", "application/json");
+            sendBody = JSON.stringify(body);
+        }
+        if (options.headers) {
+            const optHeaders = new Headers(options.headers);
+            for (const entry of optHeaders.entries()) {
+                headers.set(entry[0], entry[1]);
+            }
+        }
         /**
          * Process request
          */
@@ -36,7 +61,7 @@ export class TsFetch {
         try {
             let response = await fetch(input, {
                 method: options.method,
-                body: typeof body === "undefined" ? void 0 : JSON.stringify(body),
+                body: sendBody,
                 headers,
                 ...otherInits
             });
@@ -68,7 +93,12 @@ export class TsFetch {
         else if (Array.isArray(returnType) &&
             responseText.startsWith("[")) {
             data = JSON.parse(responseText);
-            // Return models.map((model: object) => new returnType[0]().fromJSON(model));
+            if ( // If its Serializable class
+            typeof returnType[0] === "function" &&
+                returnType[0].prototype instanceof Serializable) {
+                const constructor = returnType[0];
+                data = data.map((model) => new constructor().fromJSON(model));
+            }
         }
         else if (typeof returnType === "function" &&
             returnType.prototype instanceof Serializable &&
@@ -152,8 +182,6 @@ export class TsFetch {
     }
     setHeaders() {
         const headers = new Headers();
-        headers.set("content-type", "application/json");
-        headers.set("Pragma", "no-cache");
         return headers;
     }
     parseBackendError(response, body) {

package/dist/index.d.ts

@@ -3,7 +3,7 @@ export * from "./contructors/TsFetch.js";
 export * from "./contructors/CrudHttpRepository.js";
 import { TsFetch } from "./contructors/TsFetch.js";
 declare const instance: TsFetch;
-export declare const tsfetch: typeof instance.send;
+export declare const tfetch: typeof instance.send;
 export declare const tf: {
     (options: import("./contructors/TsFetch.js").TsRequestInit<void>): Promise<void>;
     <T extends boolean>(options: import("./contructors/TsFetch.js").TsRequestInit<T>): Promise<T>;

package/dist/index.js

@@ -4,5 +4,5 @@ export * from "./contructors/CrudHttpRepository.js";
 import { TsFetch } from "./contructors/TsFetch.js";
 const instance = new TsFetch();
 // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-return
-export const tsfetch = (options) => instance.send(options);
-export const tf = tsfetch; // Alias
+export const tfetch = (options) => instance.send(options);
+export const tf = tfetch; // Alias

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@labeg/tfetch",
-    "version": "0.4.0",
+    "version": "0.6.0",
     "author": "Eugene Labutin",
     "license": "MIT",
     "homepage": "https://github.com/LabEG/ts-fetch#readme",
@@ -42,11 +42,12 @@
         "@swc-node/register": "^1.10.9",
         "@types/chai": "^5.0.1",
         "chai": "^5.1.2",
+        "fastify": "^5.2.2",
         "husky": "^9.1.7",
         "lint-staged": "^15.3.0",
-        "ts-serializable": "^3.7.3",
-        "rimraf": "^6.0.1",
         "npm-check-updates": "^17.1.13",
+        "rimraf": "^6.0.1",
+        "ts-serializable": "^3.7.3",
         "typescript": "^5.7.2"
     },
     "keywords": [