@eventcatalog/generator-openapi 7.4.3 → 7.4.5

package/dist/index.js

@@ -572,7 +572,7 @@ var getSummary2 = (message2) => {
   }
   return escapeSpecialCharactersThatBreakMarkdown(eventCatalogMessageSummary);
 };
-var buildMessage = async (pathToFile, document, operation, generateMarkdown, messageIdConfig) => {
+var buildMessage = async (pathToFile, document, operation, generateMarkdown, messageIdConfig, serviceId) => {
   const requestBodiesAndResponses = await getSchemasByOperationId(pathToFile, operation.operationId);
   const extensions = operation.extensions || {};
   const operationTags = operation.tags.map((badge) => ({
@@ -593,9 +593,10 @@ var buildMessage = async (pathToFile, document, operation, generateMarkdown, mes
     const separator = messageIdConfig.separator || "-";
     uniqueIdentifier = [messageIdConfig.prefix, uniqueIdentifier].join(separator);
   }
+  const messageFolderName = extensions["x-eventcatalog-message-id"] || uniqueIdentifier;
   if (messageIdConfig?.prefixWithServiceId) {
     const separator = messageIdConfig.separator || "-";
-    uniqueIdentifier = [apiName, uniqueIdentifier].join(separator);
+    uniqueIdentifier = [serviceId, uniqueIdentifier].join(separator);
   }
   return {
     id: extensions["x-eventcatalog-message-id"] || uniqueIdentifier,
@@ -609,6 +610,7 @@ var buildMessage = async (pathToFile, document, operation, generateMarkdown, mes
     sidebar: {
       badge: httpVerb
     },
+    messageFolderName,
     ...extensions["x-eventcatalog-draft"] ? { draft: true } : {},
     ...operation.deprecated ? { deprecated: operation.deprecated } : {}
   };
@@ -2833,7 +2835,7 @@ var import_node_path = require("path");
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-openapi",
-  version: "7.4.3",
+  version: "7.4.5",
   description: "OpenAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -3043,7 +3045,8 @@ Processing domain: ${domainName} (v${domainVersion})`));
         ...options,
         owners: service.setMessageOwnersToServiceOwners ? service.owners : [],
         serviceHasMultipleSpecFiles: Array.isArray(serviceSpec.path),
-        isDraft: isServiceMarkedAsDraft
+        isDraft: isServiceMarkedAsDraft,
+        serviceId: service.id
       });
       let owners = service.owners || [];
       let repository = null;
@@ -3114,12 +3117,13 @@ var processMessagesForOpenAPISpec = async (pathToSpec, document, servicePath, op
   const isDraft = options.isDraft ?? null;
   let receives = [], sends = [];
   for (const operation of operations) {
-    const { requestBodiesAndResponses, sidebar, ...message2 } = await buildMessage(
+    const { requestBodiesAndResponses, sidebar, messageFolderName, ...message2 } = await buildMessage(
       pathToSpec,
       document,
       operation,
       options.messages?.generateMarkdown,
-      options.messages?.id
+      options.messages?.id,
+      options.serviceId
     );
     let messageMarkdown = message2.markdown;
     const messageType = operation.type;
@@ -3146,7 +3150,7 @@ var processMessagesForOpenAPISpec = async (pathToSpec, document, servicePath, op
         console.log(import_chalk4.default.cyan(` - Versioned previous message: ${message2.id} (v${catalogedMessage.version})`));
       }
     }
-    let messagePath = (0, import_node_path.join)(servicePath, folder, message2.id);
+    let messagePath = (0, import_node_path.join)(servicePath, folder, messageFolderName);
     if (options.writeFilesToRoot) {
       messagePath = message2.id;
     }