@ahoo-wang/fetcher-generator 2.16.2 → 3.0.0

package/dist/index.js

@@ -99,11 +99,11 @@ function ve(n) {
 function Ie(n) {
   return Array.isArray(n.oneOf) && n.oneOf.length > 0;
 }
-function b(n) {
+function M(n) {
   return Array.isArray(n.allOf) && n.allOf.length > 0;
 }
 function L(n) {
-  return ve(n) || Ie(n) || b(n);
+  return ve(n) || Ie(n) || M(n);
 }
 function Ee(n) {
   return n.includes("|") || n.includes("&") ? `(${n})[]` : `${n}[]`;
@@ -175,19 +175,19 @@ function oe(n) {
   return !n.schema || g(n.schema) || !n.schema.type || !ee(n.schema.type) ? Oe : R(n.schema.type);
 }
 function re(n) {
-  return n.startsWith("http://") || n.startsWith("https://") ? Ne(n) : be(n);
+  return n.startsWith("http://") || n.startsWith("https://") ? Ne(n) : Me(n);
 }
 async function Ne(n) {
   return await (await fetch(n)).text();
 }
-function be(n) {
+function Me(n) {
   return new Promise((e, t) => {
     ye(n, "utf-8", (o, r) => {
       o ? t(o) : e(r);
     });
   });
 }
-async function Me(n) {
+async function be(n) {
   const e = await re(n);
   switch (ie(e)) {
     case "json":
@@ -550,7 +550,7 @@ class Ke {
   }
   process() {
     const { schema: e } = this.keySchema;
-    return z(e) ? this.processEnum(e) : w(e) ? this.processInterface(e) : N(e) ? this.processArray(e) : b(e) ? this.processIntersection(e) : L(e) ? this.processComposition(e) : this.processTypeAlias(e);
+    return z(e) ? this.processEnum(e) : w(e) ? this.processInterface(e) : N(e) ? this.processArray(e) : M(e) ? this.processIntersection(e) : L(e) ? this.processComposition(e) : this.processTypeAlias(e);
   }
   resolveReference(e) {
     const t = $(e);
@@ -609,7 +609,7 @@ class Ke {
     if (z(e))
       return e.enum.map((t) => `'${t}'`).join(" | ");
     if (L(e)) {
-      const o = (e.oneOf || e.anyOf || e.allOf || []).map((i) => this.resolveType(i)), r = b(e) ? " & " : " | ";
+      const o = (e.oneOf || e.anyOf || e.allOf || []).map((i) => this.resolveType(i)), r = M(e) ? " & " : " | ";
       return `(${o.join(r)})`;
     }
     if (N(e)) {
@@ -634,7 +634,7 @@ class Ke {
     i ? i.setType(r) : i = e.addProperty({
       name: t,
       type: r
-    }), g(o) || Q(i, o);
+    }), Q(i, o);
   }
   processInterface(e) {
     const t = this.sourceFile.addInterface({
@@ -810,7 +810,7 @@ const Xe = "@ahoo-wang/fetcher-decorator", Ze = [
 }, J = {
   type: "Promise<string>",
   metadata: "{resultExtractor: ResultExtractors.Text }"
-}, M = `{
+}, b = `{
   headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
   resultExtractor: JsonEventStreamResultExtractor,
 }`;
@@ -1138,14 +1138,14 @@ class it {
             `Resolved event stream return type for operation ${t.operationId}: ${p}`
           ), {
             type: p,
-            metadata: M
+            metadata: b
           };
         }
       }
       const s = "Promise<JsonServerSentEventStream<any>>";
       return this.context.logger.info(
         `Resolved generic event stream return type for operation ${t.operationId}: ${s}`
-      ), { type: s, metadata: M };
+      ), { type: s, metadata: b };
     }
     return this.context.logger.info(
       `Using default return type for operation ${t.operationId}: ${this.defaultReturnType.type}`
@@ -1404,7 +1404,7 @@ class st {
     q(
       r,
       e,
-      ["''", M],
+      ["''", b],
       [],
       `${o}<CommandResultEventStream>`
     ).addConstructor({
@@ -1511,6 +1511,7 @@ class at {
     this.context = e;
   }
   domainEventTypeSuffix = "DomainEventType";
+  domainEventTypeMapTitleSuffix = "DomainEventTypeMapTitle";
   /**
    * Generates query client classes for all aggregates.
    */
@@ -1625,7 +1626,7 @@ class at {
     }), r;
   }
   processAggregateDomainEventTypes(e, t) {
-    const o = h(e.aggregate, this.domainEventTypeSuffix + "s"), r = t.addEnum({
+    const o = h(e.aggregate, this.domainEventTypeMapTitleSuffix), r = t.addEnum({
       name: o,
       isExported: !0
     });
@@ -1729,7 +1730,7 @@ class yt {
     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 Me(this.options.inputPath);
+    const e = await be(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
     const o = new Ve(e).resolve();
     this.options.logger.info(