@ahoo-wang/fetcher-generator 2.2.9 → 2.3.0

package/dist/index.js

@@ -1,10 +1,10 @@
-import { VariableDeclarationKind as E, Scope as k } from "ts-morph";
-import { parse as Q } from "yaml";
+import { VariableDeclarationKind as E, Scope as L } from "ts-morph";
+import { parse as U } from "yaml";
 import * as v from "fs";
-import { readFile as L } from "fs";
-import { ContentTypeValues as S, combineURLs as q } from "@ahoo-wang/fetcher";
-import * as K from "path";
-import { join as U, relative as J } from "path";
+import { readFile as K } from "fs";
+import { ContentTypeValues as S, combineURLs as G } from "@ahoo-wang/fetcher";
+import * as J from "path";
+import { join as V, relative as H } from "path";
 import { ResourceAttributionPathSpec as b } from "@ahoo-wang/fetcher-wow";
 function f(n) {
   return n.$ref.split("/").pop();
@@ -13,11 +13,11 @@ function I(n, e) {
   const t = f(n);
   return e.schemas?.[t];
 }
-function V(n, e) {
+function Y(n, e) {
   const t = f(n);
   return e.requestBodies?.[t];
 }
-function H(n, e) {
+function X(n, e) {
   const t = f(n);
   return e.parameters?.[t];
 }
@@ -27,46 +27,62 @@ function C(n, e) {
     schema: I(n, e)
   };
 }
-const R = /[-_\s.]+|(?=[A-Z])/;
-function w(n) {
-  if (n === "" || n.length === 0)
-    return "";
-  let e;
-  return Array.isArray(n) ? e = n.flatMap((t) => t.split(R)) : e = n.split(R), e.filter((t) => t.length > 0).map((t) => {
+const R = /[-_\s.]+/;
+function F(n) {
+  return Array.isArray(n) ? n.flatMap((e) => j(e.split(R))) : j(n.split(R));
+}
+function j(n) {
+  return n.flatMap((e) => {
+    if (e.length === 0)
+      return [];
+    const t = [];
+    let o = "";
+    for (let r = 0; r < e.length; r++) {
+      const s = e[r], i = /[A-Z]/.test(s), c = r > 0 && /[a-z]/.test(e[r - 1]);
+      i && c && o ? (t.push(o), o = s) : o += s;
+    }
+    return o && t.push(o), t;
+  });
+}
+function $(n) {
+  return n === "" || n.length === 0 ? "" : F(n).filter((t) => t.length > 0).map((t) => {
     if (t.length === 0) return "";
     const o = t.charAt(0), r = t.slice(1);
     return (/[a-zA-Z]/.test(o) ? o.toUpperCase() : o) + r.toLowerCase();
   }).join("");
 }
 function h(n) {
-  const e = w(n);
+  const e = $(n);
   return e.charAt(0).toLowerCase() + e.slice(1);
 }
-function Y(n) {
-  return n.startsWith("http://") || n.startsWith("https://") ? X(n) : Z(n);
+function Z(n) {
+  return n === "" || Array.isArray(n) && n.length === 0 ? "" : F(n).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
+}
+function ee(n) {
+  return n.startsWith("http://") || n.startsWith("https://") ? te(n) : oe(n);
 }
-async function X(n) {
+async function te(n) {
   return await (await fetch(n)).text();
 }
-function Z(n) {
+function oe(n) {
   return new Promise((e, t) => {
-    L(n, "utf-8", (o, r) => {
+    K(n, "utf-8", (o, r) => {
       o ? t(o) : e(r);
     });
   });
 }
-async function ee(n) {
-  const e = await Y(n);
-  switch (te(e)) {
+async function ne(n) {
+  const e = await ee(n);
+  switch (re(e)) {
     case "json":
       return JSON.parse(e);
     case "yaml":
-      return Q(e);
+      return U(e);
     default:
       throw new Error(`Unsupported file format: ${n}`);
   }
 }
-function te(n) {
+function re(n) {
   const e = n.trimStart();
   if (e.startsWith("{") || e.startsWith("["))
     return "json";
@@ -83,10 +99,10 @@ function te(n) {
 function g(n) {
   return !!(n && typeof n == "object" && "$ref" in n);
 }
-function oe(n) {
+function se(n) {
   return !n || g(n) || !n.content ? void 0 : n.content[S.APPLICATION_JSON]?.schema;
 }
-function ne(n) {
+function ie(n) {
   return [
     { method: "get", operation: n.get },
     { method: "put", operation: n.put },
@@ -98,48 +114,48 @@ function ne(n) {
     { method: "trace", operation: n.trace }
   ].filter(({ operation: e }) => e !== void 0);
 }
-function G(n) {
+function W(n) {
   return n.responses[200];
 }
-function j(n) {
-  const e = G(n);
-  return oe(e);
+function M(n) {
+  const e = W(n);
+  return se(e);
 }
-const re = [
+const ae = [
   "string",
   "number",
   "integer",
   "boolean",
   "null"
 ];
-function se(n) {
-  return Array.isArray(n) ? !0 : re.includes(n);
+function ce(n) {
+  return Array.isArray(n) ? !0 : ae.includes(n);
 }
-function ie(n) {
+function ge(n) {
   return n.type === "array";
 }
-function ae(n) {
+function le(n) {
   return Array.isArray(n.enum) && n.enum.length > 0;
 }
-function F(n) {
+function _(n) {
   return Array.isArray(n.anyOf) && n.anyOf.length > 0;
 }
-function W(n) {
+function B(n) {
   return Array.isArray(n.oneOf) && n.oneOf.length > 0;
 }
-function ce(n) {
-  return F(n) || W(n);
+function pe(n) {
+  return _(n) || B(n);
 }
-function ge(n) {
+function me(n) {
   return Array.isArray(n.allOf) && n.allOf.length > 0;
 }
-function M(n) {
-  return F(n) || W(n) || ge(n);
+function q(n) {
+  return _(n) || B(n) || me(n);
 }
-function le(n) {
+function ue(n) {
   return n.includes("|") || n.includes("&") ? `(${n})[]` : `${n}[]`;
 }
-function pe(n) {
+function de(n) {
   return n.type !== "object" ? !1 : n.properties ? Object.keys(n.properties).length === 0 : !0;
 }
 function N(n) {
@@ -159,17 +175,17 @@ function N(n) {
       return "any";
   }
 }
-const _ = "types.ts", me = "@";
-function ue(n) {
-  return q(n.path, _);
+const z = "types.ts", fe = "@";
+function he(n) {
+  return G(n.path, z);
 }
 function T(n, e, t) {
-  const o = q(e, t), r = n.getSourceFile(o);
+  const o = G(e, t), r = n.getSourceFile(o);
   return r || n.createSourceFile(o, "", {
     overwrite: !0
   });
 }
-function $(n, e, t) {
+function w(n, e, t) {
   let o = n.getImportDeclaration(
     (r) => r.getModuleSpecifierValue() === e
   );
@@ -177,23 +193,23 @@ function $(n, e, t) {
     moduleSpecifier: e
   })), t.forEach((r) => {
     o.getNamedImports().some(
-      (a) => a.getName() === r
+      (i) => i.getName() === r
     ) || o.addNamedImport(r);
   });
 }
 function y(n, e, t) {
-  if (t.path.startsWith(me)) {
-    $(n, t.path, [t.name]);
+  if (t.path.startsWith(fe)) {
+    w(n, t.path, [t.name]);
     return;
   }
-  const o = n.getDirectoryPath(), r = U(e, t.path, _);
-  let s = J(o, r);
-  s = s.replace(/\.ts$/, ""), s.startsWith(".") || (s = "./" + s), $(n, s, [t.name]);
+  const o = n.getDirectoryPath(), r = V(e, t.path, z);
+  let s = H(o, r);
+  s = s.replace(/\.ts$/, ""), s.startsWith(".") || (s = "./" + s), w(n, s, [t.name]);
 }
 function O(n, e, t, o) {
   n.path !== o.path && y(e, t, o);
 }
-function de(n, e) {
+function ye(n, e) {
   const t = [n, e].filter(
     (o) => o !== void 0 && o.length > 0
   );
@@ -201,25 +217,25 @@ function de(n, e) {
 `) : void 0;
 }
 function P(n, e, t) {
-  const o = de(e, t);
+  const o = ye(e, t);
   o && n.addJsDoc({
     description: o
   });
 }
-function fe(n) {
+function Ae(n) {
   const e = n.split(".");
   return e.length != 2 || e[0].length === 0 || e[1].length === 0 ? null : e;
 }
-function he(n) {
-  const e = fe(n.name);
+function Ce(n) {
+  const e = Ae(n.name);
   return e ? {
     tag: n,
     contextAlias: e[0],
     aggregateName: e[1]
   } : null;
 }
-function ye(n) {
-  const e = n?.map((o) => he(o)).filter((o) => o !== null);
+function Pe(n) {
+  const e = n?.map((o) => Ce(o)).filter((o) => o !== null);
   if (!e)
     return /* @__PURE__ */ new Map();
   const t = /* @__PURE__ */ new Map();
@@ -231,20 +247,20 @@ function ye(n) {
     });
   }), t;
 }
-function Ae(n) {
+function we(n) {
   if (!n)
     return null;
   const e = n.split(".");
   return e.length != 3 ? null : e[2];
 }
-const Ce = "#/components/responses/wow.CommandOk", Pe = "#/components/parameters/wow.id";
-class $e {
+const $e = "#/components/responses/wow.CommandOk", xe = "#/components/parameters/wow.id";
+class Oe {
   /**
    * Creates a new AggregateResolver instance.
    * @param openAPI - The OpenAPI specification to resolve aggregates from
    */
   constructor(e) {
-    this.openAPI = e, this.aggregates = ye(e.tags), this.build();
+    this.openAPI = e, this.aggregates = Pe(e.tags), this.build();
   }
   aggregates;
   /**
@@ -253,7 +269,7 @@ class $e {
    */
   build() {
     for (const [e, t] of Object.entries(this.openAPI.paths)) {
-      const o = ne(t);
+      const o = ie(t);
       for (const r of o)
         this.commands(e, r), this.state(r.operation), this.events(r.operation), this.fields(r.operation);
     }
@@ -282,32 +298,32 @@ class $e {
     const o = t.operation;
     if (o.operationId === "wow.command.send")
       return;
-    const r = Ae(o.operationId);
+    const r = we(o.operationId);
     if (!r)
       return;
-    const s = G(o);
-    if (!s || !g(s) || s.$ref !== Ce || !o.requestBody)
+    const s = W(o);
+    if (!s || !g(s) || s.$ref !== $e || !o.requestBody)
       return;
-    const a = o.parameters ?? [], c = a.filter((u) => g(u) && u.$ref === Pe).at(0), i = a.filter(
+    const i = o.parameters ?? [], c = i.filter((u) => g(u) && u.$ref === xe).at(0), a = i.filter(
       (u) => !g(u) && u.in === "path"
     );
     if (c) {
-      const u = H(
+      const u = X(
         c,
         this.openAPI.components
       );
-      i.push(u);
+      a.push(u);
     }
     const m = o.requestBody.content[S.APPLICATION_JSON].schema, l = C(
       m,
       this.openAPI.components
     );
     l.schema.title = l.schema.title || o.summary, l.schema.description = l.schema.description || o.description;
-    const z = {
+    const Q = {
       name: r,
       method: t.method,
       path: e,
-      pathParameters: i,
+      pathParameters: a,
       summary: o.summary,
       description: o.description,
       schema: l,
@@ -315,7 +331,7 @@ class $e {
     };
     o.tags?.forEach((u) => {
       const D = this.aggregates.get(u);
-      D && D.commands.set(r, z);
+      D && D.commands.set(r, Q);
     });
   }
   /**
@@ -325,7 +341,7 @@ class $e {
   state(e) {
     if (!e.operationId?.endsWith(".snapshot_state.single"))
       return;
-    const t = j(e);
+    const t = M(e);
     if (!g(t))
       return;
     const o = C(
@@ -344,7 +360,7 @@ class $e {
   events(e) {
     if (!this.openAPI.components || !e.operationId?.endsWith(".event.list_query"))
       return;
-    const t = j(e);
+    const t = M(e);
     if (g(t))
       return;
     const o = t?.items;
@@ -353,21 +369,21 @@ class $e {
     const s = I(
       o,
       this.openAPI.components
-    ).properties.body.items.anyOf.map((a) => {
-      const c = a.title, i = a.properties.name.const, p = a.properties.body, m = C(
+    ).properties.body.items.anyOf.map((i) => {
+      const c = i.title, a = i.properties.name.const, p = i.properties.body, m = C(
         p,
         this.openAPI.components
       );
-      return m.schema.title = m.schema.title || a.title, {
+      return m.schema.title = m.schema.title || i.title, {
         title: c,
-        name: i,
+        name: a,
         schema: m
       };
     });
-    e.tags?.forEach((a) => {
-      const c = this.aggregates.get(a);
-      c && s.forEach((i) => {
-        c.events.set(i.name, i);
+    e.tags?.forEach((i) => {
+      const c = this.aggregates.get(i);
+      c && s.forEach((a) => {
+        c.events.set(a.name, a);
       });
     });
   }
@@ -378,20 +394,20 @@ class $e {
   fields(e) {
     if (!this.openAPI.components || !e.operationId?.endsWith(".snapshot.count"))
       return;
-    const o = V(
+    const o = Y(
       e.requestBody,
       this.openAPI.components
     ).content[S.APPLICATION_JSON].schema, s = I(
       o,
       this.openAPI.components
-    ).properties?.field, a = C(s, this.openAPI.components);
+    ).properties?.field, i = C(s, this.openAPI.components);
     e.tags?.forEach((c) => {
-      const i = this.aggregates.get(c);
-      i && (i.fields = a);
+      const a = this.aggregates.get(c);
+      a && (a.fields = i);
     });
   }
 }
-const A = "@ahoo-wang/fetcher-wow", we = {
+const A = "@ahoo-wang/fetcher-wow", Ee = {
   "wow.command.CommandResult": "CommandResult",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
   "wow.api.BindingError": "BindingError",
@@ -423,20 +439,20 @@ const A = "@ahoo-wang/fetcher-wow", we = {
 function d(n) {
   if (!n)
     return { name: "", path: "/" };
-  const e = we[n];
+  const e = Ee[n];
   if (e)
     return { name: e, path: A };
   const t = n.split(".");
   let o = -1;
-  for (let i = 0; i < t.length; i++)
-    if (t[i] && /^[A-Z]/.test(t[i])) {
-      o = i;
+  for (let a = 0; a < t.length; a++)
+    if (t[a] && /^[A-Z]/.test(t[a])) {
+      o = a;
       break;
     }
   if (o === -1)
     return { name: n, path: "/" };
-  const r = t.slice(0, o), s = r.length > 0 ? `/${r.join("/")}` : "/", a = t.slice(o);
-  return { name: w(a), path: s };
+  const r = t.slice(0, o), s = r.length > 0 ? `/${r.join("/")}` : "/", i = t.slice(o);
+  return { name: $(i), path: s };
 }
 class x {
   /** The ts-morph project instance used for code generation */
@@ -457,12 +473,12 @@ class x {
     this.project = e.project, this.openAPI = e.openAPI, this.outputDir = e.outputDir, this.contextAggregates = e.contextAggregates, this.logger = e.logger;
   }
 }
-class xe extends x {
+class Se extends x {
   constructor(e) {
     super(e);
   }
   getOrCreateSourceFile(e) {
-    const t = ue(e);
+    const t = he(e);
     return T(this.project, this.outputDir, t);
   }
   /**
@@ -480,9 +496,7 @@ class xe extends x {
       return;
     }
     const t = this.filterSchemas(e);
-    this.logger.progress(
-      `Generating models for ${t.length} schemas`
-    ), t.forEach((o, r) => {
+    this.logger.progress(`Generating models for ${t.length} schemas`), t.forEach((o, r) => {
       this.logger.progressWithCount(
         r + 1,
         t.length,
@@ -492,12 +506,10 @@ class xe extends x {
     }), this.logger.success("Model generation completed");
   }
   filterSchemas(e) {
-    return Object.entries(e).map(
-      ([t, o]) => ({
-        key: t,
-        schema: o
-      })
-    ).filter((t) => !this.isWowSchema(t.key));
+    return Object.entries(e).map(([t, o]) => ({
+      key: t,
+      schema: o
+    })).filter((t) => !this.isWowSchema(t.key));
   }
   isWowSchema(e) {
     return e.startsWith("wow.");
@@ -521,12 +533,12 @@ class xe extends x {
     s && P(s, t.title, t.description);
   }
   process(e, t, o) {
-    if (ae(o))
+    if (le(o))
       return t.addEnum({
         name: e.name,
         isExported: !0,
         members: o.enum.filter((s) => typeof s == "string" && s.length > 0).map((s) => ({
-          name: s,
+          name: Z(s),
           initializer: `'${s}'`
         }))
       });
@@ -539,10 +551,10 @@ class xe extends x {
       e,
       o,
       r
-    ) : (M(o) && (o.anyOf || o.oneOf || o.allOf).forEach((a) => {
-      if (g(a)) {
+    ) : (q(o) && (o.anyOf || o.oneOf || o.allOf).forEach((i) => {
+      if (g(i)) {
         const c = d(
-          f(a)
+          f(i)
         );
         O(
           e,
@@ -555,7 +567,7 @@ class xe extends x {
       this.processInterface(
         t,
         e,
-        a,
+        i,
         r
       );
     }), r);
@@ -573,18 +585,18 @@ class xe extends x {
     );
   }
   processInterface(e, t, o, r) {
-    for (const [s, a] of Object.entries(o.properties)) {
+    for (const [s, i] of Object.entries(o.properties)) {
       const c = this.resolvePropertyType(
         t,
         e,
         s,
-        a
+        i
       );
-      let i = r.getProperty(s);
-      i ? i.setType(c) : i = r.addProperty({
+      let a = r.getProperty(s);
+      a ? a.setType(c) : a = r.addProperty({
         name: s,
         type: c
-      }), g(a) || P(i, a.title, a.description);
+      }), g(i) || P(a, i.title, i.description);
     }
     return r;
   }
@@ -600,18 +612,18 @@ class xe extends x {
     }
     if (r.const)
       return `'${r.const}'`;
-    if (ie(r)) {
+    if (ge(r)) {
       const s = this.resolvePropertyType(
         e,
         t,
         o,
         r.items
       );
-      return le(s);
+      return ue(s);
     }
-    if (r.type && se(r.type))
+    if (r.type && ce(r.type))
       return N(r.type);
-    if (M(r))
+    if (q(r))
       return this.resolvePropertyCompositionType(
         e,
         t,
@@ -620,13 +632,13 @@ class xe extends x {
     if (r.type === "object" && r.properties) {
       const s = {
         path: e.path,
-        name: `${e.name}${w(o)}`
-      }, a = this.processObject(
+        name: `${e.name}${$(o)}`
+      }, i = this.processObject(
         t,
         s,
         r
       );
-      return P(a, r.title, r.description), s.name;
+      return P(i, r.title, r.description), s.name;
     }
     return "any";
   }
@@ -634,37 +646,37 @@ class xe extends x {
     const r = o.anyOf || o.oneOf || o.allOf, s = /* @__PURE__ */ new Set();
     r.forEach((c) => {
       if (g(c)) {
-        const i = d(
+        const a = d(
           f(c)
         );
         O(
           e,
           t,
           this.outputDir,
-          i
-        ), s.add(i.name);
+          a
+        ), s.add(a.name);
         return;
       }
       s.add(N(c.type ?? "string"));
     });
-    const a = ce(o) ? "|" : "&";
-    return Array.from(s).join(a);
+    const i = pe(o) ? "|" : "&";
+    return Array.from(s).join(i);
   }
 }
-function Oe(n) {
+function Ie(n) {
   let e = 0, t = 0;
   return n.commands.forEach((o) => {
     o.path.startsWith(b.TENANT) && (e += 1), o.path.startsWith(b.OWNER) && (t += 1);
   }), e === 0 && t === 0 ? "ResourceAttributionPathSpec.NONE" : e > t ? "ResourceAttributionPathSpec.TENANT" : "ResourceAttributionPathSpec.OWNER";
 }
-function B(n, e, t, o) {
+function k(n, e, t, o) {
   const r = `${t.contextAlias}/${t.aggregateName}/${o}.ts`;
   return T(n, e, r);
 }
-function Ee(n, e) {
-  return `${w(n.aggregateName)}${e}`;
+function Ne(n, e) {
+  return `${$(n.aggregateName)}${e}`;
 }
-class Se extends x {
+class Te extends x {
   /**
    * Creates a new QueryClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -701,7 +713,7 @@ class Se extends x {
    * @returns The source file for the client
    */
   createClientFilePath(e, t) {
-    return B(
+    return k(
       this.project,
       this.outputDir,
       e,
@@ -741,7 +753,7 @@ class Se extends x {
           initializer: `{
         contextAlias: '${e.aggregate.contextAlias}',
         aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${Oe(e)},
+        resourceAttribution: ${Ie(e)},
       }`
         }
       ],
@@ -757,24 +769,24 @@ class Se extends x {
         `Adding import for event model: ${l.name} from path: ${l.path}`
       ), y(t, this.outputDir, l), r.push(l);
     }
-    const s = "DOMAIN_EVENT_TYPES", a = r.map((m) => m.name).join(" | ");
+    const s = "DOMAIN_EVENT_TYPES", i = r.map((m) => m.name).join(" | ");
     this.logger.info(
-      `Creating domain event types union: ${s} = ${a}`
+      `Creating domain event types union: ${s} = ${i}`
     ), t.addTypeAlias({
       name: s,
-      type: a
+      type: i
     });
-    const c = `${h(e.aggregate.aggregateName)}QueryClientFactory`, i = d(e.state.key), p = d(e.fields.key);
+    const c = `${h(e.aggregate.aggregateName)}QueryClientFactory`, a = d(e.state.key), p = d(e.fields.key);
     this.logger.info(
-      `Adding import for state model: ${i.name} from path: ${i.path}`
-    ), y(t, this.outputDir, i), this.logger.info(
+      `Adding import for state model: ${a.name} from path: ${a.path}`
+    ), y(t, this.outputDir, a), this.logger.info(
       `Adding import for fields model: ${p.name} from path: ${p.path}`
     ), y(t, this.outputDir, p), this.logger.info(`Creating query client factory: ${c}`), t.addVariableStatement({
       declarationKind: E.Const,
       declarations: [
         {
           name: c,
-          initializer: `new QueryClientFactory<${i.name}, ${p.name} | string, ${s}>(${o})`
+          initializer: `new QueryClientFactory<${a.name}, ${p.name} | string, ${s}>(${o})`
         }
       ],
       isExported: !0
@@ -783,7 +795,7 @@ class Se extends x {
     );
   }
 }
-class Ie extends x {
+class De extends x {
   commandEndpointPathsName = "COMMAND_ENDPOINT_PATHS";
   defaultCommandClientOptionsName = "DEFAULT_COMMAND_CLIENT_OPTIONS";
   /**
@@ -823,7 +835,7 @@ class Ie extends x {
     this.logger.info(
       `Processing command client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     );
-    const t = B(
+    const t = k(
       this.project,
       this.outputDir,
       e.aggregate,
@@ -864,9 +876,9 @@ class Ie extends x {
       namedImports: ["JsonEventStreamResultExtractor"]
     }), this.logger.info(
       "Adding import from @ahoo-wang/fetcher: ContentTypeValues"
-    ), $(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.logger.info(
+    ), w(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.logger.info(
       "Adding imports from @ahoo-wang/fetcher-decorator: ApiMetadata types and decorators"
-    ), $(t, "@ahoo-wang/fetcher-decorator", [
+    ), w(t, "@ahoo-wang/fetcher-decorator", [
       "type ApiMetadata",
       "type ApiMetadataCapable",
       "api",
@@ -907,7 +919,7 @@ class Ie extends x {
     let r = "CommandClient", s = {
       name: "api",
       arguments: []
-    }, a = "Promise<CommandResult>";
+    }, i = "Promise<CommandResult>";
     o && (r = "Stream" + r, s = {
       name: "api",
       arguments: [
@@ -917,28 +929,28 @@ class Ie extends x {
   resultExtractor: JsonEventStreamResultExtractor,
 }`
       ]
-    }, a = "Promise<CommandResultEventStream>");
-    const c = Ee(
+    }, i = "Promise<CommandResultEventStream>");
+    const c = Ne(
       t.aggregate,
       r
-    ), i = e.addClass({
+    ), a = e.addClass({
       name: c,
       isExported: !0,
       decorators: [s],
       implements: ["ApiMetadataCapable"]
     });
-    i.addConstructor({
+    a.addConstructor({
       parameters: [
         {
           name: "apiMetadata",
           type: "ApiMetadata",
-          scope: k.Public,
+          scope: L.Public,
           isReadonly: !0,
           initializer: `${this.defaultCommandClientOptionsName}`
         }
       ]
     }), t.commands.forEach((p) => {
-      this.processCommandMethod(e, i, p, a);
+      this.processCommandMethod(e, a, p, i);
     });
   }
   methodToDecorator(e) {
@@ -959,24 +971,24 @@ class Ie extends x {
     ), this.logger.info(
       `Command method details: HTTP ${o.method}, path: ${o.path}, return type: ${r}`
     );
-    const a = o.pathParameters.map((i) => (this.logger.info(
-      `Adding path parameter: ${i.name} (type: string)`
+    const i = o.pathParameters.map((a) => (this.logger.info(
+      `Adding path parameter: ${a.name} (type: string)`
     ), {
-      name: i.name,
+      name: a.name,
       type: "string",
       hasQuestionToken: !1,
       decorators: [
         {
           name: "path",
-          arguments: [`'${i.name}'`]
+          arguments: [`'${a.name}'`]
         }
       ]
     }));
     this.logger.info(
       `Adding command request parameter: commandRequest (type: CommandRequest<${s.name}>)`
-    ), a.push({
+    ), i.push({
       name: "commandRequest",
-      hasQuestionToken: pe(o.schema.schema),
+      hasQuestionToken: de(o.schema.schema),
       type: `CommandRequest<${s.name}>`,
       decorators: [
         {
@@ -986,7 +998,7 @@ class Ie extends x {
       ]
     }), this.logger.info(
       "Adding attributes parameter: attributes (type: Record<string, any>)"
-    ), a.push({
+    ), i.push({
       name: "attributes",
       hasQuestionToken: !0,
       type: "Record<string, any>",
@@ -1005,10 +1017,10 @@ class Ie extends x {
           arguments: [`${this.getEndpointPath(o)}`]
         }
       ],
-      parameters: a,
+      parameters: i,
       returnType: r,
       statements: [
-        `throw autoGeneratedError(${a.map((i) => i.name).join(",")});`
+        `throw autoGeneratedError(${i.map((a) => a.name).join(",")});`
       ]
     });
     (o.summary || o.description) && this.logger.info(
@@ -1018,7 +1030,7 @@ class Ie extends x {
     );
   }
 }
-class Ne extends x {
+class ve extends x {
   queryClientGenerator;
   commandClientGenerator;
   /**
@@ -1026,7 +1038,7 @@ class Ne extends x {
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    super(e), this.queryClientGenerator = new Se(e), this.commandClientGenerator = new Ie(e);
+    super(e), this.queryClientGenerator = new Te(e), this.commandClientGenerator = new De(e);
   }
   /**
    * Generates client classes for all aggregates.
@@ -1062,7 +1074,7 @@ class Ne extends x {
     );
   }
 }
-class Me {
+class Fe {
   /**
    * Creates a new CodeGenerator instance.
    * @param options - Configuration options for code generation
@@ -1080,9 +1092,9 @@ class Me {
     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 ee(this.options.inputPath);
+    const e = await ne(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
-    const o = new $e(e).resolve();
+    const o = new Oe(e).resolve();
     this.options.logger.info(
       `Resolved ${o.size} bounded context aggregates`
     );
@@ -1093,7 +1105,7 @@ class Me {
       contextAggregates: o,
       logger: this.options.logger
     };
-    this.options.logger.info("Generating models"), new xe(r).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new Ne(r).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 Se(r).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new ve(r).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.
@@ -1132,8 +1144,8 @@ class Me {
     let r = [];
     try {
       r = v.readdirSync(t).filter((c) => {
-        const i = K.join(t, c);
-        return v.statSync(i).isDirectory();
+        const a = J.join(t, c);
+        return v.statSync(a).isDirectory();
       });
     } catch (c) {
       this.options.logger.error(
@@ -1150,22 +1162,22 @@ class Me {
     }
     const s = `${t}/index.ts`;
     this.options.logger.info(`Creating/updating index file: ${s}`);
-    const a = this.project.getSourceFile(s) || this.project.createSourceFile(s, "", { overwrite: !0 });
-    a.removeText();
+    const i = this.project.getSourceFile(s) || this.project.createSourceFile(s, "", { overwrite: !0 });
+    i.removeText();
     for (const c of o) {
-      const i = `./${c.getBaseNameWithoutExtension()}`;
-      this.options.logger.info(`Adding export for file: ${i}`), a.addExportDeclaration({
-        moduleSpecifier: i,
+      const a = `./${c.getBaseNameWithoutExtension()}`;
+      this.options.logger.info(`Adding export for file: ${a}`), i.addExportDeclaration({
+        moduleSpecifier: a,
         isTypeOnly: !1,
         namedExports: []
       });
     }
     for (const c of r) {
-      const i = `./${c}`;
+      const a = `./${c}`;
       this.options.logger.info(
-        `Adding export for subdirectory: ${i}`
-      ), a.addExportDeclaration({
-        moduleSpecifier: i,
+        `Adding export for subdirectory: ${a}`
+      ), i.addExportDeclaration({
+        moduleSpecifier: a,
         isTypeOnly: !1,
         namedExports: []
       });
@@ -1184,6 +1196,6 @@ class Me {
   }
 }
 export {
-  Me as CodeGenerator
+  Fe as CodeGenerator
 };
 //# sourceMappingURL=index.js.map