@ahoo-wang/fetcher-generator 3.3.1 → 3.3.5

package/dist/index.js

@@ -3,6 +3,7 @@ import { ContentTypeValues as I, combineURLs as E } from "@ahoo-wang/fetcher";
 import { ResourceAttributionPathSpec as L } from "@ahoo-wang/fetcher-wow";
 import { parse as K } from "yaml";
 import { readFile as Ae } from "fs";
+import { join as Ce, relative as Pe, sep as $e } from "path";
 function P(n) {
   return n.$ref.split("/").pop();
 }
@@ -24,9 +25,9 @@ function $(n, e) {
     schema: S(n, e)
   };
 }
-const Ce = /[-_'\s.]+/;
+const Te = /[-_'\s./?;:,()[\]{}|\\]+/;
 function O(n) {
-  return n.split(Ce);
+  return n.split(Te);
 }
 function X(n) {
   return Array.isArray(n) ? n.flatMap((e) => B(O(e))) : B(O(n));
@@ -60,26 +61,26 @@ function ee(n) {
 function M(n) {
   return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(n) ? n : `'${n}'`;
 }
-function Pe(n) {
+function ve(n) {
   return /^\d+$/.test(n) ? `NUM_${n}` : M(ee(n));
 }
-function g(n) {
+function p(n) {
   return !!(n && typeof n == "object" && "$ref" in n);
 }
 function G(n, e) {
-  if (e && !g(e) && e.content)
+  if (e && !p(e) && e.content)
     return e.content[n]?.schema;
 }
 function te(n) {
   return G(I.APPLICATION_JSON, n);
 }
-function $e(n) {
+function Ie(n) {
   return G(I.TEXT_EVENT_STREAM, n);
 }
-function Te(n) {
+function Ee(n) {
   return G("*/*", n);
 }
-const ve = [
+const Se = [
   "string",
   "number",
   "integer",
@@ -87,7 +88,7 @@ const ve = [
   "null"
 ];
 function ne(n) {
-  return Array.isArray(n) ? !0 : ve.includes(n);
+  return Array.isArray(n) ? !0 : Se.includes(n);
 }
 function U(n) {
   return Array.isArray(n.enum) && n.enum.length > 0;
@@ -98,28 +99,28 @@ function T(n) {
 function b(n) {
   return n.type === "array" && !!n.items;
 }
-function Ie(n) {
+function Re(n) {
   return Array.isArray(n.anyOf) && n.anyOf.length > 0;
 }
-function Ee(n) {
+function we(n) {
   return Array.isArray(n.oneOf) && n.oneOf.length > 0;
 }
 function q(n) {
   return Array.isArray(n.allOf) && n.allOf.length > 0;
 }
 function J(n) {
-  return Ie(n) || Ee(n) || q(n);
+  return Re(n) || we(n) || q(n);
 }
-function Se(n) {
+function De(n) {
   return n.includes("|") || n.includes("&") ? `(${n})[]` : `${n}[]`;
 }
-function Re(n) {
+function Ne(n) {
   return n.type === "object" && !n.properties && n.additionalProperties !== void 0;
 }
-function we(n) {
+function Oe(n) {
   return n.type !== "object" ? !1 : n.properties ? Object.keys(n.properties).length === 0 : !0;
 }
-function De(n) {
+function Me(n) {
   return n.readOnly === !0;
 }
 function w(n) {
@@ -139,13 +140,13 @@ function w(n) {
       return "any";
   }
 }
-function Ne(n) {
+function be(n) {
   if (!T(n))
     return [];
   const e = n.required || [];
   return Object.keys(n.properties).filter((t) => !e.includes(t));
 }
-function Oe(n, e) {
+function qe(n, e) {
   return n.operation.operationId && e.operation.operationId ? n.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;
@@ -160,7 +161,7 @@ function oe(n) {
         path: t
       });
     });
-  return e.sort(Oe);
+  return e.sort(qe);
 }
 function re(n) {
   return [
@@ -181,27 +182,27 @@ function Q(n) {
   const e = W(n);
   return te(e);
 }
-function Me(n, e) {
-  return n.parameters ? n.parameters.map((t) => g(t) ? Z(t, e) : t).filter((t) => t.in === "path") : [];
+function Fe(n, e) {
+  return n.parameters ? n.parameters.map((t) => p(t) ? Z(t, e) : t).filter((t) => t.in === "path") : [];
 }
-const be = "string";
+const je = "string";
 function ie(n) {
-  return !n.schema || g(n.schema) || !n.schema.type || !ne(n.schema.type) ? be : w(n.schema.type);
+  return !n.schema || p(n.schema) || !n.schema.type || !ne(n.schema.type) ? je : w(n.schema.type);
 }
 function se(n) {
-  return n.startsWith("http://") || n.startsWith("https://") ? qe(n) : Fe(n);
+  return n.startsWith("http://") || n.startsWith("https://") ? _e(n) : Ge(n);
 }
-async function qe(n) {
+async function _e(n) {
   return await (await fetch(n)).text();
 }
-function Fe(n) {
+function Ge(n) {
   return new Promise((e, t) => {
     Ae(n, "utf-8", (o, r) => {
       o ? t(o) : e(r);
     });
   });
 }
-async function je(n) {
+async function We(n) {
   const e = await se(n);
   switch (ae(e)) {
     case "json":
@@ -212,7 +213,7 @@ async function je(n) {
       throw new Error(`Unsupported file format: ${n}`);
   }
 }
-async function _e(n) {
+async function ke(n) {
   const e = await se(n);
   switch (ae(e)) {
     case "json":
@@ -237,11 +238,11 @@ function ae(n) {
   }
   throw new Error("Unable to infer file format");
 }
-const ce = "types.ts", Ge = "@";
-function We(n) {
+const ce = "types.ts", ze = "@";
+function Le(n) {
   return E(n.path, ce);
 }
-function ge(n, e, t) {
+function pe(n, e, t) {
   const o = E(e, t), r = n.getSourceFile(o);
   return r || n.createSourceFile(o, "", {
     overwrite: !0
@@ -259,19 +260,19 @@ function A(n, e, t) {
     ) || o.addNamedImport(r);
   });
 }
-function d(n, e, t) {
-  if (t.path.startsWith(Ge)) {
+function m(n, e, t) {
+  if (t.path.startsWith(ze)) {
     A(n, t.path, [t.name]);
     return;
   }
-  const o = n.getDirectoryPath(), r = (void 0)(e, t.path, ce);
-  let i = (void 0)(o, r);
-  i = i.replace(/\.ts$/, ""), i = i.split(void 0).join("/"), i.startsWith(".") || (i = "./" + i), A(n, i, [t.name]);
+  const o = n.getDirectoryPath(), r = Ce(e, t.path, ce);
+  let i = Pe(o, r);
+  i = i.replace(/\.ts$/, ""), i = i.split($e).join("/"), i.startsWith(".") || (i = "./" + i), A(n, i, [t.name]);
 }
-function ke(n, e, t, o) {
-  n.path !== o.path && d(e, t, o);
+function Be(n, e, t, o) {
+  n.path !== o.path && m(e, t, o);
 }
-function pe(n, e = `
+function ge(n, e = `
 `) {
   if (!Array.isArray(n))
     return;
@@ -281,7 +282,7 @@ function pe(n, e = `
   return t.length > 0 ? t.join(e) : void 0;
 }
 function C(n, e) {
-  const t = pe(e);
+  const t = ge(e);
   t && n.addJsDoc(t);
 }
 function k(n, e) {
@@ -289,13 +290,13 @@ function k(n, e) {
     n.title,
     n.description
   ];
-  return e && t.push(`- key: ${e}`), n.format && t.push(`- format: ${n.format}`), V(t, n, "default"), V(t, n, "example"), Be(t, n), Ue(t, n), Je(t, n), t;
+  return e && t.push(`- key: ${e}`), n.format && t.push(`- format: ${n.format}`), V(t, n, "default"), V(t, n, "example"), Qe(t, n), Ve(t, n), He(t, n), t;
 }
-function ze(n, e, t) {
+function Ue(n, e, t) {
   const o = k(e, t);
   C(n, o);
 }
-function Le(n, e, t) {
+function Je(n, e, t) {
   const o = k(e, t);
   ue(o, "schema", e), C(n, o);
 }
@@ -312,7 +313,7 @@ function V(n, e, t) {
 function ue(n, e, t) {
   n.push(`- ${e}: `), n.push("```json"), n.push(JSON.stringify(t, null, 2)), n.push("```");
 }
-function Be(n, e) {
+function Qe(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}`
@@ -320,28 +321,28 @@ function Be(n, e) {
     `  - exclusiveMaximum: ${e.exclusiveMaximum}`
   ), e.multipleOf !== void 0 && t.push(`  - multipleOf: ${e.multipleOf}`), t.length !== 1 && n.push(...t);
 }
-function Ue(n, e) {
+function Ve(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 && n.push(...t);
 }
-function Je(n, e) {
+function He(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 && n.push(...t);
 }
-function Qe(n) {
+function Ke(n) {
   const e = n.split(".");
   return e.length != 2 || e[0].length === 0 || e[1].length === 0 ? null : e;
 }
-function Ve(n) {
-  const e = Qe(n.name);
+function Ye(n) {
+  const e = Ke(n.name);
   return e ? {
     tag: n,
     contextAlias: e[0],
     aggregateName: e[1]
   } : null;
 }
-function He(n) {
-  const e = n?.map((o) => Ve(o)).filter((o) => o !== null);
+function Ze(n) {
+  const e = n?.map((o) => Ye(o)).filter((o) => o !== null);
   if (!e)
     return /* @__PURE__ */ new Map();
   const t = /* @__PURE__ */ new Map();
@@ -353,20 +354,20 @@ function He(n) {
     });
   }), t;
 }
-function Ke(n) {
+function Xe(n) {
   if (!n)
     return null;
   const e = n.split(".");
   return e.length != 3 ? null : e[2];
 }
-const Ye = "#/components/responses/wow.CommandOk", Ze = "#/components/parameters/wow.id";
-class Xe {
+const et = "#/components/responses/wow.CommandOk", tt = "#/components/parameters/wow.id";
+class nt {
   /**
    * Creates a new AggregateResolver instance.
    * @param openAPI - The OpenAPI specification to resolve aggregates from
    */
   constructor(e) {
-    this.openAPI = e, this.aggregates = He(e.tags), this.build();
+    this.openAPI = e, this.aggregates = Ze(e.tags), this.build();
   }
   aggregates;
   /**
@@ -402,27 +403,27 @@ class Xe {
     const o = t.operation;
     if (o.operationId === "wow.command.send")
       return;
-    const r = Ke(o.operationId);
+    const r = Xe(o.operationId);
     if (!r)
       return;
     const i = W(o);
-    if (!i || !g(i) || i.$ref !== Ye || !o.requestBody)
+    if (!i || !p(i) || i.$ref !== et || !o.requestBody)
       return;
-    const s = o.parameters ?? [], a = s.filter((l) => g(l) && l.$ref === Ze).at(0), c = s.filter(
-      (l) => !g(l) && l.in === "path"
+    const s = o.parameters ?? [], a = s.filter((u) => p(u) && u.$ref === tt).at(0), c = s.filter(
+      (u) => !p(u) && u.in === "path"
     );
     if (a) {
-      const l = Z(
+      const u = Z(
         a,
         this.openAPI.components
       );
-      c.push(l);
+      c.push(u);
     }
-    const p = o.requestBody.content[I.APPLICATION_JSON].schema, x = $(
-      p,
+    const g = o.requestBody.content[I.APPLICATION_JSON].schema, d = $(
+      g,
       this.openAPI.components
     );
-    x.schema.title = x.schema.title || o.summary, x.schema.description = x.schema.description || o.description;
+    d.schema.title = d.schema.title || o.summary, d.schema.description = d.schema.description || o.description;
     const he = {
       name: r,
       method: t.method,
@@ -430,11 +431,11 @@ class Xe {
       pathParameters: c,
       summary: o.summary,
       description: o.description,
-      schema: x,
+      schema: d,
       operation: o
     };
-    o.tags?.forEach((l) => {
-      const z = this.aggregates.get(l);
+    o.tags?.forEach((u) => {
+      const z = this.aggregates.get(u);
       z && z.commands.set(r, he);
     });
   }
@@ -446,7 +447,7 @@ class Xe {
     if (!e.operationId?.endsWith(".snapshot_state.single"))
       return;
     const t = Q(e);
-    if (!g(t))
+    if (!p(t))
       return;
     const o = $(
       t,
@@ -465,23 +466,23 @@ class Xe {
     if (!this.openAPI.components || !e.operationId?.endsWith(".event.list_query"))
       return;
     const t = Q(e);
-    if (g(t))
+    if (p(t))
       return;
     const o = t?.items;
-    if (!g(o))
+    if (!p(o))
       return;
     const i = S(
       o,
       this.openAPI.components
     ).properties.body.items.anyOf.map((s) => {
-      const a = s.title, c = s.properties.name.const, u = s.properties.body, p = $(
-        u,
+      const a = s.title, c = s.properties.name.const, h = s.properties.body, g = $(
+        h,
         this.openAPI.components
       );
-      return p.schema.title = p.schema.title || s.title, {
+      return g.schema.title = g.schema.title || s.title, {
         title: a,
         name: c,
-        schema: p
+        schema: g
       };
     });
     e.tags?.forEach((s) => {
@@ -511,7 +512,7 @@ class Xe {
     });
   }
 }
-const y = "@ahoo-wang/fetcher-wow", et = {
+const x = "@ahoo-wang/fetcher-wow", ot = {
   "wow.command.CommandResult": "CommandResult",
   "wow.command.CommandResultArray": "CommandResultArray",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
@@ -543,12 +544,12 @@ const y = "@ahoo-wang/fetcher-wow", et = {
   "wow.openapi.BatchResult": "BatchResult",
   "wow.messaging.CompensationTarget": "CompensationTarget"
 };
-function m(n) {
+function l(n) {
   if (!n)
     return { name: "", path: "/" };
-  const e = et[n];
+  const e = ot[n];
   if (e)
-    return { name: e, path: y };
+    return { name: e, path: x };
   const t = n.split(".");
   let o = -1;
   for (let c = 0; c < t.length; c++)
@@ -561,18 +562,18 @@ function m(n) {
 }
 function v(n) {
   const e = P(n);
-  return m(e);
+  return l(e);
 }
 function D(n) {
   return `${ee(n)}_BOUNDED_CONTEXT_ALIAS`;
 }
-class tt {
+class rt {
   constructor(e, t, o, r) {
     this.modelInfo = e, this.sourceFile = t, this.keySchema = o, this.outputDir = r;
   }
   generate() {
     const e = this.process();
-    e && Le(e, this.keySchema.schema, this.keySchema.key);
+    e && Je(e, this.keySchema.schema, this.keySchema.key);
   }
   process() {
     const { schema: e } = this.keySchema;
@@ -580,7 +581,7 @@ class tt {
   }
   resolveReference(e) {
     const t = v(e);
-    return ke(
+    return Be(
       this.modelInfo,
       this.sourceFile,
       this.outputDir,
@@ -594,8 +595,8 @@ class tt {
     const { properties: t } = e;
     return Object.entries(t).map(([o, r]) => {
       const i = this.resolveType(r), s = M(o);
-      if (!g(r)) {
-        const a = k(r), c = pe(a, `
+      if (!p(r)) {
+        const a = k(r), c = ge(a, `
  * `);
         if (c)
           return `
@@ -624,9 +625,9 @@ class tt {
     return e.additionalProperties === void 0 || e.additionalProperties === !1 || e.additionalProperties === !0 ? "any" : this.resolveType(e.additionalProperties);
   }
   resolveType(e) {
-    if (g(e))
+    if (p(e))
       return this.resolveReference(e).name;
-    if (Re(e))
+    if (Ne(e))
       return `Record<string,${this.resolveMapValueType(e)}>`;
     if (e.const)
       return `'${e.const}'`;
@@ -638,7 +639,7 @@ class tt {
     }
     if (b(e)) {
       const t = this.resolveType(e.items);
-      return Se(t);
+      return De(t);
     }
     return e.type === "object" ? this.resolveObjectType(e) : e.type ? w(e.type) : "any";
   }
@@ -647,7 +648,7 @@ class tt {
       name: this.modelInfo.name,
       isExported: !0,
       members: e.enum.filter((t) => typeof t == "string" && t.length > 0).map((t) => ({
-        name: Pe(t),
+        name: ve(t),
         initializer: `\`${t}\``
       }))
     });
@@ -658,8 +659,8 @@ class tt {
     s ? s.setType(r) : s = e.addProperty({
       name: i,
       type: r,
-      isReadonly: De(o)
-    }), ze(s, o);
+      isReadonly: Me(o)
+    }), Ue(s, o);
   }
   processInterface(e) {
     const t = this.sourceFile.addInterface({
@@ -697,7 +698,7 @@ class tt {
       isExported: !0
     });
     return e.allOf.forEach((o) => {
-      if (g(o)) {
+      if (p(o)) {
         const r = this.resolveType(o);
         t.addExtends(r);
         return;
@@ -721,12 +722,12 @@ class tt {
     });
   }
 }
-class nt {
+class it {
   constructor(e) {
     this.context = e;
   }
   getOrCreateSourceFile(e) {
-    const t = We(e);
+    const t = Le(e);
     return this.context.getOrCreateSourceFile(t);
   }
   /**
@@ -770,7 +771,7 @@ class nt {
       "AggregatedDomainEventStreamServerSentEventNonNullData"
     ) || e.endsWith("AggregatedListQuery") || e.endsWith("AggregatedPagedQuery") || e.endsWith("AggregatedSingleQuery"))
       return !0;
-    const o = m(e);
+    const o = l(e);
     return t.has(o.name);
   }
   aggregatedSchemaSuffix = [
@@ -788,7 +789,7 @@ class nt {
       this.generateBoundedContext(t);
       for (const r of o)
         this.aggregatedSchemaSuffix.forEach((i) => {
-          const s = m(r.state.key), a = R(s.name) + i;
+          const s = l(r.state.key), a = R(s.name) + i;
           e.add(a);
         });
     }
@@ -807,8 +808,8 @@ class nt {
    * 4. Type alias processing
    */
   generateKeyedSchema(e) {
-    const t = m(e.key), o = this.getOrCreateSourceFile(t);
-    new tt(
+    const t = l(e.key), o = this.getOrCreateSourceFile(t);
+    new rt(
       t,
       o,
       e,
@@ -822,7 +823,7 @@ class nt {
     o.addStatements(`export const ${r} = '${e}';`);
   }
 }
-const ot = "@ahoo-wang/fetcher-decorator", rt = [
+const st = "@ahoo-wang/fetcher-decorator", at = [
   "type ApiMetadata",
   "type ApiMetadataCapable",
   "type ParameterRequest",
@@ -836,7 +837,7 @@ const ot = "@ahoo-wang/fetcher-decorator", rt = [
   "attribute",
   "path",
   "autoGeneratedError"
-], it = {
+], ct = {
   type: "Promise<Response>",
   metadata: "{resultExtractor: ResultExtractors.Response }"
 }, H = {
@@ -847,7 +848,7 @@ const ot = "@ahoo-wang/fetcher-decorator", rt = [
   resultExtractor: JsonEventStreamResultExtractor,
 }`;
 function le(n) {
-  A(n, ot, rt);
+  A(n, st, at);
 }
 function j(n, e, t = [], o = [], r) {
   return e.addClass({
@@ -877,14 +878,14 @@ function me(n, e) {
     ]
   });
 }
-const st = "@ahoo-wang/fetcher-eventstream";
+const pt = "@ahoo-wang/fetcher-eventstream";
 function de(n) {
-  A(n, st, [
+  A(n, pt, [
     "JsonEventStreamResultExtractor",
     "type JsonServerSentEventStream"
   ]);
 }
-function at(n) {
+function gt(n) {
   let e = 0, t = 0;
   return n.commands.forEach((o) => {
     o.path.startsWith(L.TENANT) && (e += 1), o.path.startsWith(L.OWNER) && (t += 1);
@@ -892,17 +893,17 @@ function at(n) {
 }
 function fe(n, e, t, o) {
   const r = `${t.contextAlias}/${t.aggregateName}/${o}.ts`;
-  return ge(n, e, r);
+  return pe(n, e, r);
 }
-function h(n, e) {
+function y(n, e) {
   return `${R(n.aggregateName)}${e}`;
 }
 function _(n) {
   return n === "delete" ? "del" : n;
 }
-const ct = "x-fetcher-method";
-function gt(n, e) {
-  const t = n[ct];
+const ut = "x-fetcher-method";
+function lt(n, e) {
+  const t = n[ut];
   if (t)
     return t;
   if (!n.operationId)
@@ -915,7 +916,7 @@ function gt(n, e) {
   }
   return f(o);
 }
-class pt {
+class mt {
   /**
    * Creates a new ApiClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and configuration
@@ -924,7 +925,7 @@ class pt {
     this.context = e, this.apiMetadataCtorInitializer = this.context.currentContextAlias ? `{basePath:${D(this.context.currentContextAlias)}}` : void 0;
   }
   defaultParameterRequestType = "ParameterRequest";
-  defaultReturnType = it;
+  defaultReturnType = ct;
   apiMetadataCtorInitializer;
   /**
    * Generates API client classes for all valid tags in the OpenAPI specification.
@@ -976,7 +977,7 @@ class pt {
    * @param operations - Set of operations for this client
    */
   generateApiClient(e, t) {
-    const o = m(e.name);
+    const o = l(e.name);
     this.context.logger.info(
       `Generating API client class: ${o.name}ApiClient with ${t.size} operations`
     );
@@ -1001,7 +1002,7 @@ class pt {
    * @returns A unique camelCase method name
    */
   getMethodName(e, t) {
-    const o = gt(t, (r) => e.getMethod(r) !== void 0);
+    const o = lt(t, (r) => e.getMethod(r) !== void 0);
     if (!o)
       throw new Error(
         `Unable to resolve method name for apiClientClass:${e.getName()}.`
@@ -1020,7 +1021,7 @@ class pt {
         `No request body found for operation ${t.operationId}, using default: ${this.defaultParameterRequestType}`
       ), this.defaultParameterRequestType;
     let o;
-    if (g(t.requestBody) ? (this.context.logger.info(
+    if (p(t.requestBody) ? (this.context.logger.info(
       `Extracting request body from reference for operation: ${t.operationId}`
     ), o = Y(
       t.requestBody,
@@ -1035,11 +1036,11 @@ class pt {
       ), "ParameterRequest<FormData>";
     if (o.content["application/json"]) {
       const r = o.content["application/json"].schema;
-      if (g(r)) {
+      if (p(r)) {
         const i = v(r);
         this.context.logger.info(
           `Adding import for request body model: ${i.name} from ${i.path}`
-        ), d(e, this.context.outputDir, i);
+        ), m(e, this.context.outputDir, i);
         const s = `ParameterRequest<${i.name}>`;
         return this.context.logger.info(
           `Resolved request type for operation ${t.operationId}: ${s}`
@@ -1058,7 +1059,7 @@ class pt {
    * @returns Array of parameter declarations
    */
   resolveParameters(e, t, o) {
-    const r = Me(
+    const r = Fe(
       o,
       this.context.openAPI.components
     ).filter((a) => !this.context.isIgnoreApiClientPathParameters(
@@ -1116,11 +1117,11 @@ class pt {
    */
   resolveSchemaReturnType(e, t) {
     const o = "Promise<any>";
-    if (g(t)) {
+    if (p(t)) {
       const r = v(t);
       this.context.logger.info(
         `Adding import for response model: ${r.name} from ${r.path}`
-      ), d(e, this.context.outputDir, r);
+      ), m(e, this.context.outputDir, r);
       const i = `Promise<${r.name}>`;
       return this.context.logger.info(`Resolved reference return type: ${i}`), i;
     }
@@ -1148,7 +1149,7 @@ class pt {
       return this.context.logger.info(
         `No OK response found for operation ${t.operationId}, using default return type: ${this.defaultReturnType.type}`
       ), this.defaultReturnType;
-    const r = te(o) || Te(o);
+    const r = te(o) || Ee(o);
     if (r) {
       const s = this.resolveSchemaReturnType(e, r);
       return this.context.logger.info(
@@ -1158,23 +1159,23 @@ class pt {
         metadata: s === H.type ? H.metadata : void 0
       };
     }
-    const i = $e(o);
+    const i = Ie(o);
     if (i) {
-      if (g(i)) {
+      if (p(i)) {
         const a = S(
           i,
           this.context.openAPI.components
         );
-        if (b(a) && g(a.items)) {
+        if (b(a) && p(a.items)) {
           const c = v(a.items);
           this.context.logger.info(
             `Adding import for event stream model: ${c.name} from ${c.path}`
-          ), d(e, this.context.outputDir, c);
-          const p = `Promise<JsonServerSentEventStream<${c.name.includes("ServerSentEvent") ? `${c.name}['data']` : c.name}>>`;
+          ), m(e, this.context.outputDir, c);
+          const g = `Promise<JsonServerSentEventStream<${c.name.includes("ServerSentEvent") ? `${c.name}['data']` : c.name}>>`;
           return this.context.logger.info(
-            `Resolved event stream return type for operation ${t.operationId}: ${p}`
+            `Resolved event stream return type for operation ${t.operationId}: ${g}`
           ), {
-            type: p,
+            type: g,
             metadata: F
           };
         }
@@ -1215,16 +1216,16 @@ class pt {
     this.context.logger.info(
       `Creating method with ${s.length} parameters, return type: ${a.type}`
     );
-    const u = o.addMethod({
+    const h = o.addMethod({
       name: i,
       decorators: [c],
       parameters: s,
       returnType: a.type,
       statements: [
-        `throw autoGeneratedError(${s.map((p) => p.name).join(",")});`
+        `throw autoGeneratedError(${s.map((g) => g.name).join(",")});`
       ]
     });
-    C(u, [
+    C(h, [
       r.operation.summary,
       r.operation.description,
       `- operationId: \`${r.operation.operationId}\``,
@@ -1294,7 +1295,7 @@ class pt {
     return !1;
   }
 }
-class ut {
+class dt {
   /**
    * Creates a new CommandClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1361,9 +1362,9 @@ class ut {
       ],
       isExported: !1
     }), this.context.logger.info(
-      `Adding imports from ${y}: CommandRequest, CommandResult, CommandResultEventStream, CommandBody, DeleteAggregateCommand, RecoverAggregateCommand`
+      `Adding imports from ${x}: CommandRequest, CommandResult, CommandResultEventStream, CommandBody, DeleteAggregateCommand, RecoverAggregateCommand`
     ), t.addImportDeclaration({
-      moduleSpecifier: y,
+      moduleSpecifier: x,
       namedImports: [
         "CommandRequest",
         "CommandResult",
@@ -1388,7 +1389,7 @@ class ut {
     );
   }
   resolveAggregateCommandEndpointPathsName(e) {
-    return h(e, this.commandEndpointPathsSuffix);
+    return y(e, this.commandEndpointPathsSuffix);
   }
   processCommandEndpointPaths(e, t) {
     const o = this.resolveAggregateCommandEndpointPathsName(
@@ -1413,16 +1414,16 @@ class ut {
     ), o;
   }
   resolveCommandTypeName(e) {
-    const t = m(e.schema.key);
+    const t = l(e.schema.key);
     return [t, t.name + "Command"];
   }
   resolveCommandType(e, t) {
     const [o, r] = this.resolveCommandTypeName(t);
-    if (o.path === y)
+    if (o.path === x)
       return;
-    d(e, this.context.outputDir, o);
+    m(e, this.context.outputDir, o);
     let i = `${o.name}`;
-    const s = Ne(t.schema.schema).map((a) => `'${a}'`).join(" | ");
+    const s = be(t.schema.schema).map((a) => `'${a}'`).join(" | ");
     s !== "" && (i = `PartialBy<${i},${s}>`), i = `CommandBody<${i}>`, e.addTypeAlias({
       name: r,
       type: `${i}`,
@@ -1438,7 +1439,7 @@ class ut {
     return `${e}.${t.name.toUpperCase()}`;
   }
   processCommandClient(e, t, o) {
-    const r = h(
+    const r = y(
       t.aggregate,
       "CommandClient"
     ), i = j(
@@ -1457,10 +1458,10 @@ class ut {
     });
   }
   processStreamCommandClient(e, t) {
-    const o = h(
+    const o = y(
       t.aggregate,
       "CommandClient"
-    ), r = h(
+    ), r = y(
       t.aggregate,
       "StreamCommandClient"
     );
@@ -1509,7 +1510,7 @@ class ut {
       `Adding command request parameter: commandRequest (type: CommandRequest<${r}>)`
     ), i.push({
       name: "commandRequest",
-      hasQuestionToken: we(t.schema.schema),
+      hasQuestionToken: Oe(t.schema.schema),
       type: `CommandRequest<${r}>`,
       decorators: [
         {
@@ -1566,7 +1567,7 @@ class ut {
     );
   }
 }
-class lt {
+class ft {
   /**
    * Creates a new QueryClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1623,9 +1624,9 @@ class lt {
     this.context.logger.info(
       `Processing query client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     ), this.context.logger.info(
-      `Adding imports from ${y}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
+      `Adding imports from ${x}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
     ), t.addImportDeclaration({
-      moduleSpecifier: y,
+      moduleSpecifier: x,
       namedImports: [
         "QueryClientFactory",
         "QueryClientOptions",
@@ -1644,7 +1645,7 @@ class lt {
           initializer: `{
         contextAlias: ${D(e.aggregate.contextAlias)},
         aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${at(e)},
+        resourceAttribution: ${gt(e)},
       }`
         }
       ],
@@ -1653,12 +1654,12 @@ class lt {
     const r = this.processAggregateDomainEventType(
       e,
       t
-    ), i = `${f(e.aggregate.aggregateName)}QueryClientFactory`, s = m(e.state.key), a = m(e.fields.key);
+    ), i = `${f(e.aggregate.aggregateName)}QueryClientFactory`, s = l(e.state.key), a = l(e.fields.key);
     this.context.logger.info(
       `Adding import for state model: ${s.name} from path: ${s.path}`
-    ), d(t, this.context.outputDir, s), this.context.logger.info(
+    ), m(t, this.context.outputDir, s), this.context.logger.info(
       `Adding import for fields model: ${a.name} from path: ${a.path}`
-    ), d(t, this.context.outputDir, a), this.context.logger.info(
+    ), m(t, this.context.outputDir, a), this.context.logger.info(
       `Creating query client factory: ${i}`
     ), t.addVariableStatement({
       declarationKind: N.Const,
@@ -1679,16 +1680,16 @@ class lt {
       `Processing ${e.events.size} domain events for aggregate: ${e.aggregate.aggregateName}`
     );
     for (const s of e.events.values()) {
-      const a = m(s.schema.key);
+      const a = l(s.schema.key);
       this.context.logger.info(
         `Adding import for event model: ${a.name} from path: ${a.path}`
-      ), d(
+      ), m(
         t,
         this.context.outputDir,
         a
       ), o.push(a);
     }
-    const r = h(
+    const r = y(
       e.aggregate,
       this.domainEventTypeSuffix
     ), i = o.map((s) => s.name).join(" | ");
@@ -1701,7 +1702,7 @@ class lt {
     }), r;
   }
   processAggregateDomainEventTypes(e, t) {
-    const o = h(
+    const o = y(
       e.aggregate,
       this.domainEventTypeMapTitleSuffix
     ), r = t.addEnum({
@@ -1715,13 +1716,13 @@ class lt {
       });
   }
 }
-class mt {
+class ht {
   /**
    * Creates a new ClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    this.context = e, this.queryClientGenerator = new lt(e), this.commandClientGenerator = new ut(e), this.apiClientGenerator = new pt(e);
+    this.context = e, this.queryClientGenerator = new ft(e), this.commandClientGenerator = new dt(e), this.apiClientGenerator = new mt(e);
   }
   queryClientGenerator;
   commandClientGenerator;
@@ -1744,7 +1745,7 @@ class mt {
     this.queryClientGenerator.generate(), this.commandClientGenerator.generate(), this.apiClientGenerator.generate(), this.context.logger.success("Client generation completed");
   }
 }
-class dt {
+class yt {
   /** The ts-morph project instance used for code generation */
   project;
   /** The OpenAPI specification object */
@@ -1762,7 +1763,7 @@ class dt {
     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 ge(this.project, this.outputDir, e);
+    return pe(this.project, this.outputDir, e);
   }
   isIgnoreApiClientPathParameters(e, t) {
     return (this.config.apiClients?.[e]?.ignorePathParameters ?? this.defaultIgnorePathParameters).includes(t);
@@ -1771,8 +1772,8 @@ class dt {
     return this.defaultIgnorePathParameters.includes(t);
   }
 }
-const ft = "./fetcher-generator.config.json";
-class Pt {
+const xt = "./fetcher-generator.config.json";
+class It {
   /**
    * Creates a new CodeGenerator instance with the specified options.
    *
@@ -1807,35 +1808,37 @@ class Pt {
   async generate() {
     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 je(this.options.inputPath);
+    );
+    const e = process.cwd();
+    this.options.logger.info(`Work directory: ${e}`), 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 t = await We(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
-    const o = new Xe(e).resolve();
+    const r = new nt(t).resolve();
     this.options.logger.info(
-      `Resolved ${o.size} bounded context aggregates`
+      `Resolved ${r.size} bounded context aggregates`
     );
-    const r = this.options.configPath ?? ft;
-    let i = {};
+    const i = this.options.configPath ?? xt;
+    let s = {};
     try {
-      this.options.logger.info(`Parsing configuration file: ${r}`), i = await _e(r);
-    } catch (p) {
-      this.options.logger.info(`Configuration file parsing failed: ${p}`);
+      this.options.logger.info(`Parsing configuration file: ${i}`), s = await ke(i);
+    } catch (d) {
+      this.options.logger.info(`Configuration file parsing failed: ${d}`);
     }
-    const s = new dt({
-      openAPI: e,
+    const a = new yt({
+      openAPI: t,
       project: this.project,
       outputDir: this.options.outputDir,
-      contextAggregates: o,
+      contextAggregates: r,
       logger: this.options.logger,
-      config: i
+      config: s
     });
-    this.options.logger.info("Generating models"), new nt(s).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new mt(s).generate(), this.options.logger.info("Clients generated successfully");
-    const u = this.project.getDirectory(this.options.outputDir);
-    if (!u) {
+    this.options.logger.info("Generating models"), new it(a).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new ht(a).generate(), this.options.logger.info("Clients generated successfully");
+    const g = this.project.getDirectory(this.options.outputDir);
+    if (!g) {
       this.options.logger.info("Output directory not found.");
       return;
     }
-    this.options.logger.info("Generating index files"), this.generateIndex(u), this.options.logger.info("Index files generated successfully"), this.options.logger.info("Optimizing source files"), this.optimizeSourceFiles(u), 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 index files"), this.generateIndex(g), this.options.logger.info("Index files generated successfully"), this.options.logger.info("Optimizing source files"), this.optimizeSourceFiles(g), 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.
@@ -1926,7 +1929,7 @@ class Pt {
   }
 }
 export {
-  Pt as CodeGenerator,
-  ft as DEFAULT_CONFIG_PATH
+  It as CodeGenerator,
+  xt as DEFAULT_CONFIG_PATH
 };
 //# sourceMappingURL=index.js.map