@spoosh/core 0.4.3 → 0.6.0

package/dist/index.js

@@ -20,7 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  HTTP_METHODS: () => HTTP_METHODS2,
+  HTTP_METHODS: () => HTTP_METHODS,
   Spoosh: () => Spoosh,
   applyMiddlewares: () => applyMiddlewares,
   buildUrl: () => buildUrl,
@@ -41,6 +41,7 @@ __export(src_exports, {
   extractMethodFromSelector: () => extractMethodFromSelector,
   extractPathFromSelector: () => extractPathFromSelector,
   generateTags: () => generateTags,
+  getContentType: () => getContentType,
   isJsonBody: () => isJsonBody,
   mergeHeaders: () => mergeHeaders,
   objectToFormData: () => objectToFormData,
@@ -167,6 +168,11 @@ function setHeaders(requestOptions, newHeaders) {
     };
   }
 }
+function getContentType(headers) {
+  if (!headers) return void 0;
+  const headersObj = new Headers(headers);
+  return headersObj.get("content-type") ?? void 0;
+}
 
 // src/utils/objectToFormData.ts
 function objectToFormData(obj) {
@@ -302,12 +308,6 @@ function buildInputFields(requestOptions) {
   if (requestOptions?.body !== void 0) {
     fields.body = requestOptions.body;
   }
-  if (requestOptions?.formData !== void 0) {
-    fields.formData = requestOptions.formData;
-  }
-  if (requestOptions?.urlEncoded !== void 0) {
-    fields.urlEncoded = requestOptions.urlEncoded;
-  }
   if (requestOptions?.params !== void 0) {
     fields.params = requestOptions.params;
   }
@@ -336,7 +336,7 @@ async function executeCoreFetch(config) {
   const maxRetries = requestOptions?.retries ?? 3;
   const baseDelay = requestOptions?.retryDelay ?? 1e3;
   const retryCount = maxRetries === false ? 0 : maxRetries;
-  const finalPath = requestOptions?._pathTransformer?.(path) ?? path;
+  const finalPath = path;
   const url = buildUrl(baseUrl, finalPath, requestOptions?.query);
   let headers = await mergeHeaders(defaultHeaders, requestOptions?.headers);
   const fetchInit = {
@@ -361,22 +361,17 @@ async function executeCoreFetch(config) {
   if (requestOptions?.signal) {
     fetchInit.signal = requestOptions.signal;
   }
-  if (requestOptions?.formData !== void 0) {
-    fetchInit.body = objectToFormData(
-      requestOptions.formData
-    );
-  } else if (requestOptions?.urlEncoded !== void 0) {
-    fetchInit.body = objectToUrlEncoded(
-      requestOptions.urlEncoded
-    );
-    headers = await mergeHeaders(headers, {
-      "Content-Type": "application/x-www-form-urlencoded"
-    });
-    if (headers) {
-      fetchInit.headers = headers;
-    }
-  } else if (requestOptions?.body !== void 0) {
-    if (isJsonBody(requestOptions.body)) {
+  if (requestOptions?.body !== void 0) {
+    const contentType = getContentType(headers);
+    if (contentType?.includes("application/x-www-form-urlencoded")) {
+      fetchInit.body = objectToUrlEncoded(
+        requestOptions.body
+      );
+    } else if (contentType?.includes("multipart/form-data") || containsFile(requestOptions.body)) {
+      fetchInit.body = objectToFormData(
+        requestOptions.body
+      );
+    } else if (isJsonBody(requestOptions.body)) {
       fetchInit.body = JSON.stringify(requestOptions.body);
       headers = await mergeHeaders(headers, {
         "Content-Type": "application/json"
@@ -384,10 +379,6 @@ async function executeCoreFetch(config) {
       if (headers) {
         fetchInit.headers = headers;
       }
-    } else if (containsFile(requestOptions.body)) {
-      fetchInit.body = objectToFormData(
-        requestOptions.body
-      );
     } else {
       fetchInit.body = requestOptions.body;
     }
@@ -440,104 +431,89 @@ async function executeCoreFetch(config) {
 }
 
 // src/proxy/handler.ts
-var HTTP_METHODS = {
-  $get: "GET",
-  $post: "POST",
-  $put: "PUT",
-  $patch: "PATCH",
-  $delete: "DELETE"
-};
+function resolvePath2(path, params) {
+  const segments = path.split("/").filter(Boolean);
+  if (!params) {
+    return segments;
+  }
+  return segments.map((segment) => {
+    if (segment.startsWith(":")) {
+      const paramName = segment.slice(1);
+      const value = params[paramName];
+      return value !== void 0 ? String(value) : segment;
+    }
+    return segment;
+  });
+}
 function createProxyHandler(config) {
   const {
     baseUrl,
     defaultOptions,
-    path = [],
     fetchExecutor = executeFetch,
     nextTags
   } = config;
-  const handler = {
-    get(_target, prop) {
-      if (typeof prop === "symbol") return void 0;
-      const method = HTTP_METHODS[prop];
-      if (method) {
-        return (options) => fetchExecutor(
-          baseUrl,
-          path,
-          method,
-          defaultOptions,
-          options,
-          nextTags
-        );
+  return ((path) => {
+    return new Proxy(
+      {},
+      {
+        get(_target, prop) {
+          if (typeof prop === "symbol") return void 0;
+          const method = prop;
+          if (!["GET", "POST", "PUT", "PATCH", "DELETE"].includes(method)) {
+            return void 0;
+          }
+          return (options) => {
+            const resolvedPath = resolvePath2(path, options?.params);
+            return fetchExecutor(
+              baseUrl,
+              resolvedPath,
+              method,
+              defaultOptions,
+              options,
+              nextTags
+            );
+          };
+        }
       }
-      return createProxyHandler({
-        baseUrl,
-        defaultOptions,
-        path: [...path, prop],
-        fetchExecutor,
-        nextTags
-      });
-    },
-    // Handles function call syntax for dynamic segments: api.posts(123), api.posts(":id"), api.users(userId)
-    // This is the only way to access dynamic segments in Spoosh.
-    // The function call syntax allows TypeScript to capture the literal type, enabling params: { id: string } inference.
-    apply(_target, _thisArg, args) {
-      const [segment] = args;
-      return createProxyHandler({
-        baseUrl,
-        defaultOptions,
-        path: [...path, segment],
-        fetchExecutor,
-        nextTags
-      });
-    }
-  };
-  const noop = () => {
-  };
-  return new Proxy(noop, handler);
+    );
+  });
 }
 
 // src/proxy/selector-proxy.ts
-var HTTP_METHODS2 = [
-  "$get",
-  "$post",
-  "$put",
-  "$patch",
-  "$delete"
-];
+var HTTP_METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE"];
 function createSelectorProxy(onCapture) {
-  const createProxy = (path = []) => {
-    return new Proxy(() => {
-    }, {
-      get(_, prop) {
-        if (HTTP_METHODS2.includes(prop)) {
-          const selectorFn = (options) => {
+  const createMethodsProxy = (path) => {
+    return new Proxy(
+      {},
+      {
+        get(_, prop) {
+          if (HTTP_METHODS.includes(prop)) {
+            const selectorFn = (options) => {
+              onCapture?.({
+                call: { path, method: prop, options },
+                selector: null
+              });
+              return Promise.resolve({ data: void 0 });
+            };
+            selectorFn.__selectorPath = path;
+            selectorFn.__selectorMethod = prop;
             onCapture?.({
-              call: { path, method: prop, options },
-              selector: null
+              call: null,
+              selector: { path, method: prop }
             });
-            return Promise.resolve({ data: void 0 });
-          };
-          selectorFn.__selectorPath = path;
-          selectorFn.__selectorMethod = prop;
-          onCapture?.({
-            call: null,
-            selector: { path, method: prop }
-          });
-          return selectorFn;
+            return selectorFn;
+          }
+          return void 0;
         }
-        return createProxy([...path, prop]);
-      },
-      // Handles function call syntax for dynamic segments: api.posts("123"), api.users(userId)
-      apply(_, __, args) {
-        const [segment] = args;
-        return createProxy([...path, String(segment)]);
       }
-    });
+    );
   };
-  return createProxy();
+  return ((path) => {
+    return createMethodsProxy(path);
+  });
 }
 function extractPathFromSelector(fn) {
-  return fn.__selectorPath ?? [];
+  return fn.__selectorPath ?? "";
 }
 function extractMethodFromSelector(fn) {
   return fn.__selectorMethod;
@@ -598,7 +574,7 @@ function createStateManager() {
         const newEntry = {
           state: entry.state ?? createInitialState(),
           tags: entry.tags ?? [],
-          pluginResult: /* @__PURE__ */ new Map(),
+          meta: /* @__PURE__ */ new Map(),
           selfTag: generateSelfTagFromKey(key),
           previousData: entry.previousData,
           stale: entry.stale
@@ -658,11 +634,11 @@ function createStateManager() {
       });
       return entries;
     },
-    setPluginResult(key, data) {
+    setMeta(key, data) {
       const entry = cache.get(key);
       if (entry) {
         for (const [name, value] of Object.entries(data)) {
-          entry.pluginResult.set(name, value);
+          entry.meta.set(name, value);
         }
         notifySubscribers(key);
       }
@@ -982,13 +958,13 @@ var Spoosh = class _Spoosh {
    * const { api } = client;
    *
    * // GET request
-   * const { data } = await api.posts.$get();
+   * const { data } = await api("posts").GET();
    *
    * // POST request with body
-   * const { data } = await api.posts.$post({ body: { title: 'Hello' } });
+   * const { data } = await api("posts").POST({ body: { title: 'Hello' } });
    *
    * // Dynamic path parameters
-   * const { data } = await api.posts(postId).$get();
+   * const { data } = await api("posts/:id").GET({ params: { id: postId } });
    * ```
    */
   get api() {
@@ -1004,7 +980,7 @@ var Spoosh = class _Spoosh {
    * const { stateManager } = client;
    *
    * // Get cached data
-   * const cache = stateManager.getCache('posts.$get');
+   * const cache = stateManager.getCache('posts.GET');
    *
    * // Invalidate cache by tag
    * stateManager.invalidate(['posts']);

package/dist/index.mjs

@@ -112,6 +112,11 @@ function setHeaders(requestOptions, newHeaders) {
     };
   }
 }
+function getContentType(headers) {
+  if (!headers) return void 0;
+  const headersObj = new Headers(headers);
+  return headersObj.get("content-type") ?? void 0;
+}
 
 // src/utils/objectToFormData.ts
 function objectToFormData(obj) {
@@ -247,12 +252,6 @@ function buildInputFields(requestOptions) {
   if (requestOptions?.body !== void 0) {
     fields.body = requestOptions.body;
   }
-  if (requestOptions?.formData !== void 0) {
-    fields.formData = requestOptions.formData;
-  }
-  if (requestOptions?.urlEncoded !== void 0) {
-    fields.urlEncoded = requestOptions.urlEncoded;
-  }
   if (requestOptions?.params !== void 0) {
     fields.params = requestOptions.params;
   }
@@ -281,7 +280,7 @@ async function executeCoreFetch(config) {
   const maxRetries = requestOptions?.retries ?? 3;
   const baseDelay = requestOptions?.retryDelay ?? 1e3;
   const retryCount = maxRetries === false ? 0 : maxRetries;
-  const finalPath = requestOptions?._pathTransformer?.(path) ?? path;
+  const finalPath = path;
   const url = buildUrl(baseUrl, finalPath, requestOptions?.query);
   let headers = await mergeHeaders(defaultHeaders, requestOptions?.headers);
   const fetchInit = {
@@ -306,22 +305,17 @@ async function executeCoreFetch(config) {
   if (requestOptions?.signal) {
     fetchInit.signal = requestOptions.signal;
   }
-  if (requestOptions?.formData !== void 0) {
-    fetchInit.body = objectToFormData(
-      requestOptions.formData
-    );
-  } else if (requestOptions?.urlEncoded !== void 0) {
-    fetchInit.body = objectToUrlEncoded(
-      requestOptions.urlEncoded
-    );
-    headers = await mergeHeaders(headers, {
-      "Content-Type": "application/x-www-form-urlencoded"
-    });
-    if (headers) {
-      fetchInit.headers = headers;
-    }
-  } else if (requestOptions?.body !== void 0) {
-    if (isJsonBody(requestOptions.body)) {
+  if (requestOptions?.body !== void 0) {
+    const contentType = getContentType(headers);
+    if (contentType?.includes("application/x-www-form-urlencoded")) {
+      fetchInit.body = objectToUrlEncoded(
+        requestOptions.body
+      );
+    } else if (contentType?.includes("multipart/form-data") || containsFile(requestOptions.body)) {
+      fetchInit.body = objectToFormData(
+        requestOptions.body
+      );
+    } else if (isJsonBody(requestOptions.body)) {
       fetchInit.body = JSON.stringify(requestOptions.body);
       headers = await mergeHeaders(headers, {
         "Content-Type": "application/json"
@@ -329,10 +323,6 @@ async function executeCoreFetch(config) {
       if (headers) {
         fetchInit.headers = headers;
       }
-    } else if (containsFile(requestOptions.body)) {
-      fetchInit.body = objectToFormData(
-        requestOptions.body
-      );
     } else {
       fetchInit.body = requestOptions.body;
     }
@@ -385,104 +375,89 @@ async function executeCoreFetch(config) {
 }
 
 // src/proxy/handler.ts
-var HTTP_METHODS = {
-  $get: "GET",
-  $post: "POST",
-  $put: "PUT",
-  $patch: "PATCH",
-  $delete: "DELETE"
-};
+function resolvePath2(path, params) {
+  const segments = path.split("/").filter(Boolean);
+  if (!params) {
+    return segments;
+  }
+  return segments.map((segment) => {
+    if (segment.startsWith(":")) {
+      const paramName = segment.slice(1);
+      const value = params[paramName];
+      return value !== void 0 ? String(value) : segment;
+    }
+    return segment;
+  });
+}
 function createProxyHandler(config) {
   const {
     baseUrl,
     defaultOptions,
-    path = [],
     fetchExecutor = executeFetch,
     nextTags
   } = config;
-  const handler = {
-    get(_target, prop) {
-      if (typeof prop === "symbol") return void 0;
-      const method = HTTP_METHODS[prop];
-      if (method) {
-        return (options) => fetchExecutor(
-          baseUrl,
-          path,
-          method,
-          defaultOptions,
-          options,
-          nextTags
-        );
+  return ((path) => {
+    return new Proxy(
+      {},
+      {
+        get(_target, prop) {
+          if (typeof prop === "symbol") return void 0;
+          const method = prop;
+          if (!["GET", "POST", "PUT", "PATCH", "DELETE"].includes(method)) {
+            return void 0;
+          }
+          return (options) => {
+            const resolvedPath = resolvePath2(path, options?.params);
+            return fetchExecutor(
+              baseUrl,
+              resolvedPath,
+              method,
+              defaultOptions,
+              options,
+              nextTags
+            );
+          };
+        }
       }
-      return createProxyHandler({
-        baseUrl,
-        defaultOptions,
-        path: [...path, prop],
-        fetchExecutor,
-        nextTags
-      });
-    },
-    // Handles function call syntax for dynamic segments: api.posts(123), api.posts(":id"), api.users(userId)
-    // This is the only way to access dynamic segments in Spoosh.
-    // The function call syntax allows TypeScript to capture the literal type, enabling params: { id: string } inference.
-    apply(_target, _thisArg, args) {
-      const [segment] = args;
-      return createProxyHandler({
-        baseUrl,
-        defaultOptions,
-        path: [...path, segment],
-        fetchExecutor,
-        nextTags
-      });
-    }
-  };
-  const noop = () => {
-  };
-  return new Proxy(noop, handler);
+    );
+  });
 }
 
 // src/proxy/selector-proxy.ts
-var HTTP_METHODS2 = [
-  "$get",
-  "$post",
-  "$put",
-  "$patch",
-  "$delete"
-];
+var HTTP_METHODS = ["GET", "POST", "PUT", "PATCH", "DELETE"];
 function createSelectorProxy(onCapture) {
-  const createProxy = (path = []) => {
-    return new Proxy(() => {
-    }, {
-      get(_, prop) {
-        if (HTTP_METHODS2.includes(prop)) {
-          const selectorFn = (options) => {
+  const createMethodsProxy = (path) => {
+    return new Proxy(
+      {},
+      {
+        get(_, prop) {
+          if (HTTP_METHODS.includes(prop)) {
+            const selectorFn = (options) => {
+              onCapture?.({
+                call: { path, method: prop, options },
+                selector: null
+              });
+              return Promise.resolve({ data: void 0 });
+            };
+            selectorFn.__selectorPath = path;
+            selectorFn.__selectorMethod = prop;
             onCapture?.({
-              call: { path, method: prop, options },
-              selector: null
+              call: null,
+              selector: { path, method: prop }
             });
-            return Promise.resolve({ data: void 0 });
-          };
-          selectorFn.__selectorPath = path;
-          selectorFn.__selectorMethod = prop;
-          onCapture?.({
-            call: null,
-            selector: { path, method: prop }
-          });
-          return selectorFn;
+            return selectorFn;
+          }
+          return void 0;
         }
-        return createProxy([...path, prop]);
-      },
-      // Handles function call syntax for dynamic segments: api.posts("123"), api.users(userId)
-      apply(_, __, args) {
-        const [segment] = args;
-        return createProxy([...path, String(segment)]);
       }
-    });
+    );
   };
-  return createProxy();
+  return ((path) => {
+    return createMethodsProxy(path);
+  });
 }
 function extractPathFromSelector(fn) {
-  return fn.__selectorPath ?? [];
+  return fn.__selectorPath ?? "";
 }
 function extractMethodFromSelector(fn) {
   return fn.__selectorMethod;
@@ -543,7 +518,7 @@ function createStateManager() {
         const newEntry = {
           state: entry.state ?? createInitialState(),
           tags: entry.tags ?? [],
-          pluginResult: /* @__PURE__ */ new Map(),
+          meta: /* @__PURE__ */ new Map(),
           selfTag: generateSelfTagFromKey(key),
           previousData: entry.previousData,
           stale: entry.stale
@@ -603,11 +578,11 @@ function createStateManager() {
       });
       return entries;
     },
-    setPluginResult(key, data) {
+    setMeta(key, data) {
       const entry = cache.get(key);
       if (entry) {
         for (const [name, value] of Object.entries(data)) {
-          entry.pluginResult.set(name, value);
+          entry.meta.set(name, value);
         }
         notifySubscribers(key);
       }
@@ -927,13 +902,13 @@ var Spoosh = class _Spoosh {
    * const { api } = client;
    *
    * // GET request
-   * const { data } = await api.posts.$get();
+   * const { data } = await api("posts").GET();
    *
    * // POST request with body
-   * const { data } = await api.posts.$post({ body: { title: 'Hello' } });
+   * const { data } = await api("posts").POST({ body: { title: 'Hello' } });
    *
    * // Dynamic path parameters
-   * const { data } = await api.posts(postId).$get();
+   * const { data } = await api("posts/:id").GET({ params: { id: postId } });
    * ```
    */
   get api() {
@@ -949,7 +924,7 @@ var Spoosh = class _Spoosh {
    * const { stateManager } = client;
    *
    * // Get cached data
-   * const cache = stateManager.getCache('posts.$get');
+   * const cache = stateManager.getCache('posts.GET');
    *
    * // Invalidate cache by tag
    * stateManager.invalidate(['posts']);
@@ -1586,7 +1561,7 @@ function createInfiniteReadController(options) {
   return controller;
 }
 export {
-  HTTP_METHODS2 as HTTP_METHODS,
+  HTTP_METHODS,
   Spoosh,
   applyMiddlewares,
   buildUrl,
@@ -1607,6 +1582,7 @@ export {
   extractMethodFromSelector,
   extractPathFromSelector,
   generateTags,
+  getContentType,
   isJsonBody,
   mergeHeaders,
   objectToFormData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@spoosh/core",
-  "version": "0.4.3",
+  "version": "0.6.0",
   "license": "MIT",
   "description": "Type-safe API client with plugin middleware system",
   "keywords": [