@ahoo-wang/fetcher-decorator 1.0.1 → 1.0.2

package/dist/endpointDecorator.d.ts

@@ -1,26 +1,28 @@
 import { HttpMethod } from '@ahoo-wang/fetcher';
 import { ApiMetadata } from './apiDecorator';
 import { ResultExtractorCapable } from './resultExtractor';
+export interface PathCapable {
+    /**
+     * Path for the endpoint (relative to class base path).
+     *
+     * This path will be appended to the class's base path to form the complete URL.
+     * Path parameters can be specified using curly braces, e.g., '/users/{id}'
+     */
+    path?: string;
+}
 /**
  * Metadata for HTTP endpoints.
  *
  * Defines the configuration options for individual HTTP endpoints (methods).
  * These settings will override any corresponding class-level settings from ApiMetadata.
  */
-export interface EndpointMetadata extends ApiMetadata, ResultExtractorCapable {
+export interface EndpointMetadata extends ApiMetadata, ResultExtractorCapable, PathCapable {
     /**
      * HTTP method for the endpoint.
      *
      * Specifies the HTTP verb to be used for this endpoint (GET, POST, PUT, DELETE, etc.)
      */
-    method: HttpMethod;
-    /**
-     * Path for the endpoint (relative to class base path).
-     *
-     * This path will be appended to the class's base path to form the complete URL.
-     * Path parameters can be specified using curly braces, e.g., '/users/{id}'
-     */
-    path?: string;
+    method?: HttpMethod;
 }
 export declare const ENDPOINT_METADATA_KEY: unique symbol;
 export type MethodEndpointMetadata = Omit<EndpointMetadata, 'method' | 'path'>;
@@ -48,7 +50,7 @@ export type MethodEndpointMetadata = Omit<EndpointMetadata, 'method' | 'path'>;
  * }
  * ```
  */
-export declare function endpoint(method: HttpMethod, path?: string, metadata?: MethodEndpointMetadata): (target: object, propertyKey: string | symbol) => void;
+export declare function endpoint(method?: HttpMethod, path?: string, metadata?: MethodEndpointMetadata): (target: object, propertyKey: string | symbol) => void;
 export declare function get(path?: string, metadata?: MethodEndpointMetadata): (target: object, propertyKey: string | symbol) => void;
 export declare function post(path?: string, metadata?: MethodEndpointMetadata): (target: object, propertyKey: string | symbol) => void;
 export declare function put(path?: string, metadata?: MethodEndpointMetadata): (target: object, propertyKey: string | symbol) => void;

package/dist/endpointDecorator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"endpointDecorator.d.ts","sourceRoot":"","sources":["../src/endpointDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAmB,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE5E;;;;;GAKG;AACH,MAAM,WAAW,gBAAiB,SAAQ,WAAW,EAAE,sBAAsB;IAC3E;;;;OAIG;IACH,MAAM,EAAE,UAAU,CAAC;IAEnB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED,eAAO,MAAM,qBAAqB,eAA8B,CAAC;AAEjE,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,gBAAgB,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAC;AAE/E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,QAAQ,CACtB,MAAM,EAAE,UAAU,EAClB,IAAI,GAAE,MAAW,EACjB,QAAQ,GAAE,sBAA2B,IAErB,QAAQ,MAAM,EAAE,aAAa,MAAM,GAAG,MAAM,KAAG,IAAI,CAcpE;AAED,wBAAgB,GAAG,CAAC,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,sBAA2B,YAhBlD,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CAkBpE;AAED,wBAAgB,IAAI,CAAC,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,sBAA2B,YApBnD,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CAsBpE;AAED,wBAAgB,GAAG,CAAC,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,sBAA2B,YAxBlD,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CA0BpE;AAED,wBAAgB,GAAG,CAAC,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,sBAA2B,YA5BlD,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CA8BpE;AAED,wBAAgB,KAAK,CACnB,IAAI,GAAE,MAAW,EACjB,QAAQ,GAAE,sBAA2B,YAlCb,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CAqCpE;AAED,wBAAgB,IAAI,CAAC,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,sBAA2B,YAvCnD,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CAyCpE;AAED,wBAAgB,OAAO,CACrB,IAAI,GAAE,MAAW,EACjB,QAAQ,GAAE,sBAA2B,YA7Cb,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CAgDpE"}
+{"version":3,"file":"endpointDecorator.d.ts","sourceRoot":"","sources":["../src/endpointDecorator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,kBAAkB,CAAC;AAC1B,OAAO,EAAmB,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAE5E,MAAM,WAAW,WAAW;IAC1B;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;;GAKG;AACH,MAAM,WAAW,gBAAiB,SAAQ,WAAW,EAAE,sBAAsB,EAAE,WAAW;IACxF;;;;OAIG;IACH,MAAM,CAAC,EAAE,UAAU,CAAC;CACrB;AAED,eAAO,MAAM,qBAAqB,eAA8B,CAAC;AAEjE,MAAM,MAAM,sBAAsB,GAAG,IAAI,CAAC,gBAAgB,EAAE,QAAQ,GAAG,MAAM,CAAC,CAAC;AAE/E;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,QAAQ,CACtB,MAAM,CAAC,EAAE,UAAU,EACnB,IAAI,CAAC,EAAE,MAAM,EACb,QAAQ,GAAE,sBAA2B,IAErB,QAAQ,MAAM,EAAE,aAAa,MAAM,GAAG,MAAM,KAAG,IAAI,CAcpE;AAED,wBAAgB,GAAG,CAAC,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,sBAA2B,YAhBlD,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CAkBpE;AAED,wBAAgB,IAAI,CAAC,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,sBAA2B,YApBnD,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CAsBpE;AAED,wBAAgB,GAAG,CAAC,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,sBAA2B,YAxBlD,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CA0BpE;AAED,wBAAgB,GAAG,CAAC,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,sBAA2B,YA5BlD,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CA8BpE;AAED,wBAAgB,KAAK,CACnB,IAAI,GAAE,MAAW,EACjB,QAAQ,GAAE,sBAA2B,YAlCb,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CAqCpE;AAED,wBAAgB,IAAI,CAAC,IAAI,GAAE,MAAW,EAAE,QAAQ,GAAE,sBAA2B,YAvCnD,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CAyCpE;AAED,wBAAgB,OAAO,CACrB,IAAI,GAAE,MAAW,EACjB,QAAQ,GAAE,sBAA2B,YA7Cb,MAAM,eAAe,MAAM,GAAG,MAAM,KAAG,IAAI,CAgDpE"}

package/dist/index.es.js

@@ -1,88 +1,88 @@
-import { HttpMethod as c, ExchangeError as x, fetcherRegistrar as A, Fetcher as g, fetcher as y, mergeRequest as v, combineURLs as M } from "@ahoo-wang/fetcher";
+import { HttpMethod as c, ExchangeError as g, fetcherRegistrar as v, Fetcher as q, fetcher as M, mergeRequest as S, combineURLs as w } from "@ahoo-wang/fetcher";
 import "reflect-metadata";
-const q = Symbol("endpoint:metadata");
-function d(t, e = "", r = {}) {
+const T = Symbol("endpoint:metadata");
+function d(t, e, r = {}) {
   return function(n, s) {
-    const o = {
+    const a = {
       method: t,
       path: e,
       ...r
     };
     Reflect.defineMetadata(
-      q,
-      o,
+      T,
+      a,
       n,
       s
     );
   };
 }
-function Z(t = "", e = {}) {
+function et(t = "", e = {}) {
   return d(c.GET, t, e);
 }
-function tt(t = "", e = {}) {
+function rt(t = "", e = {}) {
   return d(c.POST, t, e);
 }
-function et(t = "", e = {}) {
+function nt(t = "", e = {}) {
   return d(c.PUT, t, e);
 }
-function rt(t = "", e = {}) {
+function st(t = "", e = {}) {
   return d(c.DELETE, t, e);
 }
-function nt(t = "", e = {}) {
+function at(t = "", e = {}) {
   return d(c.PATCH, t, e);
 }
-function st(t = "", e = {}) {
+function ot(t = "", e = {}) {
   return d(c.HEAD, t, e);
 }
-function ot(t = "", e = {}) {
+function it(t = "", e = {}) {
   return d(c.OPTIONS, t, e);
 }
 const f = /* @__PURE__ */ new WeakMap();
-function S(t) {
+function D(t) {
   if (typeof t != "function")
     throw new TypeError("Expected a function");
   if (f.has(t))
     return f.get(t);
   try {
-    const e = t.toString().trim(), r = O(e);
-    if (!D(r)) {
+    const e = t.toString().trim(), r = F(e);
+    if (!H(r)) {
       const s = [];
       return f.set(t, s), s;
     }
-    const n = H(r);
+    const n = _(r);
     return f.set(t, n), n;
   } catch {
     const e = [];
     return f.set(t, e), e;
   }
 }
-function w(t, e, r, n) {
+function O(t, e, r, n) {
   if (n)
     return n;
   try {
     const s = t[e];
     if (s && typeof s == "function") {
-      const o = S(s);
-      if (r < o.length)
-        return o[r];
+      const a = D(s);
+      if (r < a.length)
+        return a[r];
     }
   } catch {
   }
 }
-function D(t) {
+function H(t) {
   return t != null && t.trim() !== "";
 }
-function O(t) {
+function F(t) {
   if (t.startsWith("(")) {
-    const n = R(t, 0);
+    const n = P(t, 0);
     return n === -1 ? "" : t.substring(1, n);
   }
   const e = t.indexOf("(");
   if (e === -1) return "";
-  const r = R(t, e);
+  const r = P(t, e);
   return r === -1 ? "" : t.substring(e + 1, r);
 }
-function R(t, e) {
+function P(t, e) {
   let r = 1;
   for (let n = e + 1; n < t.length; n++) {
     const s = t[n];
@@ -93,95 +93,95 @@ function R(t, e) {
   }
   return -1;
 }
-function H(t) {
-  return t.split(",").map(F).filter(_).map(N);
+function _(t) {
+  return t.split(",").map(N).filter(U).map(Y);
 }
-function F(t) {
+function N(t) {
   return t.trim();
 }
-function _(t) {
+function U(t) {
   return t.length > 0;
 }
-function N(t) {
-  let e = U(t);
-  return e = Y(e), e.trim();
+function Y(t) {
+  let e = k(t);
+  return e = G(e), e.trim();
 }
-function U(t) {
+function k(t) {
   const e = t.indexOf("=");
   return e !== -1 ? t.substring(0, e) : t;
 }
-function Y(t) {
+function G(t) {
   const e = t.indexOf(":");
   return e !== -1 ? t.substring(0, e) : t;
 }
-var h = /* @__PURE__ */ ((t) => (t.PATH = "path", t.QUERY = "query", t.HEADER = "header", t.BODY = "body", t.REQUEST = "request", t))(h || {});
+var p = /* @__PURE__ */ ((t) => (t.PATH = "path", t.QUERY = "query", t.HEADER = "header", t.BODY = "body", t.REQUEST = "request", t))(p || {});
 const l = Symbol("parameter:metadata");
 function m(t, e = "") {
   return function(r, n, s) {
-    const o = w(
+    const a = O(
       r,
       n,
       s,
       e
-    ), a = Reflect.getMetadata(l, r, n) || /* @__PURE__ */ new Map(), i = {
+    ), o = Reflect.getMetadata(l, r, n) || /* @__PURE__ */ new Map(), i = {
       type: t,
-      name: o,
+      name: a,
       index: s
     };
-    a.set(s, i), Reflect.defineMetadata(
+    o.set(s, i), Reflect.defineMetadata(
       l,
-      a,
+      o,
       r,
       n
     );
   };
 }
-function at(t = "") {
+function ut(t = "") {
   return m("path", t);
 }
-function it(t = "") {
+function ct(t = "") {
   return m("query", t);
 }
-function ut(t = "") {
+function dt(t = "") {
   return m("header", t);
 }
-function ct() {
+function pt() {
   return m(
     "body"
     /* BODY */
   );
 }
-function dt() {
+function ht() {
   return m(
     "request"
     /* REQUEST */
   );
 }
-const I = (t) => t, k = (t) => t.requiredResponse, P = (t) => t.requiredResponse.json(), G = (t) => t.requiredResponse.text(), Q = (t) => {
+const I = (t) => t, Q = (t) => t.requiredResponse, x = (t) => t.requiredResponse.json(), j = (t) => t.requiredResponse.text(), J = (t) => {
   if (!t.requiredResponse.eventStream)
-    throw new x(t, "ServerSentEventStream is not supported");
+    throw new g(t, "ServerSentEventStream is not supported");
   return t.requiredResponse.eventStream();
-}, j = (t) => {
+}, C = (t) => {
   if (!t.requiredResponse.jsonEventStream)
-    throw new x(
+    throw new g(
       t,
       "JsonServerSentEventStream is not supported"
     );
   return t.requiredResponse.jsonEventStream();
-}, J = {
+}, L = {
   Exchange: I,
-  Response: k,
-  Json: P,
-  Text: G,
-  EventStream: Q,
-  JsonEventStream: j,
-  DEFAULT: P
+  Response: Q,
+  Json: x,
+  Text: j,
+  EventStream: J,
+  JsonEventStream: C,
+  DEFAULT: x
 };
-function C(t) {
+function W(t) {
   if (t)
-    return t instanceof g ? t : A.requiredGet(t);
+    return t instanceof q ? t : v.requiredGet(t);
 }
-class L {
+class B {
   /**
    * Creates a new FunctionMetadata instance.
    *
@@ -202,7 +202,7 @@ class L {
    * @returns The fetcher instance
    */
   get fetcher() {
-    return C(this.endpoint.fetcher ?? this.api.fetcher) ?? y;
+    return W(this.endpoint.fetcher ?? this.api.fetcher) ?? M;
   }
   /**
    * Resolves the request configuration from the method arguments.
@@ -255,28 +255,28 @@ class L {
       ...this.api.headers,
       ...this.endpoint.headers
     };
-    let o, a, i = {};
-    e.forEach((u, b) => {
+    let a, o, i = {};
+    e.forEach((u, A) => {
       if (u instanceof AbortSignal) {
-        a = u;
+        o = u;
         return;
       }
-      const p = this.parameters.get(b);
-      if (p)
-        switch (p.type) {
-          case h.PATH:
-            this.processPathParam(p, u, r);
+      const h = this.parameters.get(A);
+      if (h)
+        switch (h.type) {
+          case p.PATH:
+            this.processPathParam(h, u, r);
             break;
-          case h.QUERY:
-            this.processQueryParam(p, u, n);
+          case p.QUERY:
+            this.processQueryParam(h, u, n);
             break;
-          case h.HEADER:
-            this.processHeaderParam(p, u, s);
+          case p.HEADER:
+            this.processHeaderParam(h, u, s);
             break;
-          case h.BODY:
-            o = u;
+          case p.BODY:
+            a = u;
             break;
-          case h.REQUEST:
+          case p.REQUEST:
             i = this.processRequestParam(u);
             break;
         }
@@ -284,15 +284,15 @@ class L {
     const E = {
       path: r,
       query: n
-    }, T = {
+    }, b = {
       method: this.endpoint.method,
       urlParams: E,
       headers: s,
-      body: o,
+      body: a,
       timeout: this.resolveTimeout(),
-      signal: a
-    };
-    return v(T, i);
+      signal: o
+    }, R = S(b, i), y = i.path;
+    return R.url = this.resolvePath(y), R;
   }
   processPathParam(e, r, n) {
     const s = e.name || `param${e.index}`;
@@ -333,16 +333,14 @@ class L {
     return e;
   }
   /**
-   * Resolves the full path for the request.
+   * Resolves the complete path by combining base path and endpoint path
    *
-   * Combines the base path from API metadata with the endpoint path
-   * from endpoint metadata to create the complete path.
-   *
-   * @returns The full path for the request
+   * @param parameterPath - Optional path parameter to use instead of endpoint path
+   * @returns The combined URL path
    */
-  resolvePath() {
-    const e = this.endpoint.basePath || this.api.basePath || "", r = this.endpoint.path || "";
-    return M(e, r);
+  resolvePath(e) {
+    const r = this.endpoint.basePath || this.api.basePath || "", n = e || this.endpoint.path || "";
+    return w(r, n);
   }
   /**
    * Resolves the timeout for the request.
@@ -356,11 +354,11 @@ class L {
     return this.endpoint.timeout || this.api.timeout;
   }
   resolveResultExtractor() {
-    return this.endpoint.resultExtractor || this.api.resultExtractor || J.DEFAULT;
+    return this.endpoint.resultExtractor || this.api.resultExtractor || L.DEFAULT;
   }
 }
-const W = "fetcher";
-class B {
+const $ = "fetcher";
+class K {
   /**
    * Creates a new RequestExecutor instance.
    *
@@ -378,8 +376,8 @@ class B {
   getTargetFetcher(e) {
     if (!e || typeof e != "object")
       return;
-    const r = e[W];
-    if (r instanceof g)
+    const r = e[$];
+    if (r instanceof q)
       return r;
   }
   /**
@@ -393,89 +391,86 @@ class B {
    * @returns A Promise that resolves to the Response
    */
   async execute(e, r) {
-    const n = this.metadata.resolvePath(), s = this.metadata.resolveRequest(r), o = {
-      url: n,
-      ...s
-    }, i = await (this.getTargetFetcher(e) || this.metadata.fetcher).request(o);
-    return this.metadata.resolveResultExtractor()(i);
+    const n = this.getTargetFetcher(e) || this.metadata.fetcher, s = this.metadata.resolveRequest(r), a = await n.request(s);
+    return this.metadata.resolveResultExtractor()(a);
   }
 }
-const $ = Symbol("api:metadata");
-function K(t, e, r) {
+const V = Symbol("api:metadata");
+function z(t, e, r) {
   const n = t.prototype[e];
   if (e === "constructor" || typeof n != "function")
     return;
   const s = Reflect.getMetadata(
-    q,
+    T,
     t.prototype,
     e
   );
   if (!s)
     return;
-  const o = Reflect.getMetadata(
+  const a = Reflect.getMetadata(
     l,
     t.prototype,
     e
-  ) || /* @__PURE__ */ new Map(), a = new L(
+  ) || /* @__PURE__ */ new Map(), o = new B(
     e,
     r,
     s,
-    o
-  ), i = new B(a);
+    a
+  ), i = new K(o);
   t.prototype[e] = function(...E) {
     return i.execute(this, E);
   };
 }
-function ht(t = "", e = {}) {
+function ft(t = "", e = {}) {
   return function(r) {
     const n = {
       basePath: t,
       ...e
     };
-    return Reflect.defineMetadata($, n, r), Object.getOwnPropertyNames(r.prototype).forEach((s) => {
-      K(r, s, n);
+    return Reflect.defineMetadata(V, n, r), Object.getOwnPropertyNames(r.prototype).forEach((s) => {
+      z(r, s, n);
     }), r;
   };
 }
-class V extends Error {
+class X extends Error {
   constructor() {
     super("Implementation will be generated automatically."), this.name = "AutoGenerated";
   }
 }
-const pt = (...t) => new V();
+const mt = (...t) => new X();
 export {
-  $ as API_METADATA_KEY,
-  V as AutoGenerated,
-  q as ENDPOINT_METADATA_KEY,
-  Q as EventStreamResultExtractor,
+  V as API_METADATA_KEY,
+  X as AutoGenerated,
+  T as ENDPOINT_METADATA_KEY,
+  J as EventStreamResultExtractor,
   I as ExchangeResultExtractor,
-  L as FunctionMetadata,
-  j as JsonEventStreamResultExtractor,
-  P as JsonResultExtractor,
+  B as FunctionMetadata,
+  C as JsonEventStreamResultExtractor,
+  x as JsonResultExtractor,
   l as PARAMETER_METADATA_KEY,
-  h as ParameterType,
-  B as RequestExecutor,
-  k as ResponseResultExtractor,
-  J as ResultExtractors,
-  G as TextResultExtractor,
-  ht as api,
-  pt as autoGeneratedError,
-  ct as body,
-  rt as del,
+  p as ParameterType,
+  K as RequestExecutor,
+  Q as ResponseResultExtractor,
+  L as ResultExtractors,
+  j as TextResultExtractor,
+  ft as api,
+  mt as autoGeneratedError,
+  pt as body,
+  st as del,
   d as endpoint,
-  Z as get,
-  C as getFetcher,
-  w as getParameterName,
-  S as getParameterNames,
-  st as head,
-  ut as header,
-  ot as options,
+  et as get,
+  W as getFetcher,
+  O as getParameterName,
+  D as getParameterNames,
+  ot as head,
+  dt as header,
+  it as options,
   m as parameter,
-  nt as patch,
-  at as path,
-  tt as post,
-  et as put,
-  it as query,
-  dt as request
+  at as patch,
+  ut as path,
+  rt as post,
+  nt as put,
+  ct as query,
+  ht as request
 };
 //# sourceMappingURL=index.es.js.map