Merge branch 'master' into feat/docs

.github/workflows/runtime-csharp-testing.yml

@@ -0,0 +1,43 @@
+name: Runtime Testing C# Models
+on: 
+  push:
+  pull_request:
+    types: [opened, synchronize, reopened, ready_for_review]
+    paths: 
+      - 'src/generators/csharp/**'
+      - 'test/runtime/runtime-csharp/**'
+      - 'test/runtime/**csharp**'
+
+jobs:
+  test:
+    name: Runtime Testing C# Models
+    if: "github.event.pull_request.draft == false &&!((github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'ci: update global workflows')) || (github.actor == 'asyncapi-bot' && startsWith(github.event.pull_request.title, 'chore(release):')) || (github.actor == 'allcontributors' && startsWith(github.event.pull_request.title, 'docs: add')))"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v3
+      - name: Check package-lock version
+        uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
+        id: lockversion
+      - name: Setup Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: "${{ steps.lockversion.outputs.version }}"
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
+      - if: matrix.os != 'windows-latest'
+        name: Setup dotnet
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: '6.0.x'
+      - if: matrix.os == 'windows-latest'
+        name: Setup csc.exe
+        uses: yoavain/Setup-CSC@v7
+      - name: Build library
+        run: npm install && npm run build:prod
+      - name: Generate C# models
+        run: npm run generate:runtime:csharp        
+      - name: Run runtime tests
+        run: npm run test:runtime:csharp
+
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asyncapi/modelina",
-  "version": "1.8.11",
+  "version": "1.8.12",
   "description": "Library for generating data models based on inputs such as AsyncAPI, OpenAPI, or JSON Schema documents",
   "license": "Apache-2.0",
   "homepage": "https://www.modelina.org",
@@ -110,6 +110,8 @@
     "generate:runtime:php": "cross-env CI=true ts-node ./test/runtime/runtime-php.ts",
     "test:runtime:typescript": "cd ./test/runtime/runtime-typescript && npm i && npm run test",
     "generate:runtime:typescript": "cross-env CI=true ts-node ./test/runtime/runtime-typescript.ts",
+    "test:runtime:csharp": "cross-env CI=true jest ./test/runtime/runtime-csharp.spec.ts",
+    "generate:runtime:csharp": "cross-env CI=true ts-node ./test/runtime/runtime-csharp.ts",
     "test:watch": "jest --watch",
     "docs": "npm run docs:api",
     "docs:api": "typedoc src/index.ts --out ./modelina-website/public/docs/api/generated --name Modelina",

src/generators/csharp/presets/JsonSerializerPreset.ts

@@ -50,12 +50,13 @@ if (${modelInstanceVariable} != null) {
     ${renderSerializeProperty('unwrappedProperty.Value', propertyModel)}
   }
 }`;
-      }
-      serializeProperties += `if(${modelInstanceVariable} != null) {
+      } else {
+        serializeProperties += `if(${modelInstanceVariable} != null) {
   // write property name and let the serializer serialize the value itself
   writer.WritePropertyName("${propertyModel.unconstrainedPropertyName}");
   ${renderSerializeProperty(modelInstanceVariable, propertyModel)}
 }\n`;
+      }
     }
   }
   return serializeProperties;

test/generators/csharp/presets/__snapshots__/JsonSerializerPreset.spec.ts.snap

@@ -147,13 +147,8 @@ internal class TestConverter : JsonConverter<Test>
         writer.WritePropertyName(unwrappedProperty.Key);
         JsonSerializer.Serialize(writer, unwrappedProperty.Value, options);
       }
-    }if(value.AdditionalProperties != null) {
-      // write property name and let the serializer serialize the value itself
-      writer.WritePropertyName(\\"additionalProperties\\");
-      JsonSerializer.Serialize(writer, value.AdditionalProperties, options);
     }
 
-
     writer.WriteEndObject();
   }
 
@@ -292,13 +287,8 @@ internal class NestedTestConverter : JsonConverter<NestedTest>
         writer.WritePropertyName(unwrappedProperty.Key);
         JsonSerializer.Serialize(writer, unwrappedProperty.Value, options);
       }
-    }if(value.AdditionalProperties != null) {
-      // write property name and let the serializer serialize the value itself
-      writer.WritePropertyName(\\"additionalProperties\\");
-      JsonSerializer.Serialize(writer, value.AdditionalProperties, options);
     }
 
-
     writer.WriteEndObject();
   }
 

test/runtime/runtime-csharp.spec.ts

@@ -0,0 +1,12 @@
+import { execCommand } from '../blackbox/utils/Utils';
+import path from 'path';
+
+jest.setTimeout(50000);
+
+test('C# runtime testing', async () => {
+  const compileCommand = `cd ${path.resolve(
+    __dirname,
+    './runtime-csharp'
+  )} && dotnet test runtime-csharp`;
+  await execCommand(compileCommand);
+});

test/runtime/runtime-csharp.ts

@@ -0,0 +1,17 @@
+import { CSHARP_JSON_SERIALIZER_PRESET, CSharpFileGenerator } from '../../';
+import path from 'path';
+import input from './generic-input.json';
+
+const generator = new CSharpFileGenerator({
+  presets: [CSHARP_JSON_SERIALIZER_PRESET]
+});
+
+generator.generateToFiles(
+  input,
+  path.resolve(
+    // eslint-disable-next-line no-undef
+    __dirname,
+    './runtime-csharp/runtime-csharp/src/models/json_serializer'
+  ),
+  { namespace: 'com.mycompany.app.generic' }
+);