@ahoo-wang/fetcher-generator 2.3.6 → 2.5.0

package/dist/index.js

@@ -1,86 +1,127 @@
-import { VariableDeclarationKind as E, Scope as Q } from "ts-morph";
-import { parse as L } from "yaml";
-import { readFile as U } from "fs";
-import { ContentTypeValues as I, combineURLs as q } from "@ahoo-wang/fetcher";
-import { join as K, relative as J } from "path";
-import { ResourceAttributionPathSpec as v } from "@ahoo-wang/fetcher-wow";
-function f(o) {
+import { ContentTypeValues as I, combineURLs as S } from "@ahoo-wang/fetcher";
+import { VariableDeclarationKind as v, Scope as se } from "ts-morph";
+import { ResourceAttributionPathSpec as M } from "@ahoo-wang/fetcher-wow";
+import { parse as z } from "yaml";
+import { readFile as ie } from "fs";
+import { join as ae, relative as ce } from "path";
+function ge(o) {
+  const e = o.split(".");
+  return e.length != 2 || e[0].length === 0 || e[1].length === 0 ? null : e;
+}
+function le(o) {
+  const e = ge(o.name);
+  return e ? {
+    tag: o,
+    contextAlias: e[0],
+    aggregateName: e[1]
+  } : null;
+}
+function pe(o) {
+  const e = o?.map((n) => le(n)).filter((n) => n !== null);
+  if (!e)
+    return /* @__PURE__ */ new Map();
+  const t = /* @__PURE__ */ new Map();
+  return e.forEach((n) => {
+    t.set(n.tag.name, {
+      aggregate: n,
+      commands: /* @__PURE__ */ new Map(),
+      events: /* @__PURE__ */ new Map()
+    });
+  }), t;
+}
+function ue(o) {
+  if (!o)
+    return null;
+  const e = o.split(".");
+  return e.length != 3 ? null : e[2];
+}
+function $(o) {
   return o.$ref.split("/").pop();
 }
-function S(o, e) {
-  const t = f(o);
+function w(o, e) {
+  const t = $(o);
   return e.schemas?.[t];
 }
-function V(o, e) {
-  const t = f(o);
+function B(o, e) {
+  const t = $(o);
   return e.requestBodies?.[t];
 }
-function H(o, e) {
-  const t = f(o);
+function de(o, e) {
+  const t = $(o);
   return e.parameters?.[t];
 }
-function C(o, e) {
+function P(o, e) {
   return {
-    key: f(o),
-    schema: S(o, e)
+    key: $(o),
+    schema: w(o, e)
   };
 }
-const b = /[-_\s.]+/;
-function G(o) {
-  return Array.isArray(o) ? o.flatMap((e) => R(e.split(b))) : R(o.split(b));
+const j = /[-_\s.]+/;
+function k(o) {
+  return Array.isArray(o) ? o.flatMap((e) => G(e.split(j))) : G(o.split(j));
 }
-function R(o) {
+function G(o) {
   return o.flatMap((e) => {
     if (e.length === 0)
       return [];
     const t = [];
     let n = "";
     for (let r = 0; r < e.length; r++) {
-      const s = e[r], i = /[A-Z]/.test(s), c = r > 0 && /[a-z]/.test(e[r - 1]);
-      i && c && n ? (t.push(n), n = s) : n += s;
+      const s = e[r], i = /[A-Z]/.test(s), a = r > 0 && /[a-z]/.test(e[r - 1]);
+      i && a && n ? (t.push(n), n = s) : n += s;
     }
     return n && t.push(n), t;
   });
 }
-function $(o) {
-  return o === "" || o.length === 0 ? "" : G(o).filter((t) => t.length > 0).map((t) => {
-    if (t.length === 0) return "";
+function A(o) {
+  return o === "" || o.length === 0 ? "" : k(o).filter((t) => t.length > 0).map((t) => {
     const n = t.charAt(0), r = t.slice(1);
     return (/[a-zA-Z]/.test(n) ? n.toUpperCase() : n) + r.toLowerCase();
   }).join("");
 }
 function h(o) {
-  const e = $(o);
+  const e = A(o);
   return e.charAt(0).toLowerCase() + e.slice(1);
 }
-function Y(o) {
-  return o === "" || Array.isArray(o) && o.length === 0 ? "" : G(o).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
+function me(o) {
+  return o === "" || Array.isArray(o) && o.length === 0 ? "" : k(o).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
 }
-function X(o) {
-  return o.startsWith("http://") || o.startsWith("https://") ? Z(o) : ee(o);
+function Q(o) {
+  return o.startsWith("http://") || o.startsWith("https://") ? fe(o) : he(o);
 }
-async function Z(o) {
+async function fe(o) {
   return await (await fetch(o)).text();
 }
-function ee(o) {
+function he(o) {
   return new Promise((e, t) => {
-    U(o, "utf-8", (n, r) => {
+    ie(o, "utf-8", (n, r) => {
       n ? t(n) : e(r);
     });
   });
 }
-async function te(o) {
-  const e = await X(o);
-  switch (ne(e)) {
+async function ye(o) {
+  const e = await Q(o);
+  switch (L(e)) {
     case "json":
       return JSON.parse(e);
     case "yaml":
-      return L(e);
+      return z(e);
     default:
       throw new Error(`Unsupported file format: ${o}`);
   }
 }
-function ne(o) {
+async function xe(o) {
+  const e = await Q(o);
+  switch (L(e)) {
+    case "json":
+      return JSON.parse(e);
+    case "yaml":
+      return z(e);
+    default:
+      throw new Error(`Unsupported file format: ${o}`);
+  }
+}
+function L(o) {
   const e = o.trimStart();
   if (e.startsWith("{") || e.startsWith("["))
     return "json";
@@ -94,13 +135,23 @@ function ne(o) {
   }
   throw new Error("Unable to infer file format");
 }
-function g(o) {
+function l(o) {
   return !!(o && typeof o == "object" && "$ref" in o);
 }
-function oe(o) {
-  return !o || g(o) || !o.content ? void 0 : o.content[I.APPLICATION_JSON]?.schema;
+function D(o, e) {
+  if (e && !l(e) && e.content)
+    return e.content[o]?.schema;
+}
+function U(o) {
+  return D(I.APPLICATION_JSON, o);
+}
+function Ae(o) {
+  return D(I.TEXT_EVENT_STREAM, o);
+}
+function Ce(o) {
+  return D("*/*", o);
 }
-function re(o) {
+function J(o) {
   return [
     { method: "get", operation: o.get },
     { method: "put", operation: o.put },
@@ -112,53 +163,53 @@ function re(o) {
     { method: "trace", operation: o.trace }
   ].filter(({ operation: e }) => e !== void 0);
 }
-function F(o) {
+function b(o) {
   return o.responses[200];
 }
-function j(o) {
-  const e = F(o);
-  return oe(e);
+function F(o) {
+  const e = b(o);
+  return U(e);
 }
-const se = [
+const $e = [
   "string",
   "number",
   "integer",
   "boolean",
   "null"
 ];
-function ie(o) {
-  return Array.isArray(o) ? !0 : se.includes(o);
+function V(o) {
+  return Array.isArray(o) ? !0 : $e.includes(o);
 }
-function ae(o) {
+function O(o) {
   return o.type === "array";
 }
-function ce(o) {
+function Pe(o) {
   return Array.isArray(o.enum) && o.enum.length > 0;
 }
-function W(o) {
+function K(o) {
   return Array.isArray(o.anyOf) && o.anyOf.length > 0;
 }
-function _(o) {
+function H(o) {
   return Array.isArray(o.oneOf) && o.oneOf.length > 0;
 }
-function ge(o) {
-  return W(o) || _(o);
+function Te(o) {
+  return K(o) || H(o);
 }
-function le(o) {
+function Ie(o) {
   return Array.isArray(o.allOf) && o.allOf.length > 0;
 }
-function M(o) {
-  return W(o) || _(o) || le(o);
+function _(o) {
+  return K(o) || H(o) || Ie(o);
 }
-function pe(o) {
+function W(o) {
   return o.includes("|") || o.includes("&") ? `(${o})[]` : `${o}[]`;
 }
-function ue(o) {
+function Se(o) {
   return o.type !== "object" ? !1 : o.properties ? Object.keys(o.properties).length === 0 : !0;
 }
-function N(o) {
+function R(o) {
   if (Array.isArray(o))
-    return o.map((e) => N(e)).join(" | ");
+    return o.map((e) => R(e)).join(" | ");
   switch (o) {
     case "string":
       return "string";
@@ -173,17 +224,17 @@ function N(o) {
       return "any";
   }
 }
-const B = "types.ts", me = "@";
-function de(o) {
-  return q(o.path, B);
+const X = "types.ts", we = "@";
+function Re(o) {
+  return S(o.path, X);
 }
-function D(o, e, t) {
-  const n = q(e, t), r = o.getSourceFile(n);
+function Y(o, e, t) {
+  const n = S(e, t), r = o.getSourceFile(n);
   return r || o.createSourceFile(n, "", {
     overwrite: !0
   });
 }
-function w(o, e, t) {
+function E(o, e, t) {
   let n = o.getImportDeclaration(
     (r) => r.getModuleSpecifierValue() === e
   );
@@ -195,70 +246,39 @@ function w(o, e, t) {
     ) || n.addNamedImport(r);
   });
 }
-function y(o, e, t) {
-  if (t.path.startsWith(me)) {
-    w(o, t.path, [t.name]);
+function f(o, e, t) {
+  if (t.path.startsWith(we)) {
+    E(o, t.path, [t.name]);
     return;
   }
-  const n = o.getDirectoryPath(), r = K(e, t.path, B);
-  let s = J(n, r);
-  s = s.replace(/\.ts$/, ""), s.startsWith(".") || (s = "./" + s), w(o, s, [t.name]);
+  const n = o.getDirectoryPath(), r = ae(e, t.path, X);
+  let s = ce(n, r);
+  s = s.replace(/\.ts$/, ""), s.startsWith(".") || (s = "./" + s), E(o, s, [t.name]);
 }
-function O(o, e, t, n) {
-  o.path !== n.path && y(e, t, n);
+function T(o, e, t, n) {
+  o.path !== n.path && f(e, t, n);
 }
-function fe(o, e) {
+function Ee(o, e) {
   const t = [o, e].filter(
     (n) => n !== void 0 && n.length > 0
   );
   return t.length > 0 ? t.join(`
 `) : void 0;
 }
-function P(o, e, t) {
-  const n = fe(e, t);
+function x(o, e, t) {
+  const n = Ee(e, t);
   n && o.addJsDoc({
     description: n
   });
 }
-function he(o) {
-  const e = o.split(".");
-  return e.length != 2 || e[0].length === 0 || e[1].length === 0 ? null : e;
-}
-function ye(o) {
-  const e = he(o.name);
-  return e ? {
-    tag: o,
-    contextAlias: e[0],
-    aggregateName: e[1]
-  } : null;
-}
-function Ae(o) {
-  const e = o?.map((n) => ye(n)).filter((n) => n !== null);
-  if (!e)
-    return /* @__PURE__ */ new Map();
-  const t = /* @__PURE__ */ new Map();
-  return e.forEach((n) => {
-    t.set(n.tag.name, {
-      aggregate: n,
-      commands: /* @__PURE__ */ new Map(),
-      events: /* @__PURE__ */ new Map()
-    });
-  }), t;
-}
-function Ce(o) {
-  if (!o)
-    return null;
-  const e = o.split(".");
-  return e.length != 3 ? null : e[2];
-}
-const Pe = "#/components/responses/wow.CommandOk", we = "#/components/parameters/wow.id";
-class $e {
+const ve = "#/components/responses/wow.CommandOk", Oe = "#/components/parameters/wow.id";
+class Ne {
   /**
    * Creates a new AggregateResolver instance.
    * @param openAPI - The OpenAPI specification to resolve aggregates from
    */
   constructor(e) {
-    this.openAPI = e, this.aggregates = Ae(e.tags), this.build();
+    this.openAPI = e, this.aggregates = pe(e.tags), this.build();
   }
   aggregates;
   /**
@@ -267,7 +287,7 @@ class $e {
    */
   build() {
     for (const [e, t] of Object.entries(this.openAPI.paths)) {
-      const n = re(t);
+      const n = J(t);
       for (const r of n)
         this.commands(e, r), this.state(r.operation), this.events(r.operation), this.fields(r.operation);
     }
@@ -296,40 +316,40 @@ class $e {
     const n = t.operation;
     if (n.operationId === "wow.command.send")
       return;
-    const r = Ce(n.operationId);
+    const r = ue(n.operationId);
     if (!r)
       return;
-    const s = F(n);
-    if (!s || !g(s) || s.$ref !== Pe || !n.requestBody)
+    const s = b(n);
+    if (!s || !l(s) || s.$ref !== ve || !n.requestBody)
       return;
-    const i = n.parameters ?? [], c = i.filter((m) => g(m) && m.$ref === we).at(0), a = i.filter(
-      (m) => !g(m) && m.in === "path"
+    const i = n.parameters ?? [], a = i.filter((d) => l(d) && d.$ref === Oe).at(0), c = i.filter(
+      (d) => !l(d) && d.in === "path"
     );
-    if (c) {
-      const m = H(
-        c,
+    if (a) {
+      const d = de(
+        a,
         this.openAPI.components
       );
-      a.push(m);
+      c.push(d);
     }
-    const u = n.requestBody.content[I.APPLICATION_JSON].schema, l = C(
+    const u = n.requestBody.content[I.APPLICATION_JSON].schema, p = P(
       u,
       this.openAPI.components
     );
-    l.schema.title = l.schema.title || n.summary, l.schema.description = l.schema.description || n.description;
-    const k = {
+    p.schema.title = p.schema.title || n.summary, p.schema.description = p.schema.description || n.description;
+    const re = {
       name: r,
       method: t.method,
       path: e,
-      pathParameters: a,
+      pathParameters: c,
       summary: n.summary,
       description: n.description,
-      schema: l,
+      schema: p,
       operation: n
     };
-    n.tags?.forEach((m) => {
-      const T = this.aggregates.get(m);
-      T && T.commands.set(r, k);
+    n.tags?.forEach((d) => {
+      const q = this.aggregates.get(d);
+      q && q.commands.set(r, re);
     });
   }
   /**
@@ -339,10 +359,10 @@ class $e {
   state(e) {
     if (!e.operationId?.endsWith(".snapshot_state.single"))
       return;
-    const t = j(e);
-    if (!g(t))
+    const t = F(e);
+    if (!l(t))
       return;
-    const n = C(
+    const n = P(
       t,
       this.openAPI.components
     );
@@ -358,30 +378,30 @@ class $e {
   events(e) {
     if (!this.openAPI.components || !e.operationId?.endsWith(".event.list_query"))
       return;
-    const t = j(e);
-    if (g(t))
+    const t = F(e);
+    if (l(t))
       return;
     const n = t?.items;
-    if (!g(n))
+    if (!l(n))
       return;
-    const s = S(
+    const s = w(
       n,
       this.openAPI.components
     ).properties.body.items.anyOf.map((i) => {
-      const c = i.title, a = i.properties.name.const, p = i.properties.body, u = C(
-        p,
+      const a = i.title, c = i.properties.name.const, g = i.properties.body, u = P(
+        g,
         this.openAPI.components
       );
       return u.schema.title = u.schema.title || i.title, {
-        title: c,
-        name: a,
+        title: a,
+        name: c,
         schema: u
       };
     });
     e.tags?.forEach((i) => {
-      const c = this.aggregates.get(i);
-      c && s.forEach((a) => {
-        c.events.set(a.name, a);
+      const a = this.aggregates.get(i);
+      a && s.forEach((c) => {
+        a.events.set(c.name, c);
       });
     });
   }
@@ -392,20 +412,20 @@ class $e {
   fields(e) {
     if (!this.openAPI.components || !e.operationId?.endsWith(".snapshot.count"))
       return;
-    const n = V(
+    const n = B(
       e.requestBody,
       this.openAPI.components
-    ).content[I.APPLICATION_JSON].schema, s = S(
+    ).content[I.APPLICATION_JSON].schema, s = w(
       n,
       this.openAPI.components
-    ).properties?.field, i = C(s, this.openAPI.components);
-    e.tags?.forEach((c) => {
-      const a = this.aggregates.get(c);
-      a && (a.fields = i);
+    ).properties?.field, i = P(s, this.openAPI.components);
+    e.tags?.forEach((a) => {
+      const c = this.aggregates.get(a);
+      c && (c.fields = i);
     });
   }
 }
-const A = "@ahoo-wang/fetcher-wow", xe = {
+const C = "@ahoo-wang/fetcher-wow", De = {
   "wow.command.CommandResult": "CommandResult",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
   "wow.api.BindingError": "BindingError",
@@ -434,50 +454,35 @@ const A = "@ahoo-wang/fetcher-wow", xe = {
   "wow.openapi.BatchResult": "BatchResult",
   "wow.messaging.CompensationTarget": "CompensationTarget"
 };
-function d(o) {
+function m(o) {
   if (!o)
     return { name: "", path: "/" };
-  const e = xe[o];
+  const e = De[o];
   if (e)
-    return { name: e, path: A };
+    return { name: e, path: C };
   const t = o.split(".");
   let n = -1;
-  for (let a = 0; a < t.length; a++)
-    if (t[a] && /^[A-Z]/.test(t[a])) {
-      n = a;
+  for (let c = 0; c < t.length; c++)
+    if (t[c] && /^[A-Z]/.test(t[c])) {
+      n = c;
       break;
     }
   if (n === -1)
     return { name: o, path: "/" };
   const r = t.slice(0, n), s = r.length > 0 ? `/${r.join("/")}` : "/", i = t.slice(n);
-  return { name: $(i), path: s };
+  return { name: A(i), path: s };
 }
-class x {
-  /** The ts-morph project instance used for code generation */
-  project;
-  /** The OpenAPI specification object */
-  openAPI;
-  /** The output directory path for generated files */
-  outputDir;
-  /** Map of bounded context aggregates for domain modeling */
-  contextAggregates;
-  /** Optional logger for generation progress and errors */
-  logger;
-  /**
-   * Creates a new ClientGenerator instance.
-   * @param context - The generation context containing OpenAPI spec and project details
-   */
-  constructor(e) {
-    this.project = e.project, this.openAPI = e.openAPI, this.outputDir = e.outputDir, this.contextAggregates = e.contextAggregates, this.logger = e.logger;
-  }
+function y(o) {
+  const e = $(o);
+  return m(e);
 }
-class Oe extends x {
+class be {
   constructor(e) {
-    super(e);
+    this.context = e;
   }
   getOrCreateSourceFile(e) {
-    const t = de(e);
-    return D(this.project, this.outputDir, t);
+    const t = Re(e);
+    return this.context.getOrCreateSourceFile(t);
   }
   /**
    * Generates models for all schemas in the OpenAPI specification.
@@ -488,29 +493,53 @@ class Oe extends x {
    * and generates corresponding TypeScript models for each one.
    */
   generate() {
-    const e = this.openAPI.components?.schemas;
+    const e = this.context.openAPI.components?.schemas;
     if (!e) {
-      this.logger.info("No schemas found in OpenAPI specification");
+      this.context.logger.info("No schemas found in OpenAPI specification");
       return;
     }
-    const t = this.filterSchemas(e);
-    this.logger.progress(`Generating models for ${t.length} schemas`), t.forEach((n, r) => {
-      this.logger.progressWithCount(
-        r + 1,
-        t.length,
-        `Processing schema: ${n.key}`,
+    const t = this.stateAggregatedTypeNames(), n = this.filterSchemas(e, t);
+    this.context.logger.progress(`Generating models for ${n.length} schemas`), n.forEach((r, s) => {
+      this.context.logger.progressWithCount(
+        s + 1,
+        n.length,
+        `Processing schema: ${r.key}`,
         2
-      ), this.generateKeyedSchema(n);
-    }), this.logger.success("Model generation completed");
+      ), this.generateKeyedSchema(r);
+    }), this.context.logger.success("Model generation completed");
+  }
+  filterSchemas(e, t) {
+    return Object.entries(e).map(([n, r]) => ({
+      key: n,
+      schema: r
+    })).filter((n) => !this.isWowSchema(n.key, t));
   }
-  filterSchemas(e) {
-    return Object.entries(e).map(([t, n]) => ({
-      key: t,
-      schema: n
-    })).filter((t) => !this.isWowSchema(t.key));
+  isWowSchema(e, t) {
+    if (e.startsWith("wow.") || e.endsWith("AggregatedCondition") || e.endsWith("AggregatedDomainEventStream") || e.endsWith("AggregatedDomainEventStreamPagedList") || e.endsWith("AggregatedDomainEventStreamServerSentEventNonNullData") || e.endsWith("AggregatedListQuery") || e.endsWith("AggregatedPagedQuery") || e.endsWith("AggregatedSingleQuery"))
+      return !0;
+    const n = m(e);
+    return t.has(n.name);
   }
-  isWowSchema(e) {
-    return e.startsWith("wow.");
+  aggregatedSchemaSuffix = [
+    "MaterializedSnapshot",
+    "MaterializedSnapshotPagedList",
+    "MaterializedSnapshotServerSentEventNonNullData",
+    "PagedList",
+    "ServerSentEventNonNullData",
+    "Snapshot",
+    "StateEvent"
+  ];
+  stateAggregatedTypeNames() {
+    const e = /* @__PURE__ */ new Set();
+    for (const t of this.context.contextAggregates.values())
+      for (const n of t)
+        this.aggregatedSchemaSuffix.forEach(
+          (r) => {
+            const s = m(n.state.key), i = A(s.name) + r;
+            e.add(i);
+          }
+        );
+    return e;
   }
   /**
    * Generates a model for a specific schema key.
@@ -527,19 +556,32 @@ class Oe extends x {
    * 4. Type alias processing
    */
   generateKeyedSchema({ key: e, schema: t }) {
-    const n = d(e), r = this.getOrCreateSourceFile(n), s = this.process(n, r, t);
-    s && P(s, t.title, t.description);
+    const n = m(e), r = this.getOrCreateSourceFile(n), s = this.process(n, r, t);
+    s && x(s, t.title, t.description);
   }
   process(e, t, n) {
-    if (ce(n))
+    if (Pe(n))
       return t.addEnum({
         name: e.name,
         isExported: !0,
         members: n.enum.filter((s) => typeof s == "string" && s.length > 0).map((s) => ({
-          name: Y(s),
+          name: me(s),
           initializer: `'${s}'`
         }))
       });
+    if (O(n) && l(n.items)) {
+      const s = y(n.items);
+      return T(
+        e,
+        t,
+        this.context.outputDir,
+        s
+      ), t.addTypeAlias({
+        name: e.name,
+        type: W(s.name),
+        isExported: !0
+      });
+    }
     const r = t.addInterface({
       name: e.name,
       isExported: !0
@@ -549,17 +591,15 @@ class Oe extends x {
       e,
       n,
       r
-    ) : (M(n) && (n.anyOf || n.oneOf || n.allOf).forEach((i) => {
-      if (g(i)) {
-        const c = d(
-          f(i)
-        );
-        O(
+    ) : (_(n) && (n.anyOf || n.oneOf || n.allOf).forEach((i) => {
+      if (l(i)) {
+        const a = y(i);
+        T(
           e,
           t,
-          this.outputDir,
-          c
-        ), r.addExtends(c.name);
+          this.context.outputDir,
+          a
+        ), r.addExtends(a.name);
         return;
       }
       this.processInterface(
@@ -584,44 +624,44 @@ class Oe extends x {
   }
   processInterface(e, t, n, r) {
     for (const [s, i] of Object.entries(n.properties)) {
-      const c = this.resolvePropertyType(
+      const a = this.resolvePropertyType(
         t,
         e,
         s,
         i
       );
-      let a = r.getProperty(s);
-      a ? a.setType(c) : a = r.addProperty({
+      let c = r.getProperty(s);
+      c ? c.setType(a) : c = r.addProperty({
         name: s,
-        type: c
-      }), g(i) || P(a, i.title, i.description);
+        type: a
+      }), l(i) || x(c, i.title, i.description);
     }
     return r;
   }
   resolvePropertyType(e, t, n, r) {
-    if (g(r)) {
-      const s = d(f(r));
-      return O(
+    if (l(r)) {
+      const s = y(r);
+      return T(
         e,
         t,
-        this.outputDir,
+        this.context.outputDir,
         s
       ), s.name;
     }
     if (r.const)
       return `'${r.const}'`;
-    if (ae(r)) {
+    if (O(r)) {
       const s = this.resolvePropertyType(
         e,
         t,
         n,
         r.items
       );
-      return pe(s);
+      return W(s);
     }
-    if (r.type && ie(r.type))
-      return N(r.type);
-    if (M(r))
+    if (r.type && V(r.type))
+      return R(r.type);
+    if (_(r))
       return this.resolvePropertyCompositionType(
         e,
         t,
@@ -630,79 +670,80 @@ class Oe extends x {
     if (r.type === "object" && r.properties) {
       const s = {
         path: e.path,
-        name: `${e.name}${$(n)}`
+        name: `${e.name}${A(n)}`
       }, i = this.processObject(
         t,
         s,
         r
       );
-      return P(i, r.title, r.description), s.name;
+      return x(i, r.title, r.description), s.name;
     }
     return "any";
   }
   resolvePropertyCompositionType(e, t, n) {
     const r = n.anyOf || n.oneOf || n.allOf, s = /* @__PURE__ */ new Set();
-    r.forEach((c) => {
-      if (g(c)) {
-        const a = d(
-          f(c)
-        );
-        O(
+    r.forEach((a) => {
+      if (l(a)) {
+        const c = y(a);
+        T(
           e,
           t,
-          this.outputDir,
-          a
-        ), s.add(a.name);
+          this.context.outputDir,
+          c
+        ), s.add(c.name);
         return;
       }
-      s.add(N(c.type ?? "string"));
+      s.add(R(a.type ?? "string"));
     });
-    const i = ge(n) ? "|" : "&";
+    const i = Te(n) ? "|" : "&";
     return Array.from(s).join(i);
   }
 }
-function Ee(o) {
+function qe(o) {
   let e = 0, t = 0;
   return o.commands.forEach((n) => {
-    n.path.startsWith(v.TENANT) && (e += 1), n.path.startsWith(v.OWNER) && (t += 1);
+    n.path.startsWith(M.TENANT) && (e += 1), n.path.startsWith(M.OWNER) && (t += 1);
   }), e === 0 && t === 0 ? "ResourceAttributionPathSpec.NONE" : e > t ? "ResourceAttributionPathSpec.TENANT" : "ResourceAttributionPathSpec.OWNER";
 }
-function z(o, e, t, n) {
+function Z(o, e, t, n) {
   const r = `${t.contextAlias}/${t.aggregateName}/${n}.ts`;
-  return D(o, e, r);
+  return Y(o, e, r);
 }
-function Ie(o, e) {
-  return `${$(o.aggregateName)}${e}`;
+function Me(o, e) {
+  return `${A(o.aggregateName)}${e}`;
 }
-class Se extends x {
+function N(o) {
+  return o === "delete" ? "del" : o;
+}
+class je {
   /**
    * Creates a new QueryClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    super(e);
+    this.context = e;
   }
   /**
    * Generates query client classes for all aggregates.
    */
   generate() {
-    const e = Array.from(this.contextAggregates.values()).reduce(
+    const e = Array.from(this.context.contextAggregates.values()).reduce(
       (n, r) => n + r.size,
       0
     );
-    this.logger.info("--- Generating Query Clients ---"), this.logger.progress(
+    this.context.logger.info("--- Generating Query Clients ---"), this.context.logger.progress(
       `Generating query clients for ${e} aggregates`
     );
     let t = 0;
-    for (const [, n] of this.contextAggregates)
+    for (const [, n] of this.context.contextAggregates)
       n.forEach((r) => {
-        t++, this.logger.progressWithCount(
+        t++, this.context.logger.progressWithCount(
           t,
           e,
           `Processing query client for aggregate: ${r.aggregate.aggregateName}`
         ), this.processQueryClient(r);
       });
-    this.logger.success("Query client generation completed");
+    this.context.logger.success("Query client generation completed");
   }
   /**
    * Creates or retrieves a source file for client generation.
@@ -711,9 +752,9 @@ class Se extends x {
    * @returns The source file for the client
    */
   createClientFilePath(e, t) {
-    return z(
-      this.project,
-      this.outputDir,
+    return Z(
+      this.context.project,
+      this.context.outputDir,
       e,
       t
     );
@@ -727,12 +768,12 @@ class Se extends x {
       e.aggregate,
       "queryClient"
     );
-    this.logger.info(
+    this.context.logger.info(
       `Processing query client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
-    ), this.logger.info(
-      `Adding imports from ${A}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
+    ), this.context.logger.info(
+      `Adding imports from ${C}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
     ), t.addImportDeclaration({
-      moduleSpecifier: A,
+      moduleSpecifier: C,
       namedImports: [
         "QueryClientFactory",
         "QueryClientOptions",
@@ -740,10 +781,10 @@ class Se extends x {
       ]
     });
     const n = "DEFAULT_QUERY_CLIENT_OPTIONS";
-    this.logger.info(
+    this.context.logger.info(
       `Creating default query client options: ${n}`
     ), t.addVariableStatement({
-      declarationKind: E.Const,
+      declarationKind: v.Const,
       declarations: [
         {
           name: n,
@@ -751,100 +792,145 @@ class Se extends x {
           initializer: `{
         contextAlias: '${e.aggregate.contextAlias}',
         aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${Ee(e)},
+        resourceAttribution: ${qe(e)},
       }`
         }
       ],
       isExported: !1
     });
     const r = [];
-    this.logger.info(
+    this.context.logger.info(
       `Processing ${e.events.size} domain events for aggregate: ${e.aggregate.aggregateName}`
     );
     for (const u of e.events.values()) {
-      const l = d(u.schema.key);
-      this.logger.info(
-        `Adding import for event model: ${l.name} from path: ${l.path}`
-      ), y(t, this.outputDir, l), r.push(l);
+      const p = m(u.schema.key);
+      this.context.logger.info(
+        `Adding import for event model: ${p.name} from path: ${p.path}`
+      ), f(t, this.context.outputDir, p), r.push(p);
     }
     const s = "DOMAIN_EVENT_TYPES", i = r.map((u) => u.name).join(" | ");
-    this.logger.info(
+    this.context.logger.info(
       `Creating domain event types union: ${s} = ${i}`
     ), t.addTypeAlias({
       name: s,
       type: i
     });
-    const c = `${h(e.aggregate.aggregateName)}QueryClientFactory`, a = d(e.state.key), p = d(e.fields.key);
-    this.logger.info(
-      `Adding import for state model: ${a.name} from path: ${a.path}`
-    ), y(t, this.outputDir, a), this.logger.info(
-      `Adding import for fields model: ${p.name} from path: ${p.path}`
-    ), y(t, this.outputDir, p), this.logger.info(`Creating query client factory: ${c}`), t.addVariableStatement({
-      declarationKind: E.Const,
+    const a = `${h(e.aggregate.aggregateName)}QueryClientFactory`, c = m(e.state.key), g = m(e.fields.key);
+    this.context.logger.info(
+      `Adding import for state model: ${c.name} from path: ${c.path}`
+    ), f(t, this.context.outputDir, c), this.context.logger.info(
+      `Adding import for fields model: ${g.name} from path: ${g.path}`
+    ), f(t, this.context.outputDir, g), this.context.logger.info(`Creating query client factory: ${a}`), t.addVariableStatement({
+      declarationKind: v.Const,
       declarations: [
         {
-          name: c,
-          initializer: `new QueryClientFactory<${a.name}, ${p.name} | string, ${s}>(${n})`
+          name: a,
+          initializer: `new QueryClientFactory<${c.name}, ${g.name} | string, ${s}>(${n})`
         }
       ],
       isExported: !0
-    }), this.logger.success(
+    }), this.context.logger.success(
       `Query client generation completed for aggregate: ${e.aggregate.aggregateName}`
     );
   }
 }
-class Ne extends x {
-  commandEndpointPathsName = "COMMAND_ENDPOINT_PATHS";
-  defaultCommandClientOptionsName = "DEFAULT_COMMAND_CLIENT_OPTIONS";
+const Ge = "@ahoo-wang/fetcher-decorator", Fe = [
+  "type ApiMetadata",
+  "type ApiMetadataCapable",
+  "api",
+  "post",
+  "put",
+  "patch",
+  "del",
+  "request",
+  "attribute",
+  "path",
+  "autoGeneratedError"
+], ee = `{
+  headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
+  resultExtractor: JsonEventStreamResultExtractor,
+}`;
+function te(o) {
+  E(o, Ge, Fe);
+}
+function ne(o, e, t = []) {
+  return e.addClass({
+    name: o,
+    isExported: !0,
+    decorators: [
+      {
+        name: "api",
+        arguments: t
+      }
+    ]
+  });
+}
+function oe(o, e) {
+  o.addImplements("ApiMetadataCapable"), o.addConstructor({
+    parameters: [
+      {
+        name: "apiMetadata",
+        type: "ApiMetadata",
+        hasQuestionToken: e === void 0,
+        scope: se.Public,
+        isReadonly: !0,
+        initializer: e
+      }
+    ]
+  });
+}
+class _e {
   /**
    * Creates a new CommandClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    super(e);
+    this.context = e;
   }
+  commandEndpointPathsName = "COMMAND_ENDPOINT_PATHS";
+  defaultCommandClientOptionsName = "DEFAULT_COMMAND_CLIENT_OPTIONS";
   /**
    * Generates command client classes for all aggregates.
    */
   generate() {
-    const e = Array.from(this.contextAggregates.values()).reduce(
+    const e = Array.from(this.context.contextAggregates.values()).reduce(
       (n, r) => n + r.size,
       0
     );
-    this.logger.info("--- Generating Command Clients ---"), this.logger.progress(
+    this.context.logger.info("--- Generating Command Clients ---"), this.context.logger.progress(
       `Generating command clients for ${e} aggregates`
     );
     let t = 0;
-    for (const [, n] of this.contextAggregates)
+    for (const [, n] of this.context.contextAggregates)
       n.forEach((r) => {
-        t++, this.logger.progressWithCount(
+        t++, this.context.logger.progressWithCount(
           t,
           e,
           `Processing command client for aggregate: ${r.aggregate.aggregateName}`
         ), this.processAggregate(r);
       });
-    this.logger.success("Command client generation completed");
+    this.context.logger.success("Command client generation completed");
   }
   /**
    * Processes and generates command client for an aggregate.
    * @param aggregate - The aggregate definition
    */
   processAggregate(e) {
-    this.logger.info(
+    this.context.logger.info(
       `Processing command client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     );
-    const t = z(
-      this.project,
-      this.outputDir,
+    const t = Z(
+      this.context.project,
+      this.context.outputDir,
       e.aggregate,
       "commandClient"
     );
-    this.logger.info(
+    this.context.logger.info(
       `Processing command endpoint paths for ${e.commands.size} commands`
-    ), this.processCommandEndpointPaths(t, e), this.logger.info(
+    ), this.processCommandEndpointPaths(t, e), this.context.logger.info(
       `Creating default command client options: ${this.defaultCommandClientOptionsName}`
     ), t.addVariableStatement({
-      declarationKind: E.Const,
+      declarationKind: v.Const,
       declarations: [
         {
           name: this.defaultCommandClientOptionsName,
@@ -855,10 +941,10 @@ class Ne extends x {
         }
       ],
       isExported: !1
-    }), this.logger.info(
-      `Adding imports from ${A}: CommandRequest, CommandResult, CommandResultEventStream, DeleteAggregate, RecoverAggregate`
+    }), this.context.logger.info(
+      `Adding imports from ${C}: CommandRequest, CommandResult, CommandResultEventStream, DeleteAggregate, RecoverAggregate`
     ), t.addImportDeclaration({
-      moduleSpecifier: A,
+      moduleSpecifier: C,
       namedImports: [
         "CommandRequest",
         "CommandResult",
@@ -867,46 +953,34 @@ class Ne extends x {
         "RecoverAggregate"
       ],
       isTypeOnly: !0
-    }), this.logger.info(
+    }), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher-eventstream: JsonEventStreamResultExtractor"
     ), t.addImportDeclaration({
       moduleSpecifier: "@ahoo-wang/fetcher-eventstream",
       namedImports: ["JsonEventStreamResultExtractor"]
-    }), this.logger.info(
+    }), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher: ContentTypeValues"
-    ), w(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.logger.info(
+    ), E(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info(
       "Adding imports from @ahoo-wang/fetcher-decorator: ApiMetadata types and decorators"
-    ), w(t, "@ahoo-wang/fetcher-decorator", [
-      "type ApiMetadata",
-      "type ApiMetadataCapable",
-      "api",
-      "post",
-      "put",
-      "patch",
-      "del",
-      "request",
-      "attribute",
-      "path",
-      "autoGeneratedError"
-    ]), this.logger.info("Generating standard command client class"), this.processCommandClient(t, e), this.logger.info("Generating stream command client class"), this.processCommandClient(t, e, !0), this.logger.success(
+    ), te(t), this.context.logger.info("Generating standard command client class"), this.processCommandClient(t, e), this.context.logger.info("Generating stream command client class"), this.processCommandClient(t, e, !0), this.context.logger.success(
       `Command client generation completed for aggregate: ${e.aggregate.aggregateName}`
     );
   }
   processCommandEndpointPaths(e, t) {
-    this.logger.info(
+    this.context.logger.info(
       `Creating command endpoint paths enum: ${this.commandEndpointPathsName}`
     );
     const n = e.addEnum({
       name: this.commandEndpointPathsName
     });
     t.commands.forEach((r) => {
-      this.logger.info(
+      this.context.logger.info(
         `Adding command endpoint: ${r.name.toUpperCase()} = '${r.path}'`
       ), n.addMember({
         name: r.name.toUpperCase(),
         initializer: `'${r.path}'`
       });
-    }), this.logger.success(
+    }), this.context.logger.success(
       `Command endpoint paths enum created with ${t.commands.size} entries`
     );
   }
@@ -914,45 +988,18 @@ class Ne extends x {
     return `${this.commandEndpointPathsName}.${e.name.toUpperCase()}`;
   }
   processCommandClient(e, t, n = !1) {
-    let r = "CommandClient", s = {
-      name: "api",
-      arguments: []
-    }, i = "Promise<CommandResult>";
-    n && (r = "Stream" + r, s = {
-      name: "api",
-      arguments: [
-        "''",
-        `{
-  headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
-  resultExtractor: JsonEventStreamResultExtractor,
-}`
-      ]
-    }, i = "Promise<CommandResultEventStream>");
-    const c = Ie(
+    let r = "CommandClient", s = [], i = "Promise<CommandResult>";
+    n && (r = "Stream" + r, s = [
+      "''",
+      ee
+    ], i = "Promise<CommandResultEventStream>");
+    const a = Me(
       t.aggregate,
       r
-    ), a = e.addClass({
-      name: c,
-      isExported: !0,
-      decorators: [s],
-      implements: ["ApiMetadataCapable"]
+    ), c = ne(a, e, s);
+    oe(c, this.defaultCommandClientOptionsName), t.commands.forEach((g) => {
+      this.processCommandMethod(e, c, g, i);
     });
-    a.addConstructor({
-      parameters: [
-        {
-          name: "apiMetadata",
-          type: "ApiMetadata",
-          scope: Q.Public,
-          isReadonly: !0,
-          initializer: `${this.defaultCommandClientOptionsName}`
-        }
-      ]
-    }), t.commands.forEach((p) => {
-      this.processCommandMethod(e, a, p, i);
-    });
-  }
-  methodToDecorator(e) {
-    return e === "delete" ? "del" : e;
   }
   /**
    * Processes and generates a command method for the command client.
@@ -961,32 +1008,32 @@ class Ne extends x {
    * @param definition - The command definition
    */
   processCommandMethod(e, t, n, r) {
-    const s = d(n.schema.key);
-    this.logger.info(
+    const s = m(n.schema.key);
+    this.context.logger.info(
       `Adding import for command model: ${s.name} from path: ${s.path}`
-    ), y(e, this.outputDir, s), this.logger.info(
+    ), f(e, this.context.outputDir, s), this.context.logger.info(
       `Generating command method: ${h(n.name)} for command: ${n.name}`
-    ), this.logger.info(
+    ), this.context.logger.info(
       `Command method details: HTTP ${n.method}, path: ${n.path}, return type: ${r}`
     );
-    const i = n.pathParameters.map((a) => (this.logger.info(
-      `Adding path parameter: ${a.name} (type: string)`
+    const i = n.pathParameters.map((c) => (this.context.logger.info(
+      `Adding path parameter: ${c.name} (type: string)`
     ), {
-      name: a.name,
+      name: c.name,
       type: "string",
       hasQuestionToken: !1,
       decorators: [
         {
           name: "path",
-          arguments: [`'${a.name}'`]
+          arguments: [`'${c.name}'`]
         }
       ]
     }));
-    this.logger.info(
+    this.context.logger.info(
       `Adding command request parameter: commandRequest (type: CommandRequest<${s.name}>)`
     ), i.push({
       name: "commandRequest",
-      hasQuestionToken: ue(n.schema.schema),
+      hasQuestionToken: Se(n.schema.schema),
       type: `CommandRequest<${s.name}>`,
       decorators: [
         {
@@ -994,7 +1041,7 @@ class Ne extends x {
           arguments: []
         }
       ]
-    }), this.logger.info(
+    }), this.context.logger.info(
       "Adding attributes parameter: attributes (type: Record<string, any>)"
     ), i.push({
       name: "attributes",
@@ -1007,53 +1054,438 @@ class Ne extends x {
         }
       ]
     });
-    const c = t.addMethod({
+    const a = t.addMethod({
       name: h(n.name),
       decorators: [
         {
-          name: this.methodToDecorator(n.method),
+          name: N(n.method),
           arguments: [`${this.getEndpointPath(n)}`]
         }
       ],
       parameters: i,
       returnType: r,
       statements: [
-        `throw autoGeneratedError(${i.map((a) => a.name).join(",")});`
+        `throw autoGeneratedError(${i.map((c) => c.name).join(",")});`
       ]
     });
-    (n.summary || n.description) && this.logger.info(
+    (n.summary || n.description) && this.context.logger.info(
       `Adding JSDoc documentation for method: ${h(n.name)}`
-    ), P(c, n.summary, n.description), this.logger.success(
+    ), x(a, n.summary, n.description), this.context.logger.success(
       `Command method generated: ${h(n.name)}`
     );
   }
 }
-class De extends x {
-  queryClientGenerator;
-  commandClientGenerator;
+class We {
+  /**
+   * Creates a new ApiClientGenerator instance.
+   * @param context - The generation context containing OpenAPI spec and configuration
+   */
+  constructor(e) {
+    this.context = e, this.apiMetadataCtorInitializer = this.context.currentContextAlias ? `{basePath:'${this.context.currentContextAlias}'}` : void 0;
+  }
+  defaultParameterRequestType = "ParameterRequest";
+  defaultReturnType = { type: "Promise<any>" };
+  apiMetadataCtorInitializer;
+  /**
+   * Generates API client classes for all valid tags in the OpenAPI specification.
+   * Processes tags, groups operations, and creates client classes with methods.
+   */
+  generate() {
+    this.context.logger.info("Starting API client generation");
+    const e = this.resolveApiTags();
+    this.context.logger.info(
+      `Resolved ${e.size} API client tags: ${Array.from(e.keys()).join(", ")}`
+    );
+    const t = this.groupOperations(e);
+    this.context.logger.info(
+      `Grouped operations into ${t.size} tag groups`
+    ), this.generateApiClients(e, t), this.context.logger.success("API client generation completed");
+  }
+  /**
+   * Generates API client classes for each tag group.
+   * @param apiClientTags - Map of valid API client tags
+   * @param groupOperations - Map of operations grouped by tag
+   */
+  generateApiClients(e, t) {
+    this.context.logger.info(
+      `Generating ${t.size} API client classes`
+    );
+    let n = 0;
+    for (const [r, s] of t) {
+      n++, this.context.logger.progressWithCount(
+        n,
+        t.size,
+        `Generating API client for tag: ${r}`
+      );
+      const i = e.get(r);
+      this.generateApiClient(i, s);
+    }
+  }
+  /**
+   * Creates a new source file for the API client.
+   * @param modelInfo - The model information for the client
+   * @returns The created source file
+   */
+  createApiClientFile(e) {
+    let t = e.path;
+    return this.context.currentContextAlias && (t = S(this.context.currentContextAlias, t)), t = S(t, `${e.name}ApiClient.ts`), this.context.logger.info(`Creating API client file: ${t}`), this.context.getOrCreateSourceFile(t);
+  }
+  /**
+   * Generates a single API client class for the given tag and operations.
+   * @param tag - The OpenAPI tag for the client
+   * @param operations - Set of operations for this client
+   */
+  generateApiClient(e, t) {
+    const n = m(e.name);
+    this.context.logger.info(
+      `Generating API client class: ${n.name}ApiClient with ${t.size} operations`
+    );
+    const r = this.createApiClientFile(n);
+    te(r);
+    const s = ne(
+      n.name + "ApiClient",
+      r
+    );
+    x(s, e.description), oe(s, this.apiMetadataCtorInitializer), this.context.logger.info(
+      `Processing ${t.size} operations for ${n.name}ApiClient`
+    ), t.forEach((i) => {
+      this.processOperation(e, r, s, i);
+    }), this.context.logger.success(
+      `Completed API client: ${n.name}ApiClient`
+    );
+  }
+  /**
+   * Generates a unique method name for the operation.
+   * @param apiClientClass - The client class to check for existing methods
+   * @param operation - The operation to generate a name for
+   * @returns A unique camelCase method name
+   */
+  getMethodName(e, t) {
+    const n = t.operationId.split(".");
+    for (let r = n.length - 1; r >= 0; r--) {
+      const s = h(n.slice(r));
+      if (!e.getMethod(s))
+        return s;
+    }
+    return h(n);
+  }
+  /**
+   * Resolves the request type for an operation based on its request body.
+   * @param sourceFile - The source file to add imports to
+   * @param operation - The operation to resolve the request type for
+   * @returns The resolved request type string
+   */
+  resolveRequestType(e, t) {
+    if (!t.requestBody)
+      return this.context.logger.info(
+        `No request body found for operation ${t.operationId}, using default: ${this.defaultParameterRequestType}`
+      ), this.defaultParameterRequestType;
+    let n;
+    if (l(t.requestBody) ? (this.context.logger.info(
+      `Extracting request body from reference for operation: ${t.operationId}`
+    ), n = B(
+      t.requestBody,
+      this.context.openAPI.components
+    )) : n = t.requestBody, !n)
+      return this.context.logger.info(
+        `Request body extraction failed for operation ${t.operationId}, using default: ${this.defaultParameterRequestType}`
+      ), this.defaultParameterRequestType;
+    if (n.content["multipart/form-data"])
+      return this.context.logger.info(
+        `Detected multipart/form-data content for operation ${t.operationId}, using ParameterRequest<FormData>`
+      ), "ParameterRequest<FormData>";
+    if (n.content["application/json"]) {
+      const r = n.content["application/json"].schema;
+      if (l(r)) {
+        const s = y(r);
+        this.context.logger.info(
+          `Adding import for request body model: ${s.name} from ${s.path}`
+        ), f(e, this.context.outputDir, s);
+        const i = `ParameterRequest<${s.name}>`;
+        return this.context.logger.info(
+          `Resolved request type for operation ${t.operationId}: ${i}`
+        ), i;
+      }
+    }
+    return this.context.logger.info(
+      `Using default request type for operation ${t.operationId}: ${this.defaultParameterRequestType}`
+    ), this.defaultParameterRequestType;
+  }
+  /**
+   * Resolves method parameters for an operation.
+   * @param tag - The tag for parameter filtering
+   * @param sourceFile - The source file to add imports to
+   * @param operation - The operation to resolve parameters for
+   * @returns Array of parameter declarations
+   */
+  resolveParameters(e, t, n) {
+    if (!n.parameters)
+      return this.context.logger.info(
+        `No parameters found for operation ${n.operationId}`
+      ), [];
+    const r = n.parameters?.filter((a) => !l(a) && a.in === "path" && !this.context.isIgnoreApiClientPathParameters(
+      e.name,
+      a.name
+    )) ?? [];
+    this.context.logger.info(
+      `Found ${r.length} path parameters for operation ${n.operationId}`
+    );
+    const s = r.map((a) => (this.context.logger.info(
+      `Adding path parameter: ${a.name} (type: string)`
+    ), {
+      name: a.name,
+      type: "string",
+      hasQuestionToken: !1,
+      decorators: [
+        {
+          name: "path",
+          arguments: [`'${a.name}'`]
+        }
+      ]
+    })), i = this.resolveRequestType(t, n);
+    return this.context.logger.info(`Adding httpRequest parameter: ${i}`), s.push({
+      name: "httpRequest",
+      hasQuestionToken: i === this.defaultParameterRequestType,
+      type: `${i}`,
+      decorators: [
+        {
+          name: "request",
+          arguments: []
+        }
+      ]
+    }), this.context.logger.info(
+      "Adding attributes parameter: Record<string, any>"
+    ), s.push({
+      name: "attributes",
+      hasQuestionToken: !0,
+      type: "Record<string, any>",
+      decorators: [
+        {
+          name: "attribute",
+          arguments: []
+        }
+      ]
+    }), s;
+  }
+  /**
+   * Resolves the return type for a schema.
+   * @param sourceFile - The source file to add imports to
+   * @param schema - The schema to resolve the return type for
+   * @returns The resolved return type string
+   */
+  resolveSchemaReturnType(e, t) {
+    if (l(t)) {
+      const n = y(t);
+      this.context.logger.info(
+        `Adding import for response model: ${n.name} from ${n.path}`
+      ), f(e, this.context.outputDir, n);
+      const r = `Promise<${n.name}>`;
+      return this.context.logger.info(`Resolved reference return type: ${r}`), r;
+    }
+    if (!t.type)
+      return this.context.logger.info(
+        `Schema has no type, using default return type: ${this.defaultReturnType.type}`
+      ), this.defaultReturnType.type;
+    if (V(t.type)) {
+      const r = `Promise<${R(t.type)}>`;
+      return this.context.logger.info(`Resolved primitive return type: ${r}`), r;
+    }
+    return this.context.logger.info(
+      `Using default return type: ${this.defaultReturnType.type}`
+    ), this.defaultReturnType.type;
+  }
+  /**
+   * Resolves the return type for an operation based on its responses.
+   * @param sourceFile - The source file to add imports to
+   * @param operation - The operation to resolve the return type for
+   * @returns Object containing type and optional stream flag
+   */
+  resolveReturnType(e, t) {
+    const n = b(t);
+    if (!n)
+      return this.context.logger.info(
+        `No OK response found for operation ${t.operationId}, using default return type: ${this.defaultReturnType.type}`
+      ), this.defaultReturnType;
+    const r = U(n);
+    if (r) {
+      const a = this.resolveSchemaReturnType(e, r);
+      return this.context.logger.info(
+        `Resolved JSON response return type for operation ${t.operationId}: ${a}`
+      ), {
+        stream: !1,
+        type: a
+      };
+    }
+    const s = Ae(n);
+    if (s) {
+      if (l(s)) {
+        const c = w(
+          s,
+          this.context.openAPI.components
+        );
+        if (O(c) && l(c.items)) {
+          const g = y(c.items);
+          this.context.logger.info(
+            `Adding import for event stream model: ${g.name} from ${g.path}`
+          ), f(e, this.context.outputDir, g);
+          const p = `Promise<JsonServerSentEventStream<${g.name.includes("ServerSentEvent") ? `${g.name}['data']` : g.name}>>`;
+          return this.context.logger.info(
+            `Resolved event stream return type for operation ${t.operationId}: ${p}`
+          ), {
+            stream: !0,
+            type: p
+          };
+        }
+      }
+      const a = "Promise<JsonServerSentEventStream<any>>";
+      return this.context.logger.info(
+        `Resolved generic event stream return type for operation ${t.operationId}: ${a}`
+      ), { stream: !0, type: a };
+    }
+    const i = Ce(n);
+    if (i) {
+      const a = this.resolveSchemaReturnType(
+        e,
+        i
+      );
+      return this.context.logger.info(
+        `Resolved wildcard response return type for operation ${t.operationId}: ${a}`
+      ), { type: a };
+    }
+    return this.context.logger.info(
+      `Using default return type for operation ${t.operationId}: ${this.defaultReturnType.type}`
+    ), this.defaultReturnType;
+  }
+  /**
+   * Processes a single operation and adds it as a method to the client class.
+   * @param tag - The tag for parameter filtering
+   * @param sourceFile - The source file containing the client
+   * @param apiClientClass - The client class to add the method to
+   * @param operation - The operation to process
+   */
+  processOperation(e, t, n, r) {
+    this.context.logger.info(
+      `Processing operation: ${r.operation.operationId} (${r.method} ${r.path})`
+    );
+    const s = this.getMethodName(n, r.operation);
+    this.context.logger.info(`Generated method name: ${s}`);
+    const i = this.resolveParameters(
+      e,
+      t,
+      r.operation
+    ), a = this.resolveReturnType(t, r.operation), c = a.stream ? {
+      name: N(r.method),
+      arguments: [`'${r.path}'`, ee]
+    } : {
+      name: N(r.method),
+      arguments: [`'${r.path}'`]
+    };
+    this.context.logger.info(
+      `Creating method with ${i.length} parameters, return type: ${a.type}, stream: ${a.stream || !1}`
+    );
+    const g = n.addMethod({
+      name: s,
+      decorators: [c],
+      parameters: i,
+      returnType: a.type,
+      statements: [
+        `throw autoGeneratedError(${i.map((u) => u.name).join(",")});`
+      ]
+    });
+    x(
+      g,
+      r.operation.summary,
+      r.operation.description
+    ), this.context.logger.success(`Operation method generated: ${s}`);
+  }
+  /**
+   * Groups operations by their tags for client generation.
+   * @param apiClientTags - Map of valid API client tags
+   * @returns Map of operations grouped by tag name
+   */
+  groupOperations(e) {
+    this.context.logger.info("Grouping operations by API client tags");
+    const t = /* @__PURE__ */ new Map();
+    let n = 0;
+    for (const [r, s] of Object.entries(this.context.openAPI.paths)) {
+      const i = J(s).filter(
+        (a) => {
+          if (!a.operation.operationId)
+            return !1;
+          const c = a.operation.tags;
+          return !c || c.length == 0 ? !1 : c.every((g) => e.has(g));
+        }
+      );
+      this.context.logger.info(
+        `Path ${r}: found ${i.length} valid operations`
+      );
+      for (const a of i)
+        a.operation.tags.forEach((c) => {
+          const g = {
+            ...a,
+            path: r
+          };
+          t.has(c) || t.set(c, /* @__PURE__ */ new Set()), t.get(c).add(g), n++;
+        });
+    }
+    return this.context.logger.info(
+      `Grouped ${n} operations into ${t.size} tag groups`
+    ), t;
+  }
+  /**
+   * Resolves valid API client tags from the OpenAPI specification.
+   * Filters out system tags like 'wow' and 'Actuator' and aggregate tags.
+   * @returns Map of valid API client tags
+   */
+  resolveApiTags() {
+    this.context.logger.info(
+      "Resolving API client tags from OpenAPI specification"
+    );
+    const e = /* @__PURE__ */ new Map(), t = this.context.openAPI.tags?.length || 0;
+    let n = 0;
+    return this.context.openAPI.tags?.forEach((r) => {
+      r.name != "wow" && r.name != "Actuator" && !this.isAggregateTag(r) ? (e.set(r.name, r), n++, this.context.logger.info(`Included API client tag: ${r.name}`)) : this.context.logger.info(
+        `Excluded tag: ${r.name} (wow/Actuator/aggregate)`
+      );
+    }), this.context.logger.info(
+      `Resolved ${n} API client tags from ${t} total tags`
+    ), e;
+  }
+  isAggregateTag(e) {
+    for (const t of this.context.contextAggregates.values())
+      for (const n of t)
+        if (n.aggregate.tag.name === e.name)
+          return !0;
+    return !1;
+  }
+}
+class ze {
   /**
    * Creates a new ClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    super(e), this.queryClientGenerator = new Se(e), this.commandClientGenerator = new Ne(e);
+    this.context = e, this.queryClientGenerator = new je(e), this.commandClientGenerator = new _e(e), this.apiClientGenerator = new We(e);
   }
+  queryClientGenerator;
+  commandClientGenerator;
+  apiClientGenerator;
   /**
    * Generates client classes for all aggregates.
    */
   generate() {
-    this.logger.info("--- Generating Clients ---"), this.logger.progress(
-      `Generating clients for ${this.contextAggregates.size} bounded contexts`
+    this.context.logger.info("--- Generating Clients ---"), this.context.logger.progress(
+      `Generating clients for ${this.context.contextAggregates.size} bounded contexts`
     );
     let e = 0;
-    for (const [t] of this.contextAggregates)
-      e++, this.logger.progressWithCount(
+    for (const [t] of this.context.contextAggregates)
+      e++, this.context.logger.progressWithCount(
         e,
-        this.contextAggregates.size,
+        this.context.contextAggregates.size,
         `Processing bounded context: ${t}`,
         1
       ), this.processBoundedContext(t);
-    this.queryClientGenerator.generate(), this.commandClientGenerator.generate(), this.logger.success("Client generation completed");
+    this.queryClientGenerator.generate(), this.commandClientGenerator.generate(), this.apiClientGenerator.generate(), this.context.logger.success("Client generation completed");
   }
   /**
    * Processes a bounded context by creating a file with the context alias constant.
@@ -1061,18 +1493,43 @@ class De extends x {
    */
   processBoundedContext(e) {
     const t = `${e}/boundedContext.ts`;
-    this.logger.info(`Creating bounded context file: ${t}`);
-    const n = D(this.project, this.outputDir, t);
-    this.logger.info(
+    this.context.logger.info(`Creating bounded context file: ${t}`);
+    const n = this.context.getOrCreateSourceFile(t);
+    this.context.logger.info(
       `Adding bounded context alias constant: BOUNDED_CONTEXT_ALIAS = '${e}'`
     ), n.addStatements(
       `export const BOUNDED_CONTEXT_ALIAS = '${e}';`
-    ), this.logger.success(
+    ), this.context.logger.success(
       `Bounded context file created successfully: ${t}`
     );
   }
 }
-class qe {
+class Be {
+  /** The ts-morph project instance used for code generation */
+  project;
+  /** The OpenAPI specification object */
+  openAPI;
+  /** The output directory path for generated files */
+  outputDir;
+  /** Map of bounded context aggregates for domain modeling */
+  contextAggregates;
+  /** Optional logger for generation progress and errors */
+  logger;
+  config;
+  defaultIgnorePathParameters = ["tenantId", "ownerId"];
+  currentContextAlias;
+  constructor(e) {
+    this.project = e.project, this.openAPI = e.openAPI, this.outputDir = e.outputDir, this.contextAggregates = e.contextAggregates, this.logger = e.logger, this.config = e.config ?? {}, this.currentContextAlias = this.openAPI.info["x-wow-context-alias"];
+  }
+  getOrCreateSourceFile(e) {
+    return Y(this.project, this.outputDir, e);
+  }
+  isIgnoreApiClientPathParameters(e, t) {
+    return (this.config.apiClients?.[e]?.ignorePathParameters ?? this.defaultIgnorePathParameters).includes(t);
+  }
+}
+const ke = "./fetcher-generator.config.json";
+class He {
   /**
    * Creates a new CodeGenerator instance.
    * @param options - Configuration options for code generation
@@ -1090,20 +1547,28 @@ class qe {
     this.options.logger.info(
       "Starting code generation from OpenAPI specification"
     ), this.options.logger.info(`Input path: ${this.options.inputPath}`), this.options.logger.info(`Output directory: ${this.options.outputDir}`), this.options.logger.info("Parsing OpenAPI specification");
-    const e = await te(this.options.inputPath);
+    const e = await ye(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
-    const n = new $e(e).resolve();
+    const n = new Ne(e).resolve();
     this.options.logger.info(
       `Resolved ${n.size} bounded context aggregates`
     );
-    const r = {
+    const r = this.options.configPath ?? ke;
+    let s = {};
+    try {
+      this.options.logger.info("Parsing configuration file:", r), s = await xe(r);
+    } catch (g) {
+      this.options.logger.info("Configuration file parsing failed ", g);
+    }
+    const i = new Be({
       openAPI: e,
       project: this.project,
       outputDir: this.options.outputDir,
       contextAggregates: n,
-      logger: this.options.logger
-    };
-    this.options.logger.info("Generating models"), new Oe(r).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new De(r).generate(), this.options.logger.info("Clients generated successfully"), this.options.logger.info("Generating index files"), this.generateIndex(), this.options.logger.info("Index files generated successfully"), this.options.logger.info("Optimizing source files"), this.optimizeSourceFiles(), this.options.logger.info("Source files optimized successfully"), this.options.logger.info("Saving project to disk"), await this.project.save(), this.options.logger.info("Code generation completed successfully");
+      logger: this.options.logger,
+      config: s
+    });
+    this.options.logger.info("Generating models"), new be(i).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new ze(i).generate(), this.options.logger.info("Clients generated successfully"), this.options.logger.info("Generating index files"), this.generateIndex(), this.options.logger.info("Index files generated successfully"), this.options.logger.info("Optimizing source files"), this.optimizeSourceFiles(), this.options.logger.info("Source files optimized successfully"), this.options.logger.info("Saving project to disk"), await this.project.save(), this.options.logger.info("Code generation completed successfully");
   }
   /**
    * Generates index.ts files for all subdirectories in the output directory.
@@ -1137,7 +1602,7 @@ class qe {
     const t = e.getPath();
     this.options.logger.info(`Generating index for directory: ${t}`);
     const n = e.getSourceFiles().filter(
-      (c) => c.getBaseName().endsWith(".ts") && c.getBaseName() !== "index.ts"
+      (a) => a.getBaseName().endsWith(".ts") && a.getBaseName() !== "index.ts"
     ), r = e.getDirectories();
     if (this.options.logger.info(
       `Found ${n.length} TypeScript files and ${r.length} subdirectories in ${t}`
@@ -1151,20 +1616,20 @@ class qe {
     this.options.logger.info(`Creating/updating index file: ${s}`);
     const i = this.project.getSourceFile(s) || this.project.createSourceFile(s, "", { overwrite: !0 });
     i.removeText();
-    for (const c of n) {
-      const a = `./${c.getBaseNameWithoutExtension()}`;
-      this.options.logger.info(`Adding export for file: ${a}`), i.addExportDeclaration({
-        moduleSpecifier: a,
+    for (const a of n) {
+      const c = `./${a.getBaseNameWithoutExtension()}`;
+      this.options.logger.info(`Adding export for file: ${c}`), i.addExportDeclaration({
+        moduleSpecifier: c,
         isTypeOnly: !1,
         namedExports: []
       });
     }
-    for (const c of r) {
-      const a = `./${c.getBaseName()}`;
+    for (const a of r) {
+      const c = `./${a.getBaseName()}`;
       this.options.logger.info(
-        `Adding export for subdirectory: ${a}`
+        `Adding export for subdirectory: ${c}`
       ), i.addExportDeclaration({
-        moduleSpecifier: a,
+        moduleSpecifier: c,
         isTypeOnly: !1,
         namedExports: []
       });
@@ -1183,6 +1648,7 @@ class qe {
   }
 }
 export {
-  qe as CodeGenerator
+  He as CodeGenerator,
+  ke as DEFAULT_CONFIG_PATH
 };
 //# sourceMappingURL=index.js.map