@ahoo-wang/fetcher-decorator 2.9.3 → 2.9.6

package/dist/index.es.js

@@ -1,43 +1,43 @@
-import { HttpMethod as u, getFetcher as w, combineURLs as O, JsonResultExtractor as D, mergeRecordToMap as l, mergeRequest as H } from "@ahoo-wang/fetcher";
+import { HttpMethod as h, getFetcher as w, combineURLs as O, JsonResultExtractor as D, mergeRecordToMap as l, mergeRequest as H } from "@ahoo-wang/fetcher";
 import "reflect-metadata";
-const x = Symbol("endpoint:metadata");
-function h(t, e, r = {}) {
-  return function(n, s) {
-    const a = {
+const T = Symbol("endpoint:metadata");
+function p(t, e, r = {}) {
+  return function(n, a) {
+    const s = {
       method: t,
       path: e,
       ...r
     };
     Reflect.defineMetadata(
-      x,
-      a,
+      T,
+      s,
       n,
-      s
+      a
     );
   };
 }
 function z(t = "", e = {}) {
-  return h(u.GET, t, e);
+  return p(h.GET, t, e);
 }
 function Z(t = "", e = {}) {
-  return h(u.POST, t, e);
+  return p(h.POST, t, e);
 }
 function F(t = "", e = {}) {
-  return h(u.PUT, t, e);
+  return p(h.PUT, t, e);
 }
 function tt(t = "", e = {}) {
-  return h(u.DELETE, t, e);
+  return p(h.DELETE, t, e);
 }
 function et(t = "", e = {}) {
-  return h(u.PATCH, t, e);
+  return p(h.PATCH, t, e);
 }
 function rt(t = "", e = {}) {
-  return h(u.HEAD, t, e);
+  return p(h.HEAD, t, e);
 }
 function nt(t = "", e = {}) {
-  return h(u.OPTIONS, t, e);
+  return p(h.OPTIONS, t, e);
 }
-var b = /* @__PURE__ */ ((t) => (t.EXCHANGE = "Exchange", t.RESULT = "Result", t))(b || {});
+var P = /* @__PURE__ */ ((t) => (t.EXCHANGE = "Exchange", t.RESULT = "Result", t))(P || {});
 const I = "__decorator_target__", U = "__decorator_metadata__";
 class C {
   /**
@@ -50,52 +50,57 @@ class C {
     this.target = e, this.metadata = r;
   }
   /**
-     * Executes the HTTP request.
-     *
-     * This method resolves the path and request configuration from the metadata
-     * and arguments, then executes the request using the configured fetcher.
-     * It handles the complete request lifecycle from parameter processing to
-     * response extraction.
-     *
-  
-     * @param args - The runtime arguments passed to the decorated method.
-     *               These are mapped to request components based on parameter decorators.
-     * @returns A Promise that resolves to the extracted result based on the configured result extractor.
-     *          By default, this is the Response object, but can be customized to return
-     *          parsed JSON, the raw exchange object, or any other transformed result.
-     *
-     * @example
-     * ```typescript
-     * // Given a decorated service method:
-     * class UserService {
-     *   @get('/users/{id}')
-     *   getUser(@path('id') id: number): Promise<Response> {
-     *     // This method body is replaced by the executor at runtime
-     *   }
-     * }
-     *
-     * // When calling:
-     * const userService = new UserService();
-     * const response = await userService.getUser(123);
-     *
-     * // The execute method will:
-     * // 1. Resolve the path to '/users/123'
-     * // 2. Create a request with method 'GET'
-     * // 3. Execute the request using the configured fetcher
-     * // 4. Return the Response object
-     * ```
-     */
+   * Executes the HTTP request based on the decorated method metadata.
+   *
+   * This method orchestrates the complete HTTP request lifecycle:
+   * 1. Resolves request configuration from metadata and runtime arguments
+   * 2. Sets up request attributes for interceptor access
+   * 3. Creates the FetchExchange object
+   * 4. Executes lifecycle hooks (beforeExecute)
+   * 5. Processes the request through the interceptor chain
+   * 6. Executes lifecycle hooks (afterExecute)
+   * 7. Extracts and returns the result based on endpoint return type
+   *
+   * @param args - The runtime arguments passed to the decorated method.
+   *               These are mapped to request components (path variables, query params, body, etc.)
+   *               based on parameter decorators applied to the method.
+   * @returns A Promise that resolves to the extracted result. The return type depends on:
+   *          - EndpointReturnType.EXCHANGE: Returns the FetchExchange object directly
+   *          - Otherwise: Returns the result of exchange.extractResult() (e.g., Response, parsed JSON)
+   * @throws Error if the request fails during execution or if lifecycle hooks/interceptors throw
+   *
+   * @example
+   * ```typescript
+   * // Given a decorated service method:
+   * class UserService {
+   *   @get('/users/{id}')
+   *   getUser(@path('id') id: number): Promise<User> {
+   *     // This method body is replaced by the executor at runtime
+   *   }
+   * }
+   *
+   * // When calling:
+   * const userService = new UserService();
+   * const user = await userService.getUser(123);
+   *
+   * // The execute method will:
+   * // 1. Resolve the path to '/users/123'
+   * // 2. Create a GET request
+   * // 3. Execute the request using the configured fetcher
+   * // 4. Extract and return the parsed User object
+   * ```
+   */
   async execute(e) {
     const r = this.metadata.fetcher, n = this.metadata.resolveExchangeInit(e);
-    n.attributes?.set(I, this.target), n.attributes?.set(
+    n.attributes.set(I, this.target), n.attributes.set(
       U,
       this.metadata
     );
-    const s = this.metadata.resolveResultExtractor(), a = this.metadata.resolveEndpointReturnType(), o = await r.exchange(n.request, {
-      resultExtractor: s,
+    const a = this.metadata.resolveResultExtractor(), s = this.metadata.resolveEndpointReturnType(), o = r.resolveExchange(n.request, {
+      resultExtractor: a,
       attributes: n.attributes
-    });
-    return a === b.EXCHANGE ? o : await o.extractResult();
+    }), i = this.target;
+    return i.beforeExecute && await i.beforeExecute(o), await r.interceptors.exchange(o), i.afterExecute && await i.afterExecute(o), s === P.EXCHANGE ? o : await o.extractResult();
   }
 }
 const m = /* @__PURE__ */ new WeakMap();
@@ -107,8 +112,8 @@ function N(t) {
   try {
     const e = t.toString().trim(), r = G(e);
     if (!k(r)) {
-      const s = [];
-      return m.set(t, s), s;
+      const a = [];
+      return m.set(t, a), a;
     }
     const n = S(r);
     return m.set(t, n), n;
@@ -121,11 +126,11 @@ function Y(t, e, r, n) {
   if (n)
     return n;
   try {
-    const s = t[e];
-    if (s && typeof s == "function") {
-      const a = N(s);
-      if (r < a.length)
-        return a[r];
+    const a = t[e];
+    if (a && typeof a == "function") {
+      const s = N(a);
+      if (r < s.length)
+        return s[r];
     }
   } catch {
   }
@@ -135,72 +140,72 @@ function k(t) {
 }
 function G(t) {
   if (t.startsWith("(")) {
-    const n = T(t, 0);
+    const n = A(t, 0);
     return n === -1 ? "" : t.substring(1, n);
   }
   const e = t.indexOf("(");
   if (e === -1) return "";
-  const r = T(t, e);
+  const r = A(t, e);
   return r === -1 ? "" : t.substring(e + 1, r);
 }
-function T(t, e) {
+function A(t, e) {
   let r = 1;
   for (let n = e + 1; n < t.length; n++) {
-    const s = t[n];
-    if (s === "(")
+    const a = t[n];
+    if (a === "(")
       r++;
-    else if (s === ")" && (r--, r === 0))
+    else if (a === ")" && (r--, r === 0))
       return n;
   }
   return -1;
 }
 function S(t) {
-  return t.split(",").map(B).filter(Q).map(v);
+  return t.split(",").map(v).filter(B).map(Q);
 }
-function B(t) {
+function v(t) {
   return t.trim();
 }
-function Q(t) {
+function B(t) {
   return t.length > 0;
 }
-function v(t) {
-  let e = j(t);
-  return e = L(e), e.trim();
+function Q(t) {
+  let e = L(t);
+  return e = j(e), e.trim();
 }
-function j(t) {
+function L(t) {
   const e = t.indexOf("=");
   return e !== -1 ? t.substring(0, e) : t;
 }
-function L(t) {
+function j(t) {
   const e = t.indexOf(":");
   return e !== -1 ? t.substring(0, e) : t;
 }
-var c = /* @__PURE__ */ ((t) => (t.PATH = "path", t.QUERY = "query", t.HEADER = "header", t.BODY = "body", t.REQUEST = "request", t.ATTRIBUTE = "attribute", t))(c || {});
-const P = Symbol("parameter:metadata");
+var u = /* @__PURE__ */ ((t) => (t.PATH = "path", t.QUERY = "query", t.HEADER = "header", t.BODY = "body", t.REQUEST = "request", t.ATTRIBUTE = "attribute", t))(u || {});
+const b = Symbol("parameter:metadata");
 function f(t, e = "") {
-  return function(r, n, s) {
-    const a = Y(
+  return function(r, n, a) {
+    const s = Y(
       r,
       n,
-      s,
+      a,
       e
-    ), o = Reflect.getMetadata(P, r, n) || /* @__PURE__ */ new Map(), p = {
+    ), o = Reflect.getMetadata(b, r, n) || /* @__PURE__ */ new Map(), i = {
       type: t,
-      name: a,
-      index: s
+      name: s,
+      index: a
     };
-    o.set(s, p), Reflect.defineMetadata(
-      P,
+    o.set(a, i), Reflect.defineMetadata(
+      b,
       o,
       r,
       n
     );
   };
 }
-function st(t = "") {
+function at(t = "") {
   return f("path", t);
 }
-function at(t = "") {
+function st(t = "") {
   return f("query", t);
 }
 function ot(t = "") {
@@ -230,8 +235,8 @@ class g {
    * @param endpoint - Endpoint-level metadata
    * @param parameters - Parameter metadata array
    */
-  constructor(e, r, n, s) {
-    this.name = e, this.api = r, this.endpoint = n, this.parameters = s;
+  constructor(e, r, n, a) {
+    this.name = e, this.api = r, this.endpoint = n, this.parameters = a;
   }
   /**
    * Gets the fetcher instance to use for this function.
@@ -273,7 +278,7 @@ class g {
     return l(this.endpoint.attributes, e);
   }
   resolveEndpointReturnType() {
-    return this.endpoint.returnType || this.api.returnType || b.RESULT;
+    return this.endpoint.returnType || this.api.returnType || P.RESULT;
   }
   /**
    * Resolves the request configuration from the method arguments.
@@ -322,41 +327,41 @@ class g {
    * ```
    */
   resolveExchangeInit(e) {
-    const r = {}, n = {}, s = {
+    const r = {}, n = {}, a = {
       ...this.api.headers,
       ...this.endpoint.headers
     };
-    let a, o, p, E = {};
+    let s, o, i, E = {};
     const R = this.resolveAttributes();
-    e.forEach((i, _) => {
-      if (i instanceof AbortSignal) {
-        o = i;
+    e.forEach((c, _) => {
+      if (c instanceof AbortSignal) {
+        o = c;
         return;
       }
-      if (i instanceof AbortController) {
-        p = i;
+      if (c instanceof AbortController) {
+        i = c;
         return;
       }
       const d = this.parameters.get(_);
       if (d)
         switch (d.type) {
-          case c.PATH:
-            this.processPathParam(d, i, r);
+          case u.PATH:
+            this.processPathParam(d, c, r);
             break;
-          case c.QUERY:
-            this.processQueryParam(d, i, n);
+          case u.QUERY:
+            this.processQueryParam(d, c, n);
             break;
-          case c.HEADER:
-            this.processHeaderParam(d, i, s);
+          case u.HEADER:
+            this.processHeaderParam(d, c, a);
             break;
-          case c.BODY:
-            a = i;
+          case u.BODY:
+            s = c;
             break;
-          case c.REQUEST:
-            E = this.processRequestParam(i);
+          case u.REQUEST:
+            E = this.processRequestParam(c);
             break;
-          case c.ATTRIBUTE:
-            this.processAttributeParam(d, i, R);
+          case u.ATTRIBUTE:
+            this.processAttributeParam(d, c, R);
             break;
         }
     });
@@ -366,17 +371,17 @@ class g {
     }, q = {
       method: this.endpoint.method,
       urlParams: y,
-      headers: s,
-      body: a,
+      headers: a,
+      body: s,
       timeout: this.resolveTimeout(),
       signal: o,
-      abortController: p
-    }, A = H(
+      abortController: i
+    }, x = H(
       q,
       E
     ), M = E.path;
-    return A.url = this.resolvePath(M), {
-      request: A,
+    return x.url = this.resolvePath(M), {
+      request: x,
       attributes: R
     };
   }
@@ -384,13 +389,13 @@ class g {
     if (r == null)
       return;
     if (typeof r == "object") {
-      Object.entries(r).forEach(([a, o]) => {
-        n[a] = o;
+      Object.entries(r).forEach(([s, o]) => {
+        n[s] = o;
       });
       return;
     }
-    const s = e.name || `param${e.index}`;
-    n[s] = r;
+    const a = e.name || `param${e.index}`;
+    n[a] = r;
   }
   processPathParam(e, r, n) {
     this.processHttpParam(e, r, n);
@@ -448,28 +453,28 @@ function W(t, e, r) {
   const n = t.prototype[e];
   if (e === "constructor" || typeof n != "function")
     return;
-  const s = Reflect.getMetadata(
-    x,
+  const a = Reflect.getMetadata(
+    T,
     t.prototype,
     e
   );
-  if (!s)
+  if (!a)
     return;
-  const a = Reflect.getMetadata(
-    P,
+  const s = Reflect.getMetadata(
+    b,
     t.prototype,
     e
   ) || /* @__PURE__ */ new Map(), o = new g(
     e,
     r,
-    s,
-    a
+    a,
+    s
   );
-  t.prototype[e] = async function(...p) {
+  t.prototype[e] = async function(...i) {
     return await X(
       this,
       o
-    ).execute(p);
+    ).execute(i);
   };
 }
 function X(t, e) {
@@ -478,15 +483,15 @@ function X(t, e) {
   let n = r.get(e.name);
   if (n)
     return n;
-  const s = t.apiMetadata, a = {
+  const a = t.apiMetadata, s = {
     ...e.api,
-    ...s
+    ...a
   };
   return n = new C(
     t,
     new g(
       e.name,
-      a,
+      s,
       e.endpoint,
       e.parameters
     )
@@ -498,8 +503,8 @@ function ht(t = "", e = {}) {
       basePath: t,
       ...e
     };
-    return Reflect.defineMetadata(K, n, r), Object.getOwnPropertyNames(r.prototype).forEach((s) => {
-      W(r, s, n);
+    return Reflect.defineMetadata(K, n, r), Object.getOwnPropertyNames(r.prototype).forEach((a) => {
+      W(r, a, n);
     }), r;
   };
 }
@@ -514,11 +519,11 @@ export {
   J as AutoGenerated,
   U as DECORATOR_METADATA_ATTRIBUTE_KEY,
   I as DECORATOR_TARGET_ATTRIBUTE_KEY,
-  x as ENDPOINT_METADATA_KEY,
-  b as EndpointReturnType,
+  T as ENDPOINT_METADATA_KEY,
+  P as EndpointReturnType,
   g as FunctionMetadata,
-  P as PARAMETER_METADATA_KEY,
-  c as ParameterType,
+  b as PARAMETER_METADATA_KEY,
+  u as ParameterType,
   C as RequestExecutor,
   ht as api,
   ut as attribute,
@@ -526,7 +531,7 @@ export {
   it as body,
   X as buildRequestExecutor,
   tt as del,
-  h as endpoint,
+  p as endpoint,
   z as get,
   Y as getParameterName,
   N as getParameterNames,
@@ -535,10 +540,10 @@ export {
   nt as options,
   f as parameter,
   et as patch,
-  st as path,
+  at as path,
   Z as post,
   F as put,
-  at as query,
+  st as query,
   ct as request
 };
 //# sourceMappingURL=index.es.js.map