@ahoo-wang/fetcher-generator 2.5.2 → 2.5.3

package/dist/index.js

@@ -1,40 +1,9 @@
+import { Scope as ae, VariableDeclarationKind as v, Project as ce } from "ts-morph";
 import { ContentTypeValues as S, combineURLs as w } from "@ahoo-wang/fetcher";
-import { VariableDeclarationKind as v, Scope as ae } from "ts-morph";
 import { ResourceAttributionPathSpec as j } from "@ahoo-wang/fetcher-wow";
 import { parse as B } from "yaml";
-import { readFile as ce } from "fs";
-import { join as ge, relative as le } from "path";
-function pe(r) {
-  const e = r.split(".");
-  return e.length != 2 || e[0].length === 0 || e[1].length === 0 ? null : e;
-}
-function ue(r) {
-  const e = pe(r.name);
-  return e ? {
-    tag: r,
-    contextAlias: e[0],
-    aggregateName: e[1]
-  } : null;
-}
-function me(r) {
-  const e = r?.map((n) => ue(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 de(r) {
-  if (!r)
-    return null;
-  const e = r.split(".");
-  return e.length != 3 ? null : e[2];
-}
+import { readFile as ge } from "fs";
+import { join as le, relative as pe } from "path";
 function $(r) {
   return r.$ref.split("/").pop();
 }
@@ -56,11 +25,11 @@ function T(r, e) {
     schema: R(r, e)
   };
 }
-const G = /[-_\s.]+/;
+const F = /[-_\s.]+/;
 function L(r) {
-  return Array.isArray(r) ? r.flatMap((e) => _(e.split(G))) : _(r.split(G));
+  return Array.isArray(r) ? r.flatMap((e) => G(e.split(F))) : G(r.split(F));
 }
-function _(r) {
+function G(r) {
   return r.flatMap((e) => {
     if (e.length === 0)
       return [];
@@ -83,58 +52,9 @@ function h(r) {
   const e = A(r);
   return e.charAt(0).toLowerCase() + e.slice(1);
 }
-function fe(r) {
+function ue(r) {
   return r === "" || Array.isArray(r) && r.length === 0 ? "" : L(r).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
 }
-function U(r) {
-  return r.startsWith("http://") || r.startsWith("https://") ? he(r) : ye(r);
-}
-async function he(r) {
-  return await (await fetch(r)).text();
-}
-function ye(r) {
-  return new Promise((e, t) => {
-    ce(r, "utf-8", (n, o) => {
-      n ? t(n) : e(o);
-    });
-  });
-}
-async function xe(r) {
-  const e = await U(r);
-  switch (J(e)) {
-    case "json":
-      return JSON.parse(e);
-    case "yaml":
-      return B(e);
-    default:
-      throw new Error(`Unsupported file format: ${r}`);
-  }
-}
-async function Ae(r) {
-  const e = await U(r);
-  switch (J(e)) {
-    case "json":
-      return JSON.parse(e);
-    case "yaml":
-      return B(e);
-    default:
-      throw new Error(`Unsupported file format: ${r}`);
-  }
-}
-function J(r) {
-  const e = r.trimStart();
-  if (e.startsWith("{") || e.startsWith("["))
-    return "json";
-  if (e.startsWith("-") || e.startsWith("%YAML"))
-    return "yaml";
-  try {
-    return JSON.parse(e), "json";
-  } catch {
-    if (e.length > 0)
-      return "yaml";
-  }
-  throw new Error("Unable to infer file format");
-}
 function l(r) {
   return !!(r && typeof r == "object" && "$ref" in r);
 }
@@ -142,16 +62,16 @@ function D(r, e) {
   if (e && !l(e) && e.content)
     return e.content[r]?.schema;
 }
-function V(r) {
+function U(r) {
   return D(S.APPLICATION_JSON, r);
 }
-function Ce(r) {
+function me(r) {
   return D(S.TEXT_EVENT_STREAM, r);
 }
-function Pe(r) {
+function de(r) {
   return D("*/*", r);
 }
-const $e = [
+const fe = [
   "string",
   "number",
   "integer",
@@ -159,33 +79,33 @@ const $e = [
   "null"
 ];
 function b(r) {
-  return Array.isArray(r) ? !0 : $e.includes(r);
+  return Array.isArray(r) ? !0 : fe.includes(r);
 }
 function O(r) {
   return r.type === "array";
 }
-function Te(r) {
+function he(r) {
   return Array.isArray(r.enum) && r.enum.length > 0;
 }
-function K(r) {
+function J(r) {
   return Array.isArray(r.anyOf) && r.anyOf.length > 0;
 }
-function H(r) {
+function V(r) {
   return Array.isArray(r.oneOf) && r.oneOf.length > 0;
 }
-function Ie(r) {
-  return K(r) || H(r);
+function ye(r) {
+  return J(r) || V(r);
 }
-function Se(r) {
+function xe(r) {
   return Array.isArray(r.allOf) && r.allOf.length > 0;
 }
-function F(r) {
-  return K(r) || H(r) || Se(r);
+function _(r) {
+  return J(r) || V(r) || xe(r);
 }
 function W(r) {
   return r.includes("|") || r.includes("&") ? `(${r})[]` : `${r}[]`;
 }
-function we(r) {
+function Ae(r) {
   return r.type !== "object" ? !1 : r.properties ? Object.keys(r.properties).length === 0 : !0;
 }
 function C(r) {
@@ -205,7 +125,7 @@ function C(r) {
       return "any";
   }
 }
-function Y(r) {
+function K(r) {
   return [
     { method: "get", operation: r.get },
     { method: "put", operation: r.put },
@@ -222,17 +142,66 @@ function q(r) {
 }
 function z(r) {
   const e = q(r);
-  return V(e);
+  return U(e);
 }
-function Re(r, e) {
+function Ce(r, e) {
   return r.parameters ? r.parameters.map((t) => l(t) ? Q(t, e) : t).filter((t) => t.in === "path") : [];
 }
-const Ee = "string";
+const Pe = "string";
+function H(r) {
+  return !r.schema || l(r.schema) || !r.schema.type || !b(r.schema.type) ? Pe : C(r.schema.type);
+}
+function Y(r) {
+  return r.startsWith("http://") || r.startsWith("https://") ? $e(r) : Te(r);
+}
+async function $e(r) {
+  return await (await fetch(r)).text();
+}
+function Te(r) {
+  return new Promise((e, t) => {
+    ge(r, "utf-8", (n, o) => {
+      n ? t(n) : e(o);
+    });
+  });
+}
+async function Ie(r) {
+  const e = await Y(r);
+  switch (X(e)) {
+    case "json":
+      return JSON.parse(e);
+    case "yaml":
+      return B(e);
+    default:
+      throw new Error(`Unsupported file format: ${r}`);
+  }
+}
+async function Se(r) {
+  const e = await Y(r);
+  switch (X(e)) {
+    case "json":
+      return JSON.parse(e);
+    case "yaml":
+      return B(e);
+    default:
+      throw new Error(`Unsupported file format: ${r}`);
+  }
+}
 function X(r) {
-  return !r.schema || l(r.schema) || !r.schema.type || !b(r.schema.type) ? Ee : C(r.schema.type);
+  const e = r.trimStart();
+  if (e.startsWith("{") || e.startsWith("["))
+    return "json";
+  if (e.startsWith("-") || e.startsWith("%YAML"))
+    return "yaml";
+  try {
+    return JSON.parse(e), "json";
+  } catch {
+    if (e.length > 0)
+      return "yaml";
+  }
+  throw new Error("Unable to infer file format");
 }
-const Z = "types.ts", ve = "@";
-function Oe(r) {
+const Z = "types.ts", we = "@";
+function Re(r) {
   return w(r.path, Z);
 }
 function ee(r, e, t) {
@@ -254,18 +223,18 @@ function E(r, e, t) {
   });
 }
 function f(r, e, t) {
-  if (t.path.startsWith(ve)) {
+  if (t.path.startsWith(we)) {
     E(r, t.path, [t.name]);
     return;
   }
-  const n = r.getDirectoryPath(), o = ge(e, t.path, Z);
-  let s = le(n, o);
+  const n = r.getDirectoryPath(), o = le(e, t.path, Z);
+  let s = pe(n, o);
   s = s.replace(/\.ts$/, ""), s.startsWith(".") || (s = "./" + s), E(r, s, [t.name]);
 }
 function I(r, e, t, n) {
   r.path !== n.path && f(e, t, n);
 }
-function Ne(r, e) {
+function Ee(r, e) {
   const t = [r, e].filter(
     (n) => n !== void 0 && n.length > 0
   );
@@ -273,19 +242,50 @@ function Ne(r, e) {
 `) : void 0;
 }
 function x(r, e, t) {
-  const n = Ne(e, t);
+  const n = Ee(e, t);
   n && r.addJsDoc({
     description: n
   });
 }
-const De = "#/components/responses/wow.CommandOk", be = "#/components/parameters/wow.id";
-class qe {
+function ve(r) {
+  const e = r.split(".");
+  return e.length != 2 || e[0].length === 0 || e[1].length === 0 ? null : e;
+}
+function Oe(r) {
+  const e = ve(r.name);
+  return e ? {
+    tag: r,
+    contextAlias: e[0],
+    aggregateName: e[1]
+  } : null;
+}
+function Ne(r) {
+  const e = r?.map((n) => Oe(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 De(r) {
+  if (!r)
+    return null;
+  const e = r.split(".");
+  return e.length != 3 ? null : e[2];
+}
+const be = "#/components/responses/wow.CommandOk", qe = "#/components/parameters/wow.id";
+class Me {
   /**
    * Creates a new AggregateResolver instance.
    * @param openAPI - The OpenAPI specification to resolve aggregates from
    */
   constructor(e) {
-    this.openAPI = e, this.aggregates = me(e.tags), this.build();
+    this.openAPI = e, this.aggregates = Ne(e.tags), this.build();
   }
   aggregates;
   /**
@@ -294,7 +294,7 @@ class qe {
    */
   build() {
     for (const [e, t] of Object.entries(this.openAPI.paths)) {
-      const n = Y(t);
+      const n = K(t);
       for (const o of n)
         this.commands(e, o), this.state(o.operation), this.events(o.operation), this.fields(o.operation);
     }
@@ -323,13 +323,13 @@ class qe {
     const n = t.operation;
     if (n.operationId === "wow.command.send")
       return;
-    const o = de(n.operationId);
+    const o = De(n.operationId);
     if (!o)
       return;
     const s = q(n);
-    if (!s || !l(s) || s.$ref !== De || !n.requestBody)
+    if (!s || !l(s) || s.$ref !== be || !n.requestBody)
       return;
-    const i = n.parameters ?? [], a = i.filter((m) => l(m) && m.$ref === be).at(0), c = i.filter(
+    const i = n.parameters ?? [], a = i.filter((m) => l(m) && m.$ref === qe).at(0), c = i.filter(
       (m) => !l(m) && m.in === "path"
     );
     if (a) {
@@ -432,7 +432,7 @@ class qe {
     });
   }
 }
-const P = "@ahoo-wang/fetcher-wow", Me = {
+const P = "@ahoo-wang/fetcher-wow", je = {
   "wow.command.CommandResult": "CommandResult",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
   "wow.api.BindingError": "BindingError",
@@ -464,7 +464,7 @@ const P = "@ahoo-wang/fetcher-wow", Me = {
 function d(r) {
   if (!r)
     return { name: "", path: "/" };
-  const e = Me[r];
+  const e = je[r];
   if (e)
     return { name: e, path: P };
   const t = r.split(".");
@@ -483,12 +483,12 @@ function y(r) {
   const e = $(r);
   return d(e);
 }
-class je {
+class Fe {
   constructor(e) {
     this.context = e;
   }
   getOrCreateSourceFile(e) {
-    const t = Oe(e);
+    const t = Re(e);
     return this.context.getOrCreateSourceFile(t);
   }
   /**
@@ -567,12 +567,12 @@ class je {
     s && x(s, t.title, t.description);
   }
   process(e, t, n) {
-    if (Te(n))
+    if (he(n))
       return t.addEnum({
         name: e.name,
         isExported: !0,
         members: n.enum.filter((s) => typeof s == "string" && s.length > 0).map((s) => ({
-          name: fe(s),
+          name: ue(s),
           initializer: `'${s}'`
         }))
       });
@@ -598,7 +598,7 @@ class je {
       e,
       n,
       o
-    ) : (F(n) && (n.anyOf || n.oneOf || n.allOf).forEach((i) => {
+    ) : (_(n) && (n.anyOf || n.oneOf || n.allOf).forEach((i) => {
       if (l(i)) {
         const a = y(i);
         I(
@@ -668,7 +668,7 @@ class je {
     }
     if (o.type && b(o.type))
       return C(o.type);
-    if (F(o))
+    if (_(o))
       return this.resolvePropertyCompositionType(
         e,
         t,
@@ -702,191 +702,455 @@ class je {
       }
       s.add(C(a.type ?? "string"));
     });
-    const i = Ie(n) ? "|" : "&";
+    const i = ye(n) ? "|" : "&";
     return Array.from(s).join(i);
   }
 }
-function Ge(r) {
+const Ge = "@ahoo-wang/fetcher-decorator", _e = [
+  "type ApiMetadata",
+  "type ApiMetadataCapable",
+  "api",
+  "post",
+  "put",
+  "patch",
+  "del",
+  "request",
+  "attribute",
+  "path",
+  "autoGeneratedError"
+], te = `{
+  headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
+  resultExtractor: JsonEventStreamResultExtractor,
+}`;
+function ne(r) {
+  E(r, Ge, _e);
+}
+function oe(r, e, t = []) {
+  return e.addClass({
+    name: r,
+    isExported: !0,
+    decorators: [
+      {
+        name: "api",
+        arguments: t
+      }
+    ]
+  });
+}
+function re(r, e) {
+  r.addImplements("ApiMetadataCapable"), r.addConstructor({
+    parameters: [
+      {
+        name: "apiMetadata",
+        type: "ApiMetadata",
+        hasQuestionToken: e === void 0,
+        scope: ae.Public,
+        isReadonly: !0,
+        initializer: e
+      }
+    ]
+  });
+}
+function We(r) {
   let e = 0, t = 0;
   return r.commands.forEach((n) => {
     n.path.startsWith(j.TENANT) && (e += 1), n.path.startsWith(j.OWNER) && (t += 1);
   }), e === 0 && t === 0 ? "ResourceAttributionPathSpec.NONE" : e > t ? "ResourceAttributionPathSpec.TENANT" : "ResourceAttributionPathSpec.OWNER";
 }
-function te(r, e, t, n) {
+function se(r, e, t, n) {
   const o = `${t.contextAlias}/${t.aggregateName}/${n}.ts`;
   return ee(r, e, o);
 }
-function _e(r, e) {
+function ze(r, e) {
   return `${A(r.aggregateName)}${e}`;
 }
 function N(r) {
   return r === "delete" ? "del" : r;
 }
-class Fe {
+class Be {
   /**
-   * Creates a new QueryClientGenerator instance.
-   * @param context - The generation context containing OpenAPI spec and project details
+   * Creates a new ApiClientGenerator instance.
+   * @param context - The generation context containing OpenAPI spec and configuration
    */
   constructor(e) {
-    this.context = e;
+    this.context = e, this.apiMetadataCtorInitializer = this.context.currentContextAlias ? `{basePath:'${this.context.currentContextAlias}'}` : void 0;
   }
+  defaultParameterRequestType = "ParameterRequest";
+  defaultReturnType = { type: "Promise<any>" };
+  apiMetadataCtorInitializer;
   /**
-   * Generates query client classes for all aggregates.
+   * Generates API client classes for all valid tags in the OpenAPI specification.
+   * Processes tags, groups operations, and creates client classes with methods.
    */
   generate() {
-    const e = Array.from(this.context.contextAggregates.values()).reduce(
-      (n, o) => n + o.size,
-      0
-    );
-    this.context.logger.info("--- Generating Query Clients ---"), this.context.logger.progress(
-      `Generating query clients for ${e} aggregates`
+    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(", ")}`
     );
-    let t = 0;
-    for (const [, n] of this.context.contextAggregates)
-      n.forEach((o) => {
-        t++, this.context.logger.progressWithCount(
-          t,
-          e,
-          `Processing query client for aggregate: ${o.aggregate.aggregateName}`
-        ), this.processQueryClient(o);
-      });
-    this.context.logger.success("Query client generation completed");
+    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");
   }
   /**
-   * Creates or retrieves a source file for client generation.
-   * @param aggregate - The aggregate metadata
-   * @param fileName - The name of the client file
-   * @returns The source file for the client
+   * Generates API client classes for each tag group.
+   * @param apiClientTags - Map of valid API client tags
+   * @param groupOperations - Map of operations grouped by tag
    */
-  createClientFilePath(e, t) {
-    return te(
-      this.context.project,
-      this.context.outputDir,
-      e,
-      t
+  generateApiClients(e, t) {
+    this.context.logger.info(
+      `Generating ${t.size} API client classes`
     );
+    let n = 0;
+    for (const [o, s] of t) {
+      n++, this.context.logger.progressWithCount(
+        n,
+        t.size,
+        `Generating API client for tag: ${o}`
+      );
+      const i = e.get(o);
+      this.generateApiClient(i, s);
+    }
   }
   /**
-   * Processes and generates query client classes for an aggregate.
-   * @param aggregate - The aggregate definition
-   */
-  processQueryClient(e) {
-    const t = this.createClientFilePath(
-      e.aggregate,
-      "queryClient"
+   * 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 = w(this.context.currentContextAlias, t)), t = w(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 = d(e.name);
+    this.context.logger.info(
+      `Generating API client class: ${n.name}ApiClient with ${t.size} operations`
+    );
+    const o = this.createApiClientFile(n);
+    ne(o);
+    const s = oe(
+      n.name + "ApiClient",
+      o
+    );
+    x(s, e.description), re(s, this.apiMetadataCtorInitializer), this.context.logger.info(
+      `Processing ${t.size} operations for ${n.name}ApiClient`
+    ), t.forEach((i) => {
+      this.processOperation(e, o, 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 o = n.length - 1; o >= 0; o--) {
+      const s = h(n.slice(o));
+      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 = k(
+      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 o = n.content["application/json"].schema;
+      if (l(o)) {
+        const s = y(o);
+        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) {
+    const o = Ce(n, this.context.openAPI.components).filter((a) => !this.context.isIgnoreApiClientPathParameters(
+      e.name,
+      a.name
+    ));
     this.context.logger.info(
-      `Processing query client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
-    ), this.context.logger.info(
-      `Adding imports from ${P}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
-    ), t.addImportDeclaration({
-      moduleSpecifier: P,
-      namedImports: [
-        "QueryClientFactory",
-        "QueryClientOptions",
-        "ResourceAttributionPathSpec"
+      `Found ${o.length} path parameters for operation ${n.operationId}`
+    );
+    const s = o.map((a) => {
+      const c = H(a);
+      return this.context.logger.info(
+        `Adding path parameter: ${a.name} (type: ${c})`
+      ), {
+        name: a.name,
+        type: c,
+        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: []
+        }
       ]
-    });
-    const n = "DEFAULT_QUERY_CLIENT_OPTIONS";
-    this.context.logger.info(
-      `Creating default query client options: ${n}`
-    ), t.addVariableStatement({
-      declarationKind: v.Const,
-      declarations: [
+    }), this.context.logger.info(
+      "Adding attributes parameter: Record<string, any>"
+    ), s.push({
+      name: "attributes",
+      hasQuestionToken: !0,
+      type: "Record<string, any>",
+      decorators: [
         {
-          name: n,
-          type: "QueryClientOptions",
-          initializer: `{
-        contextAlias: '${e.aggregate.contextAlias}',
-        aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${Ge(e)},
-      }`
+          name: "attribute",
+          arguments: []
         }
-      ],
-      isExported: !1
-    });
-    const o = [];
-    this.context.logger.info(
-      `Processing ${e.events.size} domain events for aggregate: ${e.aggregate.aggregateName}`
-    );
-    for (const u of e.events.values()) {
-      const p = d(u.schema.key);
+      ]
+    }), 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 event model: ${p.name} from path: ${p.path}`
-      ), f(t, this.context.outputDir, p), o.push(p);
+        `Adding import for response model: ${n.name} from ${n.path}`
+      ), f(e, this.context.outputDir, n);
+      const o = `Promise<${n.name}>`;
+      return this.context.logger.info(`Resolved reference return type: ${o}`), o;
     }
-    const s = "DOMAIN_EVENT_TYPES", i = o.map((u) => u.name).join(" | ");
+    if (!t.type)
+      return this.context.logger.info(
+        `Schema has no type, using default return type: ${this.defaultReturnType.type}`
+      ), this.defaultReturnType.type;
+    if (b(t.type)) {
+      const o = `Promise<${C(t.type)}>`;
+      return this.context.logger.info(`Resolved primitive return type: ${o}`), o;
+    }
+    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 = q(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 o = U(n);
+    if (o) {
+      const a = this.resolveSchemaReturnType(e, o);
+      return this.context.logger.info(
+        `Resolved JSON response return type for operation ${t.operationId}: ${a}`
+      ), {
+        stream: !1,
+        type: a
+      };
+    }
+    const s = me(n);
+    if (s) {
+      if (l(s)) {
+        const c = R(
+          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 = de(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, o) {
     this.context.logger.info(
-      `Creating domain event types union: ${s} = ${i}`
-    ), t.addTypeAlias({
-      name: s,
-      type: i
-    });
-    const a = `${h(e.aggregate.aggregateName)}QueryClientFactory`, c = d(e.state.key), g = d(e.fields.key);
+      `Processing operation: ${o.operation.operationId} (${o.method} ${o.path})`
+    );
+    const s = this.getMethodName(n, o.operation);
+    this.context.logger.info(`Generated method name: ${s}`);
+    const i = this.resolveParameters(
+      e,
+      t,
+      o.operation
+    ), a = this.resolveReturnType(t, o.operation), c = a.stream ? {
+      name: N(o.method),
+      arguments: [`'${o.path}'`, te]
+    } : {
+      name: N(o.method),
+      arguments: [`'${o.path}'`]
+    };
     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: a,
-          initializer: `new QueryClientFactory<${c.name}, ${g.name} | string, ${s}>(${n})`
-        }
-      ],
-      isExported: !0
-    }), this.context.logger.success(
-      `Query client generation completed for aggregate: ${e.aggregate.aggregateName}`
+      `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,
+      o.operation.summary,
+      o.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 [o, s] of Object.entries(this.context.openAPI.paths)) {
+      const i = K(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 ${o}: found ${i.length} valid operations`
+      );
+      for (const a of i)
+        a.operation.tags.forEach((c) => {
+          const g = {
+            ...a,
+            path: o
+          };
+          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((o) => {
+      o.name != "wow" && o.name != "Actuator" && !this.isAggregateTag(o) ? (e.set(o.name, o), n++, this.context.logger.info(`Included API client tag: ${o.name}`)) : this.context.logger.info(
+        `Excluded tag: ${o.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;
   }
 }
-const We = "@ahoo-wang/fetcher-decorator", ze = [
-  "type ApiMetadata",
-  "type ApiMetadataCapable",
-  "api",
-  "post",
-  "put",
-  "patch",
-  "del",
-  "request",
-  "attribute",
-  "path",
-  "autoGeneratedError"
-], ne = `{
-  headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
-  resultExtractor: JsonEventStreamResultExtractor,
-}`;
-function oe(r) {
-  E(r, We, ze);
-}
-function re(r, e, t = []) {
-  return e.addClass({
-    name: r,
-    isExported: !0,
-    decorators: [
-      {
-        name: "api",
-        arguments: t
-      }
-    ]
-  });
-}
-function se(r, e) {
-  r.addImplements("ApiMetadataCapable"), r.addConstructor({
-    parameters: [
-      {
-        name: "apiMetadata",
-        type: "ApiMetadata",
-        hasQuestionToken: e === void 0,
-        scope: ae.Public,
-        isReadonly: !0,
-        initializer: e
-      }
-    ]
-  });
-}
-class Be {
+class ke {
   /**
    * Creates a new CommandClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -926,7 +1190,7 @@ class Be {
     this.context.logger.info(
       `Processing command client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     );
-    const t = te(
+    const t = se(
       this.context.project,
       this.context.outputDir,
       e.aggregate,
@@ -969,7 +1233,7 @@ class Be {
       "Adding import from @ahoo-wang/fetcher: ContentTypeValues"
     ), E(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info(
       "Adding imports from @ahoo-wang/fetcher-decorator: ApiMetadata types and decorators"
-    ), oe(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(
+    ), ne(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}`
     );
   }
@@ -998,13 +1262,13 @@ class Be {
     let o = "CommandClient", s = [], i = "Promise<CommandResult>";
     n && (o = "Stream" + o, s = [
       "''",
-      ne
+      te
     ], i = "Promise<CommandResultEventStream>");
-    const a = _e(
+    const a = ze(
       t.aggregate,
       o
-    ), c = re(a, e, s);
-    se(c, this.defaultCommandClientOptionsName), t.commands.forEach((g) => {
+    ), c = oe(a, e, s);
+    re(c, this.defaultCommandClientOptionsName), t.commands.forEach((g) => {
       this.processCommandMethod(t, e, c, g, i);
     });
   }
@@ -1017,7 +1281,7 @@ class Be {
       e.name,
       i.name
     )).map((i) => {
-      const a = X(i);
+      const a = H(i);
       return this.context.logger.info(
         `Adding path parameter: ${i.name} (type: ${a})`
       ), {
@@ -1036,7 +1300,7 @@ class Be {
       `Adding command request parameter: commandRequest (type: CommandRequest<${o.name}>)`
     ), s.push({
       name: "commandRequest",
-      hasQuestionToken: we(n.schema.schema),
+      hasQuestionToken: Ae(n.schema.schema),
       type: `CommandRequest<${o.name}>`,
       decorators: [
         {
@@ -1072,409 +1336,145 @@ class Be {
           arguments: [`${this.getEndpointPath(o)}`]
         }
       ],
-      parameters: i,
-      returnType: s,
-      statements: [
-        `throw autoGeneratedError(${i.map((c) => c.name).join(",")});`
-      ]
-    });
-    (o.summary || o.description) && this.context.logger.info(
-      `Adding JSDoc documentation for method: ${h(o.name)}`
-    ), x(a, o.summary, o.description), this.context.logger.success(
-      `Command method generated: ${h(o.name)}`
-    );
-  }
-}
-class ke {
-  /**
-   * 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 [o, s] of t) {
-      n++, this.context.logger.progressWithCount(
-        n,
-        t.size,
-        `Generating API client for tag: ${o}`
-      );
-      const i = e.get(o);
-      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 = w(this.context.currentContextAlias, t)), t = w(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 = d(e.name);
-    this.context.logger.info(
-      `Generating API client class: ${n.name}ApiClient with ${t.size} operations`
-    );
-    const o = this.createApiClientFile(n);
-    oe(o);
-    const s = re(
-      n.name + "ApiClient",
-      o
-    );
-    x(s, e.description), se(s, this.apiMetadataCtorInitializer), this.context.logger.info(
-      `Processing ${t.size} operations for ${n.name}ApiClient`
-    ), t.forEach((i) => {
-      this.processOperation(e, o, 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 o = n.length - 1; o >= 0; o--) {
-      const s = h(n.slice(o));
-      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 = k(
-      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 o = n.content["application/json"].schema;
-      if (l(o)) {
-        const s = y(o);
-        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) {
-    const o = Re(n, this.context.openAPI.components).filter((a) => !this.context.isIgnoreApiClientPathParameters(
-      e.name,
-      a.name
-    ));
-    this.context.logger.info(
-      `Found ${o.length} path parameters for operation ${n.operationId}`
-    );
-    const s = o.map((a) => {
-      const c = X(a);
-      return this.context.logger.info(
-        `Adding path parameter: ${a.name} (type: ${c})`
-      ), {
-        name: a.name,
-        type: c,
-        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 o = `Promise<${n.name}>`;
-      return this.context.logger.info(`Resolved reference return type: ${o}`), o;
-    }
-    if (!t.type)
-      return this.context.logger.info(
-        `Schema has no type, using default return type: ${this.defaultReturnType.type}`
-      ), this.defaultReturnType.type;
-    if (b(t.type)) {
-      const o = `Promise<${C(t.type)}>`;
-      return this.context.logger.info(`Resolved primitive return type: ${o}`), o;
-    }
-    return this.context.logger.info(
-      `Using default return type: ${this.defaultReturnType.type}`
-    ), this.defaultReturnType.type;
+      parameters: i,
+      returnType: s,
+      statements: [
+        `throw autoGeneratedError(${i.map((c) => c.name).join(",")});`
+      ]
+    });
+    (o.summary || o.description) && this.context.logger.info(
+      `Adding JSDoc documentation for method: ${h(o.name)}`
+    ), x(a, o.summary, o.description), this.context.logger.success(
+      `Command method generated: ${h(o.name)}`
+    );
   }
+}
+class Qe {
   /**
-   * 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
+   * Creates a new QueryClientGenerator instance.
+   * @param context - The generation context containing OpenAPI spec and project details
    */
-  resolveReturnType(e, t) {
-    const n = q(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 o = V(n);
-    if (o) {
-      const a = this.resolveSchemaReturnType(e, o);
-      return this.context.logger.info(
-        `Resolved JSON response return type for operation ${t.operationId}: ${a}`
-      ), {
-        stream: !1,
-        type: a
-      };
-    }
-    const s = Ce(n);
-    if (s) {
-      if (l(s)) {
-        const c = R(
-          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 = Pe(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;
+  constructor(e) {
+    this.context = e;
   }
   /**
-   * 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
+   * Generates query client classes for all aggregates.
    */
-  processOperation(e, t, n, o) {
-    this.context.logger.info(
-      `Processing operation: ${o.operation.operationId} (${o.method} ${o.path})`
+  generate() {
+    const e = Array.from(this.context.contextAggregates.values()).reduce(
+      (n, o) => n + o.size,
+      0
     );
-    const s = this.getMethodName(n, o.operation);
-    this.context.logger.info(`Generated method name: ${s}`);
-    const i = this.resolveParameters(
+    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.context.contextAggregates)
+      n.forEach((o) => {
+        t++, this.context.logger.progressWithCount(
+          t,
+          e,
+          `Processing query client for aggregate: ${o.aggregate.aggregateName}`
+        ), this.processQueryClient(o);
+      });
+    this.context.logger.success("Query client generation completed");
+  }
+  /**
+   * Creates or retrieves a source file for client generation.
+   * @param aggregate - The aggregate metadata
+   * @param fileName - The name of the client file
+   * @returns The source file for the client
+   */
+  createClientFilePath(e, t) {
+    return se(
+      this.context.project,
+      this.context.outputDir,
       e,
-      t,
-      o.operation
-    ), a = this.resolveReturnType(t, o.operation), c = a.stream ? {
-      name: N(o.method),
-      arguments: [`'${o.path}'`, ne]
-    } : {
-      name: N(o.method),
-      arguments: [`'${o.path}'`]
-    };
-    this.context.logger.info(
-      `Creating method with ${i.length} parameters, return type: ${a.type}, stream: ${a.stream || !1}`
+      t
     );
-    const g = n.addMethod({
-      name: s,
-      decorators: [c],
-      parameters: i,
-      returnType: a.type,
-      statements: [
-        `throw autoGeneratedError(${i.map((u) => u.name).join(",")});`
-      ]
-    });
-    x(
-      g,
-      o.operation.summary,
-      o.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
+   * Processes and generates query client classes for an aggregate.
+   * @param aggregate - The aggregate definition
    */
-  groupOperations(e) {
-    this.context.logger.info("Grouping operations by API client tags");
-    const t = /* @__PURE__ */ new Map();
-    let n = 0;
-    for (const [o, s] of Object.entries(this.context.openAPI.paths)) {
-      const i = Y(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));
+  processQueryClient(e) {
+    const t = this.createClientFilePath(
+      e.aggregate,
+      "queryClient"
+    );
+    this.context.logger.info(
+      `Processing query client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
+    ), this.context.logger.info(
+      `Adding imports from ${P}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
+    ), t.addImportDeclaration({
+      moduleSpecifier: P,
+      namedImports: [
+        "QueryClientFactory",
+        "QueryClientOptions",
+        "ResourceAttributionPathSpec"
+      ]
+    });
+    const n = "DEFAULT_QUERY_CLIENT_OPTIONS";
+    this.context.logger.info(
+      `Creating default query client options: ${n}`
+    ), t.addVariableStatement({
+      declarationKind: v.Const,
+      declarations: [
+        {
+          name: n,
+          type: "QueryClientOptions",
+          initializer: `{
+        contextAlias: '${e.aggregate.contextAlias}',
+        aggregateName: '${e.aggregate.aggregateName}',
+        resourceAttribution: ${We(e)},
+      }`
         }
-      );
+      ],
+      isExported: !1
+    });
+    const o = [];
+    this.context.logger.info(
+      `Processing ${e.events.size} domain events for aggregate: ${e.aggregate.aggregateName}`
+    );
+    for (const u of e.events.values()) {
+      const p = d(u.schema.key);
       this.context.logger.info(
-        `Path ${o}: found ${i.length} valid operations`
-      );
-      for (const a of i)
-        a.operation.tags.forEach((c) => {
-          const g = {
-            ...a,
-            path: o
-          };
-          t.has(c) || t.set(c, /* @__PURE__ */ new Set()), t.get(c).add(g), n++;
-        });
+        `Adding import for event model: ${p.name} from path: ${p.path}`
+      ), f(t, this.context.outputDir, p), o.push(p);
     }
-    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() {
+    const s = "DOMAIN_EVENT_TYPES", i = o.map((u) => u.name).join(" | ");
     this.context.logger.info(
-      "Resolving API client tags from OpenAPI specification"
+      `Creating domain event types union: ${s} = ${i}`
+    ), t.addTypeAlias({
+      name: s,
+      type: i
+    });
+    const a = `${h(e.aggregate.aggregateName)}QueryClientFactory`, c = d(e.state.key), g = d(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: a,
+          initializer: `new QueryClientFactory<${c.name}, ${g.name} | string, ${s}>(${n})`
+        }
+      ],
+      isExported: !0
+    }), this.context.logger.success(
+      `Query client generation completed for aggregate: ${e.aggregate.aggregateName}`
     );
-    const e = /* @__PURE__ */ new Map(), t = this.context.openAPI.tags?.length || 0;
-    let n = 0;
-    return this.context.openAPI.tags?.forEach((o) => {
-      o.name != "wow" && o.name != "Actuator" && !this.isAggregateTag(o) ? (e.set(o.name, o), n++, this.context.logger.info(`Included API client tag: ${o.name}`)) : this.context.logger.info(
-        `Excluded tag: ${o.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 Qe {
+class Le {
   /**
    * Creates a new ClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    this.context = e, this.queryClientGenerator = new Fe(e), this.commandClientGenerator = new Be(e), this.apiClientGenerator = new ke(e);
+    this.context = e, this.queryClientGenerator = new Qe(e), this.commandClientGenerator = new ke(e), this.apiClientGenerator = new Be(e);
   }
   queryClientGenerator;
   commandClientGenerator;
@@ -1513,7 +1513,7 @@ class Qe {
     );
   }
 }
-class Le {
+class Ue {
   /** The ts-morph project instance used for code generation */
   project;
   /** The OpenAPI specification object */
@@ -1540,14 +1540,14 @@ class Le {
     return this.defaultIgnorePathParameters.includes(t);
   }
 }
-const Ue = "./fetcher-generator.config.json";
-class Ze {
+const Je = "./fetcher-generator.config.json";
+class et {
   /**
    * Creates a new CodeGenerator instance.
    * @param options - Configuration options for code generation
    */
   constructor(e) {
-    this.options = e, this.project = e.project, this.options.logger.info("CodeGenerator instance created");
+    this.options = e, this.project = new ce({ tsConfigFilePath: this.options.tsConfigFilePath }), this.options.logger.info("Project instance created with tsConfigFilePath: ", this.options.tsConfigFilePath);
   }
   project;
   /**
@@ -1559,20 +1559,20 @@ class Ze {
     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 xe(this.options.inputPath);
+    const e = await Ie(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
-    const n = new qe(e).resolve();
+    const n = new Me(e).resolve();
     this.options.logger.info(
       `Resolved ${n.size} bounded context aggregates`
     );
-    const o = this.options.configPath ?? Ue;
+    const o = this.options.configPath ?? Je;
     let s = {};
     try {
-      this.options.logger.info("Parsing configuration file:", o), s = await Ae(o);
+      this.options.logger.info("Parsing configuration file:", o), s = await Se(o);
     } catch (g) {
       this.options.logger.info("Configuration file parsing failed ", g);
     }
-    const i = new Le({
+    const i = new Ue({
       openAPI: e,
       project: this.project,
       outputDir: this.options.outputDir,
@@ -1580,7 +1580,7 @@ class Ze {
       logger: this.options.logger,
       config: s
     });
-    this.options.logger.info("Generating models"), new je(i).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new Qe(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");
+    this.options.logger.info("Generating models"), new Fe(i).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new Le(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.
@@ -1660,7 +1660,7 @@ class Ze {
   }
 }
 export {
-  Ze as CodeGenerator,
-  Ue as DEFAULT_CONFIG_PATH
+  et as CodeGenerator,
+  Je as DEFAULT_CONFIG_PATH
 };
 //# sourceMappingURL=index.js.map