Merge branch 'master' into master

Author: asyncapi-bot

Dockerfile

@@ -17,8 +17,6 @@ ENV PATH="${PATH}:/usr/local/go/bin"
 
 # Install dotnet SDK
 RUN apt install apt-transport-https dirmngr gnupg ca-certificates -yq  \
-    && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF \
-    && echo "deb https://download.mono-project.com/repo/ubuntu stable-jammy main"| tee /etc/apt/sources.list.d/mono-official-stable.list \
     && apt update -yq  \
     && apt install mono-devel -yq
 

modelina-cli/package-lock.json

@@ -5,7 +5,6 @@ import { FormatHelpers } from '../../helpers/FormatHelpers';
 import {
   deriveCopy,
   deriveHash,
-  derivePartialEq,
   deriveEq,
   derivePartialOrd,
   deriveOrd
@@ -37,16 +36,20 @@ export abstract class RustRenderer<
   }
 
   renderMacro(model: ConstrainedMetaModel): string {
-    const derive: string[] = ['Serialize', 'Deserialize', 'Clone', 'Debug'];
+    const derive: string[] = [
+      'Serialize',
+      'Deserialize',
+      'Clone',
+      'Debug',
+      'PartialEq'
+    ];
+
     if (deriveHash(model)) {
       derive.push('Hash');
     }
     if (deriveCopy(model)) {
       derive.push('Copy');
     }
-    if (derivePartialEq(model)) {
-      derive.push('PartialEq');
-    }
     if (deriveEq(model)) {
       derive.push('Eq');
     }
@@ -56,6 +59,7 @@ export abstract class RustRenderer<
     if (deriveOrd(model)) {
       derive.push('Ord');
     }
+
     derive.sort();
     return `#[derive(${derive.join(', ')})]`;
   }

package-lock.json

@@ -1,5 +1,5 @@
 import { Constraints } from '../../helpers';
-import { ConstrainedEnumValueModel } from '../../models';
+import { ConstrainedEnumValueModel, ConstrainedEnumModel } from '../../models';
 import {
   defaultEnumKeyConstraints,
   defaultEnumValueConstraints
@@ -78,6 +78,9 @@ export const ScalaDefaultTypeMapping: ScalaTypeMapping = {
     return constrainedModel.name;
   },
   Reference({ constrainedModel }): string {
+    if (constrainedModel.ref instanceof ConstrainedEnumModel) {
+      return `${constrainedModel.name}.Value`;
+    }
     return constrainedModel.name;
   },
   Any(): string {

src/generators/rust/RustRenderer.ts

@@ -550,13 +550,13 @@ describe('RustRenderer', () => {
       );
 
       expect(renderer.renderMacro(arrayModel)).toEqual(
-        '#[derive(Clone, Debug, Deserialize, Serialize)]'
+        '#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]'
       );
       expect(renderer.renderMacro(enumModel)).toEqual(
-        '#[derive(Clone, Debug, Deserialize, Serialize)]'
+        '#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]'
       );
       expect(renderer.renderMacro(objectModel)).toEqual(
-        '#[derive(Clone, Debug, Deserialize, Serialize)]'
+        '#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]'
       );
     });
   });