@ahoo-wang/fetcher-generator 3.3.3 → 3.3.6

package/dist/index.js

@@ -25,7 +25,7 @@ function $(n, e) {
     schema: S(n, e)
   };
 }
-const Te = /[-_'\s.]+/;
+const Te = /[-_'\s./?;:,()[\]{}|\\]+/;
 function O(n) {
   return n.split(Te);
 }
@@ -823,7 +823,9 @@ class it {
     o.addStatements(`export const ${r} = '${e}';`);
   }
 }
-const st = "@ahoo-wang/fetcher-decorator", at = [
+const st = "@ahoo-wang/fetcher", at = [
+  "ResultExtractors"
+], ct = "@ahoo-wang/fetcher-decorator", pt = [
   "type ApiMetadata",
   "type ApiMetadataCapable",
   "type ParameterRequest",
@@ -837,7 +839,7 @@ const st = "@ahoo-wang/fetcher-decorator", at = [
   "attribute",
   "path",
   "autoGeneratedError"
-], ct = {
+], gt = {
   type: "Promise<Response>",
   metadata: "{resultExtractor: ResultExtractors.Response }"
 }, H = {
@@ -847,9 +849,12 @@ const st = "@ahoo-wang/fetcher-decorator", at = [
   headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
   resultExtractor: JsonEventStreamResultExtractor,
 }`;
-function le(n) {
+function ut(n) {
   A(n, st, at);
 }
+function le(n) {
+  A(n, ct, pt);
+}
 function j(n, e, t = [], o = [], r) {
   return e.addClass({
     name: n,
@@ -878,14 +883,14 @@ function me(n, e) {
     ]
   });
 }
-const pt = "@ahoo-wang/fetcher-eventstream";
+const lt = "@ahoo-wang/fetcher-eventstream";
 function de(n) {
-  A(n, pt, [
+  A(n, lt, [
     "JsonEventStreamResultExtractor",
     "type JsonServerSentEventStream"
   ]);
 }
-function gt(n) {
+function mt(n) {
   let e = 0, t = 0;
   return n.commands.forEach((o) => {
     o.path.startsWith(L.TENANT) && (e += 1), o.path.startsWith(L.OWNER) && (t += 1);
@@ -901,9 +906,9 @@ function y(n, e) {
 function _(n) {
   return n === "delete" ? "del" : n;
 }
-const ut = "x-fetcher-method";
-function lt(n, e) {
-  const t = n[ut];
+const dt = "x-fetcher-method";
+function ft(n, e) {
+  const t = n[dt];
   if (t)
     return t;
   if (!n.operationId)
@@ -916,7 +921,7 @@ function lt(n, e) {
   }
   return f(o);
 }
-class mt {
+class ht {
   /**
    * Creates a new ApiClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and configuration
@@ -925,7 +930,7 @@ class mt {
     this.context = e, this.apiMetadataCtorInitializer = this.context.currentContextAlias ? `{basePath:${D(this.context.currentContextAlias)}}` : void 0;
   }
   defaultParameterRequestType = "ParameterRequest";
-  defaultReturnType = ct;
+  defaultReturnType = gt;
   apiMetadataCtorInitializer;
   /**
    * Generates API client classes for all valid tags in the OpenAPI specification.
@@ -982,7 +987,7 @@ class mt {
       `Generating API client class: ${o.name}ApiClient with ${t.size} operations`
     );
     const r = this.createApiClientFile(o);
-    le(r), de(r);
+    ut(r), le(r), de(r);
     const i = j(
       o.name + "ApiClient",
       r
@@ -1002,7 +1007,7 @@ class mt {
    * @returns A unique camelCase method name
    */
   getMethodName(e, t) {
-    const o = lt(t, (r) => e.getMethod(r) !== void 0);
+    const o = ft(t, (r) => e.getMethod(r) !== void 0);
     if (!o)
       throw new Error(
         `Unable to resolve method name for apiClientClass:${e.getName()}.`
@@ -1295,7 +1300,7 @@ class mt {
     return !1;
   }
 }
-class dt {
+class yt {
   /**
    * Creates a new CommandClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1567,7 +1572,7 @@ class dt {
     );
   }
 }
-class ft {
+class xt {
   /**
    * Creates a new QueryClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1645,7 +1650,7 @@ class ft {
           initializer: `{
         contextAlias: ${D(e.aggregate.contextAlias)},
         aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${gt(e)},
+        resourceAttribution: ${mt(e)},
       }`
         }
       ],
@@ -1716,13 +1721,13 @@ class ft {
       });
   }
 }
-class ht {
+class At {
   /**
    * Creates a new ClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    this.context = e, this.queryClientGenerator = new ft(e), this.commandClientGenerator = new dt(e), this.apiClientGenerator = new mt(e);
+    this.context = e, this.queryClientGenerator = new xt(e), this.commandClientGenerator = new yt(e), this.apiClientGenerator = new ht(e);
   }
   queryClientGenerator;
   commandClientGenerator;
@@ -1745,7 +1750,7 @@ class ht {
     this.queryClientGenerator.generate(), this.commandClientGenerator.generate(), this.apiClientGenerator.generate(), this.context.logger.success("Client generation completed");
   }
 }
-class yt {
+class Ct {
   /** The ts-morph project instance used for code generation */
   project;
   /** The OpenAPI specification object */
@@ -1772,8 +1777,8 @@ class yt {
     return this.defaultIgnorePathParameters.includes(t);
   }
 }
-const xt = "./fetcher-generator.config.json";
-class It {
+const Pt = "./fetcher-generator.config.json";
+class Rt {
   /**
    * Creates a new CodeGenerator instance with the specified options.
    *
@@ -1817,14 +1822,14 @@ class It {
     this.options.logger.info(
       `Resolved ${r.size} bounded context aggregates`
     );
-    const i = this.options.configPath ?? xt;
+    const i = this.options.configPath ?? Pt;
     let s = {};
     try {
       this.options.logger.info(`Parsing configuration file: ${i}`), s = await ke(i);
     } catch (d) {
       this.options.logger.info(`Configuration file parsing failed: ${d}`);
     }
-    const a = new yt({
+    const a = new Ct({
       openAPI: t,
       project: this.project,
       outputDir: this.options.outputDir,
@@ -1832,7 +1837,7 @@ class It {
       logger: this.options.logger,
       config: s
     });
-    this.options.logger.info("Generating models"), new it(a).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new ht(a).generate(), this.options.logger.info("Clients generated successfully");
+    this.options.logger.info("Generating models"), new it(a).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new At(a).generate(), this.options.logger.info("Clients generated successfully");
     const g = this.project.getDirectory(this.options.outputDir);
     if (!g) {
       this.options.logger.info("Output directory not found.");
@@ -1929,7 +1934,7 @@ class It {
   }
 }
 export {
-  It as CodeGenerator,
-  xt as DEFAULT_CONFIG_PATH
+  Rt as CodeGenerator,
+  Pt as DEFAULT_CONFIG_PATH
 };
 //# sourceMappingURL=index.js.map