@ahoo-wang/fetcher-decorator 1.9.8 → 2.0.0

package/dist/functionMetadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"functionMetadata.d.ts","sourceRoot":"","sources":["../src/functionMetadata.ts"],"names":[],"mappings":"AAaA,OAAO,EAEL,OAAO,EACP,KAAK,iBAAiB,EAKtB,YAAY,EAEZ,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACL,iBAAiB,EAGlB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE;;;;;;GAMG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IACnD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,GAAG,EAAE,WAAW,CAAC;IAEjB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAE3B;;;;;;;;;;OAUG;IACH,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAE3C;;;;;;;OAOG;gBAED,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,gBAAgB,EAC1B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAQ5C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;;;;OAKG;IACH,WAAW,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM;IAW3C;;;;;;;OAOG;IACH,cAAc,IAAI,MAAM,GAAG,SAAS;IAIpC,sBAAsB,IAAI,eAAe,CAAC,GAAG,CAAC;IAQ9C,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;IAKrC,yBAAyB,IAAI,kBAAkB;IAI/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6CG;IACH,mBAAmB,CACjB,IAAI,EAAE,GAAG,EAAE,GACV,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE,SAAS,GAAG,YAAY,CAAC,CAAC;IAwE9D,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,kBAAkB;IAQ1B;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,OAAO,CAAC,mBAAmB;IAc3B,OAAO,CAAC,qBAAqB;CAa9B"}
+{"version":3,"file":"functionMetadata.d.ts","sourceRoot":"","sources":["../src/functionMetadata.ts"],"names":[],"mappings":"AAaA,OAAO,EAEL,OAAO,EACP,KAAK,iBAAiB,EAKtB,YAAY,EAEZ,eAAe,EAEhB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EACL,iBAAiB,EAGlB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE;;;;;;GAMG;AACH,qBAAa,gBAAiB,YAAW,YAAY;IACnD;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,GAAG,EAAE,WAAW,CAAC;IAEjB;;OAEG;IACH,QAAQ,EAAE,gBAAgB,CAAC;IAE3B;;;;;;;;;;OAUG;IACH,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAE3C;;;;;;;OAOG;gBAED,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,WAAW,EAChB,QAAQ,EAAE,gBAAgB,EAC1B,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC;IAQ5C;;;;;;;OAOG;IACH,IAAI,OAAO,IAAI,OAAO,CAErB;IAED;;;;;OAKG;IACH,WAAW,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM;IAW3C;;;;;;;OAOG;IACH,cAAc,IAAI,MAAM,GAAG,SAAS;IAIpC,sBAAsB,IAAI,eAAe,CAAC,GAAG,CAAC;IAQ9C,iBAAiB,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC;IAKrC,yBAAyB,IAAI,kBAAkB;IAI/C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA6CG;IACH,mBAAmB,CACjB,IAAI,EAAE,GAAG,EAAE,GACV,QAAQ,CAAC,IAAI,CAAC,iBAAiB,EAAE,SAAS,GAAG,YAAY,CAAC,CAAC;IAwE9D,OAAO,CAAC,gBAAgB;IAgBxB,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,iBAAiB;IAQzB,OAAO,CAAC,kBAAkB;IAQ1B;;;;;;;;;;;;;;;;;;;;;;;OAuBG;IACH,OAAO,CAAC,mBAAmB;IAc3B,OAAO,CAAC,qBAAqB;CAa9B"}

package/dist/index.d.ts

@@ -6,5 +6,4 @@ export * from './parameterDecorator';
 export * from './reflection';
 export * from './requestExecutor';
 export * from './generated';
-export * from './resultExtractor';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,oBAAoB,CAAC;AACnC,cAAc,sBAAsB,CAAC;AACrC,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,aAAa,CAAC"}

package/dist/index.es.js

@@ -1,8 +1,7 @@
-import { HttpMethod as u, JsonResultExtractor as T, TextResultExtractor as _, ResponseResultExtractor as w, ExchangeResultExtractor as O, getFetcher as U, combineURLs as I, mergeRecordToMap as l, mergeRequest as S } from "@ahoo-wang/fetcher";
+import { HttpMethod as u, getFetcher as O, combineURLs as D, JsonResultExtractor as H, mergeRecordToMap as l, mergeRequest as w } from "@ahoo-wang/fetcher";
 import "reflect-metadata";
