@ahoo-wang/fetcher-generator 2.2.5 → 2.2.8

package/dist/index.js

@@ -1,11 +1,11 @@
-import { VariableDeclarationKind as O, Scope as Q } from "ts-morph";
-import { parse as k } from "yaml";
+import { VariableDeclarationKind as E, Scope as k } from "ts-morph";
+import { parse as Q } from "yaml";
 import * as v from "fs";
 import { readFile as L } from "fs";
 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";
+import { ResourceAttributionPathSpec as b } from "@ahoo-wang/fetcher-wow";
 function f(n) {
   return n.$ref.split("/").pop();
 }
@@ -27,12 +27,12 @@ function C(n, e) {
     schema: I(n, e)
   };
 }
-const b = /[-_\s.]+|(?=[A-Z])/;
+const R = /[-_\s.]+|(?=[A-Z])/;
 function w(n) {
   if (n === "" || n.length === 0)
     return "";
   let e;
-  return Array.isArray(n) ? e = n.flatMap((t) => t.split(b)) : e = n.split(b), e.filter((t) => t.length > 0).map((t) => {
+  return Array.isArray(n) ? e = n.flatMap((t) => t.split(R)) : e = n.split(R), e.filter((t) => t.length > 0).map((t) => {
     if (t.length === 0) return "";
     const o = t.charAt(0), r = t.slice(1);
     return (/[a-zA-Z]/.test(o) ? o.toUpperCase() : o) + r.toLowerCase();
@@ -61,7 +61,7 @@ async function ee(n) {
     case "json":
       return JSON.parse(e);
     case "yaml":
-      return k(e);
+      return Q(e);
     default:
       throw new Error(`Unsupported file format: ${n}`);
   }
@@ -101,7 +101,7 @@ function ne(n) {
 function G(n) {
   return n.responses[200];
 }
-function M(n) {
+function j(n) {
   const e = G(n);
   return oe(e);
 }
@@ -133,12 +133,15 @@ function ce(n) {
 function ge(n) {
   return Array.isArray(n.allOf) && n.allOf.length > 0;
 }
-function j(n) {
+function M(n) {
   return F(n) || W(n) || ge(n);
 }
 function le(n) {
   return n.includes("|") || n.includes("&") ? `(${n})[]` : `${n}[]`;
 }
+function pe(n) {
+  return n.type !== "object" ? !1 : n.properties ? Object.keys(n.properties).length === 0 : !0;
+}
 function N(n) {
   if (Array.isArray(n))
     return n.map((e) => N(e)).join(" | ");
@@ -156,8 +159,8 @@ function N(n) {
       return "any";
   }
 }
-const _ = "types.ts", pe = "@";
-function me(n) {
+const _ = "types.ts", me = "@";
+function ue(n) {
   return q(n.path, _);
 }
 function T(n, e, t) {
@@ -179,7 +182,7 @@ function $(n, e, t) {
   });
 }
 function y(n, e, t) {
-  if (t.path.startsWith(pe)) {
+  if (t.path.startsWith(me)) {
     $(n, t.path, [t.name]);
     return;
   }
@@ -187,7 +190,7 @@ function y(n, e, t) {
   let s = J(o, r);
   s = s.replace(/\.ts$/, ""), s.startsWith(".") || (s = "./" + s), $(n, s, [t.name]);
 }
-function E(n, e, t, o) {
+function O(n, e, t, o) {
   n.path !== o.path && y(e, t, o);
 }
 function de(n, e) {
@@ -203,20 +206,20 @@ function P(n, e, t) {
     description: o
   });
 }
-function ue(n) {
+function fe(n) {
   const e = n.split(".");
   return e.length != 2 || e[0].length === 0 || e[1].length === 0 ? null : e;
 }
-function fe(n) {
-  const e = ue(n.name);
+function he(n) {
+  const e = fe(n.name);
   return e ? {
     tag: n,
     contextAlias: e[0],
     aggregateName: e[1]
   } : null;
 }
-function he(n) {
-  const e = n?.map((o) => fe(o)).filter((o) => o !== null);
+function ye(n) {
+  const e = n?.map((o) => he(o)).filter((o) => o !== null);
   if (!e)
     return /* @__PURE__ */ new Map();
   const t = /* @__PURE__ */ new Map();
@@ -228,20 +231,20 @@ function he(n) {
     });
   }), t;
 }
-function ye(n) {
+function Ae(n) {
   if (!n)
     return null;
   const e = n.split(".");
   return e.length != 3 ? null : e[2];
 }
-const Ae = "#/components/responses/wow.CommandOk", Ce = "#/components/parameters/wow.id";
-class Pe {
+const Ce = "#/components/responses/wow.CommandOk", Pe = "#/components/parameters/wow.id";
+class $e {
   /**
    * 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 = ye(e.tags), this.build();
   }
   aggregates;
   /**
@@ -279,21 +282,21 @@ class Pe {
     const o = t.operation;
     if (o.operationId === "wow.command.send")
       return;
-    const r = ye(o.operationId);
+    const r = Ae(o.operationId);
     if (!r)
       return;
     const s = G(o);
-    if (!s || !g(s) || s.$ref !== Ae || !o.requestBody)
+    if (!s || !g(s) || s.$ref !== Ce || !o.requestBody)
       return;
-    const a = o.parameters ?? [], c = a.filter((d) => g(d) && d.$ref === Ce).at(0), i = a.filter(
-      (d) => !g(d) && d.in === "path"
+    const a = o.parameters ?? [], c = a.filter((u) => g(u) && u.$ref === Pe).at(0), i = a.filter(
+      (u) => !g(u) && u.in === "path"
     );
     if (c) {
-      const d = H(
+      const u = H(
         c,
         this.openAPI.components
       );
-      i.push(d);
+      i.push(u);
     }
     const m = o.requestBody.content[S.APPLICATION_JSON].schema, l = C(
       m,
@@ -310,8 +313,8 @@ class Pe {
       schema: l,
       operation: o
     };
-    o.tags?.forEach((d) => {
-      const D = this.aggregates.get(d);
+    o.tags?.forEach((u) => {
+      const D = this.aggregates.get(u);
       D && D.commands.set(r, z);
     });
   }
@@ -322,7 +325,7 @@ class Pe {
   state(e) {
     if (!e.operationId?.endsWith(".snapshot_state.single"))
       return;
-    const t = M(e);
+    const t = j(e);
     if (!g(t))
       return;
     const o = C(
@@ -341,7 +344,7 @@ class Pe {
   events(e) {
     if (!this.openAPI.components || !e.operationId?.endsWith(".event.list_query"))
       return;
-    const t = M(e);
+    const t = j(e);
     if (g(t))
       return;
     const o = t?.items;
@@ -388,7 +391,7 @@ class Pe {
     });
   }
 }
-const A = "@ahoo-wang/fetcher-wow", $e = {
+const A = "@ahoo-wang/fetcher-wow", we = {
   "wow.command.CommandResult": "CommandResult",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
   "wow.api.BindingError": "BindingError",
@@ -417,10 +420,10 @@ const A = "@ahoo-wang/fetcher-wow", $e = {
   "wow.openapi.BatchResult": "BatchResult",
   "wow.messaging.CompensationTarget": "CompensationTarget"
 };
-function u(n) {
+function d(n) {
   if (!n)
     return { name: "", path: "/" };
-  const e = $e[n];
+  const e = we[n];
   if (e)
     return { name: e, path: A };
   const t = n.split(".");
@@ -454,12 +457,12 @@ class x {
     this.project = e.project, this.openAPI = e.openAPI, this.outputDir = e.outputDir, this.contextAggregates = e.contextAggregates, this.logger = e.logger;
   }
 }
-class we extends x {
+class xe extends x {
   constructor(e) {
     super(e);
   }
   getOrCreateSourceFile(e) {
-    const t = me(e);
+    const t = ue(e);
     return T(this.project, this.outputDir, t);
   }
   /**
@@ -514,7 +517,7 @@ class we extends x {
    * 4. Type alias processing
    */
   generateKeyedSchema({ key: e, schema: t }) {
-    const o = u(e), r = this.getOrCreateSourceFile(o), s = this.process(o, r, t);
+    const o = d(e), r = this.getOrCreateSourceFile(o), s = this.process(o, r, t);
     s && P(s, t.title, t.description);
   }
   process(e, t, o) {
@@ -536,12 +539,12 @@ class we extends x {
       e,
       o,
       r
-    ) : (j(o) && (o.anyOf || o.oneOf || o.allOf).forEach((a) => {
+    ) : (M(o) && (o.anyOf || o.oneOf || o.allOf).forEach((a) => {
       if (g(a)) {
-        const c = u(
+        const c = d(
           f(a)
         );
-        E(
+        O(
           e,
           t,
           this.outputDir,
@@ -580,15 +583,16 @@ class we extends x {
       let i = r.getProperty(s);
       i ? i.setType(c) : i = r.addProperty({
         name: s,
-        type: c
+        type: c,
+        hasQuestionToken: !o.required?.includes(s)
       }), g(a) || P(i, a.title, a.description);
     }
     return r;
   }
   resolvePropertyType(e, t, o, r) {
     if (g(r)) {
-      const s = u(f(r));
-      return E(
+      const s = d(f(r));
+      return O(
         e,
         t,
         this.outputDir,
@@ -608,7 +612,7 @@ class we extends x {
     }
     if (r.type && se(r.type))
       return N(r.type);
-    if (j(r))
+    if (M(r))
       return this.resolvePropertyCompositionType(
         e,
         t,
@@ -631,10 +635,10 @@ class we extends x {
     const r = o.anyOf || o.oneOf || o.allOf, s = /* @__PURE__ */ new Set();
     r.forEach((c) => {
       if (g(c)) {
-        const i = u(
+        const i = d(
           f(c)
         );
-        E(
+        O(
           e,
           t,
           this.outputDir,
@@ -648,10 +652,10 @@ class we extends x {
     return Array.from(s).join(a);
   }
 }
-function xe(n) {
+function Oe(n) {
   let e = 0, t = 0;
   return n.commands.forEach((o) => {
-    o.path.startsWith(R.TENANT) && (e += 1), o.path.startsWith(R.OWNER) && (t += 1);
+    o.path.startsWith(b.TENANT) && (e += 1), o.path.startsWith(b.OWNER) && (t += 1);
   }), e === 0 && t === 0 ? "ResourceAttributionPathSpec.NONE" : e > t ? "ResourceAttributionPathSpec.TENANT" : "ResourceAttributionPathSpec.OWNER";
 }
 function B(n, e, t, o) {
@@ -661,7 +665,7 @@ function B(n, e, t, o) {
 function Ee(n, e) {
   return `${w(n.aggregateName)}${e}`;
 }
-class Oe extends x {
+class Se extends x {
   /**
    * Creates a new QueryClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -730,7 +734,7 @@ class Oe extends x {
     this.logger.info(
       `Creating default query client options: ${o}`
     ), t.addVariableStatement({
-      declarationKind: O.Const,
+      declarationKind: E.Const,
       declarations: [
         {
           name: o,
@@ -738,7 +742,7 @@ class Oe extends x {
           initializer: `{
         contextAlias: '${e.aggregate.contextAlias}',
         aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${xe(e)},
+        resourceAttribution: ${Oe(e)},
       }`
         }
       ],
@@ -749,7 +753,7 @@ class Oe extends x {
       `Processing ${e.events.size} domain events for aggregate: ${e.aggregate.aggregateName}`
     );
     for (const m of e.events.values()) {
-      const l = u(m.schema.key);
+      const l = d(m.schema.key);
       this.logger.info(
         `Adding import for event model: ${l.name} from path: ${l.path}`
       ), y(t, this.outputDir, l), r.push(l);
@@ -761,13 +765,13 @@ class Oe extends x {
       name: s,
       type: a
     });
-    const c = `${h(e.aggregate.aggregateName)}QueryClientFactory`, i = u(e.state.key), p = u(e.fields.key);
+    const c = `${h(e.aggregate.aggregateName)}QueryClientFactory`, i = d(e.state.key), p = d(e.fields.key);
     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,
+      declarationKind: E.Const,
       declarations: [
         {
           name: c,
@@ -780,7 +784,7 @@ class Oe extends x {
     );
   }
 }
-class Se extends x {
+class Ie extends x {
   commandEndpointPathsName = "COMMAND_ENDPOINT_PATHS";
   defaultCommandClientOptionsName = "DEFAULT_COMMAND_CLIENT_OPTIONS";
   /**
@@ -831,7 +835,7 @@ class Se extends x {
     ), this.processCommandEndpointPaths(t, e), this.logger.info(
       `Creating default command client options: ${this.defaultCommandClientOptionsName}`
     ), t.addVariableStatement({
-      declarationKind: O.Const,
+      declarationKind: E.Const,
       declarations: [
         {
           name: this.defaultCommandClientOptionsName,
@@ -929,7 +933,7 @@ class Se extends x {
         {
           name: "apiMetadata",
           type: "ApiMetadata",
-          scope: Q.Public,
+          scope: k.Public,
           isReadonly: !0,
           initializer: `${this.defaultCommandClientOptionsName}`
         }
@@ -948,7 +952,7 @@ class Se extends x {
    * @param definition - The command definition
    */
   processCommandMethod(e, t, o, r) {
-    const s = u(o.schema.key);
+    const s = d(o.schema.key);
     this.logger.info(
       `Adding import for command model: ${s.name} from path: ${s.path}`
     ), y(e, this.outputDir, s), this.logger.info(
@@ -973,7 +977,7 @@ class Se extends x {
       `Adding command request parameter: commandRequest (type: CommandRequest<${s.name}>)`
     ), a.push({
       name: "commandRequest",
-      hasQuestionToken: !0,
+      hasQuestionToken: pe(o.schema.schema),
       type: `CommandRequest<${s.name}>`,
       decorators: [
         {
@@ -1015,7 +1019,7 @@ class Se extends x {
     );
   }
 }
-class Ie extends x {
+class Ne extends x {
   queryClientGenerator;
   commandClientGenerator;
   /**
@@ -1023,7 +1027,7 @@ class Ie 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 Se(e);
+    super(e), this.queryClientGenerator = new Se(e), this.commandClientGenerator = new Ie(e);
   }
   /**
    * Generates client classes for all aggregates.
@@ -1079,7 +1083,7 @@ class Me {
     ), 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 ee(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
-    const o = new Pe(e).resolve();
+    const o = new $e(e).resolve();
     this.options.logger.info(
       `Resolved ${o.size} bounded context aggregates`
     );
@@ -1090,7 +1094,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 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");
+    this.options.logger.info("Generating models"), new xe(r).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new Ne(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.