@ahoo-wang/fetcher-generator 2.15.9 → 2.16.1

package/dist/index.js

@@ -1,36 +1,36 @@
-import { Scope as me, VariableDeclarationKind as O, Project as fe } from "ts-morph";
-import { ContentTypeValues as $, combineURLs as I } from "@ahoo-wang/fetcher";
+import { Scope as fe, VariableDeclarationKind as D, Project as he } from "ts-morph";
+import { ContentTypeValues as T, combineURLs as v } from "@ahoo-wang/fetcher";
 import { ResourceAttributionPathSpec as W } from "@ahoo-wang/fetcher-wow";
 import { parse as V } from "yaml";
-import { readFile as he } from "fs";
-import { join as ye, relative as xe } from "path";
-function A(n) {
+import { readFile as ye } from "fs";
+import { join as xe, relative as Ae } from "path";
+function C(n) {
   return n.$ref.split("/").pop();
 }
-function T(n, e) {
-  const t = A(n);
+function I(n, e) {
+  const t = C(n);
   return e.schemas?.[t];
 }
 function H(n, e) {
-  const t = A(n);
+  const t = C(n);
   return e.requestBodies?.[t];
 }
-function Y(n, e) {
-  const t = A(n);
+function K(n, e) {
+  const t = C(n);
   return e.parameters?.[t];
 }
-function C(n, e) {
+function P(n, e) {
   return {
-    key: A(n),
-    schema: T(n, e)
+    key: C(n),
+    schema: I(n, e)
   };
 }
-const Ae = /[-_\s.]+/;
-function N(n) {
-  return n.split(Ae);
+const Ce = /[-_\s.]+/;
+function O(n) {
+  return n.split(Ce);
 }
-function K(n) {
-  return Array.isArray(n) ? n.flatMap((e) => k(N(e))) : k(N(n));
+function Y(n) {
+  return Array.isArray(n) ? n.flatMap((e) => k(O(e))) : k(O(n));
 }
 function k(n) {
   return n.flatMap((e) => {
@@ -46,17 +46,17 @@ function k(n) {
   });
 }
 function S(n) {
-  return n === "" || n.length === 0 ? "" : K(n).filter((t) => t.length > 0).map((t) => {
+  return n === "" || n.length === 0 ? "" : Y(n).filter((t) => t.length > 0).map((t) => {
     const o = t.charAt(0), r = t.slice(1);
     return (/[a-zA-Z]/.test(o) ? o.toUpperCase() : o) + r.toLowerCase();
   }).join("");
 }
-function h(n) {
+function f(n) {
   const e = S(n);
   return e.charAt(0).toLowerCase() + e.slice(1);
 }
-function Ce(n) {
-  return n === "" || Array.isArray(n) && n.length === 0 ? "" : K(n).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
+function X(n) {
+  return n === "" || Array.isArray(n) && n.length === 0 ? "" : Y(n).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
 }
 function g(n) {
   return !!(n && typeof n == "object" && "$ref" in n);
@@ -65,58 +65,58 @@ function j(n, e) {
   if (e && !g(e) && e.content)
     return e.content[n]?.schema;
 }
-function X(n) {
-  return j($.APPLICATION_JSON, n);
+function Z(n) {
+  return j(T.APPLICATION_JSON, n);
 }
 function Pe(n) {
-  return j($.TEXT_EVENT_STREAM, n);
+  return j(T.TEXT_EVENT_STREAM, n);
 }
 function $e(n) {
   return j("*/*", n);
 }
-const Ie = [
+const Te = [
   "string",
   "number",
   "integer",
   "boolean",
   "null"
 ];
-function Z(n) {
-  return Array.isArray(n) ? !0 : Ie.includes(n);
+function ee(n) {
+  return Array.isArray(n) ? !0 : Te.includes(n);
 }
 function z(n) {
   return Array.isArray(n.enum) && n.enum.length > 0;
 }
-function R(n) {
+function w(n) {
   return n.type === "object" && !!n.properties;
 }
-function D(n) {
+function N(n) {
   return n.type === "array" && !!n.items;
 }
-function Te(n) {
+function ve(n) {
   return Array.isArray(n.anyOf) && n.anyOf.length > 0;
 }
-function ve(n) {
+function Ie(n) {
   return Array.isArray(n.oneOf) && n.oneOf.length > 0;
 }
-function M(n) {
+function b(n) {
   return Array.isArray(n.allOf) && n.allOf.length > 0;
 }
 function L(n) {
-  return Te(n) || ve(n) || M(n);
+  return ve(n) || Ie(n) || b(n);
 }
-function Se(n) {
+function Ee(n) {
   return n.includes("|") || n.includes("&") ? `(${n})[]` : `${n}[]`;
 }
-function Ee(n) {
+function Se(n) {
   return n.type === "object" && !n.properties && n.additionalProperties !== void 0;
 }
 function Re(n) {
   return n.type !== "object" ? !1 : n.properties ? Object.keys(n.properties).length === 0 : !0;
 }
-function E(n) {
+function R(n) {
   if (Array.isArray(n))
-    return n.map((e) => E(e)).join(" | ");
+    return n.map((e) => R(e)).join(" | ");
   switch (n) {
     case "string":
       return "string";
@@ -136,10 +136,10 @@ function we(n, e) {
     e.operation.operationId
   ) : n.path && e.path ? n.path.localeCompare(e.path) : n.method && e.method ? n.method.localeCompare(e.method) : 0;
 }
-function ee(n) {
+function te(n) {
   const e = [];
   for (const [t, o] of Object.entries(n))
-    te(o).forEach((r) => {
+    ne(o).forEach((r) => {
       e.push({
         method: r.method,
         operation: r.operation,
@@ -148,7 +148,7 @@ function ee(n) {
     });
   return e.sort(we);
 }
-function te(n) {
+function ne(n) {
   return [
     { method: "get", operation: n.get },
     { method: "put", operation: n.put },
@@ -160,36 +160,36 @@ function te(n) {
     { method: "trace", operation: n.trace }
   ].filter(({ operation: e }) => e !== void 0);
 }
-function _(n) {
+function G(n) {
   return n.responses[200];
 }
 function B(n) {
-  const e = _(n);
-  return X(e);
+  const e = G(n);
+  return Z(e);
 }
-function Oe(n, e) {
-  return n.parameters ? n.parameters.map((t) => g(t) ? Y(t, e) : t).filter((t) => t.in === "path") : [];
-}
-const Ne = "string";
-function ne(n) {
-  return !n.schema || g(n.schema) || !n.schema.type || !Z(n.schema.type) ? Ne : E(n.schema.type);
+function De(n, e) {
+  return n.parameters ? n.parameters.map((t) => g(t) ? K(t, e) : t).filter((t) => t.in === "path") : [];
 }
+const Oe = "string";
 function oe(n) {
-  return n.startsWith("http://") || n.startsWith("https://") ? De(n) : Me(n);
+  return !n.schema || g(n.schema) || !n.schema.type || !ee(n.schema.type) ? Oe : R(n.schema.type);
+}
+function re(n) {
+  return n.startsWith("http://") || n.startsWith("https://") ? Ne(n) : be(n);
 }
-async function De(n) {
+async function Ne(n) {
   return await (await fetch(n)).text();
 }
-function Me(n) {
+function be(n) {
   return new Promise((e, t) => {
-    he(n, "utf-8", (o, r) => {
+    ye(n, "utf-8", (o, r) => {
       o ? t(o) : e(r);
     });
   });
 }
-async function be(n) {
-  const e = await oe(n);
-  switch (re(e)) {
+async function Me(n) {
+  const e = await re(n);
+  switch (ie(e)) {
     case "json":
       return JSON.parse(e);
     case "yaml":
@@ -199,8 +199,8 @@ async function be(n) {
   }
 }
 async function qe(n) {
-  const e = await oe(n);
-  switch (re(e)) {
+  const e = await re(n);
+  switch (ie(e)) {
     case "json":
       return JSON.parse(e);
     case "yaml":
@@ -209,7 +209,7 @@ async function qe(n) {
       throw new Error(`Unsupported file format: ${n}`);
   }
 }
-function re(n) {
+function ie(n) {
   const e = n.trimStart();
   if (e.startsWith("{") || e.startsWith("["))
     return "json";
@@ -223,17 +223,17 @@ function re(n) {
   }
   throw new Error("Unable to infer file format");
 }
-const ie = "types.ts", Fe = "@";
+const se = "types.ts", Fe = "@";
 function je(n) {
-  return I(n.path, ie);
+  return v(n.path, se);
 }
-function se(n, e, t) {
-  const o = I(e, t), r = n.getSourceFile(o);
+function ae(n, e, t) {
+  const o = v(e, t), r = n.getSourceFile(o);
   return r || n.createSourceFile(o, "", {
     overwrite: !0
   });
 }
-function y(n, e, t) {
+function x(n, e, t) {
   let o = n.getImportDeclaration(
     (r) => r.getModuleSpecifierValue() === e
   );
@@ -245,19 +245,19 @@ function y(n, e, t) {
     ) || o.addNamedImport(r);
   });
 }
-function f(n, e, t) {
+function d(n, e, t) {
   if (t.path.startsWith(Fe)) {
-    y(n, t.path, [t.name]);
+    x(n, t.path, [t.name]);
     return;
   }
-  const o = n.getDirectoryPath(), r = ye(e, t.path, ie);
-  let i = xe(o, r);
-  i = i.replace(/\.ts$/, ""), i.startsWith(".") || (i = "./" + i), y(n, i, [t.name]);
+  const o = n.getDirectoryPath(), r = xe(e, t.path, se);
+  let i = Ae(o, r);
+  i = i.replace(/\.ts$/, ""), i.startsWith(".") || (i = "./" + i), x(n, i, [t.name]);
 }
-function _e(n, e, t, o) {
-  n.path !== o.path && f(e, t, o);
+function Ge(n, e, t, o) {
+  n.path !== o.path && d(e, t, o);
 }
-function ae(n, e = `
+function ce(n, e = `
 `) {
   if (!Array.isArray(n))
     return;
@@ -266,20 +266,20 @@ function ae(n, e = `
   );
   return t.length > 0 ? t.join(e) : void 0;
 }
-function v(n, e) {
-  const t = ae(e);
+function E(n, e) {
+  const t = ce(e);
   t && n.addJsDoc(t);
 }
-function ce(n, e) {
+function ge(n, e) {
   const t = [
     n.title,
     n.description
   ];
-  return e && t.push(`- key: ${e}`), n.format && t.push(`- format: ${n.format}`), U(t, n, "default"), U(t, n, "example"), Ge(t, n), We(t, n), ke(t, n), t;
+  return e && t.push(`- key: ${e}`), n.format && t.push(`- format: ${n.format}`), U(t, n, "default"), U(t, n, "example"), _e(t, n), We(t, n), ke(t, n), t;
 }
 function Q(n, e, t) {
-  const o = ce(e, t);
-  v(n, o);
+  const o = ge(e, t);
+  E(n, o);
 }
 function U(n, e, t) {
   const o = e[t];
@@ -291,7 +291,7 @@ function U(n, e, t) {
     n.push(`- ${t}: `), n.push("```json"), n.push(JSON.stringify(o)), n.push("```");
   }
 }
-function Ge(n, e) {
+function _e(n, e) {
   const t = ["- Numeric Constraints"];
   e.minimum !== void 0 && t.push(`  - minimum: ${e.minimum}`), e.maximum !== void 0 && t.push(`  - maximum: ${e.maximum}`), e.exclusiveMinimum !== void 0 && t.push(
     `  - exclusiveMinimum: ${e.exclusiveMinimum}`
@@ -353,7 +353,7 @@ class Ve {
    * @private
    */
   build() {
-    const e = ee(this.openAPI.paths);
+    const e = te(this.openAPI.paths);
     for (const t of e)
       this.commands(t.path, t), this.state(t.operation), this.events(t.operation), this.fields(t.operation);
   }
@@ -384,37 +384,37 @@ class Ve {
     const r = Qe(o.operationId);
     if (!r)
       return;
-    const i = _(o);
+    const i = G(o);
     if (!i || !g(i) || i.$ref !== Ue || !o.requestBody)
       return;
-    const s = o.parameters ?? [], a = s.filter((d) => g(d) && d.$ref === Je).at(0), c = s.filter(
-      (d) => !g(d) && d.in === "path"
+    const s = o.parameters ?? [], a = s.filter((u) => g(u) && u.$ref === Je).at(0), c = s.filter(
+      (u) => !g(u) && u.in === "path"
     );
     if (a) {
-      const d = Y(
+      const u = K(
         a,
         this.openAPI.components
       );
-      c.push(d);
+      c.push(u);
     }
-    const p = o.requestBody.content[$.APPLICATION_JSON].schema, l = C(
+    const p = o.requestBody.content[T.APPLICATION_JSON].schema, y = P(
       p,
       this.openAPI.components
     );
-    l.schema.title = l.schema.title || o.summary, l.schema.description = l.schema.description || o.description;
-    const de = {
+    y.schema.title = y.schema.title || o.summary, y.schema.description = y.schema.description || o.description;
+    const me = {
       name: r,
       method: t.method,
       path: e,
       pathParameters: c,
       summary: o.summary,
       description: o.description,
-      schema: l,
+      schema: y,
       operation: o
     };
-    o.tags?.forEach((d) => {
-      const G = this.aggregates.get(d);
-      G && G.commands.set(r, de);
+    o.tags?.forEach((u) => {
+      const _ = this.aggregates.get(u);
+      _ && _.commands.set(r, me);
     });
   }
   /**
@@ -427,7 +427,7 @@ class Ve {
     const t = B(e);
     if (!g(t))
       return;
-    const o = C(
+    const o = P(
       t,
       this.openAPI.components
     );
@@ -449,12 +449,12 @@ class Ve {
     const o = t?.items;
     if (!g(o))
       return;
-    const i = T(
+    const i = I(
       o,
       this.openAPI.components
     ).properties.body.items.anyOf.map((s) => {
-      const a = s.title, c = s.properties.name.const, u = s.properties.body, p = C(
-        u,
+      const a = s.title, c = s.properties.name.const, m = s.properties.body, p = P(
+        m,
         this.openAPI.components
       );
       return p.schema.title = p.schema.title || s.title, {
@@ -480,17 +480,17 @@ class Ve {
     const o = H(
       e.requestBody,
       this.openAPI.components
-    ).content[$.APPLICATION_JSON].schema, i = T(
+    ).content[T.APPLICATION_JSON].schema, i = I(
       o,
       this.openAPI.components
-    ).properties?.field, s = C(i, this.openAPI.components);
+    ).properties?.field, s = P(i, this.openAPI.components);
     e.tags?.forEach((a) => {
       const c = this.aggregates.get(a);
       c && (c.fields = s);
     });
   }
 }
-const x = "@ahoo-wang/fetcher-wow", He = {
+const A = "@ahoo-wang/fetcher-wow", He = {
   "wow.command.CommandResult": "CommandResult",
   "wow.command.CommandResultArray": "CommandResultArray",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
@@ -520,12 +520,12 @@ const x = "@ahoo-wang/fetcher-wow", He = {
   "wow.openapi.BatchResult": "BatchResult",
   "wow.messaging.CompensationTarget": "CompensationTarget"
 };
-function m(n) {
+function l(n) {
   if (!n)
     return { name: "", path: "/" };
   const e = He[n];
   if (e)
-    return { name: e, path: x };
+    return { name: e, path: A };
   const t = n.split(".");
   let o = -1;
   for (let c = 0; c < t.length; c++)
@@ -536,11 +536,11 @@ function m(n) {
   const r = t.slice(0, o), i = r.length > 0 ? `/${r.join("/")}` : "/", s = t.slice(o);
   return { name: S(s), path: i };
 }
-function P(n) {
-  const e = A(n);
-  return m(e);
+function $(n) {
+  const e = C(n);
+  return l(e);
 }
-class Ye {
+class Ke {
   constructor(e, t, o, r) {
     this.modelInfo = e, this.sourceFile = t, this.keySchema = o, this.outputDir = r;
   }
@@ -550,11 +550,11 @@ class Ye {
   }
   process() {
     const { schema: e } = this.keySchema;
-    return z(e) ? this.processEnum(e) : R(e) ? this.processInterface(e) : D(e) ? this.processArray(e) : M(e) ? this.processIntersection(e) : L(e) ? this.processComposition(e) : this.processTypeAlias(e);
+    return z(e) ? this.processEnum(e) : w(e) ? this.processInterface(e) : N(e) ? this.processArray(e) : b(e) ? this.processIntersection(e) : L(e) ? this.processComposition(e) : this.processTypeAlias(e);
   }
   resolveReference(e) {
-    const t = P(e);
-    return _e(
+    const t = $(e);
+    return Ge(
       this.modelInfo,
       this.sourceFile,
       this.outputDir,
@@ -571,7 +571,7 @@ class Ye {
     return Object.entries(t).map(([o, r]) => {
       const i = this.resolveType(r);
       if (!g(r)) {
-        const s = ce(r), a = ae(s, `
+        const s = ge(r), a = ce(s, `
  * `);
         if (a)
           return `
@@ -586,7 +586,7 @@ class Ye {
   }
   resolveObjectType(e) {
     const t = [];
-    if (R(e)) {
+    if (w(e)) {
       const r = this.resolvePropertyDefinitions(e);
       t.push(...r);
     }
@@ -602,28 +602,28 @@ class Ye {
   resolveType(e) {
     if (g(e))
       return this.resolveReference(e).name;
-    if (Ee(e))
+    if (Se(e))
       return `Record<string,${this.resolveMapValueType(e)}>`;
     if (e.const)
       return `'${e.const}'`;
     if (z(e))
       return e.enum.map((t) => `'${t}'`).join(" | ");
     if (L(e)) {
-      const o = (e.oneOf || e.anyOf || e.allOf || []).map((i) => this.resolveType(i)), r = M(e) ? " & " : " | ";
+      const o = (e.oneOf || e.anyOf || e.allOf || []).map((i) => this.resolveType(i)), r = b(e) ? " & " : " | ";
       return `(${o.join(r)})`;
     }
-    if (D(e)) {
+    if (N(e)) {
       const t = this.resolveType(e.items);
-      return Se(t);
+      return Ee(t);
     }
-    return e.type === "object" ? this.resolveObjectType(e) : e.type ? E(e.type) : "any";
+    return e.type === "object" ? this.resolveObjectType(e) : e.type ? R(e.type) : "any";
   }
   processEnum(e) {
     return this.sourceFile.addEnum({
       name: this.modelInfo.name,
       isExported: !0,
       members: e.enum.filter((t) => typeof t == "string" && t.length > 0).map((t) => ({
-        name: Ce(t),
+        name: X(t),
         initializer: `'${t}'`
       }))
     });
@@ -677,7 +677,7 @@ class Ye {
         t.addExtends(r);
         return;
       }
-      R(o) && Object.entries(o.properties).forEach(
+      w(o) && Object.entries(o.properties).forEach(
         ([r, i]) => {
           this.addPropertyToInterface(
             t,
@@ -696,7 +696,7 @@ class Ye {
     });
   }
 }
-class Ke {
+class Ye {
   constructor(e) {
     this.context = e;
   }
@@ -739,7 +739,7 @@ class Ke {
       return !1;
     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 o = m(e);
+    const o = l(e);
     return t.has(o.name);
   }
   aggregatedSchemaSuffix = [
@@ -753,14 +753,16 @@ class Ke {
   ];
   stateAggregatedTypeNames() {
     const e = /* @__PURE__ */ new Set();
-    for (const t of this.context.contextAggregates.values())
-      for (const o of t)
+    for (const [t, o] of this.context.contextAggregates) {
+      this.generateBoundedContext(t);
+      for (const r of o)
         this.aggregatedSchemaSuffix.forEach(
-          (r) => {
-            const i = m(o.state.key), s = S(i.name) + r;
-            e.add(s);
+          (i) => {
+            const s = l(r.state.key), a = S(s.name) + i;
+            e.add(a);
           }
         );
+    }
     return e;
   }
   /**
@@ -776,8 +778,16 @@ class Ke {
    * 4. Type alias processing
    */
   generateKeyedSchema(e) {
-    const t = m(e.key), o = this.getOrCreateSourceFile(t);
-    new Ye(t, o, e, this.context.outputDir).generate();
+    const t = l(e.key), o = this.getOrCreateSourceFile(t);
+    new Ke(t, o, e, this.context.outputDir).generate();
+  }
+  generateBoundedContext(e) {
+    const t = `${e}/boundedContext.ts`;
+    this.context.logger.info(`Creating bounded context file: ${t}`);
+    const o = this.context.getOrCreateSourceFile(t), r = X(e);
+    o.addStatements(
+      `export const ${r}_BOUNDED_CONTEXT_ALIAS = '${e}';`
+    );
   }
 }
 const Xe = "@ahoo-wang/fetcher-decorator", Ze = [
@@ -800,12 +810,12 @@ const Xe = "@ahoo-wang/fetcher-decorator", Ze = [
 }, J = {
   type: "Promise<string>",
   metadata: "{resultExtractor: ResultExtractors.Text }"
-}, b = `{
+}, M = `{
   headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
   resultExtractor: JsonEventStreamResultExtractor,
 }`;
-function ge(n) {
-  y(n, Xe, Ze);
+function pe(n) {
+  x(n, Xe, Ze);
 }
 function q(n, e, t = [], o = [], r) {
   return e.addClass({
@@ -821,14 +831,14 @@ function q(n, e, t = [], o = [], r) {
     ]
   });
 }
-function pe(n, e) {
+function ue(n, e) {
   n.addImplements("ApiMetadataCapable"), n.addConstructor({
     parameters: [
       {
         name: "apiMetadata",
         type: "ApiMetadata",
         hasQuestionToken: e === void 0,
-        scope: me.Public,
+        scope: fe.Public,
         isReadonly: !0,
         initializer: e
       }
@@ -836,8 +846,8 @@ function pe(n, e) {
   });
 }
 const tt = "@ahoo-wang/fetcher-eventstream";
-function ue(n) {
-  y(n, tt, [
+function le(n) {
+  x(n, tt, [
     "JsonEventStreamResultExtractor",
     "type JsonServerSentEventStream"
   ]);
@@ -848,11 +858,11 @@ function nt(n) {
     o.path.startsWith(W.TENANT) && (e += 1), o.path.startsWith(W.OWNER) && (t += 1);
   }), e === 0 && t === 0 ? "ResourceAttributionPathSpec.NONE" : e > t ? "ResourceAttributionPathSpec.TENANT" : "ResourceAttributionPathSpec.OWNER";
 }
-function le(n, e, t, o) {
+function de(n, e, t, o) {
   const r = `${t.contextAlias}/${t.aggregateName}/${o}.ts`;
-  return se(n, e, r);
+  return ae(n, e, r);
 }
-function w(n, e) {
+function h(n, e) {
   return `${S(n.aggregateName)}${e}`;
 }
 function F(n) {
@@ -865,13 +875,13 @@ function rt(n, e) {
     return t;
   if (!n.operationId)
     return;
-  const o = N(n.operationId);
+  const o = O(n.operationId);
   for (let r = o.length - 1; r >= 0; r--) {
-    const i = h(o.slice(r));
+    const i = f(o.slice(r));
     if (!e(i))
       return i;
   }
-  return h(o);
+  return f(o);
 }
 class it {
   /**
@@ -926,7 +936,7 @@ class it {
    */
   createApiClientFile(e) {
     let t = e.path;
-    return this.context.currentContextAlias && (t = I(this.context.currentContextAlias, t)), t = I(t, `${e.name}ApiClient.ts`), this.context.logger.info(`Creating API client file: ${t}`), this.context.getOrCreateSourceFile(t);
+    return this.context.currentContextAlias && (t = v(this.context.currentContextAlias, t)), t = v(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.
@@ -934,17 +944,17 @@ class it {
    * @param operations - Set of operations for this client
    */
   generateApiClient(e, t) {
-    const o = m(e.name);
+    const o = l(e.name);
     this.context.logger.info(
       `Generating API client class: ${o.name}ApiClient with ${t.size} operations`
     );
     const r = this.createApiClientFile(o);
-    ge(r), ue(r);
+    pe(r), le(r);
     const i = q(
       o.name + "ApiClient",
       r
     );
-    v(i, [e.description]), pe(i, this.apiMetadataCtorInitializer), this.context.logger.info(
+    E(i, [e.description]), ue(i, this.apiMetadataCtorInitializer), this.context.logger.info(
       `Processing ${t.size} operations for ${o.name}ApiClient`
     ), t.forEach((s) => {
       this.processOperation(e, r, i, s);
@@ -992,10 +1002,10 @@ class it {
     if (o.content["application/json"]) {
       const r = o.content["application/json"].schema;
       if (g(r)) {
-        const i = P(r);
+        const i = $(r);
         this.context.logger.info(
           `Adding import for request body model: ${i.name} from ${i.path}`
-        ), f(e, this.context.outputDir, i);
+        ), d(e, this.context.outputDir, i);
         const s = `ParameterRequest<${i.name}>`;
         return this.context.logger.info(
           `Resolved request type for operation ${t.operationId}: ${s}`
@@ -1014,7 +1024,7 @@ class it {
    * @returns Array of parameter declarations
    */
   resolveParameters(e, t, o) {
-    const r = Oe(o, this.context.openAPI.components).filter((a) => !this.context.isIgnoreApiClientPathParameters(
+    const r = De(o, this.context.openAPI.components).filter((a) => !this.context.isIgnoreApiClientPathParameters(
       e.name,
       a.name
     ));
@@ -1022,7 +1032,7 @@ class it {
       `Found ${r.length} path parameters for operation ${o.operationId}`
     );
     const i = r.map((a) => {
-      const c = ne(a);
+      const c = oe(a);
       return this.context.logger.info(
         `Adding path parameter: ${a.name} (type: ${c})`
       ), {
@@ -1070,10 +1080,10 @@ class it {
   resolveSchemaReturnType(e, t) {
     const o = "Promise<any>";
     if (g(t)) {
-      const r = P(t);
+      const r = $(t);
       this.context.logger.info(
         `Adding import for response model: ${r.name} from ${r.path}`
-      ), f(e, this.context.outputDir, r);
+      ), d(e, this.context.outputDir, r);
       const i = `Promise<${r.name}>`;
       return this.context.logger.info(`Resolved reference return type: ${i}`), i;
     }
@@ -1081,8 +1091,8 @@ class it {
       return this.context.logger.info(
         `Schema has no type, using default return type: ${o}`
       ), o;
-    if (Z(t.type)) {
-      const i = `Promise<${E(t.type)}>`;
+    if (ee(t.type)) {
+      const i = `Promise<${R(t.type)}>`;
       return this.context.logger.info(`Resolved primitive return type: ${i}`), i;
     }
     return this.context.logger.info(
@@ -1096,12 +1106,12 @@ class it {
    * @returns Object containing type and optional stream flag
    */
   resolveReturnType(e, t) {
-    const o = _(t);
+    const o = G(t);
     if (!o)
       return this.context.logger.info(
         `No OK response found for operation ${t.operationId}, using default return type: ${this.defaultReturnType.type}`
       ), this.defaultReturnType;
-    const r = X(o) || $e(o);
+    const r = Z(o) || $e(o);
     if (r) {
       const s = this.resolveSchemaReturnType(e, r);
       return this.context.logger.info(
@@ -1114,28 +1124,28 @@ class it {
     const i = Pe(o);
     if (i) {
       if (g(i)) {
-        const a = T(
+        const a = I(
           i,
           this.context.openAPI.components
         );
-        if (D(a) && g(a.items)) {
-          const c = P(a.items);
+        if (N(a) && g(a.items)) {
+          const c = $(a.items);
           this.context.logger.info(
             `Adding import for event stream model: ${c.name} from ${c.path}`
-          ), f(e, this.context.outputDir, c);
+          ), d(e, this.context.outputDir, c);
           const p = `Promise<JsonServerSentEventStream<${c.name.includes("ServerSentEvent") ? `${c.name}['data']` : c.name}>>`;
           return this.context.logger.info(
             `Resolved event stream return type for operation ${t.operationId}: ${p}`
           ), {
             type: p,
-            metadata: b
+            metadata: M
           };
         }
       }
       const s = "Promise<JsonServerSentEventStream<any>>";
       return this.context.logger.info(
         `Resolved generic event stream return type for operation ${t.operationId}: ${s}`
-      ), { type: s, metadata: b };
+      ), { type: s, metadata: M };
     }
     return this.context.logger.info(
       `Using default return type for operation ${t.operationId}: ${this.defaultReturnType.type}`
@@ -1168,7 +1178,7 @@ class it {
     this.context.logger.info(
       `Creating method with ${s.length} parameters, return type: ${a.type}`
     );
-    const u = o.addMethod({
+    const m = o.addMethod({
       name: i,
       decorators: [c],
       parameters: s,
@@ -1177,8 +1187,8 @@ class it {
         `throw autoGeneratedError(${s.map((p) => p.name).join(",")});`
       ]
     });
-    v(
-      u,
+    E(
+      m,
       [
         r.operation.summary,
         r.operation.description,
@@ -1194,7 +1204,7 @@ class it {
    */
   groupOperations(e) {
     this.context.logger.info("Grouping operations by API client tags");
-    const t = /* @__PURE__ */ new Map(), o = ee(this.context.openAPI.paths).filter(
+    const t = /* @__PURE__ */ new Map(), o = te(this.context.openAPI.paths).filter(
       (i) => {
         if (!i.operation.operationId)
           return !1;
@@ -1225,7 +1235,7 @@ class it {
     );
     const e = /* @__PURE__ */ new Map(), t = this.context.openAPI.tags?.length || 0;
     for (const r of Object.values(this.context.openAPI.paths))
-      te(r).forEach((i) => {
+      ne(r).forEach((i) => {
         i.operation.tags?.forEach((s) => {
           !this.shouldIgnoreTag(s) && !e.has(s) && e.set(s, {
             name: s,
@@ -1258,7 +1268,7 @@ class st {
   constructor(e) {
     this.context = e;
   }
-  commandEndpointPathsName = "COMMAND_ENDPOINT_PATHS";
+  commandEndpointPathsSuffix = "CommandEndpointPaths";
   defaultCommandClientOptionsName = "DEFAULT_COMMAND_CLIENT_OPTIONS";
   /**
    * Generates command client classes for all aggregates.
@@ -1289,7 +1299,7 @@ class st {
     this.context.logger.info(
       `Processing command client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     );
-    const t = le(
+    const t = de(
       this.context.project,
       this.context.outputDir,
       e.aggregate,
@@ -1297,10 +1307,12 @@ class st {
     );
     this.context.logger.info(
       `Processing command endpoint paths for ${e.commands.size} commands`
-    ), this.processCommandEndpointPaths(t, e), this.context.logger.info(
+    );
+    const o = this.processCommandEndpointPaths(t, e);
+    this.context.logger.info(
       `Creating default command client options: ${this.defaultCommandClientOptionsName}`
     ), t.addVariableStatement({
-      declarationKind: O.Const,
+      declarationKind: D.Const,
       declarations: [
         {
           name: this.defaultCommandClientOptionsName,
@@ -1312,9 +1324,9 @@ class st {
       ],
       isExported: !1
     }), this.context.logger.info(
-      `Adding imports from ${x}: CommandRequest, CommandResult, CommandResultEventStream, DeleteAggregate, RecoverAggregate`
+      `Adding imports from ${A}: CommandRequest, CommandResult, CommandResultEventStream, DeleteAggregate, RecoverAggregate`
     ), t.addImportDeclaration({
-      moduleSpecifier: x,
+      moduleSpecifier: A,
       namedImports: [
         "CommandRequest",
         "CommandResult",
@@ -1325,66 +1337,74 @@ class st {
       isTypeOnly: !0
     }), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher-eventstream: JsonEventStreamResultExtractor"
-    ), ue(t), this.context.logger.info(
+    ), le(t), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher: ContentTypeValues"
-    ), y(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info(
+    ), x(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info(
       "Adding imports from @ahoo-wang/fetcher-decorator: ApiMetadata types and decorators"
-    ), ge(t), this.context.logger.info("Generating standard command client class"), this.processCommandClient(t, e), this.context.logger.info("Generating stream command client class"), this.processStreamCommandClient(t, e), this.context.logger.success(
+    ), pe(t), this.context.logger.info("Generating standard command client class"), this.processCommandClient(t, e, o), this.context.logger.info("Generating stream command client class"), this.processStreamCommandClient(t, e), this.context.logger.success(
       `Command client generation completed for aggregate: ${e.aggregate.aggregateName}`
     );
   }
+  resolveAggregateCommandEndpointPathsName(e) {
+    return h(e, this.commandEndpointPathsSuffix);
+  }
   processCommandEndpointPaths(e, t) {
+    const o = this.resolveAggregateCommandEndpointPathsName(
+      t.aggregate
+    );
     this.context.logger.info(
-      `Creating command endpoint paths enum: ${this.commandEndpointPathsName}`
+      `Creating command endpoint paths enum: ${o}`
     );
-    const o = e.addEnum({
-      name: this.commandEndpointPathsName
+    const r = e.addEnum({
+      name: o,
+      isExported: !0
     });
-    t.commands.forEach((r) => {
+    return t.commands.forEach((i) => {
       this.context.logger.info(
-        `Adding command endpoint: ${r.name.toUpperCase()} = '${r.path}'`
-      ), o.addMember({
-        name: r.name.toUpperCase(),
-        initializer: `'${r.path}'`
+        `Adding command endpoint: ${i.name.toUpperCase()} = '${i.path}'`
+      ), r.addMember({
+        name: i.name.toUpperCase(),
+        initializer: `'${i.path}'`
       });
     }), this.context.logger.success(
       `Command endpoint paths enum created with ${t.commands.size} entries`
-    );
+    ), o;
   }
-  getEndpointPath(e) {
-    return `${this.commandEndpointPathsName}.${e.name.toUpperCase()}`;
+  getEndpointPath(e, t) {
+    return `${e}.${t.name.toUpperCase()}`;
   }
-  processCommandClient(e, t) {
-    const o = w(
+  processCommandClient(e, t, o) {
+    const r = h(
       t.aggregate,
       "CommandClient"
-    ), r = q(
-      o,
+    ), i = q(
+      r,
       e,
       [],
       ["R = CommandResult"]
     );
-    pe(r, this.defaultCommandClientOptionsName), t.commands.forEach((i) => {
+    ue(i, this.defaultCommandClientOptionsName), t.commands.forEach((s) => {
       this.processCommandMethod(
         t,
         e,
-        r,
-        i
+        i,
+        s,
+        o
       );
     });
   }
   processStreamCommandClient(e, t) {
-    const o = w(
+    const o = h(
       t.aggregate,
       "CommandClient"
-    ), r = w(
+    ), r = h(
       t.aggregate,
       "StreamCommandClient"
     );
     q(
       r,
       e,
-      ["''", b],
+      ["''", M],
       [],
       `${o}<CommandResultEventStream>`
     ).addConstructor({
@@ -1399,15 +1419,15 @@ class st {
     });
   }
   resolveParameters(e, t, o) {
-    const r = m(o.schema.key);
+    const r = l(o.schema.key);
     this.context.logger.info(
       `Adding import for command model: ${r.name} from path: ${r.path}`
-    ), f(t, this.context.outputDir, r);
+    ), d(t, this.context.outputDir, r);
     const i = o.pathParameters.filter((s) => !this.context.isIgnoreCommandClientPathParameters(
       e.name,
       s.name
     )).map((s) => {
-      const a = ne(s);
+      const a = oe(s);
       return this.context.logger.info(
         `Adding path parameter: ${s.name} (type: ${a})`
       ), {
@@ -1448,37 +1468,37 @@ class st {
       ]
     }), i;
   }
-  processCommandMethod(e, t, o, r) {
+  processCommandMethod(e, t, o, r, i) {
     this.context.logger.info(
-      `Generating command method: ${h(r.name)} for command: ${r.name}`
+      `Generating command method: ${f(r.name)} for command: ${r.name}`
     ), this.context.logger.info(
       `Command method details: HTTP ${r.method}, path: ${r.path}`
     );
-    const i = this.resolveParameters(
+    const s = this.resolveParameters(
       e.aggregate.tag,
       t,
       r
-    ), s = o.addMethod({
-      name: h(r.name),
+    ), a = o.addMethod({
+      name: f(r.name),
       decorators: [
         {
           name: F(r.method),
-          arguments: [`${this.getEndpointPath(r)}`]
+          arguments: [`${this.getEndpointPath(i, r)}`]
         }
       ],
-      parameters: i,
+      parameters: s,
       returnType: "Promise<R>",
-      statements: `throw autoGeneratedError(${i.map((a) => a.name).join(",")});`
+      statements: `throw autoGeneratedError(${s.map((c) => c.name).join(",")});`
     });
     this.context.logger.info(
-      `Adding JSDoc documentation for method: ${h(r.name)}`
-    ), v(s, [
+      `Adding JSDoc documentation for method: ${f(r.name)}`
+    ), E(a, [
       r.summary,
       r.description,
       `- operationId: \`${r.operation.operationId}\``,
       `- path: \`${r.path}\``
     ]), this.context.logger.success(
-      `Command method generated: ${h(r.name)}`
+      `Command method generated: ${f(r.name)}`
     );
   }
 }
@@ -1490,6 +1510,7 @@ class at {
   constructor(e) {
     this.context = e;
   }
+  domainEventTypeSuffix = "DomainEventType";
   /**
    * Generates query client classes for all aggregates.
    */
@@ -1519,7 +1540,7 @@ class at {
    * @returns The source file for the client
    */
   createClientFilePath(e, t) {
-    return le(
+    return de(
       this.context.project,
       this.context.outputDir,
       e,
@@ -1538,9 +1559,9 @@ class at {
     this.context.logger.info(
       `Processing query client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     ), this.context.logger.info(
-      `Adding imports from ${x}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
+      `Adding imports from ${A}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
     ), t.addImportDeclaration({
-      moduleSpecifier: x,
+      moduleSpecifier: A,
       namedImports: [
         "QueryClientFactory",
         "QueryClientOptions",
@@ -1551,7 +1572,7 @@ class at {
     this.context.logger.info(
       `Creating default query client options: ${o}`
     ), t.addVariableStatement({
-      declarationKind: O.Const,
+      declarationKind: D.Const,
       declarations: [
         {
           name: o,
@@ -1564,35 +1585,18 @@ class at {
         }
       ],
       isExported: !1
-    });
-    const r = [];
-    this.context.logger.info(
-      `Processing ${e.events.size} domain events for aggregate: ${e.aggregate.aggregateName}`
-    );
-    for (const p of e.events.values()) {
-      const l = m(p.schema.key);
-      this.context.logger.info(
-        `Adding import for event model: ${l.name} from path: ${l.path}`
-      ), f(t, this.context.outputDir, l), r.push(l);
-    }
-    const i = "DOMAIN_EVENT_TYPES", s = r.map((p) => p.name).join(" | ");
-    this.context.logger.info(
-      `Creating domain event types union: ${i} = ${s}`
-    ), t.addTypeAlias({
-      name: i,
-      type: s
-    });
-    const a = `${h(e.aggregate.aggregateName)}QueryClientFactory`, c = m(e.state.key), u = m(e.fields.key);
+    }), this.processAggregateDomainEventTypes(e, t);
+    const r = this.processAggregateDomainEventType(e, t), i = `${f(e.aggregate.aggregateName)}QueryClientFactory`, s = l(e.state.key), a = l(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: ${u.name} from path: ${u.path}`
-    ), f(t, this.context.outputDir, u), this.context.logger.info(`Creating query client factory: ${a}`), t.addVariableStatement({
-      declarationKind: O.Const,
+      `Adding import for state model: ${s.name} from path: ${s.path}`
+    ), d(t, this.context.outputDir, s), this.context.logger.info(
+      `Adding import for fields model: ${a.name} from path: ${a.path}`
+    ), d(t, this.context.outputDir, a), this.context.logger.info(`Creating query client factory: ${i}`), t.addVariableStatement({
+      declarationKind: D.Const,
       declarations: [
         {
-          name: a,
-          initializer: `new QueryClientFactory<${c.name}, ${u.name} | string, ${i}>(${o})`
+          name: i,
+          initializer: `new QueryClientFactory<${s.name}, ${a.name} | string, ${r}>(${o})`
         }
       ],
       isExported: !0
@@ -1600,6 +1604,37 @@ class at {
       `Query client generation completed for aggregate: ${e.aggregate.aggregateName}`
     );
   }
+  processAggregateDomainEventType(e, t) {
+    const o = [];
+    this.context.logger.info(
+      `Processing ${e.events.size} domain events for aggregate: ${e.aggregate.aggregateName}`
+    );
+    for (const s of e.events.values()) {
+      const a = l(s.schema.key);
+      this.context.logger.info(
+        `Adding import for event model: ${a.name} from path: ${a.path}`
+      ), d(t, this.context.outputDir, a), o.push(a);
+    }
+    const r = h(e.aggregate, this.domainEventTypeSuffix), i = o.map((s) => s.name).join(" | ");
+    return this.context.logger.info(
+      `Creating domain event types union: ${r} = ${i}`
+    ), t.addTypeAlias({
+      isExported: !0,
+      name: r,
+      type: i
+    }), r;
+  }
+  processAggregateDomainEventTypes(e, t) {
+    const o = h(e.aggregate, this.domainEventTypeSuffix + "s"), r = t.addEnum({
+      name: o,
+      isExported: !0
+    });
+    for (const i of e.events.values())
+      r.addMember({
+        name: i.name,
+        initializer: `'${i.title}'`
+      });
+  }
 }
 class ct {
   /**
@@ -1626,25 +1661,9 @@ class ct {
         this.context.contextAggregates.size,
         `Processing bounded context: ${t}`,
         1
-      ), this.processBoundedContext(t);
+      );
     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.
-   * @param contextAlias - The alias of the bounded context to process
-   */
-  processBoundedContext(e) {
-    const t = `${e}/boundedContext.ts`;
-    this.context.logger.info(`Creating bounded context file: ${t}`);
-    const o = this.context.getOrCreateSourceFile(t);
-    this.context.logger.info(
-      `Adding bounded context alias constant: BOUNDED_CONTEXT_ALIAS = '${e}'`
-    ), o.addStatements(
-      `export const BOUNDED_CONTEXT_ALIAS = '${e}';`
-    ), this.context.logger.success(
-      `Bounded context file created successfully: ${t}`
-    );
-  }
 }
 class gt {
   /** The ts-morph project instance used for code generation */
@@ -1664,7 +1683,7 @@ class gt {
     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 se(this.project, this.outputDir, e);
+    return ae(this.project, this.outputDir, e);
   }
   isIgnoreApiClientPathParameters(e, t) {
     return (this.config.apiClients?.[e]?.ignorePathParameters ?? this.defaultIgnorePathParameters).includes(t);
@@ -1680,7 +1699,7 @@ class yt {
    * @param options - Configuration options for code generation
    */
   constructor(e) {
-    this.options = e, this.project = new fe(e), this.options.logger.info("Project instance created with tsConfigFilePath: ", this.options.tsConfigFilePath);
+    this.options = e, this.project = new he(e), this.options.logger.info("Project instance created with tsConfigFilePath: ", this.options.tsConfigFilePath);
   }
   project;
   /**
@@ -1692,7 +1711,7 @@ class yt {
     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 be(this.options.inputPath);
+    const e = await Me(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
     const o = new Ve(e).resolve();
     this.options.logger.info(
@@ -1702,8 +1721,8 @@ class yt {
     let i = {};
     try {
       this.options.logger.info("Parsing configuration file:", r), i = await qe(r);
-    } catch (u) {
-      this.options.logger.info("Configuration file parsing failed ", u);
+    } catch (m) {
+      this.options.logger.info("Configuration file parsing failed ", m);
     }
     const s = new gt({
       openAPI: e,
@@ -1713,7 +1732,7 @@ class yt {
       logger: this.options.logger,
       config: i
     });
-    this.options.logger.info("Generating models"), new Ke(s).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new ct(s).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 Ye(s).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new ct(s).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.