@ahoo-wang/fetcher-generator 2.10.0 → 2.10.2

package/dist/index.js

@@ -1,7 +1,7 @@
 import { Scope as le, VariableDeclarationKind as O, Project as pe } from "ts-morph";
 import { ContentTypeValues as S, combineURLs as E } from "@ahoo-wang/fetcher";
-import { ResourceAttributionPathSpec as F } from "@ahoo-wang/fetcher-wow";
-import { parse as U } from "yaml";
+import { ResourceAttributionPathSpec as G } from "@ahoo-wang/fetcher-wow";
+import { parse as J } from "yaml";
 import { readFile as me } from "fs";
 import { join as de, relative as fe } from "path";
 function $(o) {
@@ -11,11 +11,11 @@ function v(o, e) {
   const t = $(o);
   return e.schemas?.[t];
 }
-function J(o, e) {
+function V(o, e) {
   const t = $(o);
   return e.requestBodies?.[t];
 }
-function V(o, e) {
+function K(o, e) {
   const t = $(o);
   return e.parameters?.[t];
 }
@@ -25,11 +25,11 @@ function I(o, e) {
     schema: v(o, e)
   };
 }
-const G = /[-_\s.]+/;
-function K(o) {
-  return Array.isArray(o) ? o.flatMap((e) => W(e.split(G))) : W(o.split(G));
+const W = /[-_\s.]+/;
+function H(o) {
+  return Array.isArray(o) ? o.flatMap((e) => z(e.split(W))) : z(o.split(W));
 }
-function W(o) {
+function z(o) {
   return o.flatMap((e) => {
     if (e.length === 0)
       return [];
@@ -43,7 +43,7 @@ function W(o) {
   });
 }
 function x(o) {
-  return o === "" || o.length === 0 ? "" : K(o).filter((t) => t.length > 0).map((t) => {
+  return o === "" || o.length === 0 ? "" : H(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("");
@@ -53,23 +53,23 @@ function h(o) {
   return e.charAt(0).toLowerCase() + e.slice(1);
 }
 function he(o) {
-  return o === "" || Array.isArray(o) && o.length === 0 ? "" : K(o).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
+  return o === "" || Array.isArray(o) && o.length === 0 ? "" : H(o).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
 }
 function g(o) {
   return !!(o && typeof o == "object" && "$ref" in o);
 }
-function M(o, e) {
+function q(o, e) {
   if (e && !g(e) && e.content)
     return e.content[o]?.schema;
 }
-function H(o) {
-  return M(S.APPLICATION_JSON, o);
+function Y(o) {
+  return q(S.APPLICATION_JSON, o);
 }
 function ye(o) {
-  return M(S.TEXT_EVENT_STREAM, o);
+  return q(S.TEXT_EVENT_STREAM, o);
 }
 function xe(o) {
-  return M("*/*", o);
+  return q("*/*", o);
 }
 const Ae = [
   "string",
@@ -78,7 +78,7 @@ const Ae = [
   "boolean",
   "null"
 ];
-function q(o) {
+function j(o) {
   return Array.isArray(o) ? !0 : Ae.includes(o);
 }
 function N(o) {
@@ -87,22 +87,22 @@ function N(o) {
 function Ce(o) {
   return Array.isArray(o.enum) && o.enum.length > 0;
 }
-function Y(o) {
+function X(o) {
   return Array.isArray(o.anyOf) && o.anyOf.length > 0;
 }
-function X(o) {
+function Z(o) {
   return Array.isArray(o.oneOf) && o.oneOf.length > 0;
 }
 function Pe(o) {
-  return Y(o) || X(o);
+  return X(o) || Z(o);
 }
 function $e(o) {
   return Array.isArray(o.allOf) && o.allOf.length > 0;
 }
-function z(o) {
-  return Y(o) || X(o) || $e(o);
-}
 function L(o) {
+  return X(o) || Z(o) || $e(o);
+}
+function B(o) {
   return o.includes("|") || o.includes("&") ? `(${o})[]` : `${o}[]`;
 }
 function Ie(o) {
@@ -125,7 +125,7 @@ function A(o) {
       return "any";
   }
 }
-function Z(o) {
+function D(o) {
   return [
     { method: "get", operation: o.get },
     { method: "put", operation: o.put },
@@ -137,19 +137,19 @@ function Z(o) {
     { method: "trace", operation: o.trace }
   ].filter(({ operation: e }) => e !== void 0);
 }
-function j(o) {
+function _(o) {
   return o.responses[200];
 }
-function B(o) {
-  const e = j(o);
-  return H(e);
+function k(o) {
+  const e = _(o);
+  return Y(e);
 }
 function Te(o, e) {
-  return o.parameters ? o.parameters.map((t) => g(t) ? V(t, e) : t).filter((t) => t.in === "path") : [];
+  return o.parameters ? o.parameters.map((t) => g(t) ? K(t, e) : t).filter((t) => t.in === "path") : [];
 }
 const Se = "string";
 function ee(o) {
-  return !o.schema || g(o.schema) || !o.schema.type || !q(o.schema.type) ? Se : A(o.schema.type);
+  return !o.schema || g(o.schema) || !o.schema.type || !j(o.schema.type) ? Se : A(o.schema.type);
 }
 function te(o) {
   return o.startsWith("http://") || o.startsWith("https://") ? Ee(o) : ve(o);
@@ -170,7 +170,7 @@ async function Re(o) {
     case "json":
       return JSON.parse(e);
     case "yaml":
-      return U(e);
+      return J(e);
     default:
       throw new Error(`Unsupported file format: ${o}`);
   }
@@ -181,7 +181,7 @@ async function we(o) {
     case "json":
       return JSON.parse(e);
     case "yaml":
-      return U(e);
+      return J(e);
     default:
       throw new Error(`Unsupported file format: ${o}`);
   }
@@ -252,9 +252,9 @@ function w(o, e) {
     e.title,
     e.description
   ];
-  e.format && t.push(`- format: ${e.format}`), k(t, e, "default"), k(t, e, "example"), be(t, e), Me(t, e), qe(t, e), R(o, t);
+  e.format && t.push(`- format: ${e.format}`), Q(t, e, "default"), Q(t, e, "example"), be(t, e), Me(t, e), qe(t, e), R(o, t);
 }
-function k(o, e, t) {
+function Q(o, e, t) {
   const n = e[t];
   if (n) {
     if (typeof n != "object") {
@@ -327,7 +327,7 @@ class Le {
    */
   build() {
     for (const [e, t] of Object.entries(this.openAPI.paths)) {
-      const n = Z(t);
+      const n = D(t);
       for (const r of n)
         this.commands(e, r), this.state(r.operation), this.events(r.operation), this.fields(r.operation);
     }
@@ -359,14 +359,14 @@ class Le {
     const r = Ge(n.operationId);
     if (!r)
       return;
-    const i = j(n);
+    const i = _(n);
     if (!i || !g(i) || i.$ref !== We || !n.requestBody)
       return;
     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 = V(
+      const m = K(
         a,
         this.openAPI.components
       );
@@ -388,8 +388,8 @@ class Le {
       operation: n
     };
     n.tags?.forEach((m) => {
-      const _ = this.aggregates.get(m);
-      _ && _.commands.set(r, ue);
+      const F = this.aggregates.get(m);
+      F && F.commands.set(r, ue);
     });
   }
   /**
@@ -399,7 +399,7 @@ class Le {
   state(e) {
     if (!e.operationId?.endsWith(".snapshot_state.single"))
       return;
-    const t = B(e);
+    const t = k(e);
     if (!g(t))
       return;
     const n = I(
@@ -418,7 +418,7 @@ class Le {
   events(e) {
     if (!this.openAPI.components || !e.operationId?.endsWith(".event.list_query"))
       return;
-    const t = B(e);
+    const t = k(e);
     if (g(t))
       return;
     const n = t?.items;
@@ -452,7 +452,7 @@ class Le {
   fields(e) {
     if (!this.openAPI.components || !e.operationId?.endsWith(".snapshot.count"))
       return;
-    const n = J(
+    const n = V(
       e.requestBody,
       this.openAPI.components
     ).content[S.APPLICATION_JSON].schema, i = v(
@@ -616,7 +616,7 @@ class ke {
         i
       ), t.addTypeAlias({
         name: e.name,
-        type: L(i.name),
+        type: B(i.name),
         isExported: !0
       });
     }
@@ -629,7 +629,7 @@ class ke {
       e,
       n,
       r
-    ) : (z(n) && (n.anyOf || n.oneOf || n.allOf).forEach((s) => {
+    ) : (L(n) && (n.anyOf || n.oneOf || n.allOf).forEach((s) => {
       if (g(s)) {
         const a = y(s);
         T(
@@ -695,11 +695,11 @@ class ke {
         n,
         r.items
       );
-      return L(i);
+      return B(i);
     }
-    if (r.type && q(r.type))
+    if (r.type && j(r.type))
       return A(r.type);
-    if (z(r))
+    if (L(r))
       return this.resolvePropertyCompositionType(
         e,
         t,
@@ -754,10 +754,10 @@ const Qe = "@ahoo-wang/fetcher-decorator", Ue = [
 ], Je = {
   type: "Promise<Response>",
   metadata: "{resultExtractor: ResultExtractors.Response }"
-}, Q = {
+}, U = {
   type: "Promise<string>",
   metadata: "{resultExtractor: ResultExtractors.Text }"
-}, D = `{
+}, b = `{
   headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
   resultExtractor: JsonEventStreamResultExtractor,
 }`;
@@ -797,7 +797,7 @@ function ce(o) {
 function Ke(o) {
   let e = 0, t = 0;
   return o.commands.forEach((n) => {
-    n.path.startsWith(F.TENANT) && (e += 1), n.path.startsWith(F.OWNER) && (t += 1);
+    n.path.startsWith(G.TENANT) && (e += 1), n.path.startsWith(G.OWNER) && (t += 1);
   }), e === 0 && t === 0 ? "ResourceAttributionPathSpec.NONE" : e > t ? "ResourceAttributionPathSpec.TENANT" : "ResourceAttributionPathSpec.OWNER";
 }
 function ge(o, e, t, n) {
@@ -807,7 +807,7 @@ function ge(o, e, t, n) {
 function He(o, e) {
   return `${x(o.aggregateName)}${e}`;
 }
-function b(o) {
+function M(o) {
   return o === "delete" ? "del" : o;
 }
 class Ye {
@@ -918,7 +918,7 @@ class Ye {
     let n;
     if (g(t.requestBody) ? (this.context.logger.info(
       `Extracting request body from reference for operation: ${t.operationId}`
-    ), n = J(
+    ), n = V(
       t.requestBody,
       this.context.openAPI.components
     )) : n = t.requestBody, !n)
@@ -1021,7 +1021,7 @@ class Ye {
       return this.context.logger.info(
         `Schema has no type, using default return type: ${n}`
       ), n;
-    if (q(t.type)) {
+    if (j(t.type)) {
       const i = `Promise<${A(t.type)}>`;
       return this.context.logger.info(`Resolved primitive return type: ${i}`), i;
     }
@@ -1036,19 +1036,19 @@ class Ye {
    * @returns Object containing type and optional stream flag
    */
   resolveReturnType(e, t) {
-    const n = j(t);
+    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 = H(n) || xe(n);
+    const r = Y(n) || xe(n);
     if (r) {
       const s = this.resolveSchemaReturnType(e, r);
       return this.context.logger.info(
         `Resolved JSON/wildcard response return type for operation ${t.operationId}: ${s}`
       ), {
         type: s,
-        metadata: s === Q.type ? Q.metadata : void 0
+        metadata: s === U.type ? U.metadata : void 0
       };
     }
     const i = ye(n);
@@ -1068,14 +1068,14 @@ class Ye {
             `Resolved event stream return type for operation ${t.operationId}: ${l}`
           ), {
             type: l,
-            metadata: D
+            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: D };
+      ), { type: s, metadata: b };
     }
     return this.context.logger.info(
       `Using default return type for operation ${t.operationId}: ${this.defaultReturnType.type}`
@@ -1099,10 +1099,10 @@ class Ye {
       t,
       r.operation
     ), a = this.resolveReturnType(t, r.operation), c = a.metadata ? {
-      name: b(r.method),
+      name: M(r.method),
       arguments: [`'${r.path}'`, a.metadata]
     } : {
-      name: b(r.method),
+      name: M(r.method),
       arguments: [`'${r.path}'`]
     };
     this.context.logger.info(
@@ -1136,7 +1136,7 @@ class Ye {
     const t = /* @__PURE__ */ new Map();
     let n = 0;
     for (const [r, i] of Object.entries(this.context.openAPI.paths)) {
-      const s = Z(i).filter(
+      const s = D(i).filter(
         (a) => {
           if (!a.operation.operationId)
             return !1;
@@ -1170,6 +1170,15 @@ class Ye {
       "Resolving API client tags from OpenAPI specification"
     );
     const e = /* @__PURE__ */ new Map(), t = this.context.openAPI.tags?.length || 0;
+    for (const r of Object.values(this.context.openAPI.paths))
+      D(r).forEach((i) => {
+        i.operation.tags?.forEach((s) => {
+          e.has(s) || e.set(s, {
+            name: s,
+            description: ""
+          });
+        });
+      });
     let n = 0;
     return this.context.openAPI.tags?.forEach((r) => {
       r.name != "wow" && r.name != "Actuator" && !this.isAggregateTag(r) ? (e.set(r.name, r), n++, this.context.logger.info(`Included API client tag: ${r.name}`)) : this.context.logger.info(
@@ -1296,7 +1305,7 @@ class Xe {
     let r = "CommandClient", i = [], s = "Promise<CommandResult>";
     n && (r = "Stream" + r, i = [
       "''",
-      D
+      b
     ], s = "Promise<CommandResultEventStream>");
     const a = He(
       t.aggregate,
@@ -1366,7 +1375,7 @@ class Xe {
       name: h(r.name),
       decorators: [
         {
-          name: b(r.method),
+          name: M(r.method),
           arguments: [`${this.getEndpointPath(r)}`]
         }
       ],