@mercurjs/client 2.0.0-canary.8 → 2.0.0-canary.80

package/dist/index.d.mts

@@ -1,9 +1,5 @@
-import { MedusaResponse } from '@medusajs/framework/http';
+import { MedusaResponse } from '@medusajs/framework';
 
-type DecrementDepth = [never, 0, 1, 2, 3, 4, 5, 6];
-type PrettifyDeep<T, Depth extends number = 4> = Depth extends never ? T : T extends (...args: any[]) => any ? T : T extends Array<infer U> ? Array<PrettifyDeep<U, DecrementDepth[Depth]>> : T extends Date ? T : T extends object ? {
-    [K in keyof T]: PrettifyDeep<T[K], DecrementDepth[Depth]>;
-} & {} : T;
 type TypeError<TMessage extends string> = TMessage;
 type InferInput<TRequest> = TRequest extends {
     validatedBody: infer Input;
@@ -21,7 +17,7 @@ type AddParamsToFn<Fn, TParams> = keyof TParams extends never ? Fn : Fn extends
 }) => TOutput : Fn extends (input: infer TInput) => infer TOutput ? (input: (TInput extends Record<string, any> ? Omit<TInput, 'fetchOptions'> : {}) & TParams & {
     fetchOptions?: RequestInit;
 }) => TOutput : Fn;
-type InferFetchFn<TRequest, TResponse, TInput = PrettifyDeep<InferInput<TRequest>>, TOutput = PrettifyDeep<InferOutput<TResponse>>> = [TInput] extends [Record<string, any>] ? (input: TInput & {
+type InferFetchFn<TRequest, TResponse, TInput = InferInput<TRequest>, TOutput = InferOutput<TResponse>> = [TInput] extends [Record<string, any>] ? (input: TInput & {
     fetchOptions?: RequestInit;
 }) => Promise<TOutput> : (input?: {
     fetchOptions?: RequestInit;
@@ -47,8 +43,8 @@ type ProcessRoutes<TRoutes, TParams = {}> = InferEndpointMethods<TRoutes, TParam
 type InferClient<TRoutes> = TRoutes extends Record<string, any> ? ProcessRoutes<TRoutes> : TypeError<`Looks like you forgot to pass the \`Routes\` generic type to the \`createClient\` function.`>;
 
 type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;
-type InferClientInput<T> = T extends (input: infer I) => any ? PrettifyDeep<DistributiveOmit<I, 'fetchOptions'>> : T extends (input?: infer I) => any ? PrettifyDeep<DistributiveOmit<NonNullable<I>, 'fetchOptions'>> : never;
-type InferClientOutput<T> = T extends (...args: any[]) => Promise<infer O> ? PrettifyDeep<O> : never;
+type InferClientInput<T> = T extends (input: infer I) => any ? DistributiveOmit<I, 'fetchOptions'> : T extends (input?: infer I) => any ? DistributiveOmit<NonNullable<I>, 'fetchOptions'> : never;
+type InferClientOutput<T> = T extends (...args: any[]) => Promise<infer O> ? O : never;
 declare class ClientError extends Error {
     status: number | undefined;
     statusText: string | undefined;

package/dist/index.mjs

@@ -51,7 +51,7 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/index.ts
-import { stringify } from "qs";
+import qs from "qs";
 
 // src/create-proxy.ts
 function createRecursiveProxy(callback, path = []) {
@@ -106,16 +106,22 @@ function createClient(options) {
     const base = new URL(baseUrl);
     const fullPath = `${base.pathname.replace(/\/$/, "")}/${urlPath.replace(/^\//, "")}`;
     const url = new URL(fullPath, base.origin);
+    const isFormData = (inputFetchOptions == null ? void 0 : inputFetchOptions.body) instanceof FormData;
     let body;
-    if (method === "GET" && Object.keys(rest).length > 0) {
-      url.search = stringify(rest, { skipNulls: true });
+    if (isFormData) {
+      body = inputFetchOptions.body;
+    } else if (method === "GET" && Object.keys(rest).length > 0) {
+      url.search = qs.stringify(rest, { skipNulls: true });
     } else if (method !== "GET" && Object.keys(rest).length > 0) {
       body = JSON.stringify(rest);
     }
-    const headers = new Headers(__spreadValues(__spreadValues({
-      "Content-Type": "application/json",
+    const defaultHeaders = {
       Accept: "application/json"
-    }, defaultFetchOptions == null ? void 0 : defaultFetchOptions.headers), inputFetchOptions == null ? void 0 : inputFetchOptions.headers));
+    };
+    if (!isFormData) {
+      defaultHeaders["Content-Type"] = "application/json";
+    }
+    const headers = new Headers(__spreadValues(__spreadValues(__spreadValues({}, defaultHeaders), defaultFetchOptions == null ? void 0 : defaultFetchOptions.headers), inputFetchOptions == null ? void 0 : inputFetchOptions.headers));
     return fetch(url, __spreadProps(__spreadValues(__spreadValues({}, defaultFetchOptions), inputFetchOptions), {
       method,
       body,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mercurjs/client",
-  "version": "2.0.0-canary.8",
+  "version": "2.0.0-canary.80",
   "repository": {
     "type": "git",
     "url": "https://github.com/mercurjs/mercur",
@@ -28,10 +28,10 @@
   },
   "dependencies": {
     "@tanstack/react-query": "^5.64.2",
-    "qs": "^6.15.0"
+    "qs": "^6.12.1"
   },
   "devDependencies": {
-    "@medusajs/framework": "^2.13.0",
+    "@medusajs/framework": "^2.13.3",
     "@types/qs": "^6.9.18",
     "tsup": "^8.5.0",
     "typescript": "5.9.3"