@tahanabavi/typefetch 1.2.1 → 1.3.0

package/dist/index.js

@@ -20,6 +20,18 @@ var __spreadValues = (a, b) => {
   return a;
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+var __objRest = (source, exclude) => {
+  var target = {};
+  for (var prop in source)
+    if (__hasOwnProp.call(source, prop) && exclude.indexOf(prop) < 0)
+      target[prop] = source[prop];
+  if (source != null && __getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(source)) {
+      if (exclude.indexOf(prop) < 0 && __propIsEnum.call(source, prop))
+        target[prop] = source[prop];
+    }
+  return target;
+};
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -62,6 +74,7 @@ __export(index_exports, {
   authMiddleware: () => authMiddleware,
   cacheMiddleware: () => cacheMiddleware,
   loggingMiddleware: () => loggingMiddleware,
+  makeRequestSchema: () => makeRequestSchema,
   retryMiddleware: () => retryMiddleware
 });
 module.exports = __toCommonJS(index_exports);
@@ -4119,15 +4132,19 @@ var ApiClient = class {
    *     path: z.object({...}).optional(),
    *     query: z.object({...}).optional(),
    *     body: z.any().optional(),
+   *     header: z.object({...}).optional(),
    *   })
    *
-   * If the parsed request does not contain `path`, `query` or `body`,
+   * If the parsed request does not contain `path`, `header`,`query` or `body`,
    * the entire input is treated as the legacy flat request body.
    */
   request(endpoint, input) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d;
+      var _b, _c, _d, _e;
       const parsedInput = endpoint.request.parse(input);
+      const isObject = typeof parsedInput === "object" && parsedInput !== null;
+      const looksStructured = isObject && ("path" in parsedInput || "query" in parsedInput || "body" in parsedInput || "headers" in parsedInput);
+      const _a = parsedInput, { headers: extraHeaders } = _a, restInput = __objRest(_a, ["headers"]);
       if (this.useMockData && endpoint.mockData) {
         return this.handleMockRequest(endpoint);
       }
@@ -4141,14 +4158,32 @@ var ApiClient = class {
           status: 401,
           code: "NO_TOKEN"
         });
-        (_a = this.errorHandler) == null ? void 0 : _a.call(this, error);
+        (_b = this.errorHandler) == null ? void 0 : _b.call(this, error);
         throw error;
       }
-      const headers = { "Content-Type": "application/json" };
+      const headers = {};
       if (endpoint.auth && token) {
         headers["Authorization"] = `Bearer ${token}`;
       }
-      const { url, body } = this.buildUrlAndBody(endpoint, parsedInput);
+      if (endpoint.bodyType !== "form-data") {
+        headers["Content-Type"] = "application/json";
+      }
+      if (endpoint.headers) {
+        const endpointHeaders = typeof endpoint.headers === "function" ? endpoint.headers(parsedInput) : endpoint.headers;
+        for (const [key, value] of Object.entries(endpointHeaders)) {
+          headers[key] = value;
+        }
+      }
+      if (extraHeaders) {
+        for (const [key, value] of Object.entries(extraHeaders)) {
+          headers[key] = value;
+        }
+      }
+      const { url, body } = this.buildUrlAndBody(
+        endpoint,
+        restInput,
+        looksStructured
+      );
       const ctx = {
         url,
         init: {
@@ -4174,7 +4209,7 @@ var ApiClient = class {
               status: parsedResponse.code || res.status,
               code: `API_ERROR_${parsedResponse.code}`
             });
-            (_b = this.errorHandler) == null ? void 0 : _b.call(this, error);
+            (_c = this.errorHandler) == null ? void 0 : _c.call(this, error);
             throw error;
           }
           responseData = parsedResponse.data;
@@ -4188,34 +4223,44 @@ var ApiClient = class {
             detail: json.detail,
             errors: json.errors
           });
-          (_c = this.errorHandler) == null ? void 0 : _c.call(this, error);
+          (_d = this.errorHandler) == null ? void 0 : _d.call(this, error);
           throw error;
         }
         return this.responseTransform(endpoint.response.parse(responseData));
       } catch (err) {
         const error = this.normalizeError(err);
-        (_d = this.errorHandler) == null ? void 0 : _d.call(this, error);
+        (_e = this.errorHandler) == null ? void 0 : _e.call(this, error);
         throw error;
       }
     });
   }
   /**
-   * Builds the effective URL and request body for an endpoint.
-   *
-   * - Legacy mode: if the input does not contain `path`, `query` or `body`,
-   *   the entire input is used as the JSON request body for non-GET methods.
-   *
-   * - New mode: uses `path` to interpolate `:param` segments, `query` to
-   *   construct the query string, and `body` as the JSON payload.
+   * Builds final URL and body from endpoint + request input.
+   * Supports both structured `{ path, query, body, headers }` and legacy flat input.
    */
