@ahoo-wang/fetcher-generator 2.2.0 → 2.2.2

package/dist/index.js

@@ -2,14 +2,14 @@ import { VariableDeclarationKind as O, Scope as L } from "ts-morph";
 import { parse as Q } from "yaml";
 import * as v from "fs";
 import { readFile as k } from "fs";
-import { ContentTypeValues as I, combineURLs as q } from "@ahoo-wang/fetcher";
+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 { ResourceAttributionPathSpec as R } from "@ahoo-wang/fetcher-wow";
 function f(n) {
   return n.$ref.split("/").pop();
 }
-function S(n, e) {
+function I(n, e) {
   const t = f(n);
   return e.schemas?.[t];
 }
@@ -24,7 +24,7 @@ function H(n, e) {
 function C(n, e) {
   return {
     key: f(n),
-    schema: S(n, e)
+    schema: I(n, e)
   };
 }
 const b = /[-_\s.]+|(?=[A-Z])/;
@@ -84,7 +84,7 @@ function g(n) {
   return !!(n && typeof n == "object" && "$ref" in n);
 }
 function oe(n) {
-  return !n || g(n) || !n.content ? void 0 : n.content[I.APPLICATION_JSON]?.schema;
+  return !n || g(n) || !n.content ? void 0 : n.content[S.APPLICATION_JSON]?.schema;
 }
 function ne(n) {
   return [
@@ -124,17 +124,17 @@ function ae(n) {
 function F(n) {
   return Array.isArray(n.anyOf) && n.anyOf.length > 0;
 }
-function _(n) {
+function W(n) {
   return Array.isArray(n.oneOf) && n.oneOf.length > 0;
 }
 function ce(n) {
-  return F(n) || _(n);
+  return F(n) || W(n);
 }
 function ge(n) {
   return Array.isArray(n.allOf) && n.allOf.length > 0;
 }
 function j(n) {
-  return F(n) || _(n) || ge(n);
+  return F(n) || W(n) || ge(n);
 }
 function le(n) {
   return n.includes("|") || n.includes("&") ? `(${n})[]` : `${n}[]`;
@@ -156,9 +156,9 @@ function N(n) {
       return "any";
   }
 }
-const W = "types.ts", pe = "@";
+const _ = "types.ts", pe = "@";
 function me(n) {
-  return q(n.path, W);
+  return q(n.path, _);
 }
 function D(n, e, t) {
   const o = q(e, t), r = n.getSourceFile(o);
@@ -174,7 +174,7 @@ function $(n, e, t) {
     moduleSpecifier: e
   })), t.forEach((r) => {
     o.getNamedImports().some(
-      (i) => i.getName() === r
+      (a) => a.getName() === r
     ) || o.addNamedImport(r);
   });
 }
@@ -183,7 +183,7 @@ function y(n, e, t) {
     $(n, t.path, [t.name]);
     return;
   }
-  const o = n.getDirectoryPath(), r = U(e, t.path, W);
+  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]);
 }
@@ -285,7 +285,7 @@ class Pe {
     const s = G(o);
     if (!s || !g(s) || s.$ref !== Ae || !o.requestBody)
       return;
-    const i = o.parameters ?? [], c = i.filter((d) => g(d) && d.$ref === Ce).at(0), a = i.filter(
+    const a = o.parameters ?? [], c = a.filter((d) => g(d) && d.$ref === Ce).at(0), i = a.filter(
       (d) => !g(d) && d.in === "path"
     );
     if (c) {
@@ -293,9 +293,9 @@ class Pe {
         c,
         this.openAPI.components
       );
-      a.push(d);
+      i.push(d);
     }
-    const m = o.requestBody.content[I.APPLICATION_JSON].schema, l = C(
+    const m = o.requestBody.content[S.APPLICATION_JSON].schema, l = C(
       m,
       this.openAPI.components
     );
@@ -304,7 +304,7 @@ class Pe {
       name: r,
       method: t.method,
       path: e,
-      pathParameters: a,
+      pathParameters: i,
       summary: o.summary,
       description: o.description,
       schema: l,
@@ -347,24 +347,24 @@ class Pe {
     const o = t?.items;
     if (!g(o))
       return;
-    const s = S(
+    const s = I(
       o,
       this.openAPI.components
-    ).properties.body.items.anyOf.map((i) => {
-      const c = i.title, a = i.properties.name.const, p = i.properties.body, m = C(
+    ).properties.body.items.anyOf.map((a) => {
+      const c = a.title, i = a.properties.name.const, p = a.properties.body, m = C(
         p,
         this.openAPI.components
       );
-      return m.schema.title = m.schema.title || i.title, {
+      return m.schema.title = m.schema.title || a.title, {
         title: c,
-        name: a,
+        name: i,
         schema: m
       };
     });
-    e.tags?.forEach((i) => {
-      const c = this.aggregates.get(i);
-      c && s.forEach((a) => {
-        c.events.set(a.name, a);
+    e.tags?.forEach((a) => {
+      const c = this.aggregates.get(a);
+      c && s.forEach((i) => {
+        c.events.set(i.name, i);
       });
     });
   }
@@ -378,13 +378,13 @@ class Pe {
     const o = V(
       e.requestBody,
       this.openAPI.components
-    ).content[I.APPLICATION_JSON].schema, s = S(
+    ).content[S.APPLICATION_JSON].schema, s = I(
       o,
       this.openAPI.components
-    ).properties?.field, i = C(s, this.openAPI.components);
+    ).properties?.field, a = C(s, this.openAPI.components);
     e.tags?.forEach((c) => {
-      const a = this.aggregates.get(c);
-      a && (a.fields = i);
+      const i = this.aggregates.get(c);
+      i && (i.fields = a);
     });
   }
 }
@@ -425,15 +425,15 @@ function u(n) {
     return { name: e, path: A };
   const t = n.split(".");
   let o = -1;
-  for (let a = 0; a < t.length; a++)
-    if (t[a] && /^[A-Z]/.test(t[a])) {
-      o = a;
+  for (let i = 0; i < t.length; i++)
+    if (t[i] && /^[A-Z]/.test(t[i])) {
+      o = i;
       break;
     }
   if (o === -1)
     return { name: n, path: "/" };
-  const r = t.slice(0, o), s = r.length > 0 ? `/${r.join("/")}` : "/", i = t.slice(o);
-  return { name: w(i), path: s };
+  const r = t.slice(0, o), s = r.length > 0 ? `/${r.join("/")}` : "/", a = t.slice(o);
+  return { name: w(a), path: s };
 }
 class x {
   /** The ts-morph project instance used for code generation */
@@ -476,25 +476,29 @@ class we extends x {
       this.logger.info("No schemas found in OpenAPI specification");
       return;
     }
-    const t = Object.entries(e).filter(
-      ([o]) => !o.startsWith("wow.")
-    );
+    const t = this.filterSchemas(e);
     this.logger.progress(
       `Generating models for ${t.length} schemas`
-    ), t.forEach(([o, r], s) => {
+    ), t.forEach((o, r) => {
       this.logger.progressWithCount(
-        s + 1,
+        r + 1,
         t.length,
-        `Processing schema: ${o}`,
+        `Processing schema: ${o.key}`,
         2
-      );
-      const i = {
-        key: o,
-        schema: r
-      };
-      this.generateKeyedSchema(i);
+      ), this.generateKeyedSchema(o);
     }), 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));
+  }
+  isWowSchema(e) {
+    return e.startsWith("wow.");
+  }
   /**
    * Generates a model for a specific schema key.
    * Processes enums, objects, unions, and type aliases in order.
@@ -532,10 +536,10 @@ class we extends x {
       e,
       o,
       r
-    ) : (j(o) && (o.anyOf || o.oneOf || o.allOf).forEach((i) => {
-      if (g(i)) {
+    ) : (j(o) && (o.anyOf || o.oneOf || o.allOf).forEach((a) => {
+      if (g(a)) {
         const c = u(
-          f(i)
+          f(a)
         );
         E(
           e,
@@ -548,7 +552,7 @@ class we extends x {
       this.processInterface(
         t,
         e,
-        i,
+        a,
         r
       );
     }), r);
@@ -566,18 +570,18 @@ class we extends x {
     );
   }
   processInterface(e, t, o, r) {
-    for (const [s, i] of Object.entries(o.properties)) {
+    for (const [s, a] of Object.entries(o.properties)) {
       const c = this.resolvePropertyType(
         t,
         e,
         s,
-        i
+        a
       );
-      let a = r.getProperty(s);
-      a ? a.setType(c) : a = r.addProperty({
+      let i = r.getProperty(s);
+      i ? i.setType(c) : i = r.addProperty({
         name: s,
         type: c
-      }), g(i) || P(a, i.title, i.description);
+      }), g(a) || P(i, a.title, a.description);
     }
     return r;
   }
@@ -614,12 +618,12 @@ class we extends x {
       const s = {
         path: e.path,
         name: `${e.name}${w(o)}`
-      }, i = this.processObject(
+      }, a = this.processObject(
         t,
         s,
         r
       );
-      return P(i, r.title, r.description), s.name;
+      return P(a, r.title, r.description), s.name;
     }
     return "any";
   }
@@ -627,21 +631,21 @@ class we extends x {
     const r = o.anyOf || o.oneOf || o.allOf, s = /* @__PURE__ */ new Set();
     r.forEach((c) => {
       if (g(c)) {
-        const a = u(
+        const i = u(
           f(c)
         );
         E(
           e,
           t,
           this.outputDir,
-          a
-        ), s.add(a.name);
+          i
+        ), s.add(i.name);
         return;
       }
       s.add(N(c.type ?? "string"));
     });
-    const i = ce(o) ? "|" : "&";
-    return Array.from(s).join(i);
+    const a = ce(o) ? "|" : "&";
+    return Array.from(s).join(a);
   }
 }
 function xe(n) {
@@ -750,24 +754,24 @@ class Oe 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", i = r.map((m) => m.name).join(" | ");
+    const s = "DOMAIN_EVENT_TYPES", a = r.map((m) => m.name).join(" | ");
     this.logger.info(
-      `Creating domain event types union: ${s} = ${i}`
+      `Creating domain event types union: ${s} = ${a}`
     ), t.addTypeAlias({
       name: s,
-      type: i
+      type: a
     });
-    const c = `${h(e.aggregate.aggregateName)}QueryClientFactory`, a = u(e.state.key), p = u(e.fields.key);
+    const c = `${h(e.aggregate.aggregateName)}QueryClientFactory`, i = u(e.state.key), p = u(e.fields.key);
     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 state model: ${i.name} from path: ${i.path}`
+    ), y(t, this.outputDir, i), 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: O.Const,
       declarations: [
         {
           name: c,
-          initializer: `new QueryClientFactory<${a.name}, ${p.name} | string, ${s}>(${o})`
+          initializer: `new QueryClientFactory<${i.name}, ${p.name} | string, ${s}>(${o})`
         }
       ],
       isExported: !0
@@ -776,7 +780,7 @@ class Oe extends x {
     );
   }
 }
-class Ie extends x {
+class Se extends x {
   commandEndpointPathsName = "COMMAND_ENDPOINT_PATHS";
   defaultCommandClientOptionsName = "DEFAULT_COMMAND_CLIENT_OPTIONS";
   /**
@@ -900,7 +904,7 @@ class Ie extends x {
     let r = "CommandClient", s = {
       name: "api",
       arguments: []
-    }, i = "Promise<CommandResult>";
+    }, a = "Promise<CommandResult>";
     o && (r = "Stream" + r, s = {
       name: "api",
       arguments: [
@@ -910,17 +914,17 @@ class Ie extends x {
   resultExtractor: JsonEventStreamResultExtractor,
 }`
       ]
-    }, i = "Promise<CommandResultEventStream>");
+    }, a = "Promise<CommandResultEventStream>");
     const c = Ee(
       t.aggregate,
       r
-    ), a = e.addClass({
+    ), i = e.addClass({
       name: c,
       isExported: !0,
       decorators: [s],
       implements: ["ApiMetadataCapable"]
     });
-    a.addConstructor({
+    i.addConstructor({
       parameters: [
         {
           name: "apiMetadata",
@@ -931,7 +935,7 @@ class Ie extends x {
         }
       ]
     }), t.commands.forEach((p) => {
-      this.processCommandMethod(e, a, p, i);
+      this.processCommandMethod(e, i, p, a);
     });
   }
   methodToDecorator(e) {
@@ -952,21 +956,21 @@ class Ie extends x {
     ), this.logger.info(
       `Command method details: HTTP ${o.method}, path: ${o.path}, return type: ${r}`
     );
-    const i = o.pathParameters.map((a) => (this.logger.info(
-      `Adding path parameter: ${a.name} (type: string)`
+    const a = o.pathParameters.map((i) => (this.logger.info(
+      `Adding path parameter: ${i.name} (type: string)`
     ), {
-      name: a.name,
+      name: i.name,
       type: "string",
       decorators: [
         {
           name: "path",
-          arguments: [`'${a.name}'`]
+          arguments: [`'${i.name}'`]
         }
       ]
     }));
     this.logger.info(
       `Adding command request parameter: commandRequest (type: CommandRequest<${s.name}>)`
-    ), i.push({
+    ), a.push({
       name: "commandRequest",
       type: `CommandRequest<${s.name}>`,
       decorators: [
@@ -977,7 +981,7 @@ class Ie extends x {
       ]
     }), this.logger.info(
       "Adding attributes parameter: attributes (type: Record<string, any>)"
-    ), i.push({
+    ), a.push({
       name: "attributes",
       type: "Record<string, any>",
       decorators: [
@@ -995,10 +999,10 @@ class Ie extends x {
           arguments: [`${this.getEndpointPath(o)}`]
         }
       ],
-      parameters: i,
+      parameters: a,
       returnType: r,
       statements: [
-        `throw autoGeneratedError(${i.map((a) => a.name).join(",")});`
+        `throw autoGeneratedError(${a.map((i) => i.name).join(",")});`
       ]
     });
     (o.summary || o.description) && this.logger.info(
@@ -1008,7 +1012,7 @@ class Ie extends x {
     );
   }
 }
-class Se extends x {
+class Ie extends x {
   queryClientGenerator;
   commandClientGenerator;
   /**
@@ -1016,7 +1020,7 @@ class Se extends x {
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    super(e), this.queryClientGenerator = new Oe(e), this.commandClientGenerator = new Ie(e);
+    super(e), this.queryClientGenerator = new Oe(e), this.commandClientGenerator = new Se(e);
   }
   /**
    * Generates client classes for all aggregates.
@@ -1083,7 +1087,7 @@ class Me {
       contextAggregates: o,
       logger: this.options.logger
     };
-    this.options.logger.info("Generating models"), new we(r).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new Se(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 we(r).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new Ie(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.
@@ -1122,8 +1126,8 @@ class Me {
     let r = [];
     try {
       r = v.readdirSync(t).filter((c) => {
-        const a = K.join(t, c);
-        return v.statSync(a).isDirectory();
+        const i = K.join(t, c);
+        return v.statSync(i).isDirectory();
       });
     } catch (c) {
       this.options.logger.error(
@@ -1140,22 +1144,22 @@ class Me {
     }
     const s = `${t}/index.ts`;
     this.options.logger.info(`Creating/updating index file: ${s}`);
-    const i = this.project.getSourceFile(s) || this.project.createSourceFile(s, "", { overwrite: !0 });
-    i.removeText();
+    const a = this.project.getSourceFile(s) || this.project.createSourceFile(s, "", { overwrite: !0 });
+    a.removeText();
     for (const c of o) {
-      const a = `./${c.getBaseNameWithoutExtension()}`;
-      this.options.logger.info(`Adding export for file: ${a}`), i.addExportDeclaration({
-        moduleSpecifier: a,
+      const i = `./${c.getBaseNameWithoutExtension()}`;
+      this.options.logger.info(`Adding export for file: ${i}`), a.addExportDeclaration({
+        moduleSpecifier: i,
         isTypeOnly: !1,
         namedExports: []
       });
     }
     for (const c of r) {
-      const a = `./${c}`;
+      const i = `./${c}`;
       this.options.logger.info(
-        `Adding export for subdirectory: ${a}`
-      ), i.addExportDeclaration({
-        moduleSpecifier: a,
+        `Adding export for subdirectory: ${i}`
+      ), a.addExportDeclaration({
+        moduleSpecifier: i,
         isTypeOnly: !1,
         namedExports: []
       });