-import { JsonEventStreamResultExtractor as v, EventStreamResultExtractor as N } from "@ahoo-wang/fetcher-eventstream";
-const g = Symbol("endpoint:metadata");
-function p(t, e, r = {}) {
+const x = Symbol("endpoint:metadata");
+function h(t, e, r = {}) {
   return function(n, s) {
     const a = {
       method: t,
@@ -10,37 +9,37 @@ function p(t, e, r = {}) {
       ...r
     };
     Reflect.defineMetadata(
-      g,
+      x,
       a,
       n,
       s
     );
   };
 }
-function nt(t = "", e = {}) {
-  return p(u.GET, t, e);
+function z(t = "", e = {}) {
+  return h(u.GET, t, e);
 }
-function st(t = "", e = {}) {
-  return p(u.POST, t, e);
+function Z(t = "", e = {}) {
+  return h(u.POST, t, e);
 }
-function at(t = "", e = {}) {
-  return p(u.PUT, t, e);
+function F(t = "", e = {}) {
+  return h(u.PUT, t, e);
 }
-function ot(t = "", e = {}) {
-  return p(u.DELETE, t, e);
+function tt(t = "", e = {}) {
+  return h(u.DELETE, t, e);
 }
-function it(t = "", e = {}) {
-  return p(u.PATCH, t, e);
+function et(t = "", e = {}) {
+  return h(u.PATCH, t, e);
 }
-function ct(t = "", e = {}) {
-  return p(u.HEAD, t, e);
+function rt(t = "", e = {}) {
+  return h(u.HEAD, t, e);
 }
-function ut(t = "", e = {}) {
-  return p(u.OPTIONS, t, e);
+function nt(t = "", e = {}) {
+  return h(u.OPTIONS, t, e);
 }
-var x = /* @__PURE__ */ ((t) => (t.EXCHANGE = "Exchange", t.RESULT = "Result", t))(x || {});
-const C = "__decorator_target__";
-class Y {
+var b = /* @__PURE__ */ ((t) => (t.EXCHANGE = "Exchange", t.RESULT = "Result", t))(b || {});
+const I = "__decorator_target__", U = "__decorator_metadata__";
+class C {
   /**
    * Creates a new RequestExecutor instance.
    * @param target - The target object that the method is called on.
@@ -88,60 +87,60 @@ class Y {
      */
   async execute(e) {
     const r = this.metadata.fetcher, n = this.metadata.resolveExchangeInit(e);
-    n.attributes?.set(C, this.target);
+    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,
       attributes: n.attributes
     });
-    return a === x.EXCHANGE ? o : o.extractResult();
+    return a === b.EXCHANGE ? o : o.extractResult();
   }
 }
-const f = /* @__PURE__ */ new WeakMap();
-function k(t) {
+const m = /* @__PURE__ */ new WeakMap();
+function N(t) {
   if (typeof t != "function")
     throw new TypeError("Expected a function");
-  if (f.has(t))
-    return f.get(t);
+  if (m.has(t))
+    return m.get(t);
   try {
-    const e = t.toString().trim(), r = Q(e);
-    if (!L(r)) {
+    const e = t.toString().trim(), r = G(e);
+    if (!k(r)) {
       const s = [];
-      return f.set(t, s), s;
+      return m.set(t, s), s;
     }
-    const n = B(r);
-    return f.set(t, n), n;
+    const n = S(r);
+    return m.set(t, n), n;
   } catch {
     const e = [];
-    return f.set(t, e), e;
+    return m.set(t, e), e;
   }
 }
-function G(t, e, r, n) {
+function Y(t, e, r, n) {
   if (n)
     return n;
   try {
     const s = t[e];
     if (s && typeof s == "function") {
-      const a = k(s);
+      const a = N(s);
       if (r < a.length)
         return a[r];
     }
   } catch {
   }
 }
-function L(t) {
+function k(t) {
   return t != null && t.trim() !== "";
 }
-function Q(t) {
+function G(t) {
   if (t.startsWith("(")) {
-    const n = A(t, 0);
+    const n = T(t, 0);
     return n === -1 ? "" : t.substring(1, n);
   }
   const e = t.indexOf("(");
   if (e === -1) return "";
-  const r = A(t, e);
+  const r = T(t, e);
   return r === -1 ? "" : t.substring(e + 1, r);
 }
-function A(t, e) {
+function T(t, e) {
   let r = 1;
   for (let n = e + 1; n < t.length; n++) {
     const s = t[n];
@@ -152,83 +151,74 @@ function A(t, e) {
   }
   return -1;
 }
-function B(t) {
-  return t.split(",").map(j).filter(J).map(W);
+function S(t) {
+  return t.split(",").map(B).filter(Q).map(v);
 }
-function j(t) {
+function B(t) {
   return t.trim();
 }
-function J(t) {
+function Q(t) {
   return t.length > 0;
 }
-function W(t) {
-  let e = K(t);
-  return e = X(e), e.trim();
+function v(t) {
+  let e = j(t);
+  return e = L(e), e.trim();
 }
-function K(t) {
+function j(t) {
   const e = t.indexOf("=");
   return e !== -1 ? t.substring(0, e) : t;
 }
-function X(t) {
+function L(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 R = Symbol("parameter:metadata");
-function m(t, e = "") {
+const P = Symbol("parameter:metadata");
+function f(t, e = "") {
   return function(r, n, s) {
-    const a = G(
+    const a = Y(
       r,
       n,
       s,
       e
-    ), o = Reflect.getMetadata(R, r, n) || /* @__PURE__ */ new Map(), h = {
+    ), o = Reflect.getMetadata(P, r, n) || /* @__PURE__ */ new Map(), p = {
       type: t,
       name: a,
       index: s
     };
-    o.set(s, h), Reflect.defineMetadata(
-      R,
+    o.set(s, p), Reflect.defineMetadata(
+      P,
       o,
       r,
       n
     );
   };
 }
-function pt(t = "") {
-  return m("path", t);
+function st(t = "") {
+  return f("path", t);
 }
-function ht(t = "") {
-  return m("query", t);
+function at(t = "") {
+  return f("query", t);
 }
-function dt(t = "") {
-  return m("header", t);
+function ot(t = "") {
+  return f("header", t);
 }
-function mt() {
-  return m(
+function it() {
+  return f(
     "body"
     /* BODY */
   );
 }
-function ft() {
-  return m(
+function ct() {
+  return f(
     "request"
     /* REQUEST */
   );
 }
-function Et(t = "") {
-  return m("attribute", t);
-}
-const V = {
-  Exchange: O,
-  Response: w,
-  Json: T,
-  Text: _,
-  EventStream: N,
-  JsonEventStream: v,
-  DEFAULT: T
-};
-class y {
+function ut(t = "") {
+  return f("attribute", t);
+}
+class g {
   /**
    * Creates a new FunctionMetadata instance.
    *
@@ -249,7 +239,7 @@ class y {
    * @returns The fetcher instance
    */
   get fetcher() {
-    return U(this.endpoint.fetcher ?? this.api.fetcher);
+    return O(this.endpoint.fetcher ?? this.api.fetcher);
   }
   /**
    * Resolves the complete path by combining base path and endpoint path
@@ -259,7 +249,7 @@ class y {
    */
   resolvePath(e) {
     const r = this.endpoint.basePath || this.api.basePath || "", n = e || this.endpoint.path || "";
-    return I(r, n);
+    return D(r, n);
   }
   /**
    * Resolves the timeout for the request.
@@ -273,14 +263,14 @@ class y {
     return this.endpoint.timeout || this.api.timeout;
   }
   resolveResultExtractor() {
-    return this.endpoint.resultExtractor || this.api.resultExtractor || V.DEFAULT;
+    return this.endpoint.resultExtractor || this.api.resultExtractor || H;
   }
   resolveAttributes() {
     const e = l(this.api.attributes);
     return l(this.endpoint.attributes, e);
   }
   resolveEndpointReturnType() {
-    return this.endpoint.returnType || this.api.returnType || x.RESULT;
+    return this.endpoint.returnType || this.api.returnType || b.RESULT;
   }
   /**
    * Resolves the request configuration from the method arguments.
@@ -333,18 +323,18 @@ class y {
       ...this.api.headers,
       ...this.endpoint.headers
     };
-    let a, o, h, E = {};
-    const P = this.resolveAttributes();
-    e.forEach((i, H) => {
+    let a, o, p, E = {};
+    const R = this.resolveAttributes();
+    e.forEach((i, _) => {
       if (i instanceof AbortSignal) {
         o = i;
         return;
       }
       if (i instanceof AbortController) {
-        h = i;
+        p = i;
         return;
       }
-      const d = this.parameters.get(H);
+      const d = this.parameters.get(_);
       if (d)
         switch (d.type) {
           case c.PATH:
@@ -363,28 +353,28 @@ class y {
             E = this.processRequestParam(i);
             break;
           case c.ATTRIBUTE:
-            this.processAttributeParam(d, i, P);
+            this.processAttributeParam(d, i, R);
             break;
         }
     });
-    const q = {
+    const y = {
       path: r,
       query: n
-    }, M = {
+    }, q = {
       method: this.endpoint.method,
-      urlParams: q,
+      urlParams: y,
       headers: s,
       body: a,
       timeout: this.resolveTimeout(),
       signal: o,
-      abortController: h
-    }, b = S(
-      M,
+      abortController: p
+    }, A = w(
+      q,
       E
-    ), D = E.path;
-    return b.url = this.resolvePath(D), {
-      request: b,
-      attributes: P
+    ), M = E.path;
+    return A.url = this.resolvePath(M), {
+      request: A,
+      attributes: R
     };
   }
   processHttpParam(e, r, n) {
@@ -450,42 +440,42 @@ class y {
     e.name && r !== void 0 && n.set(e.name, r);
   }
 }
-const $ = Symbol("api:metadata");
-function z(t, e, r) {
+const K = Symbol("api:metadata");
+function W(t, e, r) {
   const n = t.prototype[e];
   if (e === "constructor" || typeof n != "function")
     return;
   const s = Reflect.getMetadata(
-    g,
+    x,
     t.prototype,
     e
   );
   if (!s)
     return;
   const a = Reflect.getMetadata(
-    R,
+    P,
     t.prototype,
     e
-  ) || /* @__PURE__ */ new Map(), o = new y(
+  ) || /* @__PURE__ */ new Map(), o = new g(
     e,
     r,
     s,
     a
   );
-  t.prototype[e] = function(...h) {
-    return F(this, o).execute(h);
+  t.prototype[e] = function(...p) {
+    return X(this, o).execute(p);
   };
 }
-function F(t, e) {
+function X(t, e) {
   let r = t.requestExecutors;
   r || (r = /* @__PURE__ */ new Map(), t.requestExecutors = r);
   let n = r.get(e.name);
   if (n)
     return n;
   const s = t.apiMetadata, a = { ...e.api, ...s };
-  return n = new Y(
+  return n = new C(
     t,
-    new y(
+    new g(
       e.name,
       a,
       e.endpoint,
@@ -493,53 +483,53 @@ function F(t, e) {
     )
   ), r.set(e.name, n), n;
 }
-function lt(t = "", e = {}) {
+function ht(t = "", e = {}) {
   return function(r) {
     const n = {
       basePath: t,
       ...e
     };
-    return Reflect.defineMetadata($, n, r), Object.getOwnPropertyNames(r.prototype).forEach((s) => {
-      z(r, s, n);
+    return Reflect.defineMetadata(K, n, r), Object.getOwnPropertyNames(r.prototype).forEach((s) => {
+      W(r, s, n);
     }), r;
   };
 }
-class Z extends Error {
+class J extends Error {
   constructor() {
     super("Implementation will be generated automatically."), this.name = "AutoGenerated";
   }
 }
-const Rt = (...t) => new Z();
+const pt = (...t) => new J();
 export {
-  $ as API_METADATA_KEY,
-  Z as AutoGenerated,
-  C as DECORATOR_TARGET_ATTRIBUTE_KEY,
-  g as ENDPOINT_METADATA_KEY,
-  x as EndpointReturnType,
-  y as FunctionMetadata,
-  R as PARAMETER_METADATA_KEY,
+  K as API_METADATA_KEY,
+  J as AutoGenerated,
+  U as DECORATOR_METADATA_ATTRIBUTE_KEY,
+  I as DECORATOR_TARGET_ATTRIBUTE_KEY,
+  x as ENDPOINT_METADATA_KEY,
+  b as EndpointReturnType,
+  g as FunctionMetadata,
+  P as PARAMETER_METADATA_KEY,
   c as ParameterType,
-  Y as RequestExecutor,
-  V as ResultExtractors,
-  lt as api,
-  Et as attribute,
-  Rt as autoGeneratedError,
-  mt as body,
-  F as buildRequestExecutor,
-  ot as del,
-  p as endpoint,
-  nt as get,
-  G as getParameterName,
-  k as getParameterNames,
-  ct as head,
-  dt as header,
-  ut as options,
-  m as parameter,
-  it as patch,
-  pt as path,
-  st as post,
-  at as put,
-  ht as query,
-  ft as request
+  C as RequestExecutor,
+  ht as api,
+  ut as attribute,
+  pt as autoGeneratedError,
+  it as body,
+  X as buildRequestExecutor,
+  tt as del,
+  h as endpoint,
+  z as get,
+  Y as getParameterName,
+  N as getParameterNames,
+  rt as head,
+  ot as header,
+  nt as options,
+  f as parameter,
+  et as patch,
+  st as path,
+  Z as post,
+  F as put,
+  at as query,
+  ct as request
 };
 //# sourceMappingURL=index.es.js.map