-  buildUrlAndBody(endpoint, parsedInput) {
-    const isObject = typeof parsedInput === "object" && parsedInput !== null;
-    const hasNewShape = isObject && ("path" in parsedInput || "query" in parsedInput || "body" in parsedInput);
-    if (!hasNewShape) {
+  buildUrlAndBody(endpoint, parsedInput, looksStructured) {
+    if (!looksStructured) {
       const url2 = this.config.baseUrl + endpoint.path;
       let requestBody2 = void 0;
       if (endpoint.method !== "GET") {
-        requestBody2 = JSON.stringify(parsedInput);
+        if (endpoint.bodyType === "form-data") {
+          const form = new FormData();
+          const flat = parsedInput || {};
+          for (const [key, value] of Object.entries(flat)) {
+            if (value === void 0 || value === null) continue;
+            if (Array.isArray(value)) {
+              for (const v of value) {
+                if (v === void 0 || v === null) continue;
+                form.append(key, v);
+              }
+            } else {
+              form.append(key, value);
+            }
+          }
+          requestBody2 = form;
+        } else {
+          requestBody2 = JSON.stringify(parsedInput);
+        }
       }
       return { url: url2, body: requestBody2 };
     }
@@ -4231,9 +4276,13 @@ var ApiClient = class {
         url = url.replace(token, encodeURIComponent(String(value)));
       }
     }
-    const missingTokens = Array.from(url.matchAll(/:([A-Za-z0-9_]+)/g)).map(
-      (m) => m[1]
-    );
+    const templatePlaceholders = Array.from(
+      endpoint.path.matchAll(/:([A-Za-z0-9_]+)/g)
+    ).map((m) => m[1]);
+    const missingTokens = templatePlaceholders.filter((name) => {
+      const v = path ? path[name] : void 0;
+      return v === void 0 || v === null;
+    });
     if (missingTokens.length > 0) {
       throw this.createError({
         message: `Missing path params for placeholders: ${missingTokens.join(
@@ -4264,8 +4313,24 @@ var ApiClient = class {
     }
     let requestBody = void 0;
     if (endpoint.method !== "GET") {
-      if (typeof body !== "undefined" && body !== null) {
-        requestBody = JSON.stringify(body);
+      if (body !== void 0 && body !== null) {
+        if (endpoint.bodyType === "form-data") {
+          const form = new FormData();
+          for (const [key, value] of Object.entries(body)) {
+            if (value === void 0 || value === null) continue;
+            if (Array.isArray(value)) {
+              for (const v of value) {
+                if (v === void 0 || v === null) continue;
+                form.append(key, v);
+              }
+            } else {
+              form.append(key, value);
+            }
+          }
+          requestBody = form;
+        } else {
+          requestBody = JSON.stringify(body);
+        }
       }
     }
     return { url, body: requestBody };
@@ -4389,6 +4454,17 @@ var cacheMiddleware = (options = {}) => {
     return next();
   });
 };
+
+// src/utils/make-request-schema.ts
+var makeRequestSchema = () => (defs) => {
+  var _a, _b, _c, _d, _e, _f;
+  return external_exports.object({
+    path: (_b = (_a = defs.path) != null ? _a : external_exports.object({})) == null ? void 0 : _b.optional(),
+    query: (_d = (_c = defs.query) != null ? _c : external_exports.object({})) == null ? void 0 : _d.optional(),
+    body: (_e = defs.body) != null ? _e : external_exports.undefined(),
+    headers: (_f = defs.headers) != null ? _f : external_exports.record(external_exports.string()).optional()
+  });
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   ApiClient,
@@ -4396,6 +4472,7 @@ var cacheMiddleware = (options = {}) => {
   authMiddleware,
   cacheMiddleware,
   loggingMiddleware,
+  makeRequestSchema,
   retryMiddleware
 });
 //# sourceMappingURL=index.js.map