@ahoo-wang/fetcher-generator 2.11.0 → 2.11.2

package/dist/index.js

@@ -15,7 +15,7 @@ function V(o, e) {
   const t = $(o);
   return e.requestBodies?.[t];
 }
-function K(o, e) {
+function H(o, e) {
   const t = $(o);
   return e.parameters?.[t];
 }
@@ -29,10 +29,10 @@ const he = /[-_\s.]+/;
 function N(o) {
   return o.split(he);
 }
-function H(o) {
-  return Array.isArray(o) ? o.flatMap((e) => z(N(e))) : z(N(o));
+function Y(o) {
+  return Array.isArray(o) ? o.flatMap((e) => L(N(e))) : L(N(o));
 }
-function z(o) {
+function L(o) {
   return o.flatMap((e) => {
     if (e.length === 0)
       return [];
@@ -46,7 +46,7 @@ function z(o) {
   });
 }
 function x(o) {
-  return o === "" || o.length === 0 ? "" : H(o).filter((t) => t.length > 0).map((t) => {
+  return o === "" || o.length === 0 ? "" : Y(o).filter((t) => t.length > 0).map((t) => {
     const n = t.charAt(0), r = t.slice(1);
     return (/[a-zA-Z]/.test(n) ? n.toUpperCase() : n) + r.toLowerCase();
   }).join("");
@@ -56,7 +56,7 @@ function h(o) {
   return e.charAt(0).toLowerCase() + e.slice(1);
 }
 function ye(o) {
-  return o === "" || Array.isArray(o) && o.length === 0 ? "" : H(o).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
+  return o === "" || Array.isArray(o) && o.length === 0 ? "" : Y(o).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
 }
 function g(o) {
   return !!(o && typeof o == "object" && "$ref" in o);
@@ -65,7 +65,7 @@ function j(o, e) {
   if (e && !g(e) && e.content)
     return e.content[o]?.schema;
 }
-function Y(o) {
+function K(o) {
   return j(E.APPLICATION_JSON, o);
 }
 function xe(o) {
@@ -102,7 +102,7 @@ function $e(o) {
 function Ie(o) {
   return Array.isArray(o.allOf) && o.allOf.length > 0;
 }
-function L(o) {
+function z(o) {
   return X(o) || Z(o) || Ie(o);
 }
 function k(o) {
@@ -145,29 +145,29 @@ function F(o) {
 }
 function B(o) {
   const e = F(o);
-  return Y(e);
+  return K(e);
 }
 function Ee(o, e) {
-  return o.parameters ? o.parameters.map((t) => g(t) ? K(t, e) : t).filter((t) => t.in === "path") : [];
+  return o.parameters ? o.parameters.map((t) => g(t) ? H(t, e) : t).filter((t) => t.in === "path") : [];
 }
 const ve = "string";
 function ee(o) {
   return !o.schema || g(o.schema) || !o.schema.type || !_(o.schema.type) ? ve : A(o.schema.type);
 }
 function te(o) {
-  return o.startsWith("http://") || o.startsWith("https://") ? Se(o) : Re(o);
+  return o.startsWith("http://") || o.startsWith("https://") ? Se(o) : we(o);
 }
 async function Se(o) {
   return await (await fetch(o)).text();
 }
-function Re(o) {
+function we(o) {
   return new Promise((e, t) => {
     me(o, "utf-8", (n, r) => {
       n ? t(n) : e(r);
     });
   });
 }
-async function we(o) {
+async function Re(o) {
   const e = await te(o);
   switch (ne(e)) {
     case "json":
@@ -246,16 +246,16 @@ function Me(o) {
   return e.length > 0 ? e.join(`
 `) : void 0;
 }
-function R(o, e) {
+function w(o, e) {
   const t = Me(e);
   t && o.addJsDoc(t);
 }
-function w(o, e) {
+function R(o, e) {
   const t = [
     e.title,
     e.description
   ];
-  e.format && t.push(`- format: ${e.format}`), U(t, e, "default"), U(t, e, "example"), be(t, e), qe(t, e), je(t, e), R(o, t);
+  e.format && t.push(`- format: ${e.format}`), U(t, e, "default"), U(t, e, "example"), be(t, e), qe(t, e), je(t, e), w(o, t);
 }
 function U(o, e, t) {
   const n = e[t];
@@ -314,7 +314,7 @@ function We(o) {
   const e = o.split(".");
   return e.length != 3 ? null : e[2];
 }
-const ze = "#/components/responses/wow.CommandOk", Le = "#/components/parameters/wow.id";
+const Le = "#/components/responses/wow.CommandOk", ze = "#/components/parameters/wow.id";
 class ke {
   /**
    * Creates a new AggregateResolver instance.
@@ -363,13 +363,13 @@ class ke {
     if (!r)
       return;
     const i = F(n);
-    if (!i || !g(i) || i.$ref !== ze || !n.requestBody)
+    if (!i || !g(i) || i.$ref !== Le || !n.requestBody)
       return;
-    const s = n.parameters ?? [], a = s.filter((m) => g(m) && m.$ref === Le).at(0), c = s.filter(
+    const s = n.parameters ?? [], a = s.filter((m) => g(m) && m.$ref === ze).at(0), c = s.filter(
       (m) => !g(m) && m.in === "path"
     );
     if (a) {
-      const m = K(
+      const m = H(
         a,
         this.openAPI.components
       );
@@ -470,6 +470,7 @@ class ke {
 }
 const P = "@ahoo-wang/fetcher-wow", Be = {
   "wow.command.CommandResult": "CommandResult",
+  "wow.command.CommandResultArray": "CommandResultArray",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
   "wow.api.BindingError": "BindingError",
   "wow.api.DefaultErrorInfo": "ErrorInfo",
@@ -556,6 +557,8 @@ class Ue {
     })).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 n = d(e);
@@ -598,7 +601,7 @@ class Ue {
    */
   generateKeyedSchema({ key: e, schema: t }) {
     const n = d(e), r = this.getOrCreateSourceFile(n), i = this.process(n, r, t);
-    i && w(i, t);
+    i && R(i, t);
   }
   process(e, t, n) {
     if (Pe(n))
@@ -632,7 +635,7 @@ class Ue {
       e,
       n,
       r
-    ) : (L(n) && (n.anyOf || n.oneOf || n.allOf).forEach((s) => {
+    ) : (z(n) && (n.anyOf || n.oneOf || n.allOf).forEach((s) => {
       if (g(s)) {
         const a = y(s);
         T(
@@ -675,7 +678,7 @@ class Ue {
       c ? c.setType(a) : c = r.addProperty({
         name: i,
         type: a
-      }), g(s) || w(c, s);
+      }), g(s) || R(c, s);
     }
     return r;
   }
@@ -702,7 +705,7 @@ class Ue {
     }
     if (r.type && _(r.type))
       return A(r.type);
-    if (L(r))
+    if (z(r))
       return this.resolvePropertyCompositionType(
         e,
         t,
@@ -717,7 +720,7 @@ class Ue {
         i,
         r
       );
-      return w(s, r), i.name;
+      return R(s, r), i.name;
     }
     return "any";
   }
@@ -793,11 +796,11 @@ function ae(o, e) {
     ]
   });
 }
-const Ke = "@ahoo-wang/fetcher-eventstream";
+const He = "@ahoo-wang/fetcher-eventstream";
 function ce(o) {
-  C(o, Ke, ["JsonEventStreamResultExtractor", "type JsonServerSentEventStream"]);
+  C(o, He, ["JsonEventStreamResultExtractor", "type JsonServerSentEventStream"]);
 }
-function He(o) {
+function Ye(o) {
   let e = 0, t = 0;
   return o.commands.forEach((n) => {
     n.path.startsWith(W.TENANT) && (e += 1), n.path.startsWith(W.OWNER) && (t += 1);
@@ -807,7 +810,7 @@ function ge(o, e, t, n) {
   const r = `${t.contextAlias}/${t.aggregateName}/${n}.ts`;
   return re(o, e, r);
 }
-function Ye(o, e) {
+function Ke(o, e) {
   return `${x(o.aggregateName)}${e}`;
 }
 function q(o) {
@@ -899,7 +902,7 @@ class et {
       n.name + "ApiClient",
       r
     );
-    R(i, [e.description]), ae(i, this.apiMetadataCtorInitializer), this.context.logger.info(
+    w(i, [e.description]), ae(i, this.apiMetadataCtorInitializer), this.context.logger.info(
       `Processing ${t.size} operations for ${n.name}ApiClient`
     ), t.forEach((s) => {
       this.processOperation(e, r, i, s);
@@ -1056,7 +1059,7 @@ class et {
       return this.context.logger.info(
         `No OK response found for operation ${t.operationId}, using default return type: ${this.defaultReturnType.type}`
       ), this.defaultReturnType;
-    const r = Y(n) || Ae(n);
+    const r = K(n) || Ae(n);
     if (r) {
       const s = this.resolveSchemaReturnType(e, r);
       return this.context.logger.info(
@@ -1132,11 +1135,12 @@ class et {
         `throw autoGeneratedError(${s.map((l) => l.name).join(",")});`
       ]
     });
-    R(
+    w(
       u,
       [
         r.operation.summary,
         r.operation.description,
+        `- operationId: \`${r.operation.operationId}\``,
         `- path: \`${r.path}\``
       ]
     ), this.context.logger.success(`Operation method generated: ${i}`);
@@ -1325,7 +1329,7 @@ class tt {
       "''",
       b
     ], s = "Promise<CommandResultEventStream>");
-    const a = Ye(
+    const a = Ke(
       t.aggregate,
       r
     ), c = se(a, e, i);
@@ -1405,7 +1409,15 @@ class tt {
     });
     this.context.logger.info(
       `Adding JSDoc documentation for method: ${h(r.name)}`
-    ), R(a, [r.summary, r.description, `- path: \`${r.path}\``]), this.context.logger.success(
+    ), w(
+      a,
+      [
+        r.summary,
+        r.description,
+        `- operationId: \`${r.operation.operationId}\``,
+        `- path: \`${r.path}\``
+      ]
+    ), this.context.logger.success(
       `Command method generated: ${h(r.name)}`
     );
   }
@@ -1487,7 +1499,7 @@ class nt {
           initializer: `{
         contextAlias: '${e.aggregate.contextAlias}',
         aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${He(e)},
+        resourceAttribution: ${Ye(e)},
       }`
         }
       ],
@@ -1620,7 +1632,7 @@ class pt {
     this.options.logger.info(
       "Starting code generation from OpenAPI specification"
     ), this.options.logger.info(`Input path: ${this.options.inputPath}`), this.options.logger.info(`Output directory: ${this.options.outputDir}`), this.options.logger.info("Parsing OpenAPI specification");
-    const e = await we(this.options.inputPath);
+    const e = await Re(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
     const n = new ke(e).resolve();
     this.options.logger.info(