@ahoo-wang/fetcher-generator 2.8.0 → 2.8.2

package/dist/index.js

@@ -1,117 +1,117 @@
-import { Scope as ce, VariableDeclarationKind as v, Project as ge } from "ts-morph";
-import { ContentTypeValues as S, combineURLs as w } from "@ahoo-wang/fetcher";
-import { ResourceAttributionPathSpec as F } from "@ahoo-wang/fetcher-wow";
-import { parse as k } from "yaml";
-import { readFile as le } from "fs";
-import { join as pe, relative as ue } from "path";
-function T(r) {
-  return r.$ref.split("/").pop();
-}
-function R(r, e) {
-  const t = T(r);
+import { Scope as ue, VariableDeclarationKind as O, Project as le } from "ts-morph";
+import { ContentTypeValues as S, combineURLs as v } from "@ahoo-wang/fetcher";
+import { ResourceAttributionPathSpec as _ } from "@ahoo-wang/fetcher-wow";
+import { parse as Q } from "yaml";
+import { readFile as pe } from "fs";
+import { join as me, relative as de } from "path";
+function $(o) {
+  return o.$ref.split("/").pop();
+}
+function E(o, e) {
+  const t = $(o);
   return e.schemas?.[t];
 }
-function L(r, e) {
-  const t = T(r);
+function U(o, e) {
+  const t = $(o);
   return e.requestBodies?.[t];
 }
-function Q(r, e) {
-  const t = T(r);
+function J(o, e) {
+  const t = $(o);
   return e.parameters?.[t];
 }
-function I(r, e) {
+function I(o, e) {
   return {
-    key: T(r),
-    schema: R(r, e)
+    key: $(o),
+    schema: E(o, e)
   };
 }
-const _ = /[-_\s.]+/;
-function U(r) {
-  return Array.isArray(r) ? r.flatMap((e) => G(e.split(_))) : G(r.split(_));
+const G = /[-_\s.]+/;
+function V(o) {
+  return Array.isArray(o) ? o.flatMap((e) => W(e.split(G))) : W(o.split(G));
 }
-function G(r) {
-  return r.flatMap((e) => {
+function W(o) {
+  return o.flatMap((e) => {
     if (e.length === 0)
       return [];
     const t = [];
     let n = "";
-    for (let o = 0; o < e.length; o++) {
-      const s = e[o], i = /[A-Z]/.test(s), a = o > 0 && /[a-z]/.test(e[o - 1]);
-      i && a && n ? (t.push(n), n = s) : n += s;
+    for (let r = 0; r < e.length; r++) {
+      const i = e[r], s = /[A-Z]/.test(i), a = r > 0 && /[a-z]/.test(e[r - 1]);
+      s && a && n ? (t.push(n), n = i) : n += i;
     }
     return n && t.push(n), t;
   });
 }
-function A(r) {
-  return r === "" || r.length === 0 ? "" : U(r).filter((t) => t.length > 0).map((t) => {
-    const n = t.charAt(0), o = t.slice(1);
-    return (/[a-zA-Z]/.test(n) ? n.toUpperCase() : n) + o.toLowerCase();
+function x(o) {
+  return o === "" || o.length === 0 ? "" : V(o).filter((t) => t.length > 0).map((t) => {
+    const n = t.charAt(0), r = t.slice(1);
+    return (/[a-zA-Z]/.test(n) ? n.toUpperCase() : n) + r.toLowerCase();
   }).join("");
 }
-function h(r) {
-  const e = A(r);
+function h(o) {
+  const e = x(o);
   return e.charAt(0).toLowerCase() + e.slice(1);
 }
-function me(r) {
-  return r === "" || Array.isArray(r) && r.length === 0 ? "" : U(r).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
+function fe(o) {
+  return o === "" || Array.isArray(o) && o.length === 0 ? "" : V(o).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
 }
-function g(r) {
-  return !!(r && typeof r == "object" && "$ref" in r);
+function g(o) {
+  return !!(o && typeof o == "object" && "$ref" in o);
 }
-function b(r, e) {
+function M(o, e) {
   if (e && !g(e) && e.content)
-    return e.content[r]?.schema;
+    return e.content[o]?.schema;
 }
-function J(r) {
-  return b(S.APPLICATION_JSON, r);
+function K(o) {
+  return M(S.APPLICATION_JSON, o);
 }
-function de(r) {
-  return b(S.TEXT_EVENT_STREAM, r);
+function he(o) {
+  return M(S.TEXT_EVENT_STREAM, o);
 }
-function fe(r) {
-  return b("*/*", r);
+function ye(o) {
+  return M("*/*", o);
 }
-const he = [
+const xe = [
   "string",
   "number",
   "integer",
   "boolean",
   "null"
 ];
-function q(r) {
-  return Array.isArray(r) ? !0 : he.includes(r);
+function q(o) {
+  return Array.isArray(o) ? !0 : xe.includes(o);
 }
-function O(r) {
-  return r.type === "array";
+function N(o) {
+  return o.type === "array";
 }
-function ye(r) {
-  return Array.isArray(r.enum) && r.enum.length > 0;
+function Ae(o) {
+  return Array.isArray(o.enum) && o.enum.length > 0;
 }
-function V(r) {
-  return Array.isArray(r.anyOf) && r.anyOf.length > 0;
+function H(o) {
+  return Array.isArray(o.anyOf) && o.anyOf.length > 0;
 }
-function K(r) {
-  return Array.isArray(r.oneOf) && r.oneOf.length > 0;
+function Y(o) {
+  return Array.isArray(o.oneOf) && o.oneOf.length > 0;
 }
-function xe(r) {
-  return V(r) || K(r);
+function Ce(o) {
+  return H(o) || Y(o);
 }
-function Ae(r) {
-  return Array.isArray(r.allOf) && r.allOf.length > 0;
+function Pe(o) {
+  return Array.isArray(o.allOf) && o.allOf.length > 0;
 }
-function W(r) {
-  return V(r) || K(r) || Ae(r);
+function z(o) {
+  return H(o) || Y(o) || Pe(o);
 }
-function z(r) {
-  return r.includes("|") || r.includes("&") ? `(${r})[]` : `${r}[]`;
+function L(o) {
+  return o.includes("|") || o.includes("&") ? `(${o})[]` : `${o}[]`;
 }
-function Ce(r) {
-  return r.type !== "object" ? !1 : r.properties ? Object.keys(r.properties).length === 0 : !0;
+function $e(o) {
+  return o.type !== "object" ? !1 : o.properties ? Object.keys(o.properties).length === 0 : !0;
 }
-function C(r) {
-  if (Array.isArray(r))
-    return r.map((e) => C(e)).join(" | ");
-  switch (r) {
+function A(o) {
+  if (Array.isArray(o))
+    return o.map((e) => A(e)).join(" | ");
+  switch (o) {
     case "string":
       return "string";
     case "number":
@@ -125,69 +125,69 @@ function C(r) {
       return "any";
   }
 }
-function H(r) {
+function X(o) {
   return [
-    { method: "get", operation: r.get },
-    { method: "put", operation: r.put },
-    { method: "post", operation: r.post },
-    { method: "delete", operation: r.delete },
-    { method: "options", operation: r.options },
-    { method: "head", operation: r.head },
-    { method: "patch", operation: r.patch },
-    { method: "trace", operation: r.trace }
+    { method: "get", operation: o.get },
+    { method: "put", operation: o.put },
+    { method: "post", operation: o.post },
+    { method: "delete", operation: o.delete },
+    { method: "options", operation: o.options },
+    { method: "head", operation: o.head },
+    { method: "patch", operation: o.patch },
+    { method: "trace", operation: o.trace }
   ].filter(({ operation: e }) => e !== void 0);
 }
-function M(r) {
-  return r.responses[200];
+function j(o) {
+  return o.responses[200];
 }
-function B(r) {
-  const e = M(r);
-  return J(e);
+function B(o) {
+  const e = j(o);
+  return K(e);
 }
-function Pe(r, e) {
-  return r.parameters ? r.parameters.map((t) => g(t) ? Q(t, e) : t).filter((t) => t.in === "path") : [];
+function Ie(o, e) {
+  return o.parameters ? o.parameters.map((t) => g(t) ? J(t, e) : t).filter((t) => t.in === "path") : [];
 }
-const $e = "string";
-function Y(r) {
-  return !r.schema || g(r.schema) || !r.schema.type || !q(r.schema.type) ? $e : C(r.schema.type);
+const Te = "string";
+function Z(o) {
+  return !o.schema || g(o.schema) || !o.schema.type || !q(o.schema.type) ? Te : A(o.schema.type);
 }
-function X(r) {
-  return r.startsWith("http://") || r.startsWith("https://") ? Te(r) : Ie(r);
+function ee(o) {
+  return o.startsWith("http://") || o.startsWith("https://") ? Se(o) : ve(o);
 }
-async function Te(r) {
-  return await (await fetch(r)).text();
+async function Se(o) {
+  return await (await fetch(o)).text();
 }
-function Ie(r) {
+function ve(o) {
   return new Promise((e, t) => {
-    le(r, "utf-8", (n, o) => {
-      n ? t(n) : e(o);
+    pe(o, "utf-8", (n, r) => {
+      n ? t(n) : e(r);
     });
   });
 }
-async function Ee(r) {
-  const e = await X(r);
-  switch (Z(e)) {
+async function Ee(o) {
+  const e = await ee(o);
+  switch (te(e)) {
     case "json":
       return JSON.parse(e);
     case "yaml":
-      return k(e);
+      return Q(e);
     default:
-      throw new Error(`Unsupported file format: ${r}`);
+      throw new Error(`Unsupported file format: ${o}`);
   }
 }
-async function Se(r) {
-  const e = await X(r);
-  switch (Z(e)) {
+async function we(o) {
+  const e = await ee(o);
+  switch (te(e)) {
     case "json":
       return JSON.parse(e);
     case "yaml":
-      return k(e);
+      return Q(e);
     default:
-      throw new Error(`Unsupported file format: ${r}`);
+      throw new Error(`Unsupported file format: ${o}`);
   }
 }
-function Z(r) {
-  const e = r.trimStart();
+function te(o) {
+  const e = o.trimStart();
   if (e.startsWith("{") || e.startsWith("["))
     return "json";
   if (e.startsWith("-") || e.startsWith("%YAML"))
@@ -200,67 +200,100 @@ function Z(r) {
   }
   throw new Error("Unable to infer file format");
 }
-const ee = "types.ts", we = "@";
-function Re(r) {
-  return w(r.path, ee);
+const ne = "types.ts", Re = "@";
+function Oe(o) {
+  return v(o.path, ne);
 }
-function te(r, e, t) {
-  const n = w(e, t), o = r.getSourceFile(n);
-  return o || r.createSourceFile(n, "", {
+function oe(o, e, t) {
+  const n = v(e, t), r = o.getSourceFile(n);
+  return r || o.createSourceFile(n, "", {
     overwrite: !0
   });
 }
-function P(r, e, t) {
-  let n = r.getImportDeclaration(
-    (o) => o.getModuleSpecifierValue() === e
+function C(o, e, t) {
+  let n = o.getImportDeclaration(
+    (r) => r.getModuleSpecifierValue() === e
   );
-  n || (n = r.addImportDeclaration({
+  n || (n = o.addImportDeclaration({
     moduleSpecifier: e
-  })), t.forEach((o) => {
+  })), t.forEach((r) => {
     n.getNamedImports().some(
-      (i) => i.getName() === o
-    ) || n.addNamedImport(o);
+      (s) => s.getName() === r
+    ) || n.addNamedImport(r);
   });
 }
-function f(r, e, t) {
-  if (t.path.startsWith(we)) {
-    P(r, t.path, [t.name]);
+function f(o, e, t) {
+  if (t.path.startsWith(Re)) {
+    C(o, t.path, [t.name]);
     return;
   }
-  const n = r.getDirectoryPath(), o = pe(e, t.path, ee);
-  let s = ue(n, o);
-  s = s.replace(/\.ts$/, ""), s.startsWith(".") || (s = "./" + s), P(r, s, [t.name]);
+  const n = o.getDirectoryPath(), r = me(e, t.path, ne);
+  let i = de(n, r);
+  i = i.replace(/\.ts$/, ""), i.startsWith(".") || (i = "./" + i), C(o, i, [t.name]);
 }
-function E(r, e, t, n) {
-  r.path !== n.path && f(e, t, n);
+function T(o, e, t, n) {
+  o.path !== n.path && f(e, t, n);
 }
-function ve(r, e) {
-  const t = [r, e].filter(
-    (n) => n !== void 0 && n.length > 0
+function Ne(o) {
+  if (!Array.isArray(o))
+    return;
+  const e = o.filter(
+    (t) => typeof t == "string" && t.length > 0
   );
-  return t.length > 0 ? t.join(`
+  return e.length > 0 ? e.join(`
 `) : void 0;
 }
-function x(r, e, t) {
-  const n = ve(e, t);
-  n && r.addJsDoc({
-    description: n
-  });
+function w(o, e) {
+  const t = Ne(e);
+  t && o.addJsDoc(t);
+}
+function R(o, e) {
+  const t = [
+    e.title,
+    e.description
+  ];
+  e.format && t.push(`- format: ${e.format}`), k(t, e, "default"), k(t, e, "example"), De(t, e), be(t, e), Me(t, e), w(o, t);
+}
+function k(o, e, t) {
+  const n = e[t];
+  if (n) {
+    if (typeof n != "object") {
+      o.push(`- ${t}: \`${n}\``);
+      return;
+    }
+    o.push(`- ${t}: `), o.push("```json"), o.push(JSON.stringify(n)), o.push("```");
+  }
 }
-function Oe(r) {
-  const e = r.split(".");
+function De(o, 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}`
+  ), e.exclusiveMaximum !== void 0 && t.push(
+    `  - exclusiveMaximum: ${e.exclusiveMaximum}`
+  ), e.multipleOf !== void 0 && t.push(`  - multipleOf: ${e.multipleOf}`), t.length !== 1 && o.push(...t);
+}
+function be(o, e) {
+  const t = ["- String Constraints"];
+  e.minLength !== void 0 && t.push(`  - minLength: ${e.minLength}`), e.maxLength !== void 0 && t.push(`  - maxLength: ${e.maxLength}`), e.pattern !== void 0 && t.push(`  - pattern: ${e.pattern}`), t.length !== 1 && o.push(...t);
+}
+function Me(o, e) {
+  const t = ["- Array Constraints"];
+  e.minItems !== void 0 && t.push(`  - minItems: ${e.minItems}`), e.maxItems !== void 0 && t.push(`  - maxItems: ${e.maxItems}`), e.uniqueItems !== void 0 && t.push(`  - uniqueItems: ${e.uniqueItems}`), t.length !== 1 && o.push(...t);
+}
+function qe(o) {
+  const e = o.split(".");
   return e.length != 2 || e[0].length === 0 || e[1].length === 0 ? null : e;
 }
-function Ne(r) {
-  const e = Oe(r.name);
+function je(o) {
+  const e = qe(o.name);
   return e ? {
-    tag: r,
+    tag: o,
     contextAlias: e[0],
     aggregateName: e[1]
   } : null;
 }
-function De(r) {
-  const e = r?.map((n) => Ne(n)).filter((n) => n !== null);
+function Fe(o) {
+  const e = o?.map((n) => je(n)).filter((n) => n !== null);
   if (!e)
     return /* @__PURE__ */ new Map();
   const t = /* @__PURE__ */ new Map();
@@ -272,20 +305,20 @@ function De(r) {
     });
   }), t;
 }
-function be(r) {
-  if (!r)
+function _e(o) {
+  if (!o)
     return null;
-  const e = r.split(".");
+  const e = o.split(".");
   return e.length != 3 ? null : e[2];
 }
-const qe = "#/components/responses/wow.CommandOk", Me = "#/components/parameters/wow.id";
-class je {
+const Ge = "#/components/responses/wow.CommandOk", We = "#/components/parameters/wow.id";
+class ze {
   /**
    * Creates a new AggregateResolver instance.
    * @param openAPI - The OpenAPI specification to resolve aggregates from
    */
   constructor(e) {
-    this.openAPI = e, this.aggregates = De(e.tags), this.build();
+    this.openAPI = e, this.aggregates = Fe(e.tags), this.build();
   }
   aggregates;
   /**
@@ -294,9 +327,9 @@ class je {
    */
   build() {
     for (const [e, t] of Object.entries(this.openAPI.paths)) {
-      const n = H(t);
-      for (const o of n)
-        this.commands(e, o), this.state(o.operation), this.events(o.operation), this.fields(o.operation);
+      const n = X(t);
+      for (const r of n)
+        this.commands(e, r), this.state(r.operation), this.events(r.operation), this.fields(r.operation);
     }
   }
   /**
@@ -309,8 +342,8 @@ class je {
       if (!t.state || !t.fields)
         continue;
       const n = t.aggregate.contextAlias;
-      let o = e.get(n);
-      o || (o = /* @__PURE__ */ new Set(), e.set(n, o)), o.add(t);
+      let r = e.get(n);
+      r || (r = /* @__PURE__ */ new Set(), e.set(n, r)), r.add(t);
     }
     return e;
   }
@@ -323,40 +356,40 @@ class je {
     const n = t.operation;
     if (n.operationId === "wow.command.send")
       return;
-    const o = be(n.operationId);
-    if (!o)
+    const r = _e(n.operationId);
+    if (!r)
       return;
-    const s = M(n);
-    if (!s || !g(s) || s.$ref !== qe || !n.requestBody)
+    const i = j(n);
+    if (!i || !g(i) || i.$ref !== Ge || !n.requestBody)
       return;
-    const i = n.parameters ?? [], a = i.filter((m) => g(m) && m.$ref === Me).at(0), c = i.filter(
+    const s = n.parameters ?? [], a = s.filter((m) => g(m) && m.$ref === We).at(0), c = s.filter(
       (m) => !g(m) && m.in === "path"
     );
     if (a) {
-      const m = Q(
+      const m = J(
         a,
         this.openAPI.components
       );
       c.push(m);
     }
-    const p = n.requestBody.content[S.APPLICATION_JSON].schema, u = I(
-      p,
+    const l = n.requestBody.content[S.APPLICATION_JSON].schema, p = I(
+      l,
       this.openAPI.components
     );
-    u.schema.title = u.schema.title || n.summary, u.schema.description = u.schema.description || n.description;
-    const ae = {
-      name: o,
+    p.schema.title = p.schema.title || n.summary, p.schema.description = p.schema.description || n.description;
+    const ge = {
+      name: r,
       method: t.method,
       path: e,
       pathParameters: c,
       summary: n.summary,
       description: n.description,
-      schema: u,
+      schema: p,
       operation: n
     };
     n.tags?.forEach((m) => {
-      const j = this.aggregates.get(m);
-      j && j.commands.set(o, ae);
+      const F = this.aggregates.get(m);
+      F && F.commands.set(r, ge);
     });
   }
   /**
@@ -373,9 +406,9 @@ class je {
       t,
       this.openAPI.components
     );
-    e.tags?.forEach((o) => {
-      const s = this.aggregates.get(o);
-      s && (s.state = n);
+    e.tags?.forEach((r) => {
+      const i = this.aggregates.get(r);
+      i && (i.state = n);
     });
   }
   /**
@@ -391,23 +424,23 @@ class je {
     const n = t?.items;
     if (!g(n))
       return;
-    const s = R(
+    const i = E(
       n,
       this.openAPI.components
-    ).properties.body.items.anyOf.map((i) => {
-      const a = i.title, c = i.properties.name.const, l = i.properties.body, p = I(
-        l,
+    ).properties.body.items.anyOf.map((s) => {
+      const a = s.title, c = s.properties.name.const, u = s.properties.body, l = I(
+        u,
         this.openAPI.components
       );
-      return p.schema.title = p.schema.title || i.title, {
+      return l.schema.title = l.schema.title || s.title, {
         title: a,
         name: c,
-        schema: p
+        schema: l
       };
     });
-    e.tags?.forEach((i) => {
-      const a = this.aggregates.get(i);
-      a && s.forEach((c) => {
+    e.tags?.forEach((s) => {
+      const a = this.aggregates.get(s);
+      a && i.forEach((c) => {
         a.events.set(c.name, c);
       });
     });
@@ -419,20 +452,20 @@ class je {
   fields(e) {
     if (!this.openAPI.components || !e.operationId?.endsWith(".snapshot.count"))
       return;
-    const n = L(
+    const n = U(
       e.requestBody,
       this.openAPI.components
-    ).content[S.APPLICATION_JSON].schema, s = R(
+    ).content[S.APPLICATION_JSON].schema, i = E(
       n,
       this.openAPI.components
-    ).properties?.field, i = I(s, this.openAPI.components);
+    ).properties?.field, s = I(i, this.openAPI.components);
     e.tags?.forEach((a) => {
       const c = this.aggregates.get(a);
-      c && (c.fields = i);
+      c && (c.fields = s);
     });
   }
 }
-const $ = "@ahoo-wang/fetcher-wow", Fe = {
+const P = "@ahoo-wang/fetcher-wow", Le = {
   "wow.command.CommandResult": "CommandResult",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
   "wow.api.BindingError": "BindingError",
@@ -461,32 +494,32 @@ const $ = "@ahoo-wang/fetcher-wow", Fe = {
   "wow.openapi.BatchResult": "BatchResult",
   "wow.messaging.CompensationTarget": "CompensationTarget"
 };
-function d(r) {
-  if (!r)
+function d(o) {
+  if (!o)
     return { name: "", path: "/" };
-  const e = Fe[r];
+  const e = Le[o];
   if (e)
-    return { name: e, path: $ };
-  const t = r.split(".");
+    return { name: e, path: P };
+  const t = o.split(".");
   let n = -1;
   for (let c = 0; c < t.length; c++)
     if (t[c] && /^[A-Z]/.test(t[c])) {
       n = c;
       break;
     }
-  const o = t.slice(0, n), s = o.length > 0 ? `/${o.join("/")}` : "/", i = t.slice(n);
-  return { name: A(i), path: s };
+  const r = t.slice(0, n), i = r.length > 0 ? `/${r.join("/")}` : "/", s = t.slice(n);
+  return { name: x(s), path: i };
 }
-function y(r) {
-  const e = T(r);
+function y(o) {
+  const e = $(o);
   return d(e);
 }
-class _e {
+class Be {
   constructor(e) {
     this.context = e;
   }
   getOrCreateSourceFile(e) {
-    const t = Re(e);
+    const t = Oe(e);
     return this.context.getOrCreateSourceFile(t);
   }
   /**
@@ -504,19 +537,19 @@ class _e {
       return;
     }
     const t = this.stateAggregatedTypeNames(), n = this.filterSchemas(e, t);
-    this.context.logger.progress(`Generating models for ${n.length} schemas`), n.forEach((o, s) => {
+    this.context.logger.progress(`Generating models for ${n.length} schemas`), n.forEach((r, i) => {
       this.context.logger.progressWithCount(
-        s + 1,
+        i + 1,
         n.length,
-        `Processing schema: ${o.key}`,
+        `Processing schema: ${r.key}`,
         2
-      ), this.generateKeyedSchema(o);
+      ), this.generateKeyedSchema(r);
     }), this.context.logger.success("Model generation completed");
   }
   filterSchemas(e, t) {
-    return Object.entries(e).map(([n, o]) => ({
+    return Object.entries(e).map(([n, r]) => ({
       key: n,
-      schema: o
+      schema: r
     })).filter((n) => !this.isWowSchema(n.key, t));
   }
   isWowSchema(e, t) {
@@ -539,9 +572,9 @@ class _e {
     for (const t of this.context.contextAggregates.values())
       for (const n of t)
         this.aggregatedSchemaSuffix.forEach(
-          (o) => {
-            const s = d(n.state.key), i = A(s.name) + o;
-            e.add(i);
+          (r) => {
+            const i = d(n.state.key), s = x(i.name) + r;
+            e.add(s);
           }
         );
     return e;
@@ -561,33 +594,33 @@ class _e {
    * 4. Type alias processing
    */
   generateKeyedSchema({ key: e, schema: t }) {
-    const n = d(e), o = this.getOrCreateSourceFile(n), s = this.process(n, o, t);
-    s && x(s, t.title, t.description);
+    const n = d(e), r = this.getOrCreateSourceFile(n), i = this.process(n, r, t);
+    i && R(i, t);
   }
   process(e, t, n) {
-    if (ye(n))
+    if (Ae(n))
       return t.addEnum({
         name: e.name,
         isExported: !0,
-        members: n.enum.filter((s) => typeof s == "string" && s.length > 0).map((s) => ({
-          name: me(s),
-          initializer: `'${s}'`
+        members: n.enum.filter((i) => typeof i == "string" && i.length > 0).map((i) => ({
+          name: fe(i),
+          initializer: `'${i}'`
         }))
       });
-    if (O(n) && g(n.items)) {
-      const s = y(n.items);
-      return E(
+    if (N(n) && g(n.items)) {
+      const i = y(n.items);
+      return T(
         e,
         t,
         this.context.outputDir,
-        s
+        i
       ), t.addTypeAlias({
         name: e.name,
-        type: z(s.name),
+        type: L(i.name),
         isExported: !0
       });
     }
-    const o = t.addInterface({
+    const r = t.addInterface({
       name: e.name,
       isExported: !0
     });
@@ -595,28 +628,28 @@ class _e {
       t,
       e,
       n,
-      o
-    ) : (W(n) && (n.anyOf || n.oneOf || n.allOf).forEach((i) => {
-      if (g(i)) {
-        const a = y(i);
-        E(
+      r
+    ) : (z(n) && (n.anyOf || n.oneOf || n.allOf).forEach((s) => {
+      if (g(s)) {
+        const a = y(s);
+        T(
           e,
           t,
           this.context.outputDir,
           a
-        ), o.addExtends(a.name);
+        ), r.addExtends(a.name);
         return;
       }
       this.processInterface(
         t,
         e,
-        i,
-        o
+        s,
+        r
       );
-    }), o);
+    }), r);
   }
   processObject(e, t, n) {
-    const o = e.addInterface({
+    const r = e.addInterface({
       name: t.name,
       isExported: !0
     });
@@ -624,87 +657,87 @@ class _e {
       e,
       t,
       n,
-      o
+      r
     );
   }
-  processInterface(e, t, n, o) {
-    for (const [s, i] of Object.entries(n.properties)) {
+  processInterface(e, t, n, r) {
+    for (const [i, s] of Object.entries(n.properties)) {
       const a = this.resolvePropertyType(
         t,
         e,
-        s,
-        i
+        i,
+        s
       );
-      let c = o.getProperty(s);
-      c ? c.setType(a) : c = o.addProperty({
-        name: s,
+      let c = r.getProperty(i);
+      c ? c.setType(a) : c = r.addProperty({
+        name: i,
         type: a
-      }), g(i) || x(c, i.title, i.description);
+      }), g(s) || R(c, s);
     }
-    return o;
+    return r;
   }
-  resolvePropertyType(e, t, n, o) {
-    if (g(o)) {
-      const s = y(o);
-      return E(
+  resolvePropertyType(e, t, n, r) {
+    if (g(r)) {
+      const i = y(r);
+      return T(
         e,
         t,
         this.context.outputDir,
-        s
-      ), s.name;
+        i
+      ), i.name;
     }
-    if (o.const)
-      return `'${o.const}'`;
-    if (O(o)) {
-      const s = this.resolvePropertyType(
+    if (r.const)
+      return `'${r.const}'`;
+    if (N(r)) {
+      const i = this.resolvePropertyType(
         e,
         t,
         n,
-        o.items
+        r.items
       );
-      return z(s);
+      return L(i);
     }
-    if (o.type && q(o.type))
-      return C(o.type);
-    if (W(o))
+    if (r.type && q(r.type))
+      return A(r.type);
+    if (z(r))
       return this.resolvePropertyCompositionType(
         e,
         t,
-        o
+        r
       );
-    if (o.type === "object" && o.properties) {
-      const s = {
+    if (r.type === "object" && r.properties) {
+      const i = {
         path: e.path,
-        name: `${e.name}${A(n)}`
-      }, i = this.processObject(
+        name: `${e.name}${x(n)}`
+      }, s = this.processObject(
         t,
-        s,
-        o
+        i,
+        r
       );
-      return x(i, o.title, o.description), s.name;
+      return R(s, r), i.name;
     }
     return "any";
   }
   resolvePropertyCompositionType(e, t, n) {
-    const o = n.anyOf || n.oneOf || n.allOf, s = /* @__PURE__ */ new Set();
-    o.forEach((a) => {
+    const r = n.anyOf || n.oneOf || n.allOf, i = /* @__PURE__ */ new Set();
+    r.forEach((a) => {
       if (g(a)) {
         const c = y(a);
-        E(
+        T(
           e,
           t,
           this.context.outputDir,
           c
-        ), s.add(c.name);
+        ), i.add(c.name);
         return;
       }
-      s.add(C(a.type ?? "string"));
+      i.add(A(a.type ?? "string"));
     });
-    const i = xe(n) ? "|" : "&";
-    return Array.from(s).join(i);
+    const s = Ce(n) ? "|" : "&";
+    return Array.from(i).join(s);
   }
 }
-const Ge = "@ahoo-wang/fetcher-decorator", We = [
+const ke = "@ahoo-wang/fetcher-decorator", Qe = [
   "type ApiMetadata",
   "type ApiMetadataCapable",
   "type ParameterRequest",
@@ -718,19 +751,19 @@ const Ge = "@ahoo-wang/fetcher-decorator", We = [
   "attribute",
   "path",
   "autoGeneratedError"
-], ze = {
+], Ue = {
   type: "Promise<Response>",
   metadata: "{resultExtractor: ResultExtractors.Response }"
-}, N = `{
+}, D = `{
   headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
   resultExtractor: JsonEventStreamResultExtractor,
 }`;
-function ne(r) {
-  P(r, Ge, We);
+function re(o) {
+  C(o, ke, Qe);
 }
-function oe(r, e, t = []) {
+function ie(o, e, t = []) {
   return e.addClass({
-    name: r,
+    name: o,
     isExported: !0,
     decorators: [
       {
@@ -740,41 +773,41 @@ function oe(r, e, t = []) {
     ]
   });
 }
-function re(r, e) {
-  r.addImplements("ApiMetadataCapable"), r.addConstructor({
+function se(o, e) {
+  o.addImplements("ApiMetadataCapable"), o.addConstructor({
     parameters: [
       {
         name: "apiMetadata",
         type: "ApiMetadata",
         hasQuestionToken: e === void 0,
-        scope: ce.Public,
+        scope: ue.Public,
         isReadonly: !0,
         initializer: e
       }
     ]
   });
 }
-const Be = "@ahoo-wang/fetcher-eventstream";
-function se(r) {
-  P(r, Be, ["JsonEventStreamResultExtractor", "type JsonServerSentEventStream"]);
+const Je = "@ahoo-wang/fetcher-eventstream";
+function ae(o) {
+  C(o, Je, ["JsonEventStreamResultExtractor", "type JsonServerSentEventStream"]);
 }
-function ke(r) {
+function Ve(o) {
   let e = 0, t = 0;
-  return r.commands.forEach((n) => {
-    n.path.startsWith(F.TENANT) && (e += 1), n.path.startsWith(F.OWNER) && (t += 1);
+  return o.commands.forEach((n) => {
+    n.path.startsWith(_.TENANT) && (e += 1), n.path.startsWith(_.OWNER) && (t += 1);
   }), e === 0 && t === 0 ? "ResourceAttributionPathSpec.NONE" : e > t ? "ResourceAttributionPathSpec.TENANT" : "ResourceAttributionPathSpec.OWNER";
 }
-function ie(r, e, t, n) {
-  const o = `${t.contextAlias}/${t.aggregateName}/${n}.ts`;
-  return te(r, e, o);
+function ce(o, e, t, n) {
+  const r = `${t.contextAlias}/${t.aggregateName}/${n}.ts`;
+  return oe(o, e, r);
 }
-function Le(r, e) {
-  return `${A(r.aggregateName)}${e}`;
+function Ke(o, e) {
+  return `${x(o.aggregateName)}${e}`;
 }
-function D(r) {
-  return r === "delete" ? "del" : r;
+function b(o) {
+  return o === "delete" ? "del" : o;
 }
-class Qe {
+class He {
   /**
    * Creates a new ApiClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and configuration
@@ -783,7 +816,7 @@ class Qe {
     this.context = e, this.apiMetadataCtorInitializer = this.context.currentContextAlias ? `{basePath:'${this.context.currentContextAlias}'}` : void 0;
   }
   defaultParameterRequestType = "ParameterRequest";
-  defaultReturnType = ze;
+  defaultReturnType = Ue;
   apiMetadataCtorInitializer;
   /**
    * Generates API client classes for all valid tags in the OpenAPI specification.
@@ -810,14 +843,14 @@ class Qe {
       `Generating ${t.size} API client classes`
     );
     let n = 0;
-    for (const [o, s] of t) {
+    for (const [r, i] of t) {
       n++, this.context.logger.progressWithCount(
         n,
         t.size,
-        `Generating API client for tag: ${o}`
+        `Generating API client for tag: ${r}`
       );
-      const i = e.get(o);
-      this.generateApiClient(i, s);
+      const s = e.get(r);
+      this.generateApiClient(s, i);
     }
   }
   /**
@@ -827,7 +860,7 @@ class Qe {
    */
   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);
+    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.
@@ -839,16 +872,16 @@ class Qe {
     this.context.logger.info(
       `Generating API client class: ${n.name}ApiClient with ${t.size} operations`
     );
-    const o = this.createApiClientFile(n);
-    ne(o), se(o);
-    const s = oe(
+    const r = this.createApiClientFile(n);
+    re(r), ae(r);
+    const i = ie(
       n.name + "ApiClient",
-      o
+      r
     );
-    x(s, e.description), re(s, this.apiMetadataCtorInitializer), this.context.logger.info(
+    w(i, [e.description]), se(i, this.apiMetadataCtorInitializer), this.context.logger.info(
       `Processing ${t.size} operations for ${n.name}ApiClient`
-    ), t.forEach((i) => {
-      this.processOperation(e, o, s, i);
+    ), t.forEach((s) => {
+      this.processOperation(e, r, i, s);
     }), this.context.logger.success(
       `Completed API client: ${n.name}ApiClient`
     );
@@ -861,10 +894,10 @@ class Qe {
    */
   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;
+    for (let r = n.length - 1; r >= 0; r--) {
+      const i = h(n.slice(r));
+      if (!e.getMethod(i))
+        return i;
     }
     return h(n);
   }
@@ -882,7 +915,7 @@ class Qe {
     let n;
     if (g(t.requestBody) ? (this.context.logger.info(
       `Extracting request body from reference for operation: ${t.operationId}`
-    ), n = L(
+    ), n = U(
       t.requestBody,
       this.context.openAPI.components
     )) : n = t.requestBody, !n)
@@ -894,16 +927,16 @@ class Qe {
         `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 (g(o)) {
-        const s = y(o);
+      const r = n.content["application/json"].schema;
+      if (g(r)) {
+        const i = y(r);
         this.context.logger.info(
-          `Adding import for request body model: ${s.name} from ${s.path}`
-        ), f(e, this.context.outputDir, s);
-        const i = `ParameterRequest<${s.name}>`;
+          `Adding import for request body model: ${i.name} from ${i.path}`
+        ), f(e, this.context.outputDir, i);
+        const s = `ParameterRequest<${i.name}>`;
         return this.context.logger.info(
-          `Resolved request type for operation ${t.operationId}: ${i}`
-        ), i;
+          `Resolved request type for operation ${t.operationId}: ${s}`
+        ), s;
       }
     }
     return this.context.logger.info(
@@ -918,15 +951,15 @@ class Qe {
    * @returns Array of parameter declarations
    */
   resolveParameters(e, t, n) {
-    const o = Pe(n, this.context.openAPI.components).filter((a) => !this.context.isIgnoreApiClientPathParameters(
+    const r = Ie(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}`
+      `Found ${r.length} path parameters for operation ${n.operationId}`
     );
-    const s = o.map((a) => {
-      const c = Y(a);
+    const i = r.map((a) => {
+      const c = Z(a);
       return this.context.logger.info(
         `Adding path parameter: ${a.name} (type: ${c})`
       ), {
@@ -940,11 +973,11 @@ class Qe {
           }
         ]
       };
-    }), i = this.resolveRequestType(t, n);
-    return this.context.logger.info(`Adding httpRequest parameter: ${i}`), s.push({
+    }), s = this.resolveRequestType(t, n);
+    return this.context.logger.info(`Adding httpRequest parameter: ${s}`), i.push({
       name: "httpRequest",
-      hasQuestionToken: i === this.defaultParameterRequestType,
-      type: `${i}`,
+      hasQuestionToken: s === this.defaultParameterRequestType,
+      type: `${s}`,
       decorators: [
         {
           name: "request",
@@ -953,7 +986,7 @@ class Qe {
       ]
     }), this.context.logger.info(
       "Adding attributes parameter: Record<string, any>"
-    ), s.push({
+    ), i.push({
       name: "attributes",
       hasQuestionToken: !0,
       type: "Record<string, any>",
@@ -963,7 +996,7 @@ class Qe {
           arguments: []
         }
       ]
-    }), s;
+    }), i;
   }
   /**
    * Resolves the return type for a schema.
@@ -974,20 +1007,20 @@ class Qe {
   resolveSchemaReturnType(e, t) {
     const n = "Promise<any>";
     if (g(t)) {
-      const o = y(t);
+      const r = y(t);
       this.context.logger.info(
-        `Adding import for response model: ${o.name} from ${o.path}`
-      ), f(e, this.context.outputDir, o);
-      const s = `Promise<${o.name}>`;
-      return this.context.logger.info(`Resolved reference return type: ${s}`), s;
+        `Adding import for response model: ${r.name} from ${r.path}`
+      ), f(e, this.context.outputDir, r);
+      const i = `Promise<${r.name}>`;
+      return this.context.logger.info(`Resolved reference return type: ${i}`), i;
     }
     if (!t.type)
       return this.context.logger.info(
         `Schema has no type, using default return type: ${n}`
       ), n;
     if (q(t.type)) {
-      const s = `Promise<${C(t.type)}>`;
-      return this.context.logger.info(`Resolved primitive return type: ${s}`), s;
+      const i = `Promise<${A(t.type)}>`;
+      return this.context.logger.info(`Resolved primitive return type: ${i}`), i;
     }
     return this.context.logger.info(
       `Using default return type: ${n}`
@@ -1000,45 +1033,45 @@ class Qe {
    * @returns Object containing type and optional stream flag
    */
   resolveReturnType(e, t) {
-    const n = M(t);
+    const n = j(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 = J(n) || fe(n);
-    if (o) {
-      const i = this.resolveSchemaReturnType(e, o);
+    const r = K(n) || ye(n);
+    if (r) {
+      const s = this.resolveSchemaReturnType(e, r);
       return this.context.logger.info(
-        `Resolved JSON/wildcard response return type for operation ${t.operationId}: ${i}`
+        `Resolved JSON/wildcard response return type for operation ${t.operationId}: ${s}`
       ), {
-        type: i
+        type: s
       };
     }
-    const s = de(n);
-    if (s) {
-      if (g(s)) {
-        const a = R(
-          s,
+    const i = he(n);
+    if (i) {
+      if (g(i)) {
+        const a = E(
+          i,
           this.context.openAPI.components
         );
-        if (O(a) && g(a.items)) {
+        if (N(a) && g(a.items)) {
           const c = y(a.items);
           this.context.logger.info(
             `Adding import for event stream model: ${c.name} from ${c.path}`
           ), f(e, this.context.outputDir, c);
-          const p = `Promise<JsonServerSentEventStream<${c.name.includes("ServerSentEvent") ? `${c.name}['data']` : c.name}>>`;
+          const l = `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}`
+            `Resolved event stream return type for operation ${t.operationId}: ${l}`
           ), {
-            type: p,
-            metadata: N
+            type: l,
+            metadata: D
           };
         }
       }
-      const i = "Promise<JsonServerSentEventStream<any>>";
+      const s = "Promise<JsonServerSentEventStream<any>>";
       return this.context.logger.info(
-        `Resolved generic event stream return type for operation ${t.operationId}: ${i}`
-      ), { type: i, metadata: N };
+        `Resolved generic event stream return type for operation ${t.operationId}: ${s}`
+      ), { type: s, metadata: D };
     }
     return this.context.logger.info(
       `Using default return type for operation ${t.operationId}: ${this.defaultReturnType.type}`
@@ -1051,40 +1084,42 @@ class Qe {
    * @param apiClientClass - The client class to add the method to
    * @param operation - The operation to process
    */
-  processOperation(e, t, n, o) {
+  processOperation(e, t, n, r) {
     this.context.logger.info(
-      `Processing operation: ${o.operation.operationId} (${o.method} ${o.path})`
+      `Processing operation: ${r.operation.operationId} (${r.method} ${r.path})`
     );
-    const s = this.getMethodName(n, o.operation);
-    this.context.logger.info(`Generated method name: ${s}`);
-    const i = this.resolveParameters(
+    const i = this.getMethodName(n, r.operation);
+    this.context.logger.info(`Generated method name: ${i}`);
+    const s = this.resolveParameters(
       e,
       t,
-      o.operation
-    ), a = this.resolveReturnType(t, o.operation), c = a.metadata ? {
-      name: D(o.method),
-      arguments: [`'${o.path}'`, a.metadata]
+      r.operation
+    ), a = this.resolveReturnType(t, r.operation), c = a.metadata ? {
+      name: b(r.method),
+      arguments: [`'${r.path}'`, a.metadata]
     } : {
-      name: D(o.method),
-      arguments: [`'${o.path}'`]
+      name: b(r.method),
+      arguments: [`'${r.path}'`]
     };
     this.context.logger.info(
-      `Creating method with ${i.length} parameters, return type: ${a.type}`
+      `Creating method with ${s.length} parameters, return type: ${a.type}`
     );
-    const l = n.addMethod({
-      name: s,
+    const u = n.addMethod({
+      name: i,
       decorators: [c],
-      parameters: i,
+      parameters: s,
       returnType: a.type,
       statements: [
-        `throw autoGeneratedError(${i.map((p) => p.name).join(",")});`
+        `throw autoGeneratedError(${s.map((l) => l.name).join(",")});`
       ]
     });
-    x(
-      l,
-      o.operation.summary,
-      o.operation.description
-    ), this.context.logger.success(`Operation method generated: ${s}`);
+    w(
+      u,
+      [
+        r.operation.summary,
+        r.operation.description
+      ]
+    ), this.context.logger.success(`Operation method generated: ${i}`);
   }
   /**
    * Groups operations by their tags for client generation.
@@ -1095,25 +1130,25 @@ class Qe {
     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 = H(s).filter(
+    for (const [r, i] of Object.entries(this.context.openAPI.paths)) {
+      const s = X(i).filter(
         (a) => {
           if (!a.operation.operationId)
             return !1;
           const c = a.operation.tags;
-          return !c || c.length == 0 ? !1 : c.every((l) => e.has(l));
+          return !c || c.length == 0 ? !1 : c.every((u) => e.has(u));
         }
       );
       this.context.logger.info(
-        `Path ${o}: found ${i.length} valid operations`
+        `Path ${r}: found ${s.length} valid operations`
       );
-      for (const a of i)
+      for (const a of s)
         a.operation.tags.forEach((c) => {
-          const l = {
+          const u = {
             ...a,
-            path: o
+            path: r
           };
-          t.has(c) || t.set(c, /* @__PURE__ */ new Set()), t.get(c).add(l), n++;
+          t.has(c) || t.set(c, /* @__PURE__ */ new Set()), t.get(c).add(u), n++;
         });
     }
     return this.context.logger.info(
@@ -1131,9 +1166,9 @@ class Qe {
     );
     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)`
+    return this.context.openAPI.tags?.forEach((r) => {
+      r.name != "wow" && r.name != "Actuator" && !this.isAggregateTag(r) ? (e.set(r.name, r), n++, this.context.logger.info(`Included API client tag: ${r.name}`)) : this.context.logger.info(
+        `Excluded tag: ${r.name} (wow/Actuator/aggregate)`
       );
     }), this.context.logger.info(
       `Resolved ${n} API client tags from ${t} total tags`
@@ -1147,7 +1182,7 @@ class Qe {
     return !1;
   }
 }
-class Ue {
+class Ye {
   /**
    * Creates a new CommandClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1162,7 +1197,7 @@ class Ue {
    */
   generate() {
     const e = Array.from(this.context.contextAggregates.values()).reduce(
-      (n, o) => n + o.size,
+      (n, r) => n + r.size,
       0
     );
     this.context.logger.info("--- Generating Command Clients ---"), this.context.logger.progress(
@@ -1170,12 +1205,12 @@ class Ue {
     );
     let t = 0;
     for (const [, n] of this.context.contextAggregates)
-      n.forEach((o) => {
+      n.forEach((r) => {
         t++, this.context.logger.progressWithCount(
           t,
           e,
-          `Processing command client for aggregate: ${o.aggregate.aggregateName}`
-        ), this.processAggregate(o);
+          `Processing command client for aggregate: ${r.aggregate.aggregateName}`
+        ), this.processAggregate(r);
       });
     this.context.logger.success("Command client generation completed");
   }
@@ -1187,7 +1222,7 @@ class Ue {
     this.context.logger.info(
       `Processing command client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     );
-    const t = ie(
+    const t = ce(
       this.context.project,
       this.context.outputDir,
       e.aggregate,
@@ -1198,7 +1233,7 @@ class Ue {
     ), this.processCommandEndpointPaths(t, e), this.context.logger.info(
       `Creating default command client options: ${this.defaultCommandClientOptionsName}`
     ), t.addVariableStatement({
-      declarationKind: v.Const,
+      declarationKind: O.Const,
       declarations: [
         {
           name: this.defaultCommandClientOptionsName,
@@ -1210,9 +1245,9 @@ class Ue {
       ],
       isExported: !1
     }), this.context.logger.info(
-      `Adding imports from ${$}: CommandRequest, CommandResult, CommandResultEventStream, DeleteAggregate, RecoverAggregate`
+      `Adding imports from ${P}: CommandRequest, CommandResult, CommandResultEventStream, DeleteAggregate, RecoverAggregate`
     ), t.addImportDeclaration({
-      moduleSpecifier: $,
+      moduleSpecifier: P,
       namedImports: [
         "CommandRequest",
         "CommandResult",
@@ -1223,11 +1258,11 @@ class Ue {
       isTypeOnly: !0
     }), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher-eventstream: JsonEventStreamResultExtractor"
-    ), se(t), this.context.logger.info(
+    ), ae(t), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher: ContentTypeValues"
-    ), P(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info(
+    ), C(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info(
       "Adding imports from @ahoo-wang/fetcher-decorator: ApiMetadata types and decorators"
-    ), 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(
+    ), re(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}`
     );
   }
@@ -1238,12 +1273,12 @@ class Ue {
     const n = e.addEnum({
       name: this.commandEndpointPathsName
     });
-    t.commands.forEach((o) => {
+    t.commands.forEach((r) => {
       this.context.logger.info(
-        `Adding command endpoint: ${o.name.toUpperCase()} = '${o.path}'`
+        `Adding command endpoint: ${r.name.toUpperCase()} = '${r.path}'`
       ), n.addMember({
-        name: o.name.toUpperCase(),
-        initializer: `'${o.path}'`
+        name: r.name.toUpperCase(),
+        initializer: `'${r.path}'`
       });
     }), this.context.logger.success(
       `Command endpoint paths enum created with ${t.commands.size} entries`
@@ -1253,49 +1288,49 @@ class Ue {
     return `${this.commandEndpointPathsName}.${e.name.toUpperCase()}`;
   }
   processCommandClient(e, t, n = !1) {
-    let o = "CommandClient", s = [], i = "Promise<CommandResult>";
-    n && (o = "Stream" + o, s = [
+    let r = "CommandClient", i = [], s = "Promise<CommandResult>";
+    n && (r = "Stream" + r, i = [
       "''",
-      N
-    ], i = "Promise<CommandResultEventStream>");
-    const a = Le(
+      D
+    ], s = "Promise<CommandResultEventStream>");
+    const a = Ke(
       t.aggregate,
-      o
-    ), c = oe(a, e, s);
-    re(c, this.defaultCommandClientOptionsName), t.commands.forEach((l) => {
-      this.processCommandMethod(t, e, c, l, i);
+      r
+    ), c = ie(a, e, i);
+    se(c, this.defaultCommandClientOptionsName), t.commands.forEach((u) => {
+      this.processCommandMethod(t, e, c, u, s);
     });
   }
   resolveParameters(e, t, n) {
-    const o = d(n.schema.key);
+    const r = d(n.schema.key);
     this.context.logger.info(
-      `Adding import for command model: ${o.name} from path: ${o.path}`
-    ), f(t, this.context.outputDir, o);
-    const s = n.pathParameters.filter((i) => !this.context.isIgnoreCommandClientPathParameters(
+      `Adding import for command model: ${r.name} from path: ${r.path}`
+    ), f(t, this.context.outputDir, r);
+    const i = n.pathParameters.filter((s) => !this.context.isIgnoreCommandClientPathParameters(
       e.name,
-      i.name
-    )).map((i) => {
-      const a = Y(i);
+      s.name
+    )).map((s) => {
+      const a = Z(s);
       return this.context.logger.info(
-        `Adding path parameter: ${i.name} (type: ${a})`
+        `Adding path parameter: ${s.name} (type: ${a})`
       ), {
-        name: i.name,
+        name: s.name,
         type: a,
         hasQuestionToken: !1,
         decorators: [
           {
             name: "path",
-            arguments: [`'${i.name}'`]
+            arguments: [`'${s.name}'`]
           }
         ]
       };
     });
     return this.context.logger.info(
-      `Adding command request parameter: commandRequest (type: CommandRequest<${o.name}>)`
-    ), s.push({
+      `Adding command request parameter: commandRequest (type: CommandRequest<${r.name}>)`
+    ), i.push({
       name: "commandRequest",
-      hasQuestionToken: Ce(n.schema.schema),
-      type: `CommandRequest<${o.name}>`,
+      hasQuestionToken: $e(n.schema.schema),
+      type: `CommandRequest<${r.name}>`,
       decorators: [
         {
           name: "request",
@@ -1304,7 +1339,7 @@ class Ue {
       ]
     }), this.context.logger.info(
       "Adding attributes parameter: attributes (type: Record<string, any>)"
-    ), s.push({
+    ), i.push({
       name: "attributes",
       hasQuestionToken: !0,
       type: "Record<string, any>",
@@ -1314,36 +1349,36 @@ class Ue {
           arguments: []
         }
       ]
-    }), s;
+    }), i;
   }
-  processCommandMethod(e, t, n, o, s) {
+  processCommandMethod(e, t, n, r, i) {
     this.context.logger.info(
-      `Generating command method: ${h(o.name)} for command: ${o.name}`
+      `Generating command method: ${h(r.name)} for command: ${r.name}`
     ), this.context.logger.info(
-      `Command method details: HTTP ${o.method}, path: ${o.path}, return type: ${s}`
+      `Command method details: HTTP ${r.method}, path: ${r.path}, return type: ${i}`
     );
-    const i = this.resolveParameters(e.aggregate.tag, t, o), a = n.addMethod({
-      name: h(o.name),
+    const s = this.resolveParameters(e.aggregate.tag, t, r), a = n.addMethod({
+      name: h(r.name),
       decorators: [
         {
-          name: D(o.method),
-          arguments: [`${this.getEndpointPath(o)}`]
+          name: b(r.method),
+          arguments: [`${this.getEndpointPath(r)}`]
         }
       ],
-      parameters: i,
-      returnType: s,
+      parameters: s,
+      returnType: i,
       statements: [
-        `throw autoGeneratedError(${i.map((c) => c.name).join(",")});`
+        `throw autoGeneratedError(${s.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)}`
+    (r.summary || r.description) && this.context.logger.info(
+      `Adding JSDoc documentation for method: ${h(r.name)}`
+    ), w(a, [r.summary, r.description]), this.context.logger.success(
+      `Command method generated: ${h(r.name)}`
     );
   }
 }
-class Je {
+class Xe {
   /**
    * Creates a new QueryClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1356,7 +1391,7 @@ class Je {
    */
   generate() {
     const e = Array.from(this.context.contextAggregates.values()).reduce(
-      (n, o) => n + o.size,
+      (n, r) => n + r.size,
       0
     );
     this.context.logger.info("--- Generating Query Clients ---"), this.context.logger.progress(
@@ -1364,12 +1399,12 @@ class Je {
     );
     let t = 0;
     for (const [, n] of this.context.contextAggregates)
-      n.forEach((o) => {
+      n.forEach((r) => {
         t++, this.context.logger.progressWithCount(
           t,
           e,
-          `Processing query client for aggregate: ${o.aggregate.aggregateName}`
-        ), this.processQueryClient(o);
+          `Processing query client for aggregate: ${r.aggregate.aggregateName}`
+        ), this.processQueryClient(r);
       });
     this.context.logger.success("Query client generation completed");
   }
@@ -1380,7 +1415,7 @@ class Je {
    * @returns The source file for the client
    */
   createClientFilePath(e, t) {
-    return ie(
+    return ce(
       this.context.project,
       this.context.outputDir,
       e,
@@ -1399,9 +1434,9 @@ class Je {
     this.context.logger.info(
       `Processing query client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     ), this.context.logger.info(
-      `Adding imports from ${$}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
+      `Adding imports from ${P}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
     ), t.addImportDeclaration({
-      moduleSpecifier: $,
+      moduleSpecifier: P,
       namedImports: [
         "QueryClientFactory",
         "QueryClientOptions",
@@ -1412,7 +1447,7 @@ class Je {
     this.context.logger.info(
       `Creating default query client options: ${n}`
     ), t.addVariableStatement({
-      declarationKind: v.Const,
+      declarationKind: O.Const,
       declarations: [
         {
           name: n,
@@ -1420,40 +1455,40 @@ class Je {
           initializer: `{
         contextAlias: '${e.aggregate.contextAlias}',
         aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${ke(e)},
+        resourceAttribution: ${Ve(e)},
       }`
         }
       ],
       isExported: !1
     });
-    const o = [];
+    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 u = d(p.schema.key);
+    for (const l of e.events.values()) {
+      const p = d(l.schema.key);
       this.context.logger.info(
-        `Adding import for event model: ${u.name} from path: ${u.path}`
-      ), f(t, this.context.outputDir, u), o.push(u);
+        `Adding import for event model: ${p.name} from path: ${p.path}`
+      ), f(t, this.context.outputDir, p), r.push(p);
     }
-    const s = "DOMAIN_EVENT_TYPES", i = o.map((p) => p.name).join(" | ");
+    const i = "DOMAIN_EVENT_TYPES", s = r.map((l) => l.name).join(" | ");
     this.context.logger.info(
-      `Creating domain event types union: ${s} = ${i}`
+      `Creating domain event types union: ${i} = ${s}`
     ), t.addTypeAlias({
-      name: s,
-      type: i
+      name: i,
+      type: s
     });
-    const a = `${h(e.aggregate.aggregateName)}QueryClientFactory`, c = d(e.state.key), l = d(e.fields.key);
+    const a = `${h(e.aggregate.aggregateName)}QueryClientFactory`, c = d(e.state.key), u = 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: ${l.name} from path: ${l.path}`
-    ), f(t, this.context.outputDir, l), this.context.logger.info(`Creating query client factory: ${a}`), t.addVariableStatement({
-      declarationKind: v.Const,
+      `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,
       declarations: [
         {
           name: a,
-          initializer: `new QueryClientFactory<${c.name}, ${l.name} | string, ${s}>(${n})`
+          initializer: `new QueryClientFactory<${c.name}, ${u.name} | string, ${i}>(${n})`
         }
       ],
       isExported: !0
@@ -1462,13 +1497,13 @@ class Je {
     );
   }
 }
-class Ve {
+class Ze {
   /**
    * Creates a new ClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    this.context = e, this.queryClientGenerator = new Je(e), this.commandClientGenerator = new Ue(e), this.apiClientGenerator = new Qe(e);
+    this.context = e, this.queryClientGenerator = new Xe(e), this.commandClientGenerator = new Ye(e), this.apiClientGenerator = new He(e);
   }
   queryClientGenerator;
   commandClientGenerator;
@@ -1507,7 +1542,7 @@ class Ve {
     );
   }
 }
-class Ke {
+class et {
   /** The ts-morph project instance used for code generation */
   project;
   /** The OpenAPI specification object */
@@ -1525,7 +1560,7 @@ class Ke {
     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 te(this.project, this.outputDir, e);
+    return oe(this.project, this.outputDir, e);
   }
   isIgnoreApiClientPathParameters(e, t) {
     return (this.config.apiClients?.[e]?.ignorePathParameters ?? this.defaultIgnorePathParameters).includes(t);
@@ -1534,14 +1569,14 @@ class Ke {
     return this.defaultIgnorePathParameters.includes(t);
   }
 }
-const He = "./fetcher-generator.config.json";
-class ot {
+const tt = "./fetcher-generator.config.json";
+class ct {
   /**
    * Creates a new CodeGenerator instance.
    * @param options - Configuration options for code generation
    */
   constructor(e) {
-    this.options = e, this.project = new ge({ tsConfigFilePath: this.options.tsConfigFilePath }), this.options.logger.info("Project instance created with tsConfigFilePath: ", this.options.tsConfigFilePath);
+    this.options = e, this.project = new le({ tsConfigFilePath: this.options.tsConfigFilePath }), this.options.logger.info("Project instance created with tsConfigFilePath: ", this.options.tsConfigFilePath);
   }
   project;
   /**
@@ -1555,26 +1590,26 @@ class ot {
     ), 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 Ee(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
-    const n = new je(e).resolve();
+    const n = new ze(e).resolve();
     this.options.logger.info(
       `Resolved ${n.size} bounded context aggregates`
     );
-    const o = this.options.configPath ?? He;
-    let s = {};
+    const r = this.options.configPath ?? tt;
+    let i = {};
     try {
-      this.options.logger.info("Parsing configuration file:", o), s = await Se(o);
-    } catch (l) {
-      this.options.logger.info("Configuration file parsing failed ", l);
+      this.options.logger.info("Parsing configuration file:", r), i = await we(r);
+    } catch (u) {
+      this.options.logger.info("Configuration file parsing failed ", u);
     }
-    const i = new Ke({
+    const s = new et({
       openAPI: e,
       project: this.project,
       outputDir: this.options.outputDir,
       contextAggregates: n,
       logger: this.options.logger,
-      config: s
+      config: i
     });
-    this.options.logger.info("Generating models"), new _e(i).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new Ve(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 Be(s).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new Ze(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.
@@ -1609,39 +1644,39 @@ class ot {
     this.options.logger.info(`Generating index for directory: ${t}`);
     const n = e.getSourceFiles().filter(
       (a) => a.getBaseName().endsWith(".ts") && a.getBaseName() !== "index.ts"
-    ), o = e.getDirectories();
+    ), r = e.getDirectories();
     if (this.options.logger.info(
-      `Found ${n.length} TypeScript files and ${o.length} subdirectories in ${t}`
-    ), n.length === 0 && o.length === 0) {
+      `Found ${n.length} TypeScript files and ${r.length} subdirectories in ${t}`
+    ), n.length === 0 && r.length === 0) {
       this.options.logger.info(
         `No files or subdirectories to export in ${t}, skipping index generation`
       );
       return;
     }
-    const s = `${t}/index.ts`;
-    this.options.logger.info(`Creating/updating index file: ${s}`);
-    const i = this.project.getSourceFile(s) || this.project.createSourceFile(s, "", { overwrite: !0 });
-    i.removeText();
+    const i = `${t}/index.ts`;
+    this.options.logger.info(`Creating/updating index file: ${i}`);
+    const s = this.project.getSourceFile(i) || this.project.createSourceFile(i, "", { overwrite: !0 });
+    s.removeText();
     for (const a of n) {
       const c = `./${a.getBaseNameWithoutExtension()}`;
-      this.options.logger.info(`Adding export for file: ${c}`), i.addExportDeclaration({
+      this.options.logger.info(`Adding export for file: ${c}`), s.addExportDeclaration({
         moduleSpecifier: c,
         isTypeOnly: !1,
         namedExports: []
       });
     }
-    for (const a of o) {
+    for (const a of r) {
       const c = `./${a.getBaseName()}`;
       this.options.logger.info(
         `Adding export for subdirectory: ${c}`
-      ), i.addExportDeclaration({
+      ), s.addExportDeclaration({
         moduleSpecifier: c,
         isTypeOnly: !1,
         namedExports: []
       });
     }
     this.options.logger.info(
-      `Index file generated for ${t} with ${n.length + o.length} exports`
+      `Index file generated for ${t} with ${n.length + r.length} exports`
     );
   }
   optimizeSourceFiles() {
@@ -1654,7 +1689,7 @@ class ot {
   }
 }
 export {
-  ot as CodeGenerator,
-  He as DEFAULT_CONFIG_PATH
+  ct as CodeGenerator,
+  tt as DEFAULT_CONFIG_PATH
 };
 //# sourceMappingURL=index.js.map