@ahoo-wang/fetcher-generator 3.8.3 → 3.8.6

package/dist/index.js

@@ -15,7 +15,7 @@ function Y(n, e) {
   const t = P(n);
   return e.requestBodies?.[t];
 }
-function Z(n, e) {
+function X(n, e) {
   const t = P(n);
   return e.parameters?.[t];
 }
@@ -29,7 +29,7 @@ const Ie = /[-_'\s./?;:,()[\]{}|\\]+/;
 function M(n) {
   return n.split(Ie);
 }
-function X(n) {
+function Z(n) {
   return Array.isArray(n) ? n.flatMap((e) => B(M(e))) : B(M(n));
 }
 function B(n) {
@@ -46,7 +46,7 @@ function B(n) {
   });
 }
 function w(n) {
-  return n === "" || n.length === 0 ? "" : X(n).filter((t) => t.length > 0).map((t) => {
+  return n === "" || n.length === 0 ? "" : Z(n).filter((t) => t.length > 0).map((t) => {
     const o = t.charAt(0), r = t.slice(1);
     return (/[a-zA-Z]/.test(o) ? o.toUpperCase() : o) + r.toLowerCase();
   }).join("");
@@ -56,7 +56,7 @@ function f(n) {
   return e.charAt(0).toLowerCase() + e.slice(1);
 }
 function ee(n) {
-  return n === "" || Array.isArray(n) && n.length === 0 ? "" : X(n).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
+  return n === "" || Array.isArray(n) && n.length === 0 ? "" : Z(n).filter((t) => t.length > 0).map((t) => t.toUpperCase()).join("_");
 }
 function b(n) {
   return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(n) ? n : `'${n}'`;
@@ -117,10 +117,14 @@ function oe(n) {
 function re(n) {
   return n.type === "object" && !n.properties && n.additionalProperties !== void 0;
 }
-function Oe(n) {
+const Oe = "x-map-key-schema";
+function Me(n) {
+  return n[Oe];
+}
+function be(n) {
   return n.type !== "object" ? !1 : n.properties ? Object.keys(n.properties).length === 0 : !0;
 }
-function Me(n) {
+function qe(n) {
   return n.readOnly === !0;
 }
 function D(n) {
@@ -140,13 +144,13 @@ function D(n) {
       return "any";
   }
 }
-function be(n) {
+function Fe(n) {
   if (!T(n))
     return [];
   const e = n.required || [];
   return Object.keys(n.properties).filter((t) => !e.includes(t));
 }
-function qe(n, e) {
+function je(n, e) {
   return n.operation.operationId && e.operation.operationId ? n.operation.operationId.localeCompare(
     e.operation.operationId
   ) : n.path && e.path ? n.path.localeCompare(e.path) : n.method && e.method ? n.method.localeCompare(e.method) : 0;
@@ -161,7 +165,7 @@ function ie(n) {
         path: t
       });
     });
-  return e.sort(qe);
+  return e.sort(je);
 }
 function se(n) {
   return [
@@ -182,27 +186,27 @@ function Q(n) {
   const e = W(n);
   return te(e);
 }
-function Fe(n, e) {
-  return n.parameters ? n.parameters.map((t) => p(t) ? Z(t, e) : t).filter((t) => t.in === "path") : [];
+function _e(n, e) {
+  return n.parameters ? n.parameters.map((t) => p(t) ? X(t, e) : t).filter((t) => t.in === "path") : [];
 }
-const je = "string";
+const Ge = "string";
 function ae(n) {
-  return !n.schema || p(n.schema) || !n.schema.type || !ne(n.schema.type) ? je : D(n.schema.type);
+  return !n.schema || p(n.schema) || !n.schema.type || !ne(n.schema.type) ? Ge : D(n.schema.type);
 }
 function ce(n) {
-  return n.startsWith("http://") || n.startsWith("https://") ? _e(n) : Ge(n);
+  return n.startsWith("http://") || n.startsWith("https://") ? We(n) : ke(n);
 }
-async function _e(n) {
+async function We(n) {
   return await (await fetch(n)).text();
 }
-function Ge(n) {
+function ke(n) {
   return new Promise((e, t) => {
     Pe(n, "utf-8", (o, r) => {
       o ? t(o) : e(r);
     });
   });
 }
-async function We(n) {
+async function ze(n) {
   const e = await ce(n);
   switch (pe(e)) {
     case "json":
@@ -213,7 +217,7 @@ async function We(n) {
       throw new Error(`Unsupported file format: ${n}`);
   }
 }
-async function ke(n) {
+async function Le(n) {
   const e = await ce(n);
   switch (pe(e)) {
     case "json":
@@ -238,8 +242,8 @@ function pe(n) {
   }
   throw new Error("Unable to infer file format");
 }
-const ge = "types.ts", ze = "@";
-function Le(n) {
+const ge = "types.ts", Be = "@";
+function Ue(n) {
   return E(n.path, ge);
 }
 function ue(n, e, t) {
@@ -261,7 +265,7 @@ function A(n, e, t) {
   });
 }
 function m(n, e, t) {
-  if (t.path.startsWith(ze)) {
+  if (t.path.startsWith(Be)) {
     A(n, t.path, [t.name]);
     return;
   }
@@ -269,7 +273,7 @@ function m(n, e, t) {
   let i = Te(o, r);
   i = i.replace(/\.ts$/, ""), i = i.split(ve).join("/"), i.startsWith(".") || (i = "./" + i), A(n, i, [t.name]);
 }
-function Be(n, e, t, o) {
+function Je(n, e, t, o) {
   n.path !== o.path && m(e, t, o);
 }
 function le(n, e = `
@@ -290,13 +294,13 @@ function k(n, e) {
     n.title,
     n.description
   ];
-  return e && t.push(`- key: ${e}`), n.format && t.push(`- format: ${n.format}`), V(t, n, "default"), V(t, n, "example"), Qe(t, n), Ve(t, n), He(t, n), t;
+  return e && t.push(`- key: ${e}`), n.format && t.push(`- format: ${n.format}`), V(t, n, "default"), V(t, n, "example"), He(t, n), Ke(t, n), Ye(t, n), t;
 }
-function Ue(n, e, t) {
+function Qe(n, e, t) {
   const o = k(e, t);
   C(n, o);
 }
-function Je(n, e, t) {
+function Ve(n, e, t) {
   const o = k(e, t);
   me(o, "schema", e), C(n, o);
 }
@@ -313,7 +317,7 @@ function V(n, e, t) {
 function me(n, e, t) {
   n.push(`- ${e}: `), n.push("```json"), n.push(JSON.stringify(t, null, 2)), n.push("```");
 }
-function Qe(n, e) {
+function He(n, e) {
   const t = ["- Numeric Constraints"];
   e.minimum !== void 0 && t.push(`  - minimum: ${e.minimum}`), e.maximum !== void 0 && t.push(`  - maximum: ${e.maximum}`), e.exclusiveMinimum !== void 0 && t.push(
     `  - exclusiveMinimum: ${e.exclusiveMinimum}`
@@ -321,28 +325,28 @@ function Qe(n, e) {
     `  - exclusiveMaximum: ${e.exclusiveMaximum}`
   ), e.multipleOf !== void 0 && t.push(`  - multipleOf: ${e.multipleOf}`), t.length !== 1 && n.push(...t);
 }
-function Ve(n, e) {
+function Ke(n, e) {
   const t = ["- String Constraints"];
   e.minLength !== void 0 && t.push(`  - minLength: ${e.minLength}`), e.maxLength !== void 0 && t.push(`  - maxLength: ${e.maxLength}`), e.pattern !== void 0 && t.push(`  - pattern: ${e.pattern}`), t.length !== 1 && n.push(...t);
 }
-function He(n, e) {
+function Ye(n, e) {
   const t = ["- Array Constraints"];
   e.minItems !== void 0 && t.push(`  - minItems: ${e.minItems}`), e.maxItems !== void 0 && t.push(`  - maxItems: ${e.maxItems}`), e.uniqueItems !== void 0 && t.push(`  - uniqueItems: ${e.uniqueItems}`), t.length !== 1 && n.push(...t);
 }
-function Ke(n) {
+function Xe(n) {
   const e = n.split(".");
   return e.length != 2 || e[0].length === 0 || e[1].length === 0 ? null : e;
 }
-function Ye(n) {
-  const e = Ke(n.name);
+function Ze(n) {
+  const e = Xe(n.name);
   return e ? {
     tag: n,
     contextAlias: e[0],
     aggregateName: e[1]
   } : null;
 }
-function Ze(n) {
-  const e = n?.map((o) => Ye(o)).filter((o) => o !== null);
+function et(n) {
+  const e = n?.map((o) => Ze(o)).filter((o) => o !== null);
   if (!e)
     return /* @__PURE__ */ new Map();
   const t = /* @__PURE__ */ new Map();
@@ -354,20 +358,20 @@ function Ze(n) {
     });
   }), t;
 }
-function Xe(n) {
+function tt(n) {
   if (!n)
     return null;
   const e = n.split(".");
   return e.length != 3 ? null : e[2];
 }
-const et = "#/components/responses/wow.CommandOk", tt = "#/components/parameters/wow.id";
-class nt {
+const nt = "#/components/responses/wow.CommandOk", ot = "#/components/parameters/wow.id";
+class rt {
   /**
    * Creates a new AggregateResolver instance.
    * @param openAPI - The OpenAPI specification to resolve aggregates from
    */
   constructor(e) {
-    this.openAPI = e, this.aggregates = Ze(e.tags), this.build();
+    this.openAPI = e, this.aggregates = et(e.tags), this.build();
   }
   aggregates;
   /**
@@ -403,17 +407,17 @@ class nt {
     const o = t.operation;
     if (o.operationId === "wow.command.send")
       return;
-    const r = Xe(o.operationId);
+    const r = tt(o.operationId);
     if (!r)
       return;
     const i = W(o);
-    if (!i || !p(i) || i.$ref !== et || !o.requestBody)
+    if (!i || !p(i) || i.$ref !== nt || !o.requestBody)
       return;
-    const s = o.parameters ?? [], a = s.filter((u) => p(u) && u.$ref === tt).at(0), c = s.filter(
+    const s = o.parameters ?? [], a = s.filter((u) => p(u) && u.$ref === ot).at(0), c = s.filter(
       (u) => !p(u) && u.in === "path"
     );
     if (a) {
-      const u = Z(
+      const u = X(
         a,
         this.openAPI.components
       );
@@ -512,7 +516,7 @@ class nt {
     });
   }
 }
-const x = "@ahoo-wang/fetcher-wow", ot = {
+const x = "@ahoo-wang/fetcher-wow", it = {
   "wow.command.CommandResult": "CommandResult",
   "wow.command.CommandResultArray": "CommandResultArray",
   "wow.MessageHeaderSqlType": "MessageHeaderSqlType",
@@ -547,7 +551,7 @@ const x = "@ahoo-wang/fetcher-wow", ot = {
 function l(n) {
   if (!n)
     return { name: "", path: "/" };
-  const e = ot[n];
+  const e = it[n];
   if (e)
     return { name: e, path: x };
   const t = n.split(".");
@@ -567,13 +571,13 @@ function v(n) {
 function N(n) {
   return `${ee(n)}_BOUNDED_CONTEXT_ALIAS`;
 }
-class rt {
+class st {
   constructor(e, t, o, r) {
     this.modelInfo = e, this.sourceFile = t, this.keySchema = o, this.outputDir = r;
   }
   generate() {
     const e = this.process();
-    e && Je(e, this.keySchema.schema, this.keySchema.key);
+    e && Ve(e, this.keySchema.schema, this.keySchema.key);
   }
   process() {
     const { schema: e } = this.keySchema;
@@ -581,7 +585,7 @@ class rt {
   }
   resolveReference(e) {
     const t = v(e);
-    return Be(
+    return Je(
       this.modelInfo,
       this.sourceFile,
       this.outputDir,
@@ -624,11 +628,19 @@ class rt {
   resolveMapValueType(e) {
     return e.additionalProperties === void 0 || e.additionalProperties === !1 || e.additionalProperties === !0 ? "any" : this.resolveType(e.additionalProperties);
   }
+  resolveMapKeyType(e) {
+    const t = Me(e);
+    return t ? this.resolveType(t) : "string";
+  }
+  resolveMapType(e) {
+    const t = this.resolveMapKeyType(e), o = this.resolveMapValueType(e);
+    return `Record<${t},${o}>`;
+  }
   resolveType(e) {
     if (p(e))
       return this.resolveReference(e).name;
     if (re(e))
-      return `Record<string,${this.resolveMapValueType(e)}>`;
+      return this.resolveMapType(e);
     if (e.const)
       return `'${e.const}'`;
     if (U(e))
@@ -659,8 +671,8 @@ class rt {
     s ? s.setType(r) : s = e.addProperty({
       name: i,
       type: r,
-      isReadonly: Me(o)
-    }), Ue(s, o);
+      isReadonly: qe(o)
+    }), Qe(s, o);
   }
   processInterface(e) {
     const t = this.sourceFile.addInterface({
@@ -722,12 +734,12 @@ class rt {
     });
   }
 }
-class it {
+class at {
   constructor(e) {
     this.context = e;
   }
   getOrCreateSourceFile(e) {
-    const t = Le(e);
+    const t = Ue(e);
     return this.context.getOrCreateSourceFile(t);
   }
   /**
@@ -765,11 +777,9 @@ class it {
     );
   }
   isWowSchema(e, t) {
-    if (e !== "wow.api.query.PagedList" && e.startsWith("wow.api.query.") && e.endsWith("PagedList"))
+    if (e !== "wow.api.query.PagedList" && e.startsWith("wow.api.query.") && e.endsWith("PagedList") || e.startsWith("wow.api.query.Operator") && e.endsWith("Map"))
       return !1;
-    if (e.startsWith("wow.") || e.endsWith("AggregatedCondition") || e.endsWith("AggregatedDomainEventStream") || e.endsWith("AggregatedDomainEventStreamPagedList") || e.endsWith(
-      "AggregatedDomainEventStreamServerSentEventNonNullData"
-    ) || e.endsWith("AggregatedListQuery") || e.endsWith("AggregatedPagedQuery") || e.endsWith("AggregatedSingleQuery"))
+    if (e.startsWith("wow.") || e.endsWith("AggregatedCondition") || e.endsWith("AggregatedDomainEventStream") || e.endsWith("AggregatedDomainEventStreamPagedList") || e.endsWith("AggregatedDomainEventStreamServerSentEventNonNullData") || e.endsWith("AggregatedListQuery") || e.endsWith("AggregatedPagedQuery") || e.endsWith("AggregatedSingleQuery"))
       return !0;
     const o = l(e);
     return t.has(o.name);
@@ -809,7 +819,7 @@ class it {
    */
   generateKeyedSchema(e) {
     const t = l(e.key), o = this.getOrCreateSourceFile(t);
-    new rt(
+    new st(
       t,
       o,
       e,
@@ -823,9 +833,9 @@ class it {
     o.addStatements(`export const ${r} = '${e}';`);
   }
 }
-const st = "@ahoo-wang/fetcher", at = [
+const ct = "@ahoo-wang/fetcher", pt = [
   "ResultExtractors"
-], ct = "@ahoo-wang/fetcher-decorator", pt = [
+], gt = "@ahoo-wang/fetcher-decorator", ut = [
   "type ApiMetadata",
   "type ApiMetadataCapable",
   "type ParameterRequest",
@@ -839,7 +849,7 @@ const st = "@ahoo-wang/fetcher", at = [
   "attribute",
   "path",
   "autoGeneratedError"
-], gt = {
+], lt = {
   type: "Promise<Response>",
   metadata: "{resultExtractor: ResultExtractors.Response }"
 }, H = {
@@ -849,11 +859,11 @@ const st = "@ahoo-wang/fetcher", at = [
   headers: { Accept: ContentTypeValues.TEXT_EVENT_STREAM },
   resultExtractor: JsonEventStreamResultExtractor,
 }`;
-function ut(n) {
-  A(n, st, at);
+function mt(n) {
+  A(n, ct, pt);
 }
 function de(n) {
-  A(n, ct, pt);
+  A(n, gt, ut);
 }
 function j(n, e, t = [], o = [], r) {
   return e.addClass({
@@ -883,14 +893,14 @@ function fe(n, e) {
     ]
   });
 }
-const lt = "@ahoo-wang/fetcher-eventstream";
+const dt = "@ahoo-wang/fetcher-eventstream";
 function he(n) {
-  A(n, lt, [
+  A(n, dt, [
     "JsonEventStreamResultExtractor",
     "type JsonServerSentEventStream"
   ]);
 }
-function mt(n) {
+function ft(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);
@@ -906,9 +916,9 @@ function y(n, e) {
 function _(n) {
   return n === "delete" ? "del" : n;
 }
-const dt = "x-fetcher-method";
-function ft(n, e) {
-  const t = n[dt];
+const ht = "x-fetcher-method";
+function yt(n, e) {
+  const t = n[ht];
   if (t)
     return t;
   if (!n.operationId)
@@ -921,7 +931,7 @@ function ft(n, e) {
   }
   return f(o);
 }
-class ht {
+class xt {
   /**
    * Creates a new ApiClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and configuration
@@ -930,7 +940,7 @@ class ht {
     this.context = e, this.apiMetadataCtorInitializer = this.context.currentContextAlias ? `{basePath:${N(this.context.currentContextAlias)}}` : void 0;
   }
   defaultParameterRequestType = "ParameterRequest";
-  defaultReturnType = gt;
+  defaultReturnType = lt;
   apiMetadataCtorInitializer;
   /**
    * Generates API client classes for all valid tags in the OpenAPI specification.
@@ -987,7 +997,7 @@ class ht {
       `Generating API client class: ${o.name}ApiClient with ${t.size} operations`
     );
     const r = this.createApiClientFile(o);
-    ut(r), de(r), he(r);
+    mt(r), de(r), he(r);
     const i = j(
       o.name + "ApiClient",
       r
@@ -1007,7 +1017,7 @@ class ht {
    * @returns A unique camelCase method name
    */
   getMethodName(e, t) {
-    const o = ft(t, (r) => e.getMethod(r) !== void 0);
+    const o = yt(t, (r) => e.getMethod(r) !== void 0);
     if (!o)
       throw new Error(
         `Unable to resolve method name for apiClientClass:${e.getName()}.`
@@ -1064,7 +1074,7 @@ class ht {
    * @returns Array of parameter declarations
    */
   resolveParameters(e, t, o) {
-    const r = Fe(
+    const r = _e(
       o,
       this.context.openAPI.components
     ).filter((a) => !this.context.isIgnoreApiClientPathParameters(
@@ -1296,7 +1306,7 @@ class ht {
     return !1;
   }
 }
-class yt {
+class At {
   /**
    * Creates a new CommandClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1424,7 +1434,7 @@ class yt {
       return;
     m(e, this.context.outputDir, o);
     let i = `${o.name}`;
-    const s = be(t.schema.schema).map((a) => `'${a}'`).join(" | ");
+    const s = Fe(t.schema.schema).map((a) => `'${a}'`).join(" | ");
     s !== "" && (i = `PartialBy<${i},${s}>`), i = `CommandBody<${i}>`, e.addTypeAlias({
       name: r,
       type: `${i}`,
@@ -1511,7 +1521,7 @@ class yt {
       `Adding command request parameter: commandRequest (type: CommandRequest<${r}>)`
     ), i.push({
       name: "commandRequest",
-      hasQuestionToken: Oe(t.schema.schema),
+      hasQuestionToken: be(t.schema.schema),
       type: `CommandRequest<${r}>`,
       decorators: [
         {
@@ -1568,7 +1578,7 @@ class yt {
     );
   }
 }
-class xt {
+class Ct {
   /**
    * Creates a new QueryClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
@@ -1646,7 +1656,7 @@ class xt {
           initializer: `{
         contextAlias: ${N(e.aggregate.contextAlias)},
         aggregateName: '${e.aggregate.aggregateName}',
-        resourceAttribution: ${mt(e)},
+        resourceAttribution: ${ft(e)},
       }`
         }
       ],
@@ -1717,13 +1727,13 @@ class xt {
       });
   }
 }
-class At {
+class Pt {
   /**
    * Creates a new ClientGenerator instance.
    * @param context - The generation context containing OpenAPI spec and project details
    */
   constructor(e) {
-    this.context = e, this.queryClientGenerator = new xt(e), this.commandClientGenerator = new yt(e), this.apiClientGenerator = new ht(e);
+    this.context = e, this.queryClientGenerator = new Ct(e), this.commandClientGenerator = new At(e), this.apiClientGenerator = new xt(e);
   }
   queryClientGenerator;
   commandClientGenerator;
@@ -1746,7 +1756,7 @@ class At {
     this.queryClientGenerator.generate(), this.commandClientGenerator.generate(), this.apiClientGenerator.generate(), this.context.logger.success("Client generation completed");
   }
 }
-class Ct {
+class $t {
   /** The ts-morph project instance used for code generation */
   project;
   /** The OpenAPI specification object */
@@ -1773,8 +1783,8 @@ class Ct {
     return this.defaultIgnorePathParameters.includes(t);
   }
 }
-const Pt = "./fetcher-generator.config.json";
-class Rt {
+const Tt = "./fetcher-generator.config.json";
+class Dt {
   /**
    * Creates a new CodeGenerator instance with the specified options.
    *
@@ -1812,20 +1822,20 @@ class Rt {
     );
     const e = process.cwd();
     this.options.logger.info(`Work directory: ${e}`), 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 t = await We(this.options.inputPath);
+    const t = await ze(this.options.inputPath);
     this.options.logger.info("OpenAPI specification parsed successfully"), this.options.logger.info("Resolving bounded context aggregates");
-    const r = new nt(t).resolve();
+    const r = new rt(t).resolve();
     this.options.logger.info(
       `Resolved ${r.size} bounded context aggregates`
     );
-    const i = this.options.configPath ?? Pt;
+    const i = this.options.configPath ?? Tt;
     let s = {};
     try {
-      this.options.logger.info(`Parsing configuration file: ${i}`), s = await ke(i);
+      this.options.logger.info(`Parsing configuration file: ${i}`), s = await Le(i);
     } catch (d) {
       this.options.logger.info(`Configuration file parsing failed: ${d}`);
     }
-    const a = new Ct({
+    const a = new $t({
       openAPI: t,
       project: this.project,
       outputDir: this.options.outputDir,
@@ -1833,7 +1843,7 @@ class Rt {
       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 At(a).generate(), this.options.logger.info("Clients generated successfully");
+    this.options.logger.info("Generating models"), new at(a).generate(), this.options.logger.info("Models generated successfully"), this.options.logger.info("Generating clients"), new Pt(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.");
@@ -1930,7 +1940,7 @@ class Rt {
   }
 }
 export {
-  Rt as CodeGenerator,
-  Pt as DEFAULT_CONFIG_PATH
+  Dt as CodeGenerator,
+  Tt as DEFAULT_CONFIG_PATH
 };
 //# sourceMappingURL=index.js.map