@eventcatalog/generator-openapi 7.12.0 → 7.12.1

package/dist/index.js

@@ -4213,7 +4213,7 @@ var import_node_path = require("path");
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-openapi",
-  version: "7.12.0",
+  version: "7.12.1",
   description: "OpenAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -4453,19 +4453,36 @@ var mergeSends = (existing, incoming) => {
 var toUniqueArray = (array) => {
   return array.filter((item, index, self) => index === self.findIndex((t) => t.id === item.id && t.version === item.version));
 };
-var SKIP_PATH_SEGMENTS = /* @__PURE__ */ new Set(["api", "v1", "v2", "v3", "v4", "v5"]);
-var getMessageGroup = (operation, groupMessagesBy) => {
+var isSkippableSegment = (segment) => /^(api|v\d+)$/i.test(segment);
+var getPathPrefix = (path4) => {
+  const segments = path4.split("/").filter(Boolean);
+  const meaningful = segments.filter((s) => !isSkippableSegment(s));
+  return meaningful.find((s) => !s.startsWith("{"));
+};
+var buildGroupablePrefixes = (operations) => {
+  const prefixToPaths = /* @__PURE__ */ new Map();
+  for (const op of operations) {
+    const prefix = getPathPrefix(op.path);
+    if (!prefix) continue;
+    if (!prefixToPaths.has(prefix)) prefixToPaths.set(prefix, /* @__PURE__ */ new Set());
+    prefixToPaths.get(prefix).add(op.path);
+  }
+  const groupable = /* @__PURE__ */ new Set();
+  for (const [prefix, paths] of prefixToPaths) {
+    if (paths.size >= 2) groupable.add(prefix);
+  }
+  return groupable;
+};
+var getMessageGroup = (operation, groupMessagesBy, groupablePrefixes) => {
   if (!groupMessagesBy) return void 0;
   if (groupMessagesBy === "x-extension") {
     return operation.extensions?.["x-eventcatalog-group"] || void 0;
   }
   if (groupMessagesBy === "path-prefix") {
-    const allSegments = operation.path.split("/").filter(Boolean);
-    const meaningfulSegments = allSegments.filter((s) => !SKIP_PATH_SEGMENTS.has(s.toLowerCase()));
-    if (meaningfulSegments.length < 2) return void 0;
-    const prefix = meaningfulSegments.find((s) => !s.startsWith("{"));
+    const prefix = getPathPrefix(operation.path);
     if (!prefix) return void 0;
-    return prefix.charAt(0).toUpperCase() + prefix.slice(1).toLowerCase();
+    if (!groupablePrefixes?.has(prefix)) return void 0;
+    return `/${prefix}`;
   }
   return void 0;
 };
@@ -4789,6 +4806,7 @@ var processMessagesForOpenAPISpec = async (pathToSpec, document2, servicePath, o
   const preserveExistingMessages = options.preserveExistingMessages ?? true;
   const parseExamples = options.parseExamples ?? true;
   const isDraft = options.isDraft ?? null;
+  const groupablePrefixes = options.groupMessagesBy === "path-prefix" ? buildGroupablePrefixes(operations) : void 0;
   let receives = [], sends = [];
   let allGeneratedMessages = [];
   for (const operation of operations) {
@@ -4845,7 +4863,7 @@ var processMessagesForOpenAPISpec = async (pathToSpec, document2, servicePath, o
       },
       { path: options.pathForMessages || messagePath, override: true }
     );
-    const group = getMessageGroup(operation, options.groupMessagesBy);
+    const group = getMessageGroup(operation, options.groupMessagesBy, groupablePrefixes);
     const pointer = {
       id: message2.id,
       version: message2.version,