@ahoo-wang/fetcher-generator 3.0.9 → 3.1.0

package/dist/index.js

@@ -1,78 +1,78 @@
-import { Scope as he, VariableDeclarationKind as O, Project as ye } from "ts-morph";
-import { ContentTypeValues as T, combineURLs as v } from "@ahoo-wang/fetcher";
+import { Scope as he, VariableDeclarationKind as D, Project as ye } from "ts-morph";
+import { ContentTypeValues as v, combineURLs as I } from "@ahoo-wang/fetcher";
 import { ResourceAttributionPathSpec as k } from "@ahoo-wang/fetcher-wow";
 import { parse as H } from "yaml";
 import { readFile as xe } from "fs";
 import { join as Ae, relative as Ce } from "path";
-function C(n) {
-  return n.$ref.split("/").pop();
+function C(o) {
+  return o.$ref.split("/").pop();
 }
-function I(n, e) {
-  const t = C(n);
+function E(o, e) {
+  const t = C(o);
   return e.schemas?.[t];
 }
-function K(n, e) {
-  const t = C(n);
+function K(o, e) {
+  const t = C(o);
   return e.requestBodies?.[t];
 }
-function Y(n, e) {
-  const t = C(n);
+function Y(o, e) {
+  const t = C(o);
   return e.parameters?.[t];
 }
-function P(n, e) {
+function P(o, e) {
   return {
-    key: C(n),
-    schema: I(n, e)
+    key: C(o),
+    schema: E(o, e)
   };
 }
 const Pe = /[-_\s.]+/;
-function N(n) {
-  return n.split(Pe);
+function N(o) {
+  return o.split(Pe);
 }
-function X(n) {
-  return Array.isArray(n) ? n.flatMap((e) => z(N(e))) : z(N(n));
+function X(o) {
+  return Array.isArray(o) ? o.flatMap((e) => z(N(e))) : z(N(o));
 }
-function z(n) {
-  return n.flatMap((e) => {
+function z(o) {
+  return o.flatMap((e) => {
     if (e.length === 0)
       return [];
     const t = [];
-    let o = "";
+    let n = "";
     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 && o ? (t.push(o), o = i) : o += i;
+      s && a && n ? (t.push(n), n = i) : n += i;
     }
-    return o && t.push(o), t;
+    return n && t.push(n), t;
   });
 }
-function S(n) {
-  return n === "" || n.length === 0 ? "" : X(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();
+function R(o) {
+  return o === "" || o.length === 0 ? "" : X(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 f(n) {
-  const e = S(n);
+function f(o) {
+  const e = R(o);
   return e.charAt(0).toLowerCase() + e.slice(1);
 }
-function Z(n) {
-  return n === "" || Array.isArray(n) && n.length === 0 ? "" : X(n).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
+function Z(o) {
+  return o === "" || Array.isArray(o) && o.length === 0 ? "" : X(o).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
 }
-function g(n) {
-  return !!(n && typeof n == "object" && "$ref" in n);
+function g(o) {
+  return !!(o && typeof o == "object" && "$ref" in o);
 }
-function G(n, e) {
+function G(o, e) {
   if (e && !g(e) && e.content)
-    return e.content[n]?.schema;
+    return e.content[o]?.schema;
 }
-function ee(n) {
-  return G(T.APPLICATION_JSON, n);
+function ee(o) {
+  return G(v.APPLICATION_JSON, o);
 }
-function $e(n) {
-  return G(T.TEXT_EVENT_STREAM, n);
+function $e(o) {
+  return G(v.TEXT_EVENT_STREAM, o);
 }
-function Te(n) {
-  return G("*/*", n);
+function Te(o) {
+  return G("*/*", o);
 }
 const ve = [
   "string",
@@ -81,46 +81,46 @@ const ve = [
   "boolean",
   "null"
 ];
-function te(n) {
-  return Array.isArray(n) ? !0 : ve.includes(n);
+function te(o) {
+  return Array.isArray(o) ? !0 : ve.includes(o);
 }
-function L(n) {
-  return Array.isArray(n.enum) && n.enum.length > 0;
+function L(o) {
+  return Array.isArray(o.enum) && o.enum.length > 0;
 }
-function D(n) {
-  return n.type === "object" && !!n.properties;
+function $(o) {
+  return o.type === "object" && !!o.properties;
 }
-function M(n) {
-  return n.type === "array" && !!n.items;
+function M(o) {
+  return o.type === "array" && !!o.items;
 }
-function Ie(n) {
-  return Array.isArray(n.anyOf) && n.anyOf.length > 0;
+function Ie(o) {
+  return Array.isArray(o.anyOf) && o.anyOf.length > 0;
 }
-function Ee(n) {
-  return Array.isArray(n.oneOf) && n.oneOf.length > 0;
+function Ee(o) {
+  return Array.isArray(o.oneOf) && o.oneOf.length > 0;
 }
-function b(n) {
-  return Array.isArray(n.allOf) && n.allOf.length > 0;
+function b(o) {
+  return Array.isArray(o.allOf) && o.allOf.length > 0;
 }
-function B(n) {
-  return Ie(n) || Ee(n) || b(n);
+function B(o) {
+  return Ie(o) || Ee(o) || b(o);
 }
-function Se(n) {
-  return n.includes("|") || n.includes("&") ? `(${n})[]` : `${n}[]`;
+function Se(o) {
+  return o.includes("|") || o.includes("&") ? `(${o})[]` : `${o}[]`;
 }
-function Re(n) {
-  return n.type === "object" && !n.properties && n.additionalProperties !== void 0;
+function Re(o) {
+  return o.type === "object" && !o.properties && o.additionalProperties !== void 0;
 }
-function we(n) {
-  return n.type !== "object" ? !1 : n.properties ? Object.keys(n.properties).length === 0 : !0;
+function we(o) {
+  return o.type !== "object" ? !1 : o.properties ? Object.keys(o.properties).length === 0 : !0;
 }
-function De(n) {
-  return n.readOnly === !0;
+function Oe(o) {
+  return o.readOnly === !0;
 }
-function R(n) {
-  if (Array.isArray(n))
-    return n.map((e) => R(e)).join(" | ");
-  switch (n) {
+function w(o) {
+  if (Array.isArray(o))
+    return o.map((e) => w(e)).join(" | ");
+  switch (o) {
     case "string":
       return "string";
     case "number":
@@ -134,86 +134,92 @@ function R(n) {
       return "any";
   }
 }
-function Oe(n, e) {
-  return n.operation.operationId && e.operation.operationId ? n.operation.operationId.localeCompare(
+function De(o) {
+  if (!$(o))
+    return [];
+  const e = o.required || [];
+  return Object.keys(o.properties).filter((t) => !e.includes(t));
+}
+function Ne(o, e) {
+  return o.operation.operationId && e.operation.operationId ? o.operation.operationId.localeCompare(
     e.operation.operationId
-  ) : n.path && e.path ? n.path.localeCompare(e.path) : n.method && e.method ? n.method.localeCompare(e.method) : 0;
+  ) : o.path && e.path ? o.path.localeCompare(e.path) : o.method && e.method ? o.method.localeCompare(e.method) : 0;
 }
-function ne(n) {
+function ne(o) {
   const e = [];
-  for (const [t, o] of Object.entries(n))
-    oe(o).forEach((r) => {
+  for (const [t, n] of Object.entries(o))
+    oe(n).forEach((r) => {
       e.push({
         method: r.method,
         operation: r.operation,
         path: t
       });
     });
-  return e.sort(Oe);
+  return e.sort(Ne);
 }
-function oe(n) {
+function oe(o) {
   return [
-    { 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 }
+    { 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 _(n) {
-  return n.responses[200];
+function _(o) {
+  return o.responses[200];
 }
-function U(n) {
-  const e = _(n);
+function U(o) {
+  const e = _(o);
   return ee(e);
 }
-function Ne(n, e) {
-  return n.parameters ? n.parameters.map((t) => g(t) ? Y(t, e) : t).filter((t) => t.in === "path") : [];
+function Me(o, e) {
+  return o.parameters ? o.parameters.map((t) => g(t) ? Y(t, e) : t).filter((t) => t.in === "path") : [];
 }
-const Me = "string";
-function re(n) {
-  return !n.schema || g(n.schema) || !n.schema.type || !te(n.schema.type) ? Me : R(n.schema.type);
+const be = "string";
+function re(o) {
+  return !o.schema || g(o.schema) || !o.schema.type || !te(o.schema.type) ? be : w(o.schema.type);
 }
-function ie(n) {
-  return n.startsWith("http://") || n.startsWith("https://") ? be(n) : qe(n);
+function ie(o) {
+  return o.startsWith("http://") || o.startsWith("https://") ? qe(o) : Fe(o);
 }
-async function be(n) {
-  return await (await fetch(n)).text();
+async function qe(o) {
+  return await (await fetch(o)).text();
 }
-function qe(n) {
+function Fe(o) {
   return new Promise((e, t) => {
-    xe(n, "utf-8", (o, r) => {
-      o ? t(o) : e(r);
+    xe(o, "utf-8", (n, r) => {
+      n ? t(n) : e(r);
     });
   });
 }
-async function Fe(n) {
-  const e = await ie(n);
+async function je(o) {
+  const e = await ie(o);
   switch (se(e)) {
     case "json":
       return JSON.parse(e);
     case "yaml":
       return H(e);
     default:
-      throw new Error(`Unsupported file format: ${n}`);
+      throw new Error(`Unsupported file format: ${o}`);
   }
 }
-async function je(n) {
-  const e = await ie(n);
+async function Ge(o) {
+  const e = await ie(o);
   switch (se(e)) {
     case "json":
       return JSON.parse(e);
     case "yaml":
       return H(e);
     default:
-      throw new Error(`Unsupported file format: ${n}`);
+      throw new Error(`Unsupported file format: ${o}`);
   }
 }
-function se(n) {
-  const e = n.trimStart();
+function se(o) {
+  const e = o.trimStart();
   if (e.startsWith("{") || e.startsWith("["))
     return "json";
   if (e.startsWith("-") || e.startsWith("%YAML"))
@@ -226,129 +232,129 @@ function se(n) {
   }
   throw new Error("Unable to infer file format");
 }
-const ae = "types.ts", Ge = "@";
-function _e(n) {
-  return v(n.path, ae);
+const ae = "types.ts", _e = "@";
+function We(o) {
+  return I(o.path, ae);
 }
-function ce(n, e, t) {
-  const o = v(e, t), r = n.getSourceFile(o);
-  return r || n.createSourceFile(o, "", {
+function ce(o, e, t) {
+  const n = I(e, t), r = o.getSourceFile(n);
+  return r || o.createSourceFile(n, "", {
     overwrite: !0
   });
 }
-function x(n, e, t) {
-  let o = n.getImportDeclaration(
+function x(o, e, t) {
+  let n = o.getImportDeclaration(
     (r) => r.getModuleSpecifierValue() === e
   );
-  o || (o = n.addImportDeclaration({
+  n || (n = o.addImportDeclaration({
     moduleSpecifier: e
   })), t.forEach((r) => {
-    o.getNamedImports().some(
+    n.getNamedImports().some(
       (s) => s.getName() === r
-    ) || o.addNamedImport(r);
+    ) || n.addNamedImport(r);
   });
 }
-function m(n, e, t) {
-  if (t.path.startsWith(Ge)) {
-    x(n, t.path, [t.name]);
+function d(o, e, t) {
+  if (t.path.startsWith(_e)) {
+    x(o, t.path, [t.name]);
     return;
   }
-  const o = n.getDirectoryPath(), r = Ae(e, t.path, ae);
-  let i = Ce(o, r);
-  i = i.replace(/\.ts$/, ""), i.startsWith(".") || (i = "./" + i), x(n, i, [t.name]);
+  const n = o.getDirectoryPath(), r = Ae(e, t.path, ae);
+  let i = Ce(n, r);
+  i = i.replace(/\.ts$/, ""), i.startsWith(".") || (i = "./" + i), x(o, i, [t.name]);
 }
-function We(n, e, t, o) {
-  n.path !== o.path && m(e, t, o);
+function ke(o, e, t, n) {
+  o.path !== n.path && d(e, t, n);
 }
-function ge(n, e = `
+function ge(o, e = `
 `) {
-  if (!Array.isArray(n))
+  if (!Array.isArray(o))
     return;
-  const t = n.filter(
-    (o) => typeof o == "string" && o.length > 0
+  const t = o.filter(
+    (n) => typeof n == "string" && n.length > 0
   );
   return t.length > 0 ? t.join(e) : void 0;
 }
-function E(n, e) {
+function S(o, e) {
   const t = ge(e);
-  t && n.addJsDoc(t);
+  t && o.addJsDoc(t);
 }
-function pe(n, e) {
+function pe(o, e) {
   const t = [
-    n.title,
-    n.description
+    o.title,
+    o.description
   ];
-  return e && t.push(`- key: ${e}`), n.format && t.push(`- format: ${n.format}`), J(t, n, "default"), J(t, n, "example"), ke(t, n), ze(t, n), Le(t, n), t;
+  return e && t.push(`- key: ${e}`), o.format && t.push(`- format: ${o.format}`), J(t, o, "default"), J(t, o, "example"), ze(t, o), Le(t, o), Be(t, o), t;
 }
-function Q(n, e, t) {
-  const o = pe(e, t);
-  E(n, o);
+function Q(o, e, t) {
+  const n = pe(e, t);
+  S(o, n);
 }
-function J(n, e, t) {
-  const o = e[t];
-  if (o) {
-    if (typeof o != "object") {
-      n.push(`- ${t}: \`${o}\``);
+function J(o, e, t) {
+  const n = e[t];
+  if (n) {
+    if (typeof n != "object") {
+      o.push(`- ${t}: \`${n}\``);
       return;
     }
-    n.push(`- ${t}: `), n.push("```json"), n.push(JSON.stringify(o)), n.push("```");
+    o.push(`- ${t}: `), o.push("```json"), o.push(JSON.stringify(n)), o.push("```");
   }
 }
-function ke(n, e) {
+function ze(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 && n.push(...t);
+  ), e.multipleOf !== void 0 && t.push(`  - multipleOf: ${e.multipleOf}`), t.length !== 1 && o.push(...t);
 }
-function ze(n, e) {
+function Le(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 && n.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 && o.push(...t);
 }
-function Le(n, e) {
+function Be(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 && n.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 && o.push(...t);
 }
-function Be(n) {
-  const e = n.split(".");
+function Ue(o) {
+  const e = o.split(".");
   return e.length != 2 || e[0].length === 0 || e[1].length === 0 ? null : e;
 }
-function Ue(n) {
-  const e = Be(n.name);
+function Qe(o) {
+  const e = Ue(o.name);
   return e ? {
-    tag: n,
+    tag: o,
     contextAlias: e[0],
     aggregateName: e[1]
   } : null;
 }
-function Qe(n) {
-  const e = n?.map((o) => Ue(o)).filter((o) => o !== null);
+function Je(o) {
+  const e = o?.map((n) => Qe(n)).filter((n) => n !== null);
   if (!e)
     return /* @__PURE__ */ new Map();
   const t = /* @__PURE__ */ new Map();
-  return e.forEach((o) => {
-    t.set(o.tag.name, {
-      aggregate: o,
+  return e.forEach((n) => {
+    t.set(n.tag.name, {
+      aggregate: n,
       commands: /* @__PURE__ */ new Map(),
       events: /* @__PURE__ */ new Map()
     });
   }), t;
 }
-function Je(n) {
-  if (!n)
+function Ve(o) {
+  if (!o)
     return null;
-  const e = n.split(".");
+  const e = o.split(".");
   return e.length != 3 ? null : e[2];
 }
-const Ve = "#/components/responses/wow.CommandOk", He = "#/components/parameters/wow.id";
-class Ke {
+const He = "#/components/responses/wow.CommandOk", Ke = "#/components/parameters/wow.id";
+class Ye {
   /**
    * Creates a new AggregateResolver instance.
    * @param openAPI - The OpenAPI specification to resolve aggregates from
    */
   constructor(e) {
-    this.openAPI = e, this.aggregates = Qe(e.tags), this.build();
+    this.openAPI = e, this.aggregates = Je(e.tags), this.build();
   }
   aggregates;
   /**
@@ -369,9 +375,9 @@ class Ke {
     for (const t of this.aggregates.values()) {
       if (!t.state || !t.fields)
         continue;
-      const o = t.aggregate.contextAlias;
-      let r = e.get(o);
-      r || (r = /* @__PURE__ */ new Set(), e.set(o, r)), r.add(t);
+      const n = t.aggregate.contextAlias;
+      let r = e.get(n);
+      r || (r = /* @__PURE__ */ new Set(), e.set(n, r)), r.add(t);
     }
     return e;
   }
@@ -381,16 +387,16 @@ class Ke {
    * @param methodOperation - The HTTP method and operation details
    */
   commands(e, t) {
-    const o = t.operation;
-    if (o.operationId === "wow.command.send")
+    const n = t.operation;
+    if (n.operationId === "wow.command.send")
       return;
-    const r = Je(o.operationId);
+    const r = Ve(n.operationId);
     if (!r)
       return;
-    const i = _(o);
-    if (!i || !g(i) || i.$ref !== Ve || !o.requestBody)
+    const i = _(n);
+    if (!i || !g(i) || i.$ref !== He || !n.requestBody)
       return;
-    const s = o.parameters ?? [], a = s.filter((l) => g(l) && l.$ref === He).at(0), c = s.filter(
+    const s = n.parameters ?? [], a = s.filter((l) => g(l) && l.$ref === Ke).at(0), c = s.filter(
       (l) => !g(l) && l.in === "path"
     );
     if (a) {
@@ -400,22 +406,22 @@ class Ke {
       );
       c.push(l);
     }
-    const p = o.requestBody.content[T.APPLICATION_JSON].schema, y = P(
+    const p = n.requestBody.content[v.APPLICATION_JSON].schema, y = P(
       p,
       this.openAPI.components
     );
-    y.schema.title = y.schema.title || o.summary, y.schema.description = y.schema.description || o.description;
+    y.schema.title = y.schema.title || n.summary, y.schema.description = y.schema.description || n.description;
     const fe = {
       name: r,
       method: t.method,
       path: e,
       pathParameters: c,
-      summary: o.summary,
-      description: o.description,
+      summary: n.summary,
+      description: n.description,
       schema: y,
-      operation: o
+      operation: n
     };
-    o.tags?.forEach((l) => {
+    n.tags?.forEach((l) => {
       const W = this.aggregates.get(l);
       W && W.commands.set(r, fe);
     });
@@ -430,13 +436,13 @@ class Ke {
     const t = U(e);
     if (!g(t))
       return;
-    const o = P(
+    const n = P(
       t,
       this.openAPI.components
     );
     e.tags?.forEach((r) => {
       const i = this.aggregates.get(r);
-      i && (i.state = o);
+      i && (i.state = n);
     });
   }
   /**
@@ -449,11 +455,11 @@ class Ke {
     const t = U(e);
     if (g(t))
       return;
-    const o = t?.items;
-    if (!g(o))
+    const n = t?.items;
+    if (!g(n))
       return;
-    const i = I(
-      o,
+    const i = E(
+      n,
       this.openAPI.components
     ).properties.body.items.anyOf.map((s) => {
       const a = s.title, c = s.properties.name.const, u = s.properties.body, p = P(
@@ -480,11 +486,11 @@ class Ke {
   fields(e) {
     if (!this.openAPI.components || !e.operationId?.endsWith(".snapshot.count"))
       return;
-    const o = K(
+    const n = K(
       e.requestBody,
       this.openAPI.components
-    ).content[T.APPLICATION_JSON].schema, i = I(
-      o,
+    ).content[v.APPLICATION_JSON].schema, i = E(
+      n,
       this.openAPI.components
     ).properties?.field, s = P(i, this.openAPI.components);
     e.tags?.forEach((a) => {
@@ -493,7 +499,7 @@ class Ke {
     });
   }
 }
-const A = "@ahoo-wang/fetcher-wow", Ye = {
+const A = "@ahoo-wang/fetcher-wow", Xe = {
   "wow.command.CommandResult": "CommandResult",
   "wow.command.CommandResultArray": "CommandResultArray",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
@@ -523,32 +529,32 @@ const A = "@ahoo-wang/fetcher-wow", Ye = {
   "wow.openapi.BatchResult": "BatchResult",
   "wow.messaging.CompensationTarget": "CompensationTarget"
 };
-function d(n) {
-  if (!n)
+function m(o) {
+  if (!o)
     return { name: "", path: "/" };
-  const e = Ye[n];
+  const e = Xe[o];
   if (e)
     return { name: e, path: A };
-  const t = n.split(".");
-  let o = -1;
+  const t = o.split(".");
+  let n = -1;
   for (let c = 0; c < t.length; c++)
     if (t[c] && /^[A-Z]/.test(t[c])) {
-      o = c;
+      n = c;
       break;
     }
-  const r = t.slice(0, o), i = r.length > 0 ? `/${r.join("/")}` : "/", s = t.slice(o);
-  return { name: S(s), path: i };
+  const r = t.slice(0, n), i = r.length > 0 ? `/${r.join("/")}` : "/", s = t.slice(n);
+  return { name: R(s), path: i };
 }
-function $(n) {
-  const e = C(n);
-  return d(e);
+function T(o) {
+  const e = C(o);
+  return m(e);
 }
-function w(n) {
-  return `${Z(n)}_BOUNDED_CONTEXT_ALIAS`;
+function O(o) {
+  return `${Z(o)}_BOUNDED_CONTEXT_ALIAS`;
 }
-class Xe {
-  constructor(e, t, o, r) {
-    this.modelInfo = e, this.sourceFile = t, this.keySchema = o, this.outputDir = r;
+class Ze {
+  constructor(e, t, n, r) {
+    this.modelInfo = e, this.sourceFile = t, this.keySchema = n, this.outputDir = r;
   }
   generate() {
     const e = this.process();
@@ -556,11 +562,11 @@ class Xe {
   }
   process() {
     const { schema: e } = this.keySchema;
-    return L(e) ? this.processEnum(e) : D(e) ? this.processInterface(e) : M(e) ? this.processArray(e) : b(e) ? this.processIntersection(e) : B(e) ? this.processComposition(e) : this.processTypeAlias(e);
+    return L(e) ? this.processEnum(e) : $(e) ? this.processInterface(e) : M(e) ? this.processArray(e) : b(e) ? this.processIntersection(e) : B(e) ? this.processComposition(e) : this.processTypeAlias(e);
   }
   resolveReference(e) {
-    const t = $(e);
-    return We(
+    const t = T(e);
+    return ke(
       this.modelInfo,
       this.sourceFile,
       this.outputDir,
@@ -574,7 +580,7 @@ class Xe {
   }
   resolvePropertyDefinitions(e) {
     const { properties: t } = e;
-    return Object.entries(t).map(([o, r]) => {
+    return Object.entries(t).map(([n, r]) => {
       const i = this.resolveType(r);
       if (!g(r)) {
         const s = pe(r), a = ge(s, `
@@ -584,20 +590,20 @@ class Xe {
           /**
            * ${a}
            */
-          ${o}: ${i}
+          ${n}: ${i}
           `;
       }
-      return `${o}: ${i}`;
+      return `${n}: ${i}`;
     });
   }
   resolveObjectType(e) {
     const t = [];
-    if (D(e)) {
+    if ($(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>" : `{
+    const n = this.resolveAdditionalProperties(e);
+    return n && t.push(n), t.length === 0 ? "Record<string, any>" : `{
   ${t.join(`;
   `)}; 
 }`;
@@ -615,14 +621,14 @@ class Xe {
     if (L(e))
       return e.enum.map((t) => `'${t}'`).join(" | ");
     if (B(e)) {
-      const o = (e.oneOf || e.anyOf || e.allOf || []).map((i) => this.resolveType(i)), r = b(e) ? " & " : " | ";
-      return `(${o.join(r)})`;
+      const n = (e.oneOf || e.anyOf || e.allOf || []).map((i) => this.resolveType(i)), r = b(e) ? " & " : " | ";
+      return `(${n.join(r)})`;
     }
     if (M(e)) {
       const t = this.resolveType(e.items);
       return Se(t);
     }
-    return e.type === "object" ? this.resolveObjectType(e) : e.type ? R(e.type) : "any";
+    return e.type === "object" ? this.resolveObjectType(e) : e.type ? w(e.type) : "any";
   }
   processEnum(e) {
     return this.sourceFile.addEnum({
@@ -634,21 +640,21 @@ class Xe {
       }))
     });
   }
-  addPropertyToInterface(e, t, o) {
-    const r = this.resolveType(o);
+  addPropertyToInterface(e, t, n) {
+    const r = this.resolveType(n);
     let i = e.getProperty(t);
     i ? i.setType(r) : i = e.addProperty({
       name: t,
       type: r,
-      isReadonly: De(o)
-    }), Q(i, o);
+      isReadonly: Oe(n)
+    }), Q(i, n);
   }
   processInterface(e) {
     const t = this.sourceFile.addInterface({
       name: this.modelInfo.name,
       isExported: !0
-    }), o = e.properties || {};
-    return Object.entries(o).forEach(([r, i]) => {
+    }), n = e.properties || {};
+    return Object.entries(n).forEach(([r, i]) => {
       this.addPropertyToInterface(t, r, i);
     }), e.additionalProperties && t.addIndexSignature({
       keyName: "key",
@@ -678,13 +684,13 @@ class Xe {
       name: this.modelInfo.name,
       isExported: !0
     });
-    return e.allOf.forEach((o) => {
-      if (g(o)) {
-        const r = this.resolveType(o);
+    return e.allOf.forEach((n) => {
+      if (g(n)) {
+        const r = this.resolveType(n);
         t.addExtends(r);
         return;
       }
-      D(o) && Object.entries(o.properties).forEach(
+      $(n) && Object.entries(n.properties).forEach(
         ([r, i]) => {
           this.addPropertyToInterface(
             t,
@@ -703,12 +709,12 @@ class Xe {
     });
   }
 }
-class Ze {
+class et {
   constructor(e) {
     this.context = e;
   }
   getOrCreateSourceFile(e) {
-    const t = _e(e);
+    const t = We(e);
     return this.context.getOrCreateSourceFile(t);
   }
   /**
@@ -725,29 +731,29 @@ class Ze {
       this.context.logger.info("No schemas found in OpenAPI specification");
       return;
     }
-    const t = this.stateAggregatedTypeNames(), o = this.filterSchemas(e, t);
-    this.context.logger.progress(`Generating models for ${o.length} schemas`), o.forEach((r, i) => {
+    const t = this.stateAggregatedTypeNames(), n = this.filterSchemas(e, t);
+    this.context.logger.progress(`Generating models for ${n.length} schemas`), n.forEach((r, i) => {
       this.context.logger.progressWithCount(
         i + 1,
-        o.length,
+        n.length,
         `Processing schema: ${r.key}`,
         2
       ), this.generateKeyedSchema(r);
     }), this.context.logger.success("Model generation completed");
   }
   filterSchemas(e, t) {
-    return Object.entries(e).map(([o, r]) => ({
-      key: o,
+    return Object.entries(e).map(([n, r]) => ({
+      key: n,
       schema: r
-    })).filter((o) => !this.isWowSchema(o.key, t));
+    })).filter((n) => !this.isWowSchema(n.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 o = d(e);
-    return t.has(o.name);
+    const n = m(e);
+    return t.has(n.name);
   }
   aggregatedSchemaSuffix = [
     "MaterializedSnapshot",
@@ -760,12 +766,12 @@ class Ze {
   ];
   stateAggregatedTypeNames() {
     const e = /* @__PURE__ */ new Set();
-    for (const [t, o] of this.context.contextAggregates) {
+    for (const [t, n] of this.context.contextAggregates) {
       this.generateBoundedContext(t);
-      for (const r of o)
+      for (const r of n)
         this.aggregatedSchemaSuffix.forEach(
           (i) => {
-            const s = d(r.state.key), a = S(s.name) + i;
+            const s = m(r.state.key), a = R(s.name) + i;
             e.add(a);
           }
         );
@@ -785,19 +791,19 @@ class Ze {
    * 4. Type alias processing
    */
   generateKeyedSchema(e) {
-    const t = d(e.key), o = this.getOrCreateSourceFile(t);
-    new Xe(t, o, e, this.context.outputDir).generate();
+    const t = m(e.key), n = this.getOrCreateSourceFile(t);
+    new Ze(t, n, e, this.context.outputDir).generate();
   }
   generateBoundedContext(e) {
     const t = `${e}/boundedContext.ts`;
     this.context.logger.info(`Creating bounded context file: ${t}`);
-    const o = this.context.getOrCreateSourceFile(t), r = w(e);
-    o.addStatements(
+    const n = this.context.getOrCreateSourceFile(t), r = O(e);
+    n.addStatements(
       `export const ${r} = '${e}';`
     );
   }
 }
-const et = "@ahoo-wang/fetcher-decorator", tt = [
+const tt = "@ahoo-wang/fetcher-decorator", nt = [
   "type ApiMetadata",
   "type ApiMetadataCapable",
   "type ParameterRequest",
@@ -811,7 +817,7 @@ const et = "@ahoo-wang/fetcher-decorator", tt = [
   "attribute",
   "path",
   "autoGeneratedError"
-], nt = {
+], ot = {
   type: "Promise<Response>",
   metadata: "{resultExtractor: ResultExtractors.Response }"
 }, V = {
@@ -821,14 +827,14 @@ const et = "@ahoo-wang/fetcher-decorator", tt = [
   headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
   resultExtractor: JsonEventStreamResultExtractor,
 }`;
-function ue(n) {
-  x(n, et, tt);
+function ue(o) {
+  x(o, tt, nt);
 }
-function F(n, e, t = [], o = [], r) {
+function F(o, e, t = [], n = [], r) {
   return e.addClass({
-    name: n,
+    name: o,
     isExported: !0,
-    typeParameters: o,
+    typeParameters: n,
     extends: r,
     decorators: [
       {
@@ -838,8 +844,8 @@ function F(n, e, t = [], o = [], r) {
     ]
   });
 }
-function le(n, e) {
-  n.addImplements("ApiMetadataCapable"), n.addConstructor({
+function le(o, e) {
+  o.addImplements("ApiMetadataCapable"), o.addConstructor({
     parameters: [
       {
         name: "apiMetadata",
@@ -852,54 +858,54 @@ function le(n, e) {
     ]
   });
 }
-const ot = "@ahoo-wang/fetcher-eventstream";
-function de(n) {
-  x(n, ot, [
+const rt = "@ahoo-wang/fetcher-eventstream";
+function me(o) {
+  x(o, rt, [
     "JsonEventStreamResultExtractor",
     "type JsonServerSentEventStream"
   ]);
 }
-function rt(n) {
+function it(o) {
   let e = 0, t = 0;
-  return n.commands.forEach((o) => {
-    o.path.startsWith(k.TENANT) && (e += 1), o.path.startsWith(k.OWNER) && (t += 1);
+  return o.commands.forEach((n) => {
+    n.path.startsWith(k.TENANT) && (e += 1), n.path.startsWith(k.OWNER) && (t += 1);
   }), e === 0 && t === 0 ? "ResourceAttributionPathSpec.NONE" : e > t ? "ResourceAttributionPathSpec.TENANT" : "ResourceAttributionPathSpec.OWNER";
 }
-function me(n, e, t, o) {
-  const r = `${t.contextAlias}/${t.aggregateName}/${o}.ts`;
-  return ce(n, e, r);
+function de(o, e, t, n) {
+  const r = `${t.contextAlias}/${t.aggregateName}/${n}.ts`;
+  return ce(o, e, r);
 }
-function h(n, e) {
-  return `${S(n.aggregateName)}${e}`;
+function h(o, e) {
+  return `${R(o.aggregateName)}${e}`;
 }
-function j(n) {
-  return n === "delete" ? "del" : n;
+function j(o) {
+  return o === "delete" ? "del" : o;
 }
-const it = "x-fetcher-method";
-function st(n, e) {
-  const t = n[it];
+const st = "x-fetcher-method";
+function at(o, e) {
+  const t = o[st];
   if (t)
     return t;
-  if (!n.operationId)
+  if (!o.operationId)
     return;
-  const o = N(n.operationId);
-  for (let r = o.length - 1; r >= 0; r--) {
-    const i = f(o.slice(r));
+  const n = N(o.operationId);
+  for (let r = n.length - 1; r >= 0; r--) {
+    const i = f(n.slice(r));
     if (!e(i))
       return i;
   }
-  return f(o);
+  return f(n);
 }
-class at {
+class ct {
   /**
    * Creates a new ApiClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and configuration
    */
   constructor(e) {
-    this.context = e, this.apiMetadataCtorInitializer = this.context.currentContextAlias ? `{basePath:${w(this.context.currentContextAlias)}}` : void 0;
+    this.context = e, this.apiMetadataCtorInitializer = this.context.currentContextAlias ? `{basePath:${O(this.context.currentContextAlias)}}` : void 0;
   }
   defaultParameterRequestType = "ParameterRequest";
-  defaultReturnType = nt;
+  defaultReturnType = ot;
   apiMetadataCtorInitializer;
   /**
    * Generates API client classes for all valid tags in the OpenAPI specification.
@@ -925,10 +931,10 @@ class at {
     this.context.logger.info(
       `Generating ${t.size} API client classes`
     );
-    let o = 0;
+    let n = 0;
     for (const [r, i] of t) {
-      o++, this.context.logger.progressWithCount(
-        o,
+      n++, this.context.logger.progressWithCount(
+        n,
         t.size,
         `Generating API client for tag: ${r}`
       );
@@ -943,7 +949,7 @@ class at {
    */
   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 = I(this.context.currentContextAlias, t)), t = I(t, `${e.name}ApiClient.ts`), this.context.logger.info(`Creating API client file: ${t}`), this.context.getOrCreateSourceFile(t);
   }
   /**
    * Generates a single API client class for the given tag and operations.
@@ -951,22 +957,22 @@ class at {
    * @param operations - Set of operations for this client
    */
   generateApiClient(e, t) {
-    const o = d(e.name);
+    const n = m(e.name);
     this.context.logger.info(
-      `Generating API client class: ${o.name}ApiClient with ${t.size} operations`
+      `Generating API client class: ${n.name}ApiClient with ${t.size} operations`
     );
-    const r = this.createApiClientFile(o);
-    ue(r), de(r);
+    const r = this.createApiClientFile(n);
+    ue(r), me(r);
     const i = F(
-      o.name + "ApiClient",
+      n.name + "ApiClient",
       r
     );
-    E(i, [e.description]), le(i, this.apiMetadataCtorInitializer), this.context.logger.info(
-      `Processing ${t.size} operations for ${o.name}ApiClient`
+    S(i, [e.description]), le(i, this.apiMetadataCtorInitializer), this.context.logger.info(
+      `Processing ${t.size} operations for ${n.name}ApiClient`
     ), t.forEach((s) => {
       this.processOperation(e, r, i, s);
     }), this.context.logger.success(
-      `Completed API client: ${o.name}ApiClient`
+      `Completed API client: ${n.name}ApiClient`
     );
   }
   /**
@@ -976,10 +982,10 @@ class at {
    * @returns A unique camelCase method name
    */
   getMethodName(e, t) {
-    const o = st(t, (r) => e.getMethod(r) !== void 0);
-    if (!o)
+    const n = at(t, (r) => e.getMethod(r) !== void 0);
+    if (!n)
       throw new Error(`Unable to resolve method name for apiClientClass:${e.getName()}.`);
-    return o;
+    return n;
   }
   /**
    * Resolves the request type for an operation based on its request body.
@@ -992,27 +998,27 @@ class at {
       return this.context.logger.info(
         `No request body found for operation ${t.operationId}, using default: ${this.defaultParameterRequestType}`
       ), this.defaultParameterRequestType;
-    let o;
+    let n;
     if (g(t.requestBody) ? (this.context.logger.info(
       `Extracting request body from reference for operation: ${t.operationId}`
-    ), o = K(
+    ), n = K(
       t.requestBody,
       this.context.openAPI.components
-    )) : o = t.requestBody, !o)
+    )) : n = t.requestBody, !n)
       return this.context.logger.info(
         `Request body extraction failed for operation ${t.operationId}, using default: ${this.defaultParameterRequestType}`
       ), this.defaultParameterRequestType;
-    if (o.content["multipart/form-data"])
+    if (n.content["multipart/form-data"])
       return this.context.logger.info(
         `Detected multipart/form-data content for operation ${t.operationId}, using ParameterRequest<FormData>`
       ), "ParameterRequest<FormData>";
-    if (o.content["application/json"]) {
-      const r = o.content["application/json"].schema;
+    if (n.content["application/json"]) {
+      const r = n.content["application/json"].schema;
       if (g(r)) {
-        const i = $(r);
+        const i = T(r);
         this.context.logger.info(
           `Adding import for request body model: ${i.name} from ${i.path}`
-        ), m(e, this.context.outputDir, i);
+        ), d(e, this.context.outputDir, i);
         const s = `ParameterRequest<${i.name}>`;
         return this.context.logger.info(
           `Resolved request type for operation ${t.operationId}: ${s}`
@@ -1030,13 +1036,13 @@ class at {
    * @param operation - The operation to resolve parameters for
    * @returns Array of parameter declarations
    */
-  resolveParameters(e, t, o) {
-    const r = Ne(o, this.context.openAPI.components).filter((a) => !this.context.isIgnoreApiClientPathParameters(
+  resolveParameters(e, t, n) {
+    const r = Me(n, this.context.openAPI.components).filter((a) => !this.context.isIgnoreApiClientPathParameters(
       e.name,
       a.name
     ));
     this.context.logger.info(
-      `Found ${r.length} path parameters for operation ${o.operationId}`
+      `Found ${r.length} path parameters for operation ${n.operationId}`
     );
     const i = r.map((a) => {
       const c = re(a);
@@ -1053,7 +1059,7 @@ class at {
           }
         ]
       };
-    }), s = this.resolveRequestType(t, o);
+    }), s = this.resolveRequestType(t, n);
     return this.context.logger.info(`Adding httpRequest parameter: ${s}`), i.push({
       name: "httpRequest",
       hasQuestionToken: s === this.defaultParameterRequestType,
@@ -1085,26 +1091,26 @@ class at {
    * @returns The resolved return type string
    */
   resolveSchemaReturnType(e, t) {
-    const o = "Promise<any>";
+    const n = "Promise<any>";
     if (g(t)) {
-      const r = $(t);
+      const r = T(t);
       this.context.logger.info(
         `Adding import for response model: ${r.name} from ${r.path}`
-      ), m(e, this.context.outputDir, r);
+      ), d(e, this.context.outputDir, r);
       const i = `Promise<${r.name}>`;
       return this.context.logger.info(`Resolved reference return type: ${i}`), i;
     }
     if (!t.type)
       return this.context.logger.info(
-        `Schema has no type, using default return type: ${o}`
-      ), o;
+        `Schema has no type, using default return type: ${n}`
+      ), n;
     if (te(t.type)) {
-      const i = `Promise<${R(t.type)}>`;
+      const i = `Promise<${w(t.type)}>`;
       return this.context.logger.info(`Resolved primitive return type: ${i}`), i;
     }
     return this.context.logger.info(
-      `Using default return type: ${o}`
-    ), o;
+      `Using default return type: ${n}`
+    ), n;
   }
   /**
    * Resolves the return type for an operation based on its responses.
@@ -1113,12 +1119,12 @@ class at {
    * @returns Object containing type and optional stream flag
    */
   resolveReturnType(e, t) {
-    const o = _(t);
-    if (!o)
+    const n = _(t);
+    if (!n)
       return this.context.logger.info(
         `No OK response found for operation ${t.operationId}, using default return type: ${this.defaultReturnType.type}`
       ), this.defaultReturnType;
-    const r = ee(o) || Te(o);
+    const r = ee(n) || Te(n);
     if (r) {
       const s = this.resolveSchemaReturnType(e, r);
       return this.context.logger.info(
@@ -1128,18 +1134,18 @@ class at {
         metadata: s === V.type ? V.metadata : void 0
       };
     }
-    const i = $e(o);
+    const i = $e(n);
     if (i) {
       if (g(i)) {
-        const a = I(
+        const a = E(
           i,
           this.context.openAPI.components
         );
         if (M(a) && g(a.items)) {
-          const c = $(a.items);
+          const c = T(a.items);
           this.context.logger.info(
             `Adding import for event stream model: ${c.name} from ${c.path}`
-          ), m(e, this.context.outputDir, c);
+          ), d(e, this.context.outputDir, c);
           const p = `Promise<JsonServerSentEventStream<${c.name.includes("ServerSentEvent") ? `${c.name}['data']` : c.name}>>`;
           return this.context.logger.info(
             `Resolved event stream return type for operation ${t.operationId}: ${p}`
@@ -1165,11 +1171,11 @@ class at {
    * @param apiClientClass - The client class to add the method to
    * @param operation - The operation to process
    */
-  processOperation(e, t, o, r) {
+  processOperation(e, t, n, r) {
     this.context.logger.info(
       `Processing operation: ${r.operation.operationId} (${r.method} ${r.path})`
     );
-    const i = this.getMethodName(o, r.operation);
+    const i = this.getMethodName(n, r.operation);
     this.context.logger.info(`Generated method name: ${i}`);
     const s = this.resolveParameters(
       e,
@@ -1185,7 +1191,7 @@ class at {
     this.context.logger.info(
       `Creating method with ${s.length} parameters, return type: ${a.type}`
     );
-    const u = o.addMethod({
+    const u = n.addMethod({
       name: i,
       decorators: [c],
       parameters: s,
@@ -1194,7 +1200,7 @@ class at {
         `throw autoGeneratedError(${s.map((p) => p.name).join(",")});`
       ]
     });
-    E(
+    S(
       u,
       [
         r.operation.summary,
@@ -1211,7 +1217,7 @@ class at {
    */
   groupOperations(e) {
     this.context.logger.info("Grouping operations by API client tags");
-    const t = /* @__PURE__ */ new Map(), o = ne(this.context.openAPI.paths).filter(
+    const t = /* @__PURE__ */ new Map(), n = ne(this.context.openAPI.paths).filter(
       (i) => {
         if (!i.operation.operationId)
           return !1;
@@ -1220,7 +1226,7 @@ class at {
       }
     );
     let r = 0;
-    for (const i of o)
+    for (const i of n)
       i.operation.tags.forEach((s) => {
         t.has(s) || t.set(s, /* @__PURE__ */ new Set()), t.get(s).add(i), r++;
       });
@@ -1250,24 +1256,24 @@ class at {
           });
         });
       });
-    let o = 0;
+    let n = 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), o++, this.context.logger.info(`Included API client tag: ${r.name}`));
+      ) : (e.set(r.name, r), n++, this.context.logger.info(`Included API client tag: ${r.name}`));
     }), this.context.logger.info(
-      `Resolved ${o} API client tags from ${t} total tags`
+      `Resolved ${n} API client tags from ${t} total tags`
     ), e;
   }
   isAggregateTag(e) {
     for (const t of this.context.contextAggregates.values())
-      for (const o of t)
-        if (o.aggregate.tag.name === e)
+      for (const n of t)
+        if (n.aggregate.tag.name === e)
           return !0;
     return !1;
   }
 }
-class ct {
+class gt {
   /**
    * Creates a new CommandClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1283,13 +1289,13 @@ class ct {
   generate() {
     const e = Array.from(
       this.context.contextAggregates.values()
-    ).reduce((o, r) => o + r.size, 0);
+    ).reduce((n, r) => n + 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 [, o] of this.context.contextAggregates)
-      o.forEach((r) => {
+    for (const [, n] of this.context.contextAggregates)
+      n.forEach((r) => {
         t++, this.context.logger.progressWithCount(
           t,
           e,
@@ -1306,7 +1312,7 @@ class ct {
     this.context.logger.info(
       `Processing command client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     );
-    const t = me(
+    const t = de(
       this.context.project,
       this.context.outputDir,
       e.aggregate,
@@ -1315,17 +1321,17 @@ class ct {
     this.context.logger.info(
       `Processing command endpoint paths for ${e.commands.size} commands`
     );
-    const o = this.processCommandEndpointPaths(t, e);
-    this.context.logger.info(
+    const n = this.processCommandEndpointPaths(t, e);
+    this.processCommandTypes(t, e), this.context.logger.info(
       `Creating default command client options: ${this.defaultCommandClientOptionsName}`
     ), t.addVariableStatement({
-      declarationKind: O.Const,
+      declarationKind: D.Const,
       declarations: [
         {
           name: this.defaultCommandClientOptionsName,
           type: "ApiMetadata",
           initializer: `{
-        basePath: ${w(e.aggregate.contextAlias)}
+        basePath: ${O(e.aggregate.contextAlias)}
       }`
         }
       ],
@@ -1344,11 +1350,11 @@ class ct {
       isTypeOnly: !0
     }), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher-eventstream: JsonEventStreamResultExtractor"
-    ), de(t), this.context.logger.info(
+    ), me(t), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher: ContentTypeValues"
     ), x(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info(
       "Adding imports from @ahoo-wang/fetcher-decorator: ApiMetadata types and decorators"
-    ), ue(t), this.context.logger.info("Generating standard command client class"), this.processCommandClient(t, e, o), this.context.logger.info("Generating stream command client class"), this.processStreamCommandClient(t, e), this.context.logger.success(
+    ), ue(t), this.context.logger.info("Generating standard command client class"), this.processCommandClient(t, e, n), this.context.logger.info("Generating stream command client class"), this.processStreamCommandClient(t, e), this.context.logger.success(
       `Command client generation completed for aggregate: ${e.aggregate.aggregateName}`
     );
   }
@@ -1356,14 +1362,14 @@ class ct {
     return h(e, this.commandEndpointPathsSuffix);
   }
   processCommandEndpointPaths(e, t) {
-    const o = this.resolveAggregateCommandEndpointPathsName(
+    const n = this.resolveAggregateCommandEndpointPathsName(
       t.aggregate
     );
     this.context.logger.info(
-      `Creating command endpoint paths enum: ${o}`
+      `Creating command endpoint paths enum: ${n}`
     );
     const r = e.addEnum({
-      name: o,
+      name: n,
       isExported: !0
     });
     return t.commands.forEach((i) => {
@@ -1375,12 +1381,32 @@ class ct {
       });
     }), this.context.logger.success(
       `Command endpoint paths enum created with ${t.commands.size} entries`
-    ), o;
+    ), n;
+  }
+  resolveCommandTypeName(e) {
+    const t = m(e.schema.key);
+    return [t, t.name + "Command"];
+  }
+  resolveCommandType(e, t) {
+    const [n, r] = this.resolveCommandTypeName(t);
+    d(e, this.context.outputDir, n);
+    let i = `${n.name}`;
+    const s = De(t.schema.schema).map((a) => `'${a}'`).join(" | ");
+    s !== "" && (i = `PartialBy<${i},${s}>`), i = `RemoveReadonlyFields<${i}>`, e.addTypeAlias({
+      name: r,
+      type: `${i}`,
+      isExported: !0
+    });
+  }
+  processCommandTypes(e, t) {
+    t.commands.forEach((n) => {
+      this.resolveCommandType(e, n);
+    });
   }
   getEndpointPath(e, t) {
     return `${e}.${t.name.toUpperCase()}`;
   }
-  processCommandClient(e, t, o) {
+  processCommandClient(e, t, n) {
     const r = h(
       t.aggregate,
       "CommandClient"
@@ -1393,15 +1419,14 @@ class ct {
     le(i, this.defaultCommandClientOptionsName), t.commands.forEach((s) => {
       this.processCommandMethod(
         t,
-        e,
         i,
         s,
-        o
+        n
       );
     });
   }
   processStreamCommandClient(e, t) {
-    const o = h(
+    const n = h(
       t.aggregate,
       "CommandClient"
     ), r = h(
@@ -1413,7 +1438,7 @@ class ct {
       e,
       ["''", q],
       [],
-      `${o}<CommandResultEventStream>`
+      `${n}<CommandResultEventStream>`
     ).addConstructor({
       parameters: [
         {
@@ -1425,12 +1450,12 @@ class ct {
       statements: "super(apiMetadata);"
     });
   }
-  resolveParameters(e, t, o) {
-    const r = d(o.schema.key);
+  resolveParameters(e, t) {
+    const [n, r] = this.resolveCommandTypeName(t);
     this.context.logger.info(
-      `Adding import for command model: ${r.name} from path: ${r.path}`
-    ), m(t, this.context.outputDir, r);
-    const i = o.pathParameters.filter((s) => !this.context.isIgnoreCommandClientPathParameters(
+      `Adding import for command model: ${n.name} from path: ${n.path}`
+    );
+    const i = t.pathParameters.filter((s) => !this.context.isIgnoreCommandClientPathParameters(
       e.name,
       s.name
     )).map((s) => {
@@ -1450,11 +1475,11 @@ class ct {
       };
     });
     return this.context.logger.info(
-      `Adding command request parameter: commandRequest (type: CommandRequest<${r.name}>)`
+      `Adding command request parameter: commandRequest (type: CommandRequest<${r}>)`
     ), i.push({
       name: "commandRequest",
-      hasQuestionToken: we(o.schema.schema),
-      type: `CommandRequest<${r.name}>`,
+      hasQuestionToken: we(t.schema.schema),
+      type: `CommandRequest<${r}>`,
       decorators: [
         {
           name: "request",
@@ -1475,41 +1500,40 @@ class ct {
       ]
     }), i;
   }
-  processCommandMethod(e, t, o, r, i) {
+  processCommandMethod(e, t, n, r) {
     this.context.logger.info(
-      `Generating command method: ${f(r.name)} for command: ${r.name}`
+      `Generating command method: ${f(n.name)} for command: ${n.name}`
     ), this.context.logger.info(
-      `Command method details: HTTP ${r.method}, path: ${r.path}`
+      `Command method details: HTTP ${n.method}, path: ${n.path}`
     );
-    const s = this.resolveParameters(
+    const i = this.resolveParameters(
       e.aggregate.tag,
-      t,
-      r
-    ), a = o.addMethod({
-      name: f(r.name),
+      n
+    ), s = t.addMethod({
+      name: f(n.name),
       decorators: [
         {
-          name: j(r.method),
-          arguments: [`${this.getEndpointPath(i, r)}`]
+          name: j(n.method),
+          arguments: [`${this.getEndpointPath(r, n)}`]
         }
       ],
-      parameters: s,
+      parameters: i,
       returnType: "Promise<R>",
-      statements: `throw autoGeneratedError(${s.map((c) => c.name).join(",")});`
+      statements: `throw autoGeneratedError(${i.map((a) => a.name).join(",")});`
     });
     this.context.logger.info(
-      `Adding JSDoc documentation for method: ${f(r.name)}`
-    ), E(a, [
-      r.summary,
-      r.description,
-      `- operationId: \`${r.operation.operationId}\``,
-      `- path: \`${r.path}\``
+      `Adding JSDoc documentation for method: ${f(n.name)}`
+    ), S(s, [
+      n.summary,
+      n.description,
+      `- operationId: \`${n.operation.operationId}\``,
+      `- path: \`${n.path}\``
     ]), this.context.logger.success(
-      `Command method generated: ${f(r.name)}`
+      `Command method generated: ${f(n.name)}`
     );
   }
 }
-class gt {
+class pt {
   /**
    * Creates a new QueryClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1524,15 +1548,15 @@ class gt {
    */
   generate() {
     const e = Array.from(this.context.contextAggregates.values()).reduce(
-      (o, r) => o + r.size,
+      (n, r) => n + 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 [, o] of this.context.contextAggregates)
-      o.forEach((r) => {
+    for (const [, n] of this.context.contextAggregates)
+      n.forEach((r) => {
         t++, this.context.logger.progressWithCount(
           t,
           e,
@@ -1548,7 +1572,7 @@ class gt {
    * @returns The source file for the client
    */
   createClientFilePath(e, t) {
-    return me(
+    return de(
       this.context.project,
       this.context.outputDir,
       e,
@@ -1576,35 +1600,35 @@ class gt {
         "ResourceAttributionPathSpec"
       ]
     });
-    const o = "DEFAULT_QUERY_CLIENT_OPTIONS";
+    const n = "DEFAULT_QUERY_CLIENT_OPTIONS";
     this.context.logger.info(
-      `Creating default query client options: ${o}`
+      `Creating default query client options: ${n}`
     ), t.addVariableStatement({
-      declarationKind: O.Const,
+      declarationKind: D.Const,
       declarations: [
         {
-          name: o,
+          name: n,
           type: "QueryClientOptions",
           initializer: `{
-        contextAlias: ${w(e.aggregate.contextAlias)},
+        contextAlias: ${O(e.aggregate.contextAlias)},
         aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${rt(e)},
+        resourceAttribution: ${it(e)},
       }`
         }
       ],
       isExported: !1
     }), this.processAggregateDomainEventTypes(e, t);
-    const r = this.processAggregateDomainEventType(e, t), i = `${f(e.aggregate.aggregateName)}QueryClientFactory`, s = d(e.state.key), a = d(e.fields.key);
+    const r = this.processAggregateDomainEventType(e, t), i = `${f(e.aggregate.aggregateName)}QueryClientFactory`, s = m(e.state.key), a = m(e.fields.key);
     this.context.logger.info(
       `Adding import for state model: ${s.name} from path: ${s.path}`
-    ), m(t, this.context.outputDir, s), this.context.logger.info(
+    ), d(t, this.context.outputDir, s), this.context.logger.info(
       `Adding import for fields model: ${a.name} from path: ${a.path}`
-    ), m(t, this.context.outputDir, a), this.context.logger.info(`Creating query client factory: ${i}`), t.addVariableStatement({
-      declarationKind: O.Const,
+    ), d(t, this.context.outputDir, a), this.context.logger.info(`Creating query client factory: ${i}`), t.addVariableStatement({
+      declarationKind: D.Const,
       declarations: [
         {
           name: i,
-          initializer: `new QueryClientFactory<${s.name}, ${a.name} | string, ${r}>(${o})`
+          initializer: `new QueryClientFactory<${s.name}, ${a.name} | string, ${r}>(${n})`
         }
       ],
       isExported: !0
@@ -1613,17 +1637,17 @@ class gt {
     );
   }
   processAggregateDomainEventType(e, t) {
-    const o = [];
+    const n = [];
     this.context.logger.info(
       `Processing ${e.events.size} domain events for aggregate: ${e.aggregate.aggregateName}`
     );
     for (const s of e.events.values()) {
-      const a = d(s.schema.key);
+      const a = m(s.schema.key);
       this.context.logger.info(
         `Adding import for event model: ${a.name} from path: ${a.path}`
-      ), m(t, this.context.outputDir, a), o.push(a);
+      ), d(t, this.context.outputDir, a), n.push(a);
     }
-    const r = h(e.aggregate, this.domainEventTypeSuffix), i = o.map((s) => s.name).join(" | ");
+    const r = h(e.aggregate, this.domainEventTypeSuffix), i = n.map((s) => s.name).join(" | ");
     return this.context.logger.info(
       `Creating domain event types union: ${r} = ${i}`
     ), t.addTypeAlias({
@@ -1633,8 +1657,8 @@ class gt {
     }), r;
   }
   processAggregateDomainEventTypes(e, t) {
-    const o = h(e.aggregate, this.domainEventTypeMapTitleSuffix), r = t.addEnum({
-      name: o,
+    const n = h(e.aggregate, this.domainEventTypeMapTitleSuffix), r = t.addEnum({
+      name: n,
       isExported: !0
     });
     for (const i of e.events.values())
@@ -1644,13 +1668,13 @@ class gt {
       });
   }
 }
-class pt {
+class ut {
   /**
    * Creates a new ClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    this.context = e, this.queryClientGenerator = new gt(e), this.commandClientGenerator = new ct(e), this.apiClientGenerator = new at(e);
+    this.context = e, this.queryClientGenerator = new pt(e), this.commandClientGenerator = new gt(e), this.apiClientGenerator = new ct(e);
   }
   queryClientGenerator;
   commandClientGenerator;
@@ -1673,7 +1697,7 @@ class pt {
     this.queryClientGenerator.generate(), this.commandClientGenerator.generate(), this.apiClientGenerator.generate(), this.context.logger.success("Client generation completed");
   }
 }
-class ut {
+class lt {
   /** The ts-morph project instance used for code generation */
   project;
   /** The OpenAPI specification object */
@@ -1700,8 +1724,8 @@ class ut {
     return this.defaultIgnorePathParameters.includes(t);
   }
 }
-const lt = "./fetcher-generator.config.json";
-class At {
+const mt = "./fetcher-generator.config.json";
+class Ct {
   /**
    * Creates a new CodeGenerator instance with the specified options.
    *
@@ -1737,28 +1761,28 @@ class At {
     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 Fe(this.options.inputPath);
+    const e = await je(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
-    const o = new Ke(e).resolve();
+    const n = new Ye(e).resolve();
     this.options.logger.info(
-      `Resolved ${o.size} bounded context aggregates`
+      `Resolved ${n.size} bounded context aggregates`
     );
-    const r = this.options.configPath ?? lt;
+    const r = this.options.configPath ?? mt;
     let i = {};
     try {
-      this.options.logger.info(`Parsing configuration file: ${r}`), i = await je(r);
+      this.options.logger.info(`Parsing configuration file: ${r}`), i = await Ge(r);
     } catch (p) {
       this.options.logger.info(`Configuration file parsing failed: ${p}`);
     }
-    const s = new ut({
+    const s = new lt({
       openAPI: e,
       project: this.project,
       outputDir: this.options.outputDir,
-      contextAggregates: o,
+      contextAggregates: n,
       logger: this.options.logger,
       config: i
     });
-    this.options.logger.info("Generating models"), new Ze(s).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new pt(s).generate(), this.options.logger.info("Clients generated successfully");
+    this.options.logger.info("Generating models"), new et(s).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new ut(s).generate(), this.options.logger.info("Clients generated successfully");
     const u = this.project.getDirectory(this.options.outputDir);
     if (!u) {
       this.options.logger.info("Output directory not found.");
@@ -1791,8 +1815,8 @@ class At {
   processDirectory(e) {
     const t = e.getDirectories();
     this.options.logger.info(`Processing ${t.length} subdirectories`);
-    for (const o of t)
-      this.options.logger.info(`Processing subdirectory: ${o.getPath()}`), this.generateIndexForDirectory(o), this.processDirectory(o);
+    for (const n of t)
+      this.options.logger.info(`Processing subdirectory: ${n.getPath()}`), this.generateIndexForDirectory(n), this.processDirectory(n);
   }
   /**
    * Generates an index.ts file for a specific directory.
@@ -1804,12 +1828,12 @@ class At {
   generateIndexForDirectory(e) {
     const t = e.getPath();
     this.options.logger.info(`Generating index for directory: ${t}`);
-    const o = e.getSourceFiles().filter(
+    const n = e.getSourceFiles().filter(
       (a) => a.getBaseName().endsWith(".ts") && a.getBaseName() !== "index.ts"
     ), r = e.getDirectories();
     if (this.options.logger.info(
-      `Found ${o.length} TypeScript files and ${r.length} subdirectories in ${t}`
-    ), o.length === 0 && r.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`
       );
@@ -1817,7 +1841,7 @@ class At {
     }
     const i = `${t}/index.ts`, s = this.project.getSourceFile(i) || this.project.createSourceFile(i, "", { overwrite: !0 });
     s.removeText();
-    for (const a of o) {
+    for (const a of n) {
       const c = `./${a.getBaseNameWithoutExtension()}`;
       s.addExportDeclaration({
         moduleSpecifier: c,
@@ -1834,7 +1858,7 @@ class At {
       });
     }
     this.options.logger.info(
-      `Index file generated for ${t} with ${o.length + r.length} exports`
+      `Index file generated for ${t} with ${n.length + r.length} exports`
     );
   }
   /**
@@ -1847,15 +1871,15 @@ class At {
     const t = e.getDescendantSourceFiles();
     this.options.logger.info(
       `Optimizing ${t.length} source files in ${e.getPath()}`
-    ), t.forEach((o, r) => {
+    ), t.forEach((n, r) => {
       this.options.logger.info(
-        `Optimizing file [${o.getFilePath()}] - ${r + 1}/${t.length}`
-      ), o.formatText(), o.organizeImports(), o.fixMissingImports();
+        `Optimizing file [${n.getFilePath()}] - ${r + 1}/${t.length}`
+      ), n.formatText(), n.organizeImports(), n.fixMissingImports();
     }), this.options.logger.info("All source files optimized");
   }
 }
 export {
-  At as CodeGenerator,
-  lt as DEFAULT_CONFIG_PATH
+  Ct as CodeGenerator,
+  mt as DEFAULT_CONFIG_PATH
 };
 //# sourceMappingURL=index.js.map