Merge master into dependabot/npm_and_yarn/modelina-cli/cross-spawn-7.0.6

Author: asyncapi-bot-eve

src/helpers/CommonModelToMetaModel.ts

@@ -359,9 +359,19 @@ export function convertToAnyModel(
   if (!Array.isArray(jsonSchemaModel.type) || !isAnyType) {
     return undefined;
   }
+  let originalInput = jsonSchemaModel.originalInput;
+  if (typeof jsonSchemaModel.originalInput !== 'object') {
+    originalInput = {
+      value: jsonSchemaModel.originalInput,
+      ...(jsonSchemaModel.originalInput?.description !== undefined && {
+        description: jsonSchemaModel.originalInput.description
+      })
+    };
+  }
+
   return new AnyModel(
     name,
-    jsonSchemaModel.originalInput,
+    originalInput,
     getMetaModelOptions(jsonSchemaModel, options)
   );
 }
@@ -519,9 +529,17 @@ export function convertToDictionaryModel(
     getOriginalInputFromAdditionalAndPatterns(jsonSchemaModel);
   const keyModel = new StringModel(name, originalInput, {});
   const valueModel = convertAdditionalAndPatterns(context);
+
+  const input = {
+    originalInput,
+    ...(jsonSchemaModel.originalInput?.description !== undefined && {
+      description: jsonSchemaModel.originalInput.description
+    })
+  };
+
   return new DictionaryModel(
     name,
-    originalInput,
+    input,
     getMetaModelOptions(jsonSchemaModel, options),
     keyModel,
     valueModel,

test/generators/go/presets/DescriptionPreset.spec.ts

@@ -17,6 +17,12 @@ const doc = {
       additionalProperties: false,
       $id: 'NestedTest',
       properties: { stringProp: { type: 'string', description: 'string prop' } }
+    },
+    anyProp: {
+      type: 'object',
+      $id: 'AnyTest',
+      properties: {},
+      description: 'AnyTest description'
     }
   }
 };

test/generators/go/presets/__snapshots__/DescriptionPreset.spec.ts.snap

@@ -7,6 +7,8 @@ type Test struct {
   // Description
   NumberProp float64
   ObjectProp *NestedTest
+  // AnyTest description
+  AnyProp map[string]interface{}
 }"
 `;
 

test/generators/java/presets/DescriptionPreset.spec.ts

@@ -20,6 +20,12 @@ describe('JAVA_DESCRIPTION_PRESET', () => {
           type: 'string',
           description: 'Description for prop',
           examples: ['exampleValue']
+        },
+        anyProp: {
+          type: 'object',
+          $id: 'AnyTest',
+          properties: {},
+          description: 'AnyTest description'
         }
       }
     };

test/generators/java/presets/__snapshots__/DescriptionPreset.spec.ts.snap

@@ -66,6 +66,7 @@ exports[`JAVA_DESCRIPTION_PRESET should render description and examples for clas
  */
 public class Clazz {
   private String prop;
+  private Map<String, Object> anyProp;
   private Map<String, Object> additionalProperties;
 
   /**
@@ -75,6 +76,12 @@ public class Clazz {
   public String getProp() { return this.prop; }
   public void setProp(String prop) { this.prop = prop; }
 
+  /**
+   * AnyTest description
+   */
+  public Map<String, Object> getAnyProp() { return this.anyProp; }
+  public void setAnyProp(Map<String, Object> anyProp) { this.anyProp = anyProp; }
+
   public Map<String, Object> getAdditionalProperties() { return this.additionalProperties; }
   public void setAdditionalProperties(Map<String, Object> additionalProperties) { this.additionalProperties = additionalProperties; }
 }"

test/generators/kotlin/presets/DescriptionPreset.spec.ts

@@ -20,6 +20,12 @@ describe('KOTLIN_DESCRIPTION_PRESET', () => {
           type: 'string',
           description: 'Description for prop',
           examples: ['exampleValue']
+        },
+        anyProp: {
+          type: 'object',
+          $id: 'AnyTest',
+          properties: {},
+          description: 'AnyTest description'
         }
       }
     };

test/generators/kotlin/presets/__snapshots__/DescriptionPreset.spec.ts.snap

@@ -5,13 +5,15 @@ exports[`KOTLIN_DESCRIPTION_PRESET should render description and examples for cl
  * Description for class
  * 
  * @property prop Description for prop
+ * @property anyProp AnyTest description
  * @property additionalProperties
  * 
  * Examples: 
  * {\\"prop\\":\\"value\\"}
  */
 data class Clazz(
     val prop: String? = null,
+    val anyProp: Map<String, Any>? = null,
     val additionalProperties: Map<String, Any>? = null,
 )"
 `;

test/generators/php/presets/DescriptionPreset.spec.ts

@@ -22,6 +22,12 @@ describe('PHP_DESCRIPTION_PRESET', () => {
           type: 'string',
           description: 'Description for prop',
           examples: ['exampleValue']
+        },
+        anyProp: {
+          type: 'object',
+          $id: 'AnyTest',
+          properties: {},
+          description: 'AnyTest description'
         }
       }
     };

test/generators/php/presets/__snapshots__/DescriptionPreset.spec.ts.snap

@@ -7,11 +7,15 @@ exports[`PHP_DESCRIPTION_PRESET should render description and examples for class
 final class Clazz
 {
   private ?string $prop;
+  private mixed $anyProp;
   private mixed $additionalProperties;
 
   public function getProp(): ?string { return $this->prop; }
   public function setProp(?string $prop): void { $this->prop = $prop; }
 
+  public function getAnyProp(): mixed { return $this->anyProp; }
+  public function setAnyProp(mixed $anyProp): void { $this->anyProp = $anyProp; }
+
   public function getAdditionalProperties(): mixed { return $this->additionalProperties; }
   public function setAdditionalProperties(mixed $additionalProperties): void { $this->additionalProperties = $additionalProperties; }
 }

test/generators/scala/presets/DescriptionPreset.spec.ts

@@ -20,6 +20,12 @@ describe('SCALA_DESCRIPTION_PRESET', () => {
           type: 'string',
           description: 'Description for prop',
           examples: ['exampleValue']
+        },
+        anyProp: {
+          type: 'object',
+          $id: 'AnyTest',
+          properties: {},
+          description: 'AnyTest description'
         }
       }
     };