@eventcatalog/generator-asyncapi 6.4.4 → 7.0.1

package/dist/index.d.mts

@@ -3,6 +3,7 @@ import { z } from 'zod';
 declare const optionsSchema: z.ZodObject<{
     licenseKey: z.ZodOptional<z.ZodString>;
     writeFilesToRoot: z.ZodOptional<z.ZodBoolean>;
+    preserveExistingMessages: z.ZodOptional<z.ZodBoolean>;
     services: z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         version: z.ZodOptional<z.ZodString>;
@@ -279,6 +280,7 @@ declare const optionsSchema: z.ZodObject<{
     }[];
     licenseKey?: string | undefined;
     writeFilesToRoot?: boolean | undefined;
+    preserveExistingMessages?: boolean | undefined;
     messages?: {
         id?: {
             lowerCase?: boolean | undefined;
@@ -344,6 +346,7 @@ declare const optionsSchema: z.ZodObject<{
     }[];
     licenseKey?: string | undefined;
     writeFilesToRoot?: boolean | undefined;
+    preserveExistingMessages?: boolean | undefined;
     messages?: {
         id?: {
             lowerCase?: boolean | undefined;

package/dist/index.d.ts

@@ -3,6 +3,7 @@ import { z } from 'zod';
 declare const optionsSchema: z.ZodObject<{
     licenseKey: z.ZodOptional<z.ZodString>;
     writeFilesToRoot: z.ZodOptional<z.ZodBoolean>;
+    preserveExistingMessages: z.ZodOptional<z.ZodBoolean>;
     services: z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         version: z.ZodOptional<z.ZodString>;
@@ -279,6 +280,7 @@ declare const optionsSchema: z.ZodObject<{
     }[];
     licenseKey?: string | undefined;
     writeFilesToRoot?: boolean | undefined;
+    preserveExistingMessages?: boolean | undefined;
     messages?: {
         id?: {
             lowerCase?: boolean | undefined;
@@ -344,6 +346,7 @@ declare const optionsSchema: z.ZodObject<{
     }[];
     licenseKey?: string | undefined;
     writeFilesToRoot?: boolean | undefined;
+    preserveExistingMessages?: boolean | undefined;
     messages?: {
         id?: {
             lowerCase?: boolean | undefined;

package/dist/index.js

@@ -1543,7 +1543,7 @@ var import_path3 = __toESM(require("path"));
 // package.json
 var package_default = {
   name: "@eventcatalog/generator-asyncapi",
-  version: "6.4.4",
+  version: "7.0.1",
   description: "AsyncAPI generator for EventCatalog",
   scripts: {
     build: "tsup",
@@ -4161,6 +4161,7 @@ var cliArgs = (0, import_minimist.default)(process.argv.slice(2));
 var optionsSchema = import_zod.z.object({
   licenseKey: import_zod.z.string().optional(),
   writeFilesToRoot: import_zod.z.boolean().optional(),
+  preserveExistingMessages: import_zod.z.boolean().optional(),
   services: import_zod.z.array(
     import_zod.z.object({
       id: import_zod.z.string({ required_error: "The service id is required. please provide the service id" }),
@@ -4295,6 +4296,9 @@ var index_default = async (config, options) => {
     versionCommand,
     versionEvent,
     versionQuery,
+    rmCommandById,
+    rmEventById,
+    rmQueryById,
     addSchemaToCommand,
     addSchemaToEvent,
     addSchemaToQuery,
@@ -4314,6 +4318,7 @@ var index_default = async (config, options) => {
       write: writeEvent,
       version: versionEvent,
       get: getEvent,
+      remove: rmEventById,
       addSchema: addSchemaToEvent,
       addExample: addExampleToEvent,
       collection: "events"
@@ -4322,6 +4327,7 @@ var index_default = async (config, options) => {
       write: writeCommand,
       version: versionCommand,
       get: getCommand,
+      remove: rmCommandById,
       addSchema: addSchemaToCommand,
       addExample: addExampleToCommand,
       collection: "commands"
@@ -4330,6 +4336,7 @@ var index_default = async (config, options) => {
       write: writeQuery,
       version: versionQuery,
       get: getQuery,
+      remove: rmQueryById,
       addSchema: addSchemaToQuery,
       addExample: addExampleToQuery,
       collection: "queries"
@@ -4342,7 +4349,8 @@ var index_default = async (config, options) => {
     parseSchemas = true,
     parseChannels = false,
     parseExamples = true,
-    attachHeadersToSchema = false
+    attachHeadersToSchema = false,
+    preserveExistingMessages = true
   } = options;
   console.log(import_chalk4.default.green(`Processing ${services.length} AsyncAPI files...`));
   for (const service of services) {
@@ -4501,7 +4509,8 @@ Processing domain: ${domainName} (v${domainVersion})`));
         const deprecatedDate = message2.extensions().get("x-eventcatalog-deprecated-date")?.value() || null;
         const deprecatedMessage = message2.extensions().get("x-eventcatalog-deprecated-message")?.value() || null;
         const isMessageMarkedAsDraft = isDomainMarkedAsDraft || isServiceMarkedAsDraft || message2.extensions().get("x-eventcatalog-draft")?.value() || null;
-        const serviceOwnsMessageContract = isServiceMessageOwner(message2, operation);
+        const messageOwnership = getMessageOwnership(message2, operation);
+        const serviceOwnsMessageContract = messageOwnership === "owner";
         const isReceived = operation.action() === "receive" || operation.action() === "subscribe";
         const isSent = operation.action() === "send" || operation.action() === "publish";
         let messageId = options.messages?.id?.lowerCase ? message2.id().toLowerCase() : message2.id();
@@ -4519,6 +4528,7 @@ Processing domain: ${domainName} (v${domainVersion})`));
           write: writeMessage,
           version: versionMessage,
           get: getMessage,
+          remove: removeMessage,
           addSchema: addSchemaToMessage,
           addExample: addExampleToMessage,
           collection: folder
@@ -4533,15 +4543,26 @@ Processing domain: ${domainName} (v${domainVersion})`));
         if (options.writeFilesToRoot) {
           messagePath = messageId;
         }
-        if (serviceOwnsMessageContract) {
+        if (messageOwnership === "external") {
+          console.log(import_chalk4.default.yellow(` - Skipping external message: ${getMessageName(message2)}(v${messageVersion})`));
+        } else {
           const catalogedMessage = await getMessage(messageId, "latest");
           let shouldWriteMessage = true;
-          if (catalogedMessage) {
-            messageMarkdown = catalogedMessage.markdown;
+          let existingMessageDirectoryToRelocate = null;
+          if (serviceOwnsMessageContract && catalogedMessage) {
             messageBadges = catalogedMessage.badges || null;
             messageAttachments = catalogedMessage.attachments || null;
+            if (preserveExistingMessages) {
+              messageMarkdown = catalogedMessage.markdown;
+            }
             const catalogedVersion = catalogedMessage.version ?? "";
             if (isSameVersion(catalogedVersion, messageVersion)) {
+              const catalogedMessagePath = await getResourcePath(process.env.PROJECT_DIR, messageId, catalogedVersion);
+              const targetMessageDirectory = import_path3.default.resolve(process.env.PROJECT_DIR, folder, messagePath);
+              const catalogedMessageDirectory = catalogedMessagePath ? import_path3.default.dirname(catalogedMessagePath.fullPath) : null;
+              if (catalogedMessageDirectory && import_path3.default.normalize(catalogedMessageDirectory) !== import_path3.default.normalize(targetMessageDirectory)) {
+                existingMessageDirectoryToRelocate = catalogedMessageDirectory;
+              }
             } else if (isNewerVersion(messageVersion, catalogedVersion)) {
               await versionMessage(messageId);
               console.log(import_chalk4.default.cyan(` - Versioned previous message: (v${catalogedMessage.version})`));
@@ -4554,8 +4575,24 @@ Processing domain: ${domainName} (v${domainVersion})`));
               messageVersion = catalogedVersion;
               shouldWriteMessage = false;
             }
+          } else if (!serviceOwnsMessageContract && catalogedMessage) {
+            console.log(
+              import_chalk4.default.yellow(` - Referencing existing message ${messageId} (v${catalogedMessage.version}) without overwriting`)
+            );
+            messageVersion = catalogedMessage.version ?? messageVersion;
+            shouldWriteMessage = false;
           }
           if (shouldWriteMessage) {
+            if (existingMessageDirectoryToRelocate) {
+              const targetMessageDirectory = import_path3.default.resolve(process.env.PROJECT_DIR, folder, messagePath);
+              await removeMessage(messageId, messageVersion, true);
+              await (0, import_promises.mkdir)(import_path3.default.dirname(targetMessageDirectory), { recursive: true });
+              await (0, import_promises.cp)(existingMessageDirectoryToRelocate, targetMessageDirectory, {
+                recursive: true,
+                force: true
+              });
+              await (0, import_promises.rm)(existingMessageDirectoryToRelocate, { recursive: true, force: true });
+            }
             await writeMessage(
               {
                 id: messageId,
@@ -4573,7 +4610,9 @@ Processing domain: ${domainName} (v${domainVersion})`));
                 ...isMessageMarkedAsDraft && { draft: true }
               },
               {
-                override: true,
+                // References only reach this branch when the message is missing. They may
+                // create a fallback, but only owners may replace an existing contract.
+                override: serviceOwnsMessageContract,
                 path: messagePath
               }
             );
@@ -4607,8 +4646,6 @@ Processing domain: ${domainName} (v${domainVersion})`));
               }
             }
           }
-        } else {
-          console.log(import_chalk4.default.yellow(` - Skipping external message: ${getMessageName(message2)}(v${messageVersion})`));
         }
         const group = options.groupMessagesBy === "x-extension" ? message2.extensions().get("x-eventcatalog-group")?.value() || void 0 : void 0;
         if (parseChannels) {
@@ -4774,10 +4811,17 @@ var getSchemaFromMessagePart = (schema) => {
 var isJSONSchemaMessage = (message2) => {
   return getSchemaFileName(message2).endsWith(".json");
 };
-var isServiceMessageOwner = (message2, operation) => {
+var getMessageOwnership = (message2, operation) => {
   const operationRole = operation?.extensions?.().get?.("x-eventcatalog-role")?.value?.();
   const messageRole = message2.extensions().get("x-eventcatalog-role")?.value();
-  const value = operationRole || messageRole || "provider";
-  return value === "provider";
+  const explicitRole = operationRole || messageRole;
+  if (explicitRole) {
+    return explicitRole === "provider" ? "owner" : "external";
+  }
+  const action = operation?.action?.();
+  if (action === "receive" || action === "subscribe") {
+    return "reference";
+  }
+  return "owner";
 };
 //# sourceMappingURL=index.js.map