feat: adds java interfaces when using allof

asyncapi · Nov 10, 2023 · 703336d · 703336d
1 parent 145fcf6
commit 703336d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/helpers/CommonModelToMetaModel.ts b/src/helpers/CommonModelToMetaModel.ts
@@ -514,10 +514,10 @@ export function convertToObjectModel(
     metaModel.properties[String(propertyName)] = propertyModel;
   }
 
-  if (jsonSchemaModel.extend) {
+  if (jsonSchemaModel.extend?.length) {
     metaModel.options.extend = [];
 
-    for (const [, extend] of Array.from(jsonSchemaModel.extend)) {
+    for (const extend of jsonSchemaModel.extend) {
       metaModel.options.extend.push(
         convertToMetaModel(extend, alreadySeenModels)
       );

diff --git a/src/helpers/ConstrainHelpers.ts b/src/helpers/ConstrainHelpers.ts
@@ -460,7 +460,7 @@ function constrainObjectModel<
 ): ConstrainedObjectModel {
   const options = getConstrainedMetaModelOptions(context.metaModel);
 
-  if (context.metaModel.options.extend) {
+  if (context.metaModel.options.extend?.length) {
     options.extend = [];
 
     for (const extend of context.metaModel.options.extend) {

diff --git a/src/models/CommonModel.ts b/src/models/CommonModel.ts
@@ -15,7 +15,7 @@ export const defaultMergingOptions: MergingOptions = {
  * Common internal representation for a model.
  */
 export class CommonModel {
-  extend?: Map<string, CommonModel>;
+  extend?: CommonModel[];
   originalInput?: any;
   $id?: string;
   type?: string | string[];
@@ -437,19 +437,19 @@ export class CommonModel {
       );
       return;
     }
-    this.extend = this.extend ?? new Map<string, CommonModel>();
-    if (this.extend.has(extendedModel.$id)) {
+
+    if (
+      this.extend?.find((commonModel) => commonModel.$id === extendedModel.$id)
+    ) {
       Logger.info(
         `${this.$id} model already extends model ${extendedModel.$id}.`,
         this,
         extendedModel
       );
       return;
     }
-    this.extend.set(
-      extendedModel.$id,
-      CommonModel.toCommonModel(extendedModel)
-    );
+    this.extend = this.extend ?? [];
+    this.extend.push(extendedModel);
   }
 
   /**