@ahoo-wang/fetcher-generator 3.1.2 → 3.1.3

package/dist/index.js

@@ -242,7 +242,7 @@ function ce(o, e, t) {
     overwrite: !0
   });
 }
-function x(o, e, t) {
+function A(o, e, t) {
   let n = o.getImportDeclaration(
     (r) => r.getModuleSpecifierValue() === e
   );
@@ -256,12 +256,12 @@ function x(o, e, t) {
 }
 function d(o, e, t) {
   if (t.path.startsWith(_e)) {
-    x(o, t.path, [t.name]);
+    A(o, t.path, [t.name]);
     return;
   }
   const n = o.getDirectoryPath(), r = Ae(e, t.path, ae);
   let i = Ce(n, r);
-  i = i.replace(/\.ts$/, ""), i.startsWith(".") || (i = "./" + i), x(o, i, [t.name]);
+  i = i.replace(/\.ts$/, ""), i.startsWith(".") || (i = "./" + i), A(o, i, [t.name]);
 }
 function ke(o, e, t, n) {
   o.path !== n.path && d(e, t, n);
@@ -275,7 +275,7 @@ function ge(o, e = `
   );
   return t.length > 0 ? t.join(e) : void 0;
 }
-function A(o, e) {
+function C(o, e) {
   const t = ge(e);
   t && o.addJsDoc(t);
 }
@@ -288,11 +288,11 @@ function W(o, e) {
 }
 function ze(o, e, t) {
   const n = W(e, t);
-  A(o, n);
+  C(o, n);
 }
 function Le(o, e, t) {
   const n = W(e, t);
-  pe(n, "schema", e), A(o, n);
+  pe(n, "schema", e), C(o, n);
 }
 function Q(o, e, t) {
   const n = e[t];
@@ -413,11 +413,11 @@ class Ze {
       );
       c.push(l);
     }
-    const p = n.requestBody.content[I.APPLICATION_JSON].schema, y = $(
+    const p = n.requestBody.content[I.APPLICATION_JSON].schema, x = $(
       p,
       this.openAPI.components
     );
-    y.schema.title = y.schema.title || n.summary, y.schema.description = y.schema.description || n.description;
+    x.schema.title = x.schema.title || n.summary, x.schema.description = x.schema.description || n.description;
     const fe = {
       name: r,
       method: t.method,
@@ -425,7 +425,7 @@ class Ze {
       pathParameters: c,
       summary: n.summary,
       description: n.description,
-      schema: y,
+      schema: x,
       operation: n
     };
     n.tags?.forEach((l) => {
@@ -506,7 +506,7 @@ class Ze {
     });
   }
 }
-const C = "@ahoo-wang/fetcher-wow", et = {
+const y = "@ahoo-wang/fetcher-wow", et = {
   "wow.command.CommandResult": "CommandResult",
   "wow.command.CommandResultArray": "CommandResultArray",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
@@ -541,7 +541,7 @@ function m(o) {
     return { name: "", path: "/" };
   const e = et[o];
   if (e)
-    return { name: e, path: C };
+    return { name: e, path: y };
   const t = o.split(".");
   let n = -1;
   for (let c = 0; c < t.length; c++)
@@ -835,7 +835,7 @@ const ot = "@ahoo-wang/fetcher-decorator", rt = [
   resultExtractor: JsonEventStreamResultExtractor,
 }`;
 function ue(o) {
-  x(o, ot, rt);
+  A(o, ot, rt);
 }
 function F(o, e, t = [], n = [], r) {
   return e.addClass({
@@ -867,7 +867,7 @@ function le(o, e) {
 }
 const st = "@ahoo-wang/fetcher-eventstream";
 function me(o) {
-  x(o, st, [
+  A(o, st, [
     "JsonEventStreamResultExtractor",
     "type JsonServerSentEventStream"
   ]);
@@ -974,7 +974,7 @@ class pt {
       n.name + "ApiClient",
       r
     );
-    A(i, [e.description]), le(i, this.apiMetadataCtorInitializer), this.context.logger.info(
+    C(i, [e.description]), le(i, this.apiMetadataCtorInitializer), this.context.logger.info(
       `Processing ${t.size} operations for ${n.name}ApiClient`
     ), t.forEach((s) => {
       this.processOperation(e, r, i, s);
@@ -1207,7 +1207,7 @@ class pt {
         `throw autoGeneratedError(${s.map((p) => p.name).join(",")});`
       ]
     });
-    A(
+    C(
       u,
       [
         r.operation.summary,
@@ -1344,22 +1344,23 @@ class ut {
       ],
       isExported: !1
     }), this.context.logger.info(
-      `Adding imports from ${C}: CommandRequest, CommandResult, CommandResultEventStream, DeleteAggregate, RecoverAggregate`
+      `Adding imports from ${y}: CommandRequest, CommandResult, CommandResultEventStream, CommandBody, DeleteAggregateCommand, RecoverAggregateCommand`
     ), t.addImportDeclaration({
-      moduleSpecifier: C,
+      moduleSpecifier: y,
       namedImports: [
         "CommandRequest",
         "CommandResult",
         "CommandResultEventStream",
-        "DeleteAggregate",
-        "RecoverAggregate"
+        "CommandBody",
+        "DeleteAggregateCommand",
+        "RecoverAggregateCommand"
       ],
       isTypeOnly: !0
     }), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher-eventstream: JsonEventStreamResultExtractor"
     ), me(t), this.context.logger.info(
       "Adding import from @ahoo-wang/fetcher: ContentTypeValues"
-    ), x(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info(
+    ), A(t, "@ahoo-wang/fetcher", ["ContentTypeValues"]), this.context.logger.info(
       "Adding imports from @ahoo-wang/fetcher-decorator: ApiMetadata types and decorators"
     ), ue(t), this.context.logger.info("Generating standard command client class"), this.processCommandClient(t, e, n), this.context.logger.info("Generating stream command client class"), this.processStreamCommandClient(t, e), this.context.logger.success(
       `Command client generation completed for aggregate: ${e.aggregate.aggregateName}`
@@ -1396,10 +1397,12 @@ class ut {
   }
   resolveCommandType(e, t) {
     const [n, r] = this.resolveCommandTypeName(t);
+    if (n.path === y)
+      return;
     d(e, this.context.outputDir, n);
     let i = `${n.name}`;
     const s = Oe(t.schema.schema).map((a) => `'${a}'`).join(" | ");
-    s !== "" && (i = `PartialBy<${i},${s}>`), i = `RemoveReadonlyFields<${i}>`, e.addTypeAlias({
+    s !== "" && (i = `PartialBy<${i},${s}>`), i = `CommandBody<${i}>`, e.addTypeAlias({
       name: r,
       type: `${i}`,
       isExported: !0
@@ -1530,7 +1533,7 @@ class ut {
     });
     this.context.logger.info(
       `Adding JSDoc documentation for method: ${f(n.name)}`
-    ), A(s, [
+    ), C(s, [
       n.summary,
       n.description,
       `- operationId: \`${n.operation.operationId}\``,
@@ -1598,9 +1601,9 @@ class lt {
     this.context.logger.info(
       `Processing query client for aggregate: ${e.aggregate.aggregateName} in context: ${e.aggregate.contextAlias}`
     ), this.context.logger.info(
-      `Adding imports from ${C}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
+      `Adding imports from ${y}: QueryClientFactory, QueryClientOptions, ResourceAttributionPathSpec`
     ), t.addImportDeclaration({
-      moduleSpecifier: C,
+      moduleSpecifier: y,
       namedImports: [
         "QueryClientFactory",
         "QueryClientOptions",