feat!: improve anonym messages (#2367)

jonaslagoni · web-flow · commit a1c2d61a8e59 · 2025-11-05T18:12:37.000+01:00
diff --git a/docs/migrations/version-5-to-6.md b/docs/migrations/version-5-to-6.md
@@ -51,3 +51,72 @@ const models = await generator.generateCompleteModels(schema, {
 ```
 
 The generated Python code behavior remains unchanged - all imports will continue to use the explicit style.
+
+## AsyncAPI
+
+### Multiple messages in operations now generate individual models
+
+When processing AsyncAPI v3 documents with multiple messages in a single operation, Modelina now correctly generates individual models for each message payload in addition to the `oneOf` wrapper model.
+
+**Example AsyncAPI Document:**
+```yaml
+asyncapi: 3.0.0
+info:
+  title: User Service
+  version: 1.0.0
+channels:
+  userEvents:
+    address: user/events
+    messages:
+      UserCreated:
+        $ref: '#/components/messages/UserCreated'
+      UserUpdated:
+        $ref: '#/components/messages/UserUpdated'
+operations:
+  onUserEvents:
+    action: receive
+    channel:
+      $ref: '#/channels/userEvents'
+    messages:
+      - $ref: '#/channels/userEvents/messages/UserCreated'
+      - $ref: '#/channels/userEvents/messages/UserUpdated'
+components:
+  messages:
+    UserCreated:
+      payload:
+        type: object
+        properties:
+          id:
+            type: string
+          name:
+            type: string
+    UserUpdated:
+      payload:
+        type: object
+        properties:
+          id:
+            type: string
+          name:
+            type: string
+          updatedAt:
+            type: string
+```
+
+**Before (v5):**
+```typescript
+const generator = new JavaGenerator();
+const models = await generator.generate(inputModel);
+// Problem: No UserCreated or UserUpdated classes were generated
+```
+
+**After (v6):**
+```typescript
+const generator = new JavaGenerator();
+const models = await generator.generate(inputModel);
+// ✓ Now generates:
+//   - UserCreatedPayload.java
+//   - UserUpdatedPayload.java
+//   - userEvents interface (discriminated union)
+```
+
+No code changes are required. This is an enhancement that fixes incomplete model generation. If you have custom post-processing logic that filters generated models, you may need to adjust it to handle the additional models.
diff --git a/examples/file-uri-input/__snapshots__/index.spec.ts.snap b/examples/file-uri-input/__snapshots__/index.spec.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`Should be able to render models using file URI as input with file generator and should log expected output to console 1`] = `
 Array [
-  "class AnonymousSchema_1 {
+  "class UserSignedUpPayload {
   private _displayName?: string;
   private _email?: string;
   private _additionalProperties?: Map<string, any>;
@@ -31,7 +31,7 @@ Array [
 
 exports[`Should be able to render models using file URI as input with regular generator and should log expected output to console 1`] = `
 Array [
-  "class AnonymousSchema_1 {
+  "class UserSignedUpPayload {
   private _displayName?: string;
   private _email?: string;
   private _additionalProperties?: Map<string, any>;
diff --git a/src/processors/AsyncAPIInputProcessor.ts b/src/processors/AsyncAPIInputProcessor.ts
@@ -102,8 +102,15 @@ export class AsyncAPIInputProcessor extends AbstractInputProcessor {
 
     inputModel.originalInput = doc;
 
-    const addToInputModel = (payload: AsyncAPISchemaInterface) => {
-      const schema = AsyncAPIInputProcessor.convertToInternalSchema(payload);
+    const addToInputModel = (
+      payload: AsyncAPISchemaInterface,
+      inferredName?: string
+    ) => {
+      const schema = AsyncAPIInputProcessor.convertToInternalSchema(
+        payload,
+        new Map(),
+        inferredName
+      );
       const newMetaModel = JsonSchemaInputProcessor.convertSchemaToMetaModel(
         schema,
         options
@@ -150,9 +157,15 @@ export class AsyncAPIInputProcessor extends AbstractInputProcessor {
 
               addToInputModel(payload);
             } else if (messages.length === 1) {
-              const payload = messages[0].payload();
+              const message = messages[0];
+              const payload = message.payload();
               if (payload) {
-                addToInputModel(payload);
+                // Use message id with 'Payload' suffix as the inferred name for the payload schema
+                // This avoids potential collisions with component schemas that might have the same name
+                const messageName = message.id()
+                  ? `${message.id()}Payload`
+                  : undefined;
+                addToInputModel(payload, messageName);
               }
             }
           };
@@ -175,7 +188,12 @@ export class AsyncAPIInputProcessor extends AbstractInputProcessor {
       for (const message of doc.allMessages()) {
         const payload = message.payload();
         if (payload) {
-          addToInputModel(payload);
+          // Use message id with 'Payload' suffix as the inferred name for the payload schema
+          // This avoids potential collisions with component schemas that might have the same name
+          const messageName = message.id()
+            ? `${message.id()}Payload`
+            : undefined;
+          addToInputModel(payload, messageName);
         }
       }
     }
@@ -190,12 +208,15 @@ export class AsyncAPIInputProcessor extends AbstractInputProcessor {
    * This keeps the the id of the model deterministic if used in conjunction with other AsyncAPI tools such as the generator.
    *
    * @param schema to reflect name for
+   * @param alreadyIteratedSchemas map of already processed schemas
+   * @param inferredName optional name to use instead of the schema id (e.g., message name)
    */
   /* eslint-disable @typescript-eslint/no-non-null-assertion */
   // eslint-disable-next-line sonarjs/cognitive-complexity
   static convertToInternalSchema(
     schema: AsyncAPISchemaInterface | boolean,
-    alreadyIteratedSchemas: Map<string, AsyncapiV2Schema> = new Map()
+    alreadyIteratedSchemas: Map<string, AsyncapiV2Schema> = new Map(),
+    inferredName?: string
   ): AsyncapiV2Schema | boolean {
     if (typeof schema === 'boolean') {
       return schema;
@@ -207,10 +228,16 @@ export class AsyncAPIInputProcessor extends AbstractInputProcessor {
       typeof schemaUid !== 'undefined' &&
       schemaUid.includes('<anonymous-schema')
     ) {
-      schemaUid = schemaUid
-        .replace('<', '')
-        .replace(/-/g, '_')
-        .replace('>', '');
+      // If an inferred name is provided and this is an anonymous schema, use the inferred name
+      // Only use inferred name if it's not also an anonymous message
+      if (inferredName && !inferredName.includes('<anonymous-message')) {
+        schemaUid = inferredName;
+      } else {
+        schemaUid = schemaUid
+          .replace('<', '')
+          .replace(/-/g, '_')
+          .replace('>', '');
+      }
     }
 
     if (alreadyIteratedSchemas.has(schemaUid)) {
diff --git a/test/generators/typescript/__snapshots__/TypeScriptGenerator.spec.ts.snap b/test/generators/typescript/__snapshots__/TypeScriptGenerator.spec.ts.snap
@@ -2,7 +2,7 @@
 
 exports[`TypeScriptGenerator AsyncAPI with polymorphism should render 6 models (1 oneOf, 3 classes and 2 enums) 1`] = `
 Array [
-  "type AnonymousSchema_1 = Cat | Dog | StickInsect;",
+  "type PetMessagePayload = Cat | Dog | StickInsect;",
   "class Cat {
   private _petType: PetType.CAT = PetType.CAT;
   private _reservedName: string;
diff --git a/test/processors/__snapshots__/AsyncAPIInputProcessor.spec.ts.snap b/test/processors/__snapshots__/AsyncAPIInputProcessor.spec.ts.snap
@@ -2,8 +2,8 @@
 
 exports[`AsyncAPIInputProcessor process() should be able to process YAML file 1`] = `
 Object {
-  "anonymous_schema_1": ObjectModel {
-    "name": "anonymous_schema_1",
+  "UserSignedUpPayload": ObjectModel {
+    "name": "UserSignedUpPayload",
     "options": Object {
       "isNullable": false,
     },
@@ -24,7 +24,7 @@ Object {
         },
       },
       "type": "object",
-      "x-modelgen-inferred-name": "anonymous_schema_1",
+      "x-modelgen-inferred-name": "UserSignedUpPayload",
       "x-parser-schema-id": "<anonymous-schema-1>",
     },
     "properties": Object {
@@ -101,8 +101,8 @@ Object {
 
 exports[`AsyncAPIInputProcessor process() should be able to process file 1`] = `
 Object {
-  "anonymous_schema_1": ObjectModel {
-    "name": "anonymous_schema_1",
+  "UserSignedUpPayload": ObjectModel {
+    "name": "UserSignedUpPayload",
     "options": Object {
       "isNullable": false,
     },
@@ -123,7 +123,7 @@ Object {
         },
       },
       "type": "object",
-      "x-modelgen-inferred-name": "anonymous_schema_1",
+      "x-modelgen-inferred-name": "UserSignedUpPayload",
       "x-parser-schema-id": "<anonymous-schema-1>",
     },
     "properties": Object {
@@ -6616,8 +6616,8 @@ InputMetaModel {
 exports[`AsyncAPIInputProcessor process() should be able to process pure object for v3 1`] = `
 InputMetaModel {
   "models": Object {
-    "anonymous_schema_1": ObjectModel {
-      "name": "anonymous_schema_1",
+    "userSignUpMessagePayload": ObjectModel {
+      "name": "userSignUpMessagePayload",
       "options": Object {
         "isNullable": false,
       },
@@ -6631,7 +6631,7 @@ InputMetaModel {
           },
         },
         "type": "object",
-        "x-modelgen-inferred-name": "anonymous_schema_1",
+        "x-modelgen-inferred-name": "userSignUpMessagePayload",
         "x-parser-schema-id": "<anonymous-schema-1>",
       },
       "properties": Object {
