@ahoo-wang/fetcher-generator 2.11.3 → 2.12.1

package/dist/index.js

@@ -1,78 +1,78 @@
-import { Scope as le, VariableDeclarationKind as O, Project as pe } from "ts-morph";
-import { ContentTypeValues as E, combineURLs as v } from "@ahoo-wang/fetcher";
-import { ResourceAttributionPathSpec as W } from "@ahoo-wang/fetcher-wow";
+import { Scope as le, VariableDeclarationKind as w, Project as de } from "ts-morph";
+import { ContentTypeValues as $, combineURLs as T } from "@ahoo-wang/fetcher";
+import { ResourceAttributionPathSpec as G } from "@ahoo-wang/fetcher-wow";
 import { parse as J } from "yaml";
 import { readFile as me } from "fs";
-import { join as de, relative as fe } from "path";
-function $(o) {
-  return o.$ref.split("/").pop();
+import { join as fe, relative as he } from "path";
+function A(n) {
+  return n.$ref.split("/").pop();
 }
-function S(o, e) {
-  const t = $(o);
+function I(n, e) {
+  const t = A(n);
   return e.schemas?.[t];
 }
-function V(o, e) {
-  const t = $(o);
+function V(n, e) {
+  const t = A(n);
   return e.requestBodies?.[t];
 }
-function H(o, e) {
-  const t = $(o);
+function H(n, e) {
+  const t = A(n);
   return e.parameters?.[t];
 }
-function I(o, e) {
+function P(n, e) {
   return {
-    key: $(o),
-    schema: S(o, e)
+    key: A(n),
+    schema: I(n, e)
   };
 }
-const he = /[-_\s.]+/;
-function N(o) {
-  return o.split(he);
+const ye = /[-_\s.]+/;
+function O(n) {
+  return n.split(ye);
 }
-function Y(o) {
-  return Array.isArray(o) ? o.flatMap((e) => L(N(e))) : L(N(o));
+function Y(n) {
+  return Array.isArray(n) ? n.flatMap((e) => W(O(e))) : W(O(n));
 }
-function L(o) {
-  return o.flatMap((e) => {
+function W(n) {
+  return n.flatMap((e) => {
     if (e.length === 0)
       return [];
     const t = [];
-    let n = "";
+    let o = "";
     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;
+      s && a && o ? (t.push(o), o = i) : o += i;
     }
-    return n && t.push(n), t;
+    return o && t.push(o), t;
   });
 }
-function x(o) {
-  return o === "" || o.length === 0 ? "" : Y(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();
+function S(n) {
+  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(o) {
-  const e = x(o);
+function h(n) {
+  const e = S(n);
   return e.charAt(0).toLowerCase() + e.slice(1);
 }
-function ye(o) {
-  return o === "" || Array.isArray(o) && o.length === 0 ? "" : Y(o).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
+function xe(n) {
+  return n === "" || Array.isArray(n) && n.length === 0 ? "" : Y(n).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
 }
-function g(o) {
-  return !!(o && typeof o == "object" && "$ref" in o);
+function u(n) {
+  return !!(n && typeof n == "object" && "$ref" in n);
 }
-function j(o, e) {
-  if (e && !g(e) && e.content)
-    return e.content[o]?.schema;
+function F(n, e) {
+  if (e && !u(e) && e.content)
+    return e.content[n]?.schema;
 }
-function K(o) {
-  return j(E.APPLICATION_JSON, o);
+function K(n) {
+  return F($.APPLICATION_JSON, n);
 }
-function xe(o) {
-  return j(E.TEXT_EVENT_STREAM, o);
+function Ae(n) {
+  return F($.TEXT_EVENT_STREAM, n);
 }
-function Ae(o) {
-  return j("*/*", o);
+function Pe(n) {
+  return F("*/*", n);
 }
 const Ce = [
   "string",
@@ -81,40 +81,43 @@ const Ce = [
   "boolean",
   "null"
 ];
-function _(o) {
-  return Array.isArray(o) ? !0 : Ce.includes(o);
+function X(n) {
+  return Array.isArray(n) ? !0 : Ce.includes(n);
 }
-function D(o) {
-  return o.type === "array";
+function k(n) {
+  return Array.isArray(n.enum) && n.enum.length > 0;
 }
-function Pe(o) {
-  return Array.isArray(o.enum) && o.enum.length > 0;
+function R(n) {
+  return n.type === "object" && !!n.properties;
 }
-function X(o) {
-  return Array.isArray(o.anyOf) && o.anyOf.length > 0;
+function D(n) {
+  return n.type === "array" && !!n.items;
 }
-function Z(o) {
-  return Array.isArray(o.oneOf) && o.oneOf.length > 0;
+function $e(n) {
+  return Array.isArray(n.anyOf) && n.anyOf.length > 0;
 }
-function $e(o) {
-  return X(o) || Z(o);
+function Te(n) {
+  return Array.isArray(n.oneOf) && n.oneOf.length > 0;
 }
-function Ie(o) {
-  return Array.isArray(o.allOf) && o.allOf.length > 0;
+function N(n) {
+  return Array.isArray(n.allOf) && n.allOf.length > 0;
 }
-function z(o) {
-  return X(o) || Z(o) || Ie(o);
+function L(n) {
+  return $e(n) || Te(n) || N(n);
 }
-function k(o) {
-  return o.includes("|") || o.includes("&") ? `(${o})[]` : `${o}[]`;
+function Ie(n) {
+  return n.includes("|") || n.includes("&") ? `(${n})[]` : `${n}[]`;
 }
-function Te(o) {
-  return o.type !== "object" ? !1 : o.properties ? Object.keys(o.properties).length === 0 : !0;
+function ve(n) {
+  return n.type === "object" && !n.properties && n.additionalProperties !== void 0;
 }
-function A(o) {
-  if (Array.isArray(o))
-    return o.map((e) => A(e)).join(" | ");
-  switch (o) {
+function Se(n) {
+  return n.type !== "object" ? !1 : n.properties ? Object.keys(n.properties).length === 0 : !0;
+}
+function E(n) {
+  if (Array.isArray(n))
+    return n.map((e) => E(e)).join(" | ");
+  switch (n) {
     case "string":
       return "string";
     case "number":
@@ -128,69 +131,69 @@ function A(o) {
       return "any";
   }
 }
-function M(o) {
+function b(n) {
   return [
-    { 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 }
+    { method: "get", operation: n.get },
+    { method: "put", operation: n.put },
+    { method: "post", operation: n.post },
+    { method: "delete", operation: n.delete },
+    { method: "options", operation: n.options },
+    { method: "head", operation: n.head },
+    { method: "patch", operation: n.patch },
+    { method: "trace", operation: n.trace }
   ].filter(({ operation: e }) => e !== void 0);
 }
-function F(o) {
-  return o.responses[200];
+function j(n) {
+  return n.responses[200];
 }
-function B(o) {
-  const e = F(o);
+function z(n) {
+  const e = j(n);
   return K(e);
 }
-function Ee(o, e) {
-  return o.parameters ? o.parameters.map((t) => g(t) ? H(t, e) : t).filter((t) => t.in === "path") : [];
+function Ee(n, e) {
+  return n.parameters ? n.parameters.map((t) => u(t) ? H(t, e) : t).filter((t) => t.in === "path") : [];
 }
-const ve = "string";
-function ee(o) {
-  return !o.schema || g(o.schema) || !o.schema.type || !_(o.schema.type) ? ve : A(o.schema.type);
+const Re = "string";
+function Z(n) {
+  return !n.schema || u(n.schema) || !n.schema.type || !X(n.schema.type) ? Re : E(n.schema.type);
 }
-function te(o) {
-  return o.startsWith("http://") || o.startsWith("https://") ? Se(o) : we(o);
+function ee(n) {
+  return n.startsWith("http://") || n.startsWith("https://") ? we(n) : Oe(n);
 }
-async function Se(o) {
-  return await (await fetch(o)).text();
+async function we(n) {
+  return await (await fetch(n)).text();
 }
-function we(o) {
+function Oe(n) {
   return new Promise((e, t) => {
-    me(o, "utf-8", (n, r) => {
-      n ? t(n) : e(r);
+    me(n, "utf-8", (o, r) => {
+      o ? t(o) : e(r);
     });
   });
 }
-async function Re(o) {
-  const e = await te(o);
-  switch (ne(e)) {
+async function De(n) {
+  const e = await ee(n);
+  switch (te(e)) {
     case "json":
       return JSON.parse(e);
     case "yaml":
       return J(e);
     default:
-      throw new Error(`Unsupported file format: ${o}`);
+      throw new Error(`Unsupported file format: ${n}`);
   }
 }
-async function Oe(o) {
-  const e = await te(o);
-  switch (ne(e)) {
+async function Ne(n) {
+  const e = await ee(n);
+  switch (te(e)) {
     case "json":
       return JSON.parse(e);
     case "yaml":
       return J(e);
     default:
-      throw new Error(`Unsupported file format: ${o}`);
+      throw new Error(`Unsupported file format: ${n}`);
   }
 }
-function ne(o) {
-  const e = o.trimStart();
+function te(n) {
+  const e = n.trimStart();
   if (e.startsWith("{") || e.startsWith("["))
     return "json";
   if (e.startsWith("-") || e.startsWith("%YAML"))
@@ -203,125 +206,129 @@ function ne(o) {
   }
   throw new Error("Unable to infer file format");
 }
-const oe = "types.ts", Ne = "@";
-function De(o) {
-  return v(o.path, oe);
+const ne = "types.ts", be = "@";
+function Me(n) {
+  return T(n.path, ne);
 }
-function re(o, e, t) {
-  const n = v(e, t), r = o.getSourceFile(n);
-  return r || o.createSourceFile(n, "", {
+function oe(n, e, t) {
+  const o = T(e, t), r = n.getSourceFile(o);
+  return r || n.createSourceFile(o, "", {
     overwrite: !0
   });
 }
-function C(o, e, t) {
-  let n = o.getImportDeclaration(
+function y(n, e, t) {
+  let o = n.getImportDeclaration(
     (r) => r.getModuleSpecifierValue() === e
   );
-  n || (n = o.addImportDeclaration({
+  o || (o = n.addImportDeclaration({
     moduleSpecifier: e
   })), t.forEach((r) => {
-    n.getNamedImports().some(
+    o.getNamedImports().some(
       (s) => s.getName() === r
-    ) || n.addNamedImport(r);
+    ) || o.addNamedImport(r);
   });
 }
-function f(o, e, t) {
-  if (t.path.startsWith(Ne)) {
-    C(o, t.path, [t.name]);
+function f(n, e, t) {
+  if (t.path.startsWith(be)) {
+    y(n, t.path, [t.name]);
     return;
   }
-  const n = o.getDirectoryPath(), r = de(e, t.path, oe);
-  let i = fe(n, r);
-  i = i.replace(/\.ts$/, ""), i.startsWith(".") || (i = "./" + i), C(o, i, [t.name]);
+  const o = n.getDirectoryPath(), r = fe(e, t.path, ne);
+  let i = he(o, r);
+  i = i.replace(/\.ts$/, ""), i.startsWith(".") || (i = "./" + i), y(n, i, [t.name]);
 }
-function T(o, e, t, n) {
-  o.path !== n.path && f(e, t, n);
+function qe(n, e, t, o) {
+  n.path !== o.path && f(e, t, o);
 }
-function Me(o) {
-  if (!Array.isArray(o))
+function re(n, e = `
+`) {
+  if (!Array.isArray(n))
     return;
-  const e = o.filter(
-    (t) => typeof t == "string" && t.length > 0
+  const t = n.filter(
+    (o) => typeof o == "string" && o.length > 0
   );
-  return e.length > 0 ? e.join(`
-`) : void 0;
+  return t.length > 0 ? t.join(e) : void 0;
 }
-function w(o, e) {
-  const t = Me(e);
-  t && o.addJsDoc(t);
+function v(n, e) {
+  const t = re(e);
+  t && n.addJsDoc(t);
 }
-function R(o, e) {
+function ie(n, e) {
   const t = [
-    e.title,
-    e.description
+    n.title,
+    n.description
   ];
-  e.format && t.push(`- format: ${e.format}`), U(t, e, "default"), U(t, e, "example"), be(t, e), qe(t, e), je(t, e), w(o, t);
+  return e && t.push(`- key: ${e}`), n.format && t.push(`- format: ${n.format}`), Q(t, n, "default"), Q(t, n, "example"), Fe(t, n), je(t, n), _e(t, n), t;
+}
+function B(n, e, t) {
+  const o = ie(e, t);
+  v(n, o);
 }
-function U(o, e, t) {
-  const n = e[t];
-  if (n) {
-    if (typeof n != "object") {
-      o.push(`- ${t}: \`${n}\``);
+function Q(n, e, t) {
+  const o = e[t];
+  if (o) {
+    if (typeof o != "object") {
+      n.push(`- ${t}: \`${o}\``);
       return;
     }
-    o.push(`- ${t}: `), o.push("```json"), o.push(JSON.stringify(n)), o.push("```");
+    n.push(`- ${t}: `), n.push("```json"), n.push(JSON.stringify(o)), n.push("```");
   }
 }
-function be(o, e) {
+function Fe(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}`
   ), e.exclusiveMaximum !== void 0 && t.push(
     `  - exclusiveMaximum: ${e.exclusiveMaximum}`
-  ), e.multipleOf !== void 0 && t.push(`  - multipleOf: ${e.multipleOf}`), t.length !== 1 && o.push(...t);
+  ), e.multipleOf !== void 0 && t.push(`  - multipleOf: ${e.multipleOf}`), t.length !== 1 && n.push(...t);
 }
-function qe(o, e) {
+function je(n, 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);
+  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 && n.push(...t);
 }
-function je(o, e) {
+function _e(n, 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);
+  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 && n.push(...t);
 }
-function _e(o) {
-  const e = o.split(".");
+function Ge(n) {
+  const e = n.split(".");
   return e.length != 2 || e[0].length === 0 || e[1].length === 0 ? null : e;
 }
-function Fe(o) {
-  const e = _e(o.name);
+function We(n) {
+  const e = Ge(n.name);
   return e ? {
-    tag: o,
+    tag: n,
     contextAlias: e[0],
     aggregateName: e[1]
   } : null;
 }
-function Ge(o) {
-  const e = o?.map((n) => Fe(n)).filter((n) => n !== null);
+function ke(n) {
+  const e = n?.map((o) => We(o)).filter((o) => o !== null);
   if (!e)
     return /* @__PURE__ */ new Map();
   const t = /* @__PURE__ */ new Map();
-  return e.forEach((n) => {
-    t.set(n.tag.name, {
-      aggregate: n,
+  return e.forEach((o) => {
+    t.set(o.tag.name, {
+      aggregate: o,
       commands: /* @__PURE__ */ new Map(),
       events: /* @__PURE__ */ new Map()
     });
   }), t;
 }
-function We(o) {
-  if (!o)
+function Le(n) {
+  if (!n)
     return null;
-  const e = o.split(".");
+  const e = n.split(".");
   return e.length != 3 ? null : e[2];
 }
-const Le = "#/components/responses/wow.CommandOk", ze = "#/components/parameters/wow.id";
-class ke {
+const ze = "#/components/responses/wow.CommandOk", Be = "#/components/parameters/wow.id";
+class Qe {
   /**
    * Creates a new AggregateResolver instance.
    * @param openAPI - The OpenAPI specification to resolve aggregates from
    */
   constructor(e) {
-    this.openAPI = e, this.aggregates = Ge(e.tags), this.build();
+    this.openAPI = e, this.aggregates = ke(e.tags), this.build();
   }
   aggregates;
   /**
@@ -330,8 +337,8 @@ class ke {
    */
   build() {
     for (const [e, t] of Object.entries(this.openAPI.paths)) {
-      const n = M(t);
-      for (const r of n)
+      const o = b(t);
+      for (const r of o)
         this.commands(e, r), this.state(r.operation), this.events(r.operation), this.fields(r.operation);
     }
   }
@@ -344,9 +351,9 @@ class ke {
     for (const t of this.aggregates.values()) {
       if (!t.state || !t.fields)
         continue;
-      const n = t.aggregate.contextAlias;
-      let r = e.get(n);
-      r || (r = /* @__PURE__ */ new Set(), e.set(n, r)), r.add(t);
+      const o = t.aggregate.contextAlias;
+      let r = e.get(o);
+      r || (r = /* @__PURE__ */ new Set(), e.set(o, r)), r.add(t);
     }
     return e;
   }
@@ -356,43 +363,43 @@ class ke {
    * @param methodOperation - The HTTP method and operation details
    */
   commands(e, t) {
-    const n = t.operation;
-    if (n.operationId === "wow.command.send")
+    const o = t.operation;
+    if (o.operationId === "wow.command.send")
       return;
-    const r = We(n.operationId);
+    const r = Le(o.operationId);
     if (!r)
       return;
-    const i = F(n);
-    if (!i || !g(i) || i.$ref !== Le || !n.requestBody)
+    const i = j(o);
+    if (!i || !u(i) || i.$ref !== ze || !o.requestBody)
       return;
-    const s = n.parameters ?? [], a = s.filter((m) => g(m) && m.$ref === ze).at(0), c = s.filter(
-      (m) => !g(m) && m.in === "path"
+    const s = o.parameters ?? [], a = s.filter((d) => u(d) && d.$ref === Be).at(0), c = s.filter(
+      (d) => !u(d) && d.in === "path"
     );
     if (a) {
-      const m = H(
+      const d = H(
         a,
         this.openAPI.components
       );
-      c.push(m);
+      c.push(d);
     }
-    const l = n.requestBody.content[E.APPLICATION_JSON].schema, p = I(
-      l,
+    const p = o.requestBody.content[$.APPLICATION_JSON].schema, l = P(
+      p,
       this.openAPI.components
     );
-    p.schema.title = p.schema.title || n.summary, p.schema.description = p.schema.description || n.description;
-    const ue = {
+    l.schema.title = l.schema.title || o.summary, l.schema.description = l.schema.description || o.description;
+    const pe = {
       name: r,
       method: t.method,
       path: e,
       pathParameters: c,
-      summary: n.summary,
-      description: n.description,
-      schema: p,
-      operation: n
+      summary: o.summary,
+      description: o.description,
+      schema: l,
+      operation: o
     };
-    n.tags?.forEach((m) => {
-      const G = this.aggregates.get(m);
-      G && G.commands.set(r, ue);
+    o.tags?.forEach((d) => {
+      const _ = this.aggregates.get(d);
+      _ && _.commands.set(r, pe);
     });
   }
   /**
@@ -402,16 +409,16 @@ class ke {
   state(e) {
     if (!e.operationId?.endsWith(".snapshot_state.single"))
       return;
-    const t = B(e);
-    if (!g(t))
+    const t = z(e);
+    if (!u(t))
       return;
-    const n = I(
+    const o = P(
       t,
       this.openAPI.components
     );
     e.tags?.forEach((r) => {
       const i = this.aggregates.get(r);
-      i && (i.state = n);
+      i && (i.state = o);
     });
   }
   /**
@@ -421,24 +428,24 @@ class ke {
   events(e) {
     if (!this.openAPI.components || !e.operationId?.endsWith(".event.list_query"))
       return;
-    const t = B(e);
-    if (g(t))
+    const t = z(e);
+    if (u(t))
       return;
-    const n = t?.items;
-    if (!g(n))
+    const o = t?.items;
+    if (!u(o))
       return;
-    const i = S(
-      n,
+    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, l = I(
-        u,
+      const a = s.title, c = s.properties.name.const, g = s.properties.body, p = P(
+        g,
         this.openAPI.components
       );
-      return l.schema.title = l.schema.title || s.title, {
+      return p.schema.title = p.schema.title || s.title, {
         title: a,
         name: c,
-        schema: l
+        schema: p
       };
     });
     e.tags?.forEach((s) => {
@@ -455,20 +462,20 @@ class ke {
   fields(e) {
     if (!this.openAPI.components || !e.operationId?.endsWith(".snapshot.count"))
       return;
-    const n = V(
+    const o = V(
       e.requestBody,
       this.openAPI.components
-    ).content[E.APPLICATION_JSON].schema, i = S(
-      n,
+    ).content[$.APPLICATION_JSON].schema, i = I(
+      o,
       this.openAPI.components
-    ).properties?.field, s = I(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 P = "@ahoo-wang/fetcher-wow", Be = {
+const x = "@ahoo-wang/fetcher-wow", Ue = {
   "wow.command.CommandResult": "CommandResult",
   "wow.command.CommandResultArray": "CommandResultArray",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
@@ -498,32 +505,188 @@ const P = "@ahoo-wang/fetcher-wow", Be = {
   "wow.openapi.BatchResult": "BatchResult",
   "wow.messaging.CompensationTarget": "CompensationTarget"
 };
-function d(o) {
-  if (!o)
+function m(n) {
+  if (!n)
     return { name: "", path: "/" };
-  const e = Be[o];
+  const e = Ue[n];
   if (e)
-    return { name: e, path: P };
-  const t = o.split(".");
-  let n = -1;
+    return { name: e, path: x };
+  const t = n.split(".");
+  let o = -1;
   for (let c = 0; c < t.length; c++)
     if (t[c] && /^[A-Z]/.test(t[c])) {
-      n = c;
+      o = c;
       break;
     }
-  const r = t.slice(0, n), i = r.length > 0 ? `/${r.join("/")}` : "/", s = t.slice(n);
-  return { name: x(s), path: i };
+  const r = t.slice(0, o), i = r.length > 0 ? `/${r.join("/")}` : "/", s = t.slice(o);
+  return { name: S(s), path: i };
 }
-function y(o) {
-  const e = $(o);
-  return d(e);
+function C(n) {
+  const e = A(n);
+  return m(e);
 }
-class Ue {
+class Je {
+  constructor(e, t, o, r) {
+    this.modelInfo = e, this.sourceFile = t, this.keySchema = o, this.outputDir = r;
+  }
+  generate() {
+    const e = this.process();
+    e && B(e, this.keySchema.schema, this.keySchema.key);
+  }
+  process() {
+    const { schema: e } = this.keySchema;
+    return k(e) ? this.processEnum(e) : R(e) ? this.processInterface(e) : D(e) ? this.processArray(e) : N(e) ? this.processIntersection(e) : L(e) ? this.processComposition(e) : this.processTypeAlias(e);
+  }
+  resolveReference(e) {
+    const t = C(e);
+    return qe(
+      this.modelInfo,
+      this.sourceFile,
+      this.outputDir,
+      t
+    ), t;
+  }
+  resolveAdditionalProperties(e) {
+    return e.additionalProperties === void 0 || e.additionalProperties === !1 ? "" : e.additionalProperties === !0 ? "[key: string]: any" : `[key: string]: ${this.resolveType(
+      e.additionalProperties
+    )}`;
+  }
+  resolvePropertyDefinitions(e) {
+    const { properties: t } = e;
+    return Object.entries(t).map(([o, r]) => {
+      const i = this.resolveType(r);
+      if (!u(r)) {
+        const s = ie(r), a = re(s, `
+ * `);
+        if (a)
+          return `
+          /**
+           * ${a}
+           */
+          ${o}: ${i}
+          `;
+      }
+      return `${o}: ${i}`;
+    });
+  }
+  resolveObjectType(e) {
+    const t = [];
+    if (R(e)) {
+      const r = this.resolvePropertyDefinitions(e);
+      t.push(...r);
+    }
+    const o = this.resolveAdditionalProperties(e);
+    return o && t.push(o), t.length === 0 ? "Record<string, any>" : `{
+  ${t.join(`;
+  `)}; 
+}`;
+  }
+  resolveMapValueType(e) {
+    return e.additionalProperties === void 0 || e.additionalProperties === !1 || e.additionalProperties === !0 ? "any" : this.resolveType(e.additionalProperties);
+  }
+  resolveType(e) {
+    if (u(e))
+      return this.resolveReference(e).name;
+    if (ve(e))
+      return `Record<string,${this.resolveMapValueType(e)}>`;
+    if (e.const)
+      return `'${e.const}'`;
+    if (k(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 = N(e) ? " & " : " | ";
+      return `(${o.join(r)})`;
+    }
+    if (D(e)) {
+      const t = this.resolveType(e.items);
+      return Ie(t);
+    }
+    return e.type === "object" ? this.resolveObjectType(e) : e.type ? E(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: xe(t),
+        initializer: `'${t}'`
+      }))
+    });
+  }
+  addPropertyToInterface(e, t, o) {
+    const r = this.resolveType(o);
+    let i = e.getProperty(t);
+    i ? i.setType(r) : i = e.addProperty({
+      name: t,
+      type: r
+    }), u(o) || B(i, o);
+  }
+  processInterface(e) {
+    const t = this.sourceFile.addInterface({
+      name: this.modelInfo.name,
+      isExported: !0
+    }), o = e.properties || {};
+    return Object.entries(o).forEach(([r, i]) => {
+      this.addPropertyToInterface(t, r, i);
+    }), e.additionalProperties && t.addIndexSignature({
+      keyName: "key",
+      keyType: "string",
+      returnType: this.resolveType(
+        e.additionalProperties === !0 ? {} : e.additionalProperties
+      )
+    }).addJsDoc("Additional properties"), t;
+  }
+  processArray(e) {
+    const t = this.resolveType(e.items);
+    return this.sourceFile.addTypeAlias({
+      name: this.modelInfo.name,
+      type: `Array<${t}>`,
+      isExported: !0
+    });
+  }
+  processComposition(e) {
+    return this.sourceFile.addTypeAlias({
+      name: this.modelInfo.name,
+      type: this.resolveType(e),
+      isExported: !0
+    });
+  }
+  processIntersection(e) {
+    const t = this.sourceFile.addInterface({
+      name: this.modelInfo.name,
+      isExported: !0
+    });
+    return e.allOf.forEach((o) => {
+      if (u(o)) {
+        const r = this.resolveType(o);
+        t.addExtends(r);
+        return;
+      }
+      R(o) && Object.entries(o.properties).forEach(
+        ([r, i]) => {
+          this.addPropertyToInterface(
+            t,
+            r,
+            i
+          );
+        }
+      );
+    }), t;
+  }
+  processTypeAlias(e) {
+    return this.sourceFile.addTypeAlias({
+      name: this.modelInfo.name,
+      type: this.resolveType(e),
+      isExported: !0
+    });
+  }
+}
+class Ve {
   constructor(e) {
     this.context = e;
   }
   getOrCreateSourceFile(e) {
-    const t = De(e);
+    const t = Me(e);
     return this.context.getOrCreateSourceFile(t);
   }
   /**
@@ -540,29 +703,29 @@ class Ue {
       this.context.logger.info("No schemas found in OpenAPI specification");
       return;
     }
-    const t = this.stateAggregatedTypeNames(), n = this.filterSchemas(e, t);
-    this.context.logger.progress(`Generating models for ${n.length} schemas`), n.forEach((r, i) => {
+    const t = this.stateAggregatedTypeNames(), o = this.filterSchemas(e, t);
+    this.context.logger.progress(`Generating models for ${o.length} schemas`), o.forEach((r, i) => {
       this.context.logger.progressWithCount(
         i + 1,
-        n.length,
+        o.length,
         `Processing schema: ${r.key}`,
         2
       ), this.generateKeyedSchema(r);
     }), this.context.logger.success("Model generation completed");
   }
   filterSchemas(e, t) {
-    return Object.entries(e).map(([n, r]) => ({
-      key: n,
+    return Object.entries(e).map(([o, r]) => ({
+      key: o,
       schema: r
-    })).filter((n) => !this.isWowSchema(n.key, t));
+    })).filter((o) => !this.isWowSchema(o.key, t));
   }
   isWowSchema(e, t) {
     if (e !== "wow.api.query.PagedList" && e.startsWith("wow.api.query.") && e.endsWith("PagedList"))
       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 n = d(e);
-    return t.has(n.name);
+    const o = m(e);
+    return t.has(o.name);
   }
   aggregatedSchemaSuffix = [
     "MaterializedSnapshot",
@@ -576,10 +739,10 @@ class Ue {
   stateAggregatedTypeNames() {
     const e = /* @__PURE__ */ new Set();
     for (const t of this.context.contextAggregates.values())
-      for (const n of t)
+      for (const o of t)
         this.aggregatedSchemaSuffix.forEach(
           (r) => {
-            const i = d(n.state.key), s = x(i.name) + r;
+            const i = m(o.state.key), s = S(i.name) + r;
             e.add(s);
           }
         );
@@ -589,8 +752,6 @@ class Ue {
    * Generates a model for a specific schema key.
    * Processes enums, objects, unions, and type aliases in order.
    *
-   * @param schemaKey - The key of the schema to generate
-   * @param schema - The schema definition
    *
    * @remarks
    * The generation process follows this order:
@@ -599,151 +760,12 @@ class Ue {
    * 3. Union processing
    * 4. Type alias processing
    */
-  generateKeyedSchema({ key: e, schema: t }) {
-    const n = d(e), r = this.getOrCreateSourceFile(n), i = this.process(n, r, t);
-    i && R(i, t);
-  }
-  process(e, t, n) {
-    if (Pe(n))
-      return t.addEnum({
-        name: e.name,
-        isExported: !0,
-        members: n.enum.filter((i) => typeof i == "string" && i.length > 0).map((i) => ({
-          name: ye(i),
-          initializer: `'${i}'`
-        }))
-      });
-    if (D(n) && g(n.items)) {
-      const i = y(n.items);
-      return T(
-        e,
-        t,
-        this.context.outputDir,
-        i
-      ), t.addTypeAlias({
-        name: e.name,
-        type: k(i.name),
-        isExported: !0
-      });
-    }
-    const r = t.addInterface({
-      name: e.name,
-      isExported: !0
-    });
-    return n.type === "object" && n.properties ? this.processInterface(
-      t,
-      e,
-      n,
-      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
-        ), r.addExtends(a.name);
-        return;
-      }
-      this.processInterface(
-        t,
-        e,
-        s,
-        r
-      );
-    }), r);
-  }
-  processObject(e, t, n) {
-    const r = e.addInterface({
-      name: t.name,
-      isExported: !0
-    });
-    return this.processInterface(
-      e,
-      t,
-      n,
-      r
-    );
-  }
-  processInterface(e, t, n, r) {
-    for (const [i, s] of Object.entries(n.properties)) {
-      const a = this.resolvePropertyType(
-        t,
-        e,
-        i,
-        s
-      );
-      let c = r.getProperty(i);
-      c ? c.setType(a) : c = r.addProperty({
-        name: i,
-        type: a
-      }), g(s) || R(c, s);
-    }
-    return r;
-  }
-  resolvePropertyType(e, t, n, r) {
-    if (g(r)) {
-      const i = y(r);
-      return T(
-        e,
-        t,
-        this.context.outputDir,
-        i
-      ), i.name;
-    }
-    if (r.const)
-      return `'${r.const}'`;
-    if (D(r)) {
-      const i = this.resolvePropertyType(
-        e,
-        t,
-        n,
-        r.items
-      );
-      return k(i);
-    }
-    if (r.type && _(r.type))
-      return A(r.type);
-    if (z(r))
-      return this.resolvePropertyCompositionType(
-        e,
-        t,
-        r
-      );
-    if (r.type === "object" && r.properties) {
-      const i = {
-        path: e.path,
-        name: `${e.name}${x(n)}`
-      }, s = this.processObject(
-        t,
-        i,
-        r
-      );
-      return R(s, r), i.name;
-    }
-    return "any";
-  }
-  resolvePropertyCompositionType(e, t, n) {
-    const r = n.anyOf || n.oneOf || n.allOf, i = /* @__PURE__ */ new Set();
-    r.forEach((a) => {
-      if (g(a)) {
-        const c = y(a);
-        T(
-          e,
-          t,
-          this.context.outputDir,
-          c
-        ), i.add(c.name);
-        return;
-      }
-      i.add(A(a.type ?? "string"));
-    });
-    const s = $e(n) ? "|" : "&";
-    return Array.from(i).join(s);
+  generateKeyedSchema(e) {
+    const t = m(e.key), o = this.getOrCreateSourceFile(t);
+    new Je(t, o, e, this.context.outputDir).generate();
   }
 }
-const Qe = "@ahoo-wang/fetcher-decorator", Je = [
+const He = "@ahoo-wang/fetcher-decorator", Ye = [
   "type ApiMetadata",
   "type ApiMetadataCapable",
   "type ParameterRequest",
@@ -757,22 +779,22 @@ const Qe = "@ahoo-wang/fetcher-decorator", Je = [
   "attribute",
   "path",
   "autoGeneratedError"
-], Ve = {
+], Ke = {
   type: "Promise<Response>",
   metadata: "{resultExtractor: ResultExtractors.Response }"
-}, Q = {
+}, U = {
   type: "Promise<string>",
   metadata: "{resultExtractor: ResultExtractors.Text }"
-}, b = `{
+}, M = `{
   headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
   resultExtractor: JsonEventStreamResultExtractor,
 }`;
-function ie(o) {
-  C(o, Qe, Je);
+function se(n) {
+  y(n, He, Ye);
 }
-function se(o, e, t = []) {
+function ae(n, e, t = []) {
   return e.addClass({
-    name: o,
+    name: n,
     isExported: !0,
     decorators: [
       {
@@ -782,8 +804,8 @@ function se(o, e, t = []) {
     ]
   });
 }
-function ae(o, e) {
-  o.addImplements("ApiMetadataCapable"), o.addConstructor({
+function ce(n, e) {
+  n.addImplements("ApiMetadataCapable"), n.addConstructor({
     parameters: [
       {
         name: "apiMetadata",
@@ -796,42 +818,42 @@ function ae(o, e) {
     ]
   });
 }
-const He = "@ahoo-wang/fetcher-eventstream";
-function ce(o) {
-  C(o, He, ["JsonEventStreamResultExtractor", "type JsonServerSentEventStream"]);
+const Xe = "@ahoo-wang/fetcher-eventstream";
+function ge(n) {
+  y(n, Xe, ["JsonEventStreamResultExtractor", "type JsonServerSentEventStream"]);
 }
-function Ye(o) {
+function Ze(n) {
   let e = 0, t = 0;
-  return o.commands.forEach((n) => {
-    n.path.startsWith(W.TENANT) && (e += 1), n.path.startsWith(W.OWNER) && (t += 1);
+  return n.commands.forEach((o) => {
+    o.path.startsWith(G.TENANT) && (e += 1), o.path.startsWith(G.OWNER) && (t += 1);
   }), e === 0 && t === 0 ? "ResourceAttributionPathSpec.NONE" : e > t ? "ResourceAttributionPathSpec.TENANT" : "ResourceAttributionPathSpec.OWNER";
 }
-function ge(o, e, t, n) {
-  const r = `${t.contextAlias}/${t.aggregateName}/${n}.ts`;
-  return re(o, e, r);
+function ue(n, e, t, o) {
+  const r = `${t.contextAlias}/${t.aggregateName}/${o}.ts`;
+  return oe(n, e, r);
 }
-function Ke(o, e) {
-  return `${x(o.aggregateName)}${e}`;
+function et(n, e) {
+  return `${S(n.aggregateName)}${e}`;
 }
-function q(o) {
-  return o === "delete" ? "del" : o;
+function q(n) {
+  return n === "delete" ? "del" : n;
 }
-const Xe = "x-fetcher-method";
-function Ze(o, e) {
-  const t = o[Xe];
+const tt = "x-fetcher-method";
+function nt(n, e) {
+  const t = n[tt];
   if (t)
     return t;
-  if (!o.operationId)
+  if (!n.operationId)
     return;
-  const n = N(o.operationId);
-  for (let r = n.length - 1; r >= 0; r--) {
-    const i = h(n.slice(r));
+  const o = O(n.operationId);
+  for (let r = o.length - 1; r >= 0; r--) {
+    const i = h(o.slice(r));
     if (!e(i))
       return i;
   }
-  return h(n);
+  return h(o);
 }
-class et {
+class ot {
   /**
    * Creates a new ApiClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and configuration
@@ -840,7 +862,7 @@ class et {
     this.context = e, this.apiMetadataCtorInitializer = this.context.currentContextAlias ? `{basePath:'${this.context.currentContextAlias}'}` : void 0;
   }
   defaultParameterRequestType = "ParameterRequest";
-  defaultReturnType = Ve;
+  defaultReturnType = Ke;
   apiMetadataCtorInitializer;
   /**
    * Generates API client classes for all valid tags in the OpenAPI specification.
@@ -866,10 +888,10 @@ class et {
     this.context.logger.info(
       `Generating ${t.size} API client classes`
     );
-    let n = 0;
+    let o = 0;
     for (const [r, i] of t) {
-      n++, this.context.logger.progressWithCount(
-        n,
+      o++, this.context.logger.progressWithCount(
+        o,
         t.size,
         `Generating API client for tag: ${r}`
       );
@@ -884,7 +906,7 @@ class et {
    */
   createApiClientFile(e) {
     let t = e.path;
-    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);
+    return this.context.currentContextAlias && (t = T(this.context.currentContextAlias, t)), t = T(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.
@@ -892,22 +914,22 @@ class et {
    * @param operations - Set of operations for this client
    */
   generateApiClient(e, t) {
-    const n = d(e.name);
+    const o = m(e.name);
     this.context.logger.info(
-      `Generating API client class: ${n.name}ApiClient with ${t.size} operations`
+      `Generating API client class: ${o.name}ApiClient with ${t.size} operations`
     );
-    const r = this.createApiClientFile(n);
-    ie(r), ce(r);
-    const i = se(
-      n.name + "ApiClient",
+    const r = this.createApiClientFile(o);
+    se(r), ge(r);
+    const i = ae(
+      o.name + "ApiClient",
       r
     );
-    w(i, [e.description]), ae(i, this.apiMetadataCtorInitializer), this.context.logger.info(
-      `Processing ${t.size} operations for ${n.name}ApiClient`
+    v(i, [e.description]), ce(i, this.apiMetadataCtorInitializer), this.context.logger.info(
+      `Processing ${t.size} operations for ${o.name}ApiClient`
     ), t.forEach((s) => {
       this.processOperation(e, r, i, s);
     }), this.context.logger.success(
-      `Completed API client: ${n.name}ApiClient`
+      `Completed API client: ${o.name}ApiClient`
     );
   }
   /**
@@ -917,10 +939,10 @@ class et {
    * @returns A unique camelCase method name
    */
   getMethodName(e, t) {
-    const n = Ze(t, (r) => e.getMethod(r) !== void 0);
-    if (!n)
+    const o = nt(t, (r) => e.getMethod(r) !== void 0);
+    if (!o)
       throw new Error(`Unable to resolve method name for apiClientClass:${e.getName()}.`);
-    return n;
+    return o;
   }
   /**
    * Resolves the request type for an operation based on its request body.
@@ -933,24 +955,24 @@ class et {
       return this.context.logger.info(
         `No request body found for operation ${t.operationId}, using default: ${this.defaultParameterRequestType}`
       ), this.defaultParameterRequestType;
-    let n;
-    if (g(t.requestBody) ? (this.context.logger.info(
+    let o;
+    if (u(t.requestBody) ? (this.context.logger.info(
       `Extracting request body from reference for operation: ${t.operationId}`
-    ), n = V(
+    ), o = V(
       t.requestBody,
       this.context.openAPI.components
-    )) : n = t.requestBody, !n)
+    )) : o = t.requestBody, !o)
       return this.context.logger.info(
         `Request body extraction failed for operation ${t.operationId}, using default: ${this.defaultParameterRequestType}`
       ), this.defaultParameterRequestType;
-    if (n.content["multipart/form-data"])
+    if (o.content["multipart/form-data"])
       return this.context.logger.info(
         `Detected multipart/form-data content for operation ${t.operationId}, using ParameterRequest<FormData>`
       ), "ParameterRequest<FormData>";
-    if (n.content["application/json"]) {
-      const r = n.content["application/json"].schema;
-      if (g(r)) {
-        const i = y(r);
+    if (o.content["application/json"]) {
+      const r = o.content["application/json"].schema;
+      if (u(r)) {
+        const i = C(r);
         this.context.logger.info(
           `Adding import for request body model: ${i.name} from ${i.path}`
         ), f(e, this.context.outputDir, i);
@@ -971,16 +993,16 @@ class et {
    * @param operation - The operation to resolve parameters for
    * @returns Array of parameter declarations
    */
-  resolveParameters(e, t, n) {
-    const r = Ee(n, this.context.openAPI.components).filter((a) => !this.context.isIgnoreApiClientPathParameters(
+  resolveParameters(e, t, o) {
+    const r = Ee(o, this.context.openAPI.components).filter((a) => !this.context.isIgnoreApiClientPathParameters(
       e.name,
       a.name
     ));
     this.context.logger.info(
-      `Found ${r.length} path parameters for operation ${n.operationId}`
+      `Found ${r.length} path parameters for operation ${o.operationId}`
     );
     const i = r.map((a) => {
-      const c = ee(a);
+      const c = Z(a);
       return this.context.logger.info(
         `Adding path parameter: ${a.name} (type: ${c})`
       ), {
@@ -994,7 +1016,7 @@ class et {
           }
         ]
       };
-    }), s = this.resolveRequestType(t, n);
+    }), s = this.resolveRequestType(t, o);
     return this.context.logger.info(`Adding httpRequest parameter: ${s}`), i.push({
       name: "httpRequest",
       hasQuestionToken: s === this.defaultParameterRequestType,
@@ -1026,9 +1048,9 @@ class et {
    * @returns The resolved return type string
    */
   resolveSchemaReturnType(e, t) {
-    const n = "Promise<any>";
-    if (g(t)) {
-      const r = y(t);
+    const o = "Promise<any>";
+    if (u(t)) {
+      const r = C(t);
       this.context.logger.info(
         `Adding import for response model: ${r.name} from ${r.path}`
       ), f(e, this.context.outputDir, r);
@@ -1037,15 +1059,15 @@ class et {
     }
     if (!t.type)
       return this.context.logger.info(
-        `Schema has no type, using default return type: ${n}`
-      ), n;
-    if (_(t.type)) {
-      const i = `Promise<${A(t.type)}>`;
+        `Schema has no type, using default return type: ${o}`
+      ), o;
+    if (X(t.type)) {
+      const i = `Promise<${E(t.type)}>`;
       return this.context.logger.info(`Resolved primitive return type: ${i}`), i;
     }
     return this.context.logger.info(
-      `Using default return type: ${n}`
-    ), n;
+      `Using default return type: ${o}`
+    ), o;
   }
   /**
    * Resolves the return type for an operation based on its responses.
@@ -1054,46 +1076,46 @@ class et {
    * @returns Object containing type and optional stream flag
    */
   resolveReturnType(e, t) {
-    const n = F(t);
-    if (!n)
+    const o = j(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 = K(n) || Ae(n);
+    const r = K(o) || Pe(o);
     if (r) {
       const s = this.resolveSchemaReturnType(e, r);
       return this.context.logger.info(
         `Resolved JSON/wildcard response return type for operation ${t.operationId}: ${s}`
       ), {
         type: s,
-        metadata: s === Q.type ? Q.metadata : void 0
+        metadata: s === U.type ? U.metadata : void 0
       };
     }
-    const i = xe(n);
+    const i = Ae(o);
     if (i) {
-      if (g(i)) {
-        const a = S(
+      if (u(i)) {
+        const a = I(
           i,
           this.context.openAPI.components
         );
-        if (D(a) && g(a.items)) {
-          const c = y(a.items);
+        if (D(a) && u(a.items)) {
+          const c = C(a.items);
           this.context.logger.info(
             `Adding import for event stream model: ${c.name} from ${c.path}`
           ), f(e, this.context.outputDir, c);
-          const l = `Promise<JsonServerSentEventStream<${c.name.includes("ServerSentEvent") ? `${c.name}['data']` : c.name}>>`;
+          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}: ${l}`
+            `Resolved event stream return type for operation ${t.operationId}: ${p}`
           ), {
-            type: l,
-            metadata: b
+            type: p,
+            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}`
@@ -1106,11 +1128,11 @@ class et {
    * @param apiClientClass - The client class to add the method to
    * @param operation - The operation to process
    */
-  processOperation(e, t, n, r) {
+  processOperation(e, t, o, r) {
     this.context.logger.info(
       `Processing operation: ${r.operation.operationId} (${r.method} ${r.path})`
     );
-    const i = this.getMethodName(n, r.operation);
+    const i = this.getMethodName(o, r.operation);
     this.context.logger.info(`Generated method name: ${i}`);
     const s = this.resolveParameters(
       e,
@@ -1126,17 +1148,17 @@ class et {
     this.context.logger.info(
       `Creating method with ${s.length} parameters, return type: ${a.type}`
     );
-    const u = n.addMethod({
+    const g = o.addMethod({
       name: i,
       decorators: [c],
       parameters: s,
       returnType: a.type,
       statements: [
-        `throw autoGeneratedError(${s.map((l) => l.name).join(",")});`
+        `throw autoGeneratedError(${s.map((p) => p.name).join(",")});`
       ]
     });
-    w(
-      u,
+    v(
+      g,
       [
         r.operation.summary,
         r.operation.description,
@@ -1153,14 +1175,14 @@ class et {
   groupOperations(e) {
     this.context.logger.info("Grouping operations by API client tags");
     const t = /* @__PURE__ */ new Map();
-    let n = 0;
+    let o = 0;
     for (const [r, i] of Object.entries(this.context.openAPI.paths)) {
-      const s = M(i).filter(
+      const s = b(i).filter(
         (a) => {
           if (!a.operation.operationId)
             return !1;
           const c = a.operation.tags;
-          return !c || c.length == 0 ? !1 : c.every((u) => e.has(u));
+          return !c || c.length == 0 ? !1 : c.every((g) => e.has(g));
         }
       );
       this.context.logger.info(
@@ -1168,15 +1190,15 @@ class et {
       );
       for (const a of s)
         a.operation.tags.forEach((c) => {
-          const u = {
+          const g = {
             ...a,
             path: r
           };
-          t.has(c) || t.set(c, /* @__PURE__ */ new Set()), t.get(c).add(u), n++;
+          t.has(c) || t.set(c, /* @__PURE__ */ new Set()), t.get(c).add(g), o++;
         });
     }
     return this.context.logger.info(
-      `Grouped ${n} operations into ${t.size} tag groups`
+      `Grouped ${o} operations into ${t.size} tag groups`
     ), t;
   }
   shouldIgnoreTag(e) {
@@ -1193,7 +1215,7 @@ class et {
     );
     const e = /* @__PURE__ */ new Map(), t = this.context.openAPI.tags?.length || 0;
     for (const r of Object.values(this.context.openAPI.paths))
-      M(r).forEach((i) => {
+      b(r).forEach((i) => {
         i.operation.tags?.forEach((s) => {
           !this.shouldIgnoreTag(s) && !e.has(s) && e.set(s, {
             name: s,
@@ -1201,24 +1223,24 @@ class et {
           });
         });
       });
-    let n = 0;
+    let o = 0;
     return this.context.openAPI.tags?.forEach((r) => {
       this.shouldIgnoreTag(r.name) ? this.context.logger.info(
         `Excluded tag: ${r.name} (wow/Actuator/aggregate)`
-      ) : (e.set(r.name, r), n++, this.context.logger.info(`Included API client tag: ${r.name}`));
+      ) : (e.set(r.name, r), o++, this.context.logger.info(`Included API client tag: ${r.name}`));
     }), this.context.logger.info(
-      `Resolved ${n} API client tags from ${t} total tags`
+      `Resolved ${o} API client tags from ${t} total tags`
     ), e;
   }
   isAggregateTag(e) {
     for (const t of this.context.contextAggregates.values())
-      for (const n of t)
-        if (n.aggregate.tag.name === e)
+      for (const o of t)
+        if (o.aggregate.tag.name === e)
           return !0;
     return !1;
   }
 }
-class tt {
+class rt {
   /**
    * Creates a new CommandClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1233,15 +1255,15 @@ class tt {
    */
   generate() {
     const e = Array.from(this.context.contextAggregates.values()).reduce(
-      (n, r) => n + r.size,
+      (o, r) => o + r.size,
       0
     );
     this.context.logger.info("--- Generating Command Clients ---"), this.context.logger.progress(
       `Generating command clients for ${e} aggregates`
     );
     let t = 0;
-    for (const [, n] of this.context.contextAggregates)
-      n.forEach((r) => {
+    for (const [, o] of this.context.contextAggregates)
+      o.forEach((r) => {
         t++, this.context.logger.progressWithCount(
           t,
           e,
@@ -1258,7 +1280,7 @@ class tt {
     this.context.logger.info(
       `Processing command client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     );
-    const t = ge(
+    const t = ue(
       this.context.project,
       this.context.outputDir,
       e.aggregate,
@@ -1269,7 +1291,7 @@ class tt {
     ), this.processCommandEndpointPaths(t, e), this.context.logger.info(
       `Creating default command client options: ${this.defaultCommandClientOptionsName}`
     ), t.addVariableStatement({
-      declarationKind: O.Const,
+      declarationKind: w.Const,
       declarations: [
         {
           name: this.defaultCommandClientOptionsName,
@@ -1281,9 +1303,9 @@ class tt {
       ],
       isExported: !1
     }), this.context.logger.info(
-      `Adding imports from ${P}: CommandRequest, CommandResult, CommandResultEventStream, DeleteAggregate, RecoverAggregate`
+      `Adding imports from ${x}: CommandRequest, CommandResult, CommandResultEventStream, DeleteAggregate, RecoverAggregate`
     ), t.addImportDeclaration({
-      moduleSpecifier: P,
+      moduleSpecifier: x,
       namedImports: [
         "CommandRequest",
         "CommandResult",
@@ -1294,11 +1316,11 @@ class tt {
       isTypeOnly: !0
     }), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher-eventstream: JsonEventStreamResultExtractor"
-    ), ce(t), this.context.logger.info(
+    ), ge(t), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher: ContentTypeValues"
-    ), C(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info(
+    ), y(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info(
       "Adding imports from @ahoo-wang/fetcher-decorator: ApiMetadata types and decorators"
-    ), ie(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(
+    ), se(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}`
     );
   }
@@ -1306,13 +1328,13 @@ class tt {
     this.context.logger.info(
       `Creating command endpoint paths enum: ${this.commandEndpointPathsName}`
     );
-    const n = e.addEnum({
+    const o = e.addEnum({
       name: this.commandEndpointPathsName
     });
     t.commands.forEach((r) => {
       this.context.logger.info(
         `Adding command endpoint: ${r.name.toUpperCase()} = '${r.path}'`
-      ), n.addMember({
+      ), o.addMember({
         name: r.name.toUpperCase(),
         initializer: `'${r.path}'`
       });
@@ -1323,30 +1345,30 @@ class tt {
   getEndpointPath(e) {
     return `${this.commandEndpointPathsName}.${e.name.toUpperCase()}`;
   }
-  processCommandClient(e, t, n = !1) {
+  processCommandClient(e, t, o = !1) {
     let r = "CommandClient", i = [], s = "Promise<CommandResult>";
-    n && (r = "Stream" + r, i = [
+    o && (r = "Stream" + r, i = [
       "''",
-      b
+      M
     ], s = "Promise<CommandResultEventStream>");
-    const a = Ke(
+    const a = et(
       t.aggregate,
       r
-    ), c = se(a, e, i);
-    ae(c, this.defaultCommandClientOptionsName), t.commands.forEach((u) => {
-      this.processCommandMethod(t, e, c, u, s);
+    ), c = ae(a, e, i);
+    ce(c, this.defaultCommandClientOptionsName), t.commands.forEach((g) => {
+      this.processCommandMethod(t, e, c, g, s);
     });
   }
-  resolveParameters(e, t, n) {
-    const r = d(n.schema.key);
+  resolveParameters(e, t, o) {
+    const r = m(o.schema.key);
     this.context.logger.info(
       `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(
+    const i = o.pathParameters.filter((s) => !this.context.isIgnoreCommandClientPathParameters(
       e.name,
       s.name
     )).map((s) => {
-      const a = ee(s);
+      const a = Z(s);
       return this.context.logger.info(
         `Adding path parameter: ${s.name} (type: ${a})`
       ), {
@@ -1365,7 +1387,7 @@ class tt {
       `Adding command request parameter: commandRequest (type: CommandRequest<${r.name}>)`
     ), i.push({
       name: "commandRequest",
-      hasQuestionToken: Te(n.schema.schema),
+      hasQuestionToken: Se(o.schema.schema),
       type: `CommandRequest<${r.name}>`,
       decorators: [
         {
@@ -1387,13 +1409,13 @@ class tt {
       ]
     }), i;
   }
-  processCommandMethod(e, t, n, r, i) {
+  processCommandMethod(e, t, o, r, i) {
     this.context.logger.info(
       `Generating command method: ${h(r.name)} for command: ${r.name}`
     ), this.context.logger.info(
       `Command method details: HTTP ${r.method}, path: ${r.path}, return type: ${i}`
     );
-    const s = this.resolveParameters(e.aggregate.tag, t, r), a = n.addMethod({
+    const s = this.resolveParameters(e.aggregate.tag, t, r), a = o.addMethod({
       name: h(r.name),
       decorators: [
         {
@@ -1409,7 +1431,7 @@ class tt {
     });
     this.context.logger.info(
       `Adding JSDoc documentation for method: ${h(r.name)}`
-    ), w(
+    ), v(
       a,
       [
         r.summary,
@@ -1422,7 +1444,7 @@ class tt {
     );
   }
 }
-class nt {
+class it {
   /**
    * Creates a new QueryClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1435,15 +1457,15 @@ class nt {
    */
   generate() {
     const e = Array.from(this.context.contextAggregates.values()).reduce(
-      (n, r) => n + r.size,
+      (o, r) => o + r.size,
       0
     );
     this.context.logger.info("--- Generating Query Clients ---"), this.context.logger.progress(
       `Generating query clients for ${e} aggregates`
     );
     let t = 0;
-    for (const [, n] of this.context.contextAggregates)
-      n.forEach((r) => {
+    for (const [, o] of this.context.contextAggregates)
+      o.forEach((r) => {
         t++, this.context.logger.progressWithCount(
           t,
           e,
@@ -1459,7 +1481,7 @@ class nt {
    * @returns The source file for the client
    */
   createClientFilePath(e, t) {
-    return ge(
+    return ue(
       this.context.project,
       this.context.outputDir,
       e,
@@ -1478,28 +1500,28 @@ class nt {
     this.context.logger.info(
       `Processing query client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     ), this.context.logger.info(
-      `Adding imports from ${P}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
+      `Adding imports from ${x}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
     ), t.addImportDeclaration({
-      moduleSpecifier: P,
+      moduleSpecifier: x,
       namedImports: [
         "QueryClientFactory",
         "QueryClientOptions",
         "ResourceAttributionPathSpec"
       ]
     });
-    const n = "DEFAULT_QUERY_CLIENT_OPTIONS";
+    const o = "DEFAULT_QUERY_CLIENT_OPTIONS";
     this.context.logger.info(
-      `Creating default query client options: ${n}`
+      `Creating default query client options: ${o}`
     ), t.addVariableStatement({
-      declarationKind: O.Const,
+      declarationKind: w.Const,
       declarations: [
         {
-          name: n,
+          name: o,
           type: "QueryClientOptions",
           initializer: `{
         contextAlias: '${e.aggregate.contextAlias}',
         aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${Ye(e)},
+        resourceAttribution: ${Ze(e)},
       }`
         }
       ],
@@ -1509,30 +1531,30 @@ class nt {
     this.context.logger.info(
       `Processing ${e.events.size} domain events for aggregate: ${e.aggregate.aggregateName}`
     );
-    for (const l of e.events.values()) {
-      const p = d(l.schema.key);
+    for (const p of e.events.values()) {
+      const l = m(p.schema.key);
       this.context.logger.info(
-        `Adding import for event model: ${p.name} from path: ${p.path}`
-      ), f(t, this.context.outputDir, p), r.push(p);
+        `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((l) => l.name).join(" | ");
+    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 = d(e.state.key), u = d(e.fields.key);
+    const a = `${h(e.aggregate.aggregateName)}QueryClientFactory`, c = m(e.state.key), g = m(e.fields.key);
     this.context.logger.info(
       `Adding import for state model: ${c.name} from path: ${c.path}`
     ), f(t, this.context.outputDir, c), this.context.logger.info(
-      `Adding import for fields model: ${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 fields model: ${g.name} from path: ${g.path}`
+    ), f(t, this.context.outputDir, g), this.context.logger.info(`Creating query client factory: ${a}`), t.addVariableStatement({
+      declarationKind: w.Const,
       declarations: [
         {
           name: a,
-          initializer: `new QueryClientFactory<${c.name}, ${u.name} | string, ${i}>(${n})`
+          initializer: `new QueryClientFactory<${c.name}, ${g.name} | string, ${i}>(${o})`
         }
       ],
       isExported: !0
@@ -1541,13 +1563,13 @@ class nt {
     );
   }
 }
-class ot {
+class st {
   /**
    * Creates a new ClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    this.context = e, this.queryClientGenerator = new nt(e), this.commandClientGenerator = new tt(e), this.apiClientGenerator = new et(e);
+    this.context = e, this.queryClientGenerator = new it(e), this.commandClientGenerator = new rt(e), this.apiClientGenerator = new ot(e);
   }
   queryClientGenerator;
   commandClientGenerator;
@@ -1576,17 +1598,17 @@ class ot {
   processBoundedContext(e) {
     const t = `${e}/boundedContext.ts`;
     this.context.logger.info(`Creating bounded context file: ${t}`);
-    const n = this.context.getOrCreateSourceFile(t);
+    const o = this.context.getOrCreateSourceFile(t);
     this.context.logger.info(
       `Adding bounded context alias constant: BOUNDED_CONTEXT_ALIAS = '${e}'`
-    ), n.addStatements(
+    ), o.addStatements(
       `export const BOUNDED_CONTEXT_ALIAS = '${e}';`
     ), this.context.logger.success(
       `Bounded context file created successfully: ${t}`
     );
   }
 }
-class rt {
+class at {
   /** The ts-morph project instance used for code generation */
   project;
   /** The OpenAPI specification object */
@@ -1604,7 +1626,7 @@ class rt {
     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 re(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);
@@ -1613,14 +1635,14 @@ class rt {
     return this.defaultIgnorePathParameters.includes(t);
   }
 }
-const it = "./fetcher-generator.config.json";
-class pt {
+const ct = "./fetcher-generator.config.json";
+class ft {
   /**
    * Creates a new CodeGenerator instance.
    * @param options - Configuration options for code generation
    */
   constructor(e) {
-    this.options = e, this.project = new pe(e), this.options.logger.info("Project instance created with tsConfigFilePath: ", this.options.tsConfigFilePath);
+    this.options = e, this.project = new de(e), this.options.logger.info("Project instance created with tsConfigFilePath: ", this.options.tsConfigFilePath);
   }
   project;
   /**
@@ -1632,28 +1654,28 @@ class pt {
     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 Re(this.options.inputPath);
+    const e = await De(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
-    const n = new ke(e).resolve();
+    const o = new Qe(e).resolve();
     this.options.logger.info(
-      `Resolved ${n.size} bounded context aggregates`
+      `Resolved ${o.size} bounded context aggregates`
     );
-    const r = this.options.configPath ?? it;
+    const r = this.options.configPath ?? ct;
     let i = {};
     try {
-      this.options.logger.info("Parsing configuration file:", r), i = await Oe(r);
-    } catch (u) {
-      this.options.logger.info("Configuration file parsing failed ", u);
+      this.options.logger.info("Parsing configuration file:", r), i = await Ne(r);
+    } catch (g) {
+      this.options.logger.info("Configuration file parsing failed ", g);
     }
-    const s = new rt({
+    const s = new at({
       openAPI: e,
       project: this.project,
       outputDir: this.options.outputDir,
-      contextAggregates: n,
+      contextAggregates: o,
       logger: this.options.logger,
       config: i
     });
-    this.options.logger.info("Generating models"), new Ue(s).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new ot(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 Ve(s).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new st(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.
@@ -1676,8 +1698,8 @@ class pt {
   processDirectory(e) {
     const t = e.getDirectories();
     this.options.logger.info(`Processing ${t.length} subdirectories`);
-    for (const n of t)
-      this.options.logger.info(`Processing subdirectory: ${n.getPath()}`), this.generateIndexForDirectory(n), this.processDirectory(n);
+    for (const o of t)
+      this.options.logger.info(`Processing subdirectory: ${o.getPath()}`), this.generateIndexForDirectory(o), this.processDirectory(o);
   }
   /**
    * Generates an index.ts file for a specific directory.
@@ -1686,12 +1708,12 @@ class pt {
   generateIndexForDirectory(e) {
     const t = e.getPath();
     this.options.logger.info(`Generating index for directory: ${t}`);
-    const n = e.getSourceFiles().filter(
+    const o = e.getSourceFiles().filter(
       (a) => a.getBaseName().endsWith(".ts") && a.getBaseName() !== "index.ts"
     ), r = e.getDirectories();
     if (this.options.logger.info(
-      `Found ${n.length} TypeScript files and ${r.length} subdirectories in ${t}`
-    ), n.length === 0 && r.length === 0) {
+      `Found ${o.length} TypeScript files and ${r.length} subdirectories in ${t}`
+    ), o.length === 0 && r.length === 0) {
       this.options.logger.info(
         `No files or subdirectories to export in ${t}, skipping index generation`
       );
@@ -1701,7 +1723,7 @@ class pt {
     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) {
+    for (const a of o) {
       const c = `./${a.getBaseNameWithoutExtension()}`;
       this.options.logger.info(`Adding export for file: ${c}`), s.addExportDeclaration({
         moduleSpecifier: c,
@@ -1720,20 +1742,20 @@ class pt {
       });
     }
     this.options.logger.info(
-      `Index file generated for ${t} with ${n.length + r.length} exports`
+      `Index file generated for ${t} with ${o.length + r.length} exports`
     );
   }
   optimizeSourceFiles() {
     const e = this.project.getSourceFiles();
-    this.options.logger.info(`Optimizing ${e.length} source files`), e.forEach((t, n) => {
+    this.options.logger.info(`Optimizing ${e.length} source files`), e.forEach((t, o) => {
       this.options.logger.info(
-        `Optimizing file ${n + 1}/${e.length}`
+        `Optimizing file ${o + 1}/${e.length}`
       ), t.formatText(), t.organizeImports(), t.fixMissingImports();
     }), this.options.logger.info("All source files optimized");
   }
 }
 export {
-  pt as CodeGenerator,
-  it as DEFAULT_CONFIG_PATH
+  ft as CodeGenerator,
+  ct as DEFAULT_CONFIG_PATH
 };
 //# sourceMappingURL=index.js.map