enlace 0.0.1-beta.3 → 0.0.1-beta.5

package/dist/next/index.mjs

@@ -5,9 +5,7 @@ import {
 
 // src/next/fetch.ts
 import {
-  buildUrl,
-  isJsonBody,
-  mergeHeaders
+  executeFetch
 } from "enlace-core";
 
 // src/utils/generateTags.ts
@@ -21,20 +19,22 @@ async function executeNextFetch(baseUrl, path, method, combinedOptions, requestO
     autoGenerateTags = true,
     autoRevalidateTags = true,
     revalidator,
-    headers: defaultHeaders,
-    ...restOptions
+    onSuccess,
+    ...coreOptions
   } = combinedOptions;
-  const url = buildUrl(baseUrl, path, requestOptions?.query);
-  let headers = mergeHeaders(defaultHeaders, requestOptions?.headers);
   const isGet = method === "GET";
   const autoTags = generateTags(path);
-  const fetchOptions = {
-    ...restOptions,
-    method
+  const nextOnSuccess = (payload) => {
+    if (!isGet && !requestOptions?.skipRevalidator) {
+      const revalidateTags = requestOptions?.revalidateTags ?? (autoRevalidateTags ? autoTags : []);
+      const revalidatePaths = requestOptions?.revalidatePaths ?? [];
+      if (revalidateTags.length || revalidatePaths.length) {
+        revalidator?.(revalidateTags, revalidatePaths);
+      }
+    }
+    onSuccess?.(payload);
   };
-  if (requestOptions?.cache) {
-    fetchOptions.cache = requestOptions.cache;
-  }
+  const nextRequestOptions = { ...requestOptions };
   if (isGet) {
     const tags = requestOptions?.tags ?? (autoGenerateTags ? autoTags : void 0);
     const nextFetchOptions = {};
@@ -44,51 +44,27 @@ async function executeNextFetch(baseUrl, path, method, combinedOptions, requestO
     if (requestOptions?.revalidate !== void 0) {
       nextFetchOptions.revalidate = requestOptions.revalidate;
     }
-    fetchOptions.next = nextFetchOptions;
-  }
-  if (headers) {
-    fetchOptions.headers = headers;
+    nextRequestOptions.next = nextFetchOptions;
   }
-  if (requestOptions?.body !== void 0) {
-    if (isJsonBody(requestOptions.body)) {
-      fetchOptions.body = JSON.stringify(requestOptions.body);
-      headers = mergeHeaders(headers, { "Content-Type": "application/json" });
-      if (headers) {
-        fetchOptions.headers = headers;
-      }
-    } else {
-      fetchOptions.body = requestOptions.body;
-    }
-  }
-  const response = await fetch(url, fetchOptions);
-  const contentType = response.headers.get("content-type");
-  const isJson = contentType?.includes("application/json");
-  if (response.ok) {
-    if (!isGet && !requestOptions?.skipRevalidator) {
-      const revalidateTags = requestOptions?.revalidateTags ?? (autoRevalidateTags ? autoTags : []);
-      const revalidatePaths = requestOptions?.revalidatePaths ?? [];
-      if (revalidateTags.length || revalidatePaths.length) {
-        revalidator?.(revalidateTags, revalidatePaths);
-      }
-    }
-    return {
-      ok: true,
-      status: response.status,
-      data: isJson ? await response.json() : response
-    };
-  }
-  return {
-    ok: false,
-    status: response.status,
-    error: isJson ? await response.json() : response
-  };
+  return executeFetch(
+    baseUrl,
+    path,
+    method,
+    { ...coreOptions, onSuccess: nextOnSuccess },
+    nextRequestOptions
+  );
 }
 
 // src/next/index.ts
 export * from "enlace-core";
 function createEnlace(baseUrl, defaultOptions = {}, nextOptions = {}) {
   const combinedOptions = { ...defaultOptions, ...nextOptions };
-  return createProxyHandler(baseUrl, combinedOptions, [], executeNextFetch);
+  return createProxyHandler(
+    baseUrl,
+    combinedOptions,
+    [],
+    executeNextFetch
+  );
 }
 export {
   createEnlace

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "enlace",
-  "version": "0.0.1-beta.3",
+  "version": "0.0.1-beta.5",
   "license": "MIT",
   "files": [
     "dist"
@@ -23,7 +23,7 @@
     }
   },
   "dependencies": {
-    "enlace-core": "0.0.1-beta.2"
+    "enlace-core": "0.0.1-beta.3"
   },
   "peerDependencies": {
     "react": "^19"