chore: update modelina dependency

.github/workflows/pull-request-example-testing.yml

@@ -5,19 +5,25 @@ on:
     types: [synchronize]
 
 jobs:
-  test:
+  integration-tests:
+    name: Integration tests - ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
     if: github.event.pull_request.draft == false
-    name: 'Run example tests'
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
       - name: Setup Node.js
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
-          node-version: 13
+          node-version: 14
+          cache: 'npm'
+          cache-dependency-path: '**/package-lock.json'
       - name: Install dependencies
-        run: npm ci
+        run: npm install --loglevel verbose
       - name: Build the docker-compose stack
         run: cd examples && docker-compose up -d
       - name: Check running containers

examples/simple-publish/asyncapi-nats-client/src/models/TurnOn.ts

@@ -1,31 +1,31 @@
 
-
 class TurnOn {
   private _lumen: number;
-  private _additionalProperties?: Map<String, object | string | number | Array<unknown> | boolean | null>;
+  private _additionalProperties?: Map<string, any>;
 
   constructor(input: {
     lumen: number,
+    additionalProperties?: Map<string, any>,
   }) {
     this._lumen = input.lumen;
+    this._additionalProperties = input.additionalProperties;
   }
 
   get lumen(): number { return this._lumen; }
   set lumen(lumen: number) { this._lumen = lumen; }
 
-  get additionalProperties(): Map<String, object | string | number | Array<unknown> | boolean | null> | undefined { return this._additionalProperties; }
-  set additionalProperties(additionalProperties: Map<String, object | string | number | Array<unknown> | boolean | null> | undefined) { this._additionalProperties = additionalProperties; }
+  get additionalProperties(): Map<string, any> | undefined { return this._additionalProperties; }
+  set additionalProperties(additionalProperties: Map<string, any> | undefined) { this._additionalProperties = additionalProperties; }
 
   public marshal() : string {
     let json = '{'
     if(this.lumen !== undefined) {
       json += `"lumen": ${typeof this.lumen === 'number' || typeof this.lumen === 'boolean' ? this.lumen : JSON.stringify(this.lumen)},`; 
     }
-
     if(this.additionalProperties !== undefined) { 
-      for (const [key, value] of this.additionalProperties.entries()) {
-        //Only render additionalProperties which are not already a property
-        if(Object.keys(this).includes(String(key))) continue;
+    for (const [key, value] of this.additionalProperties.entries()) {
+      //Only unwrap those who are not already a property in the JSON object
+      if(Object.keys(this).includes(String(key))) continue;
         json += `"${key}": ${typeof value === 'number' || typeof value === 'boolean' ? value : JSON.stringify(value)},`;
       }
     }
@@ -42,13 +42,11 @@ class TurnOn {
       instance.lumen = obj["lumen"];
     }
 
-    //Not part of core properties
-
     if (instance.additionalProperties === undefined) {instance.additionalProperties = new Map();}
-    for (const [key, value] of Object.entries(obj).filter((([key,]) => {return !["lumen"].includes(key);}))) {
-
-      instance.additionalProperties.set(key, value as any);
-    }
+      for (const [key, value] of Object.entries(obj).filter((([key,]) => {return !["lumen","additionalProperties"].includes(key);}))) {
+        instance.additionalProperties.set(key, value as any);
+      }
+
     return instance;
   }
 }

examples/simple-reply/asyncapi-nats-client/src/models/GeneralReply.ts

@@ -1,16 +1,17 @@
 
-
 class GeneralReply {
   private _statusCode?: number;
   private _statusMessage?: string;
-  private _additionalProperties?: Map<String, object | string | number | Array<unknown> | boolean | null>;
+  private _additionalProperties?: Map<string, any>;
 
   constructor(input: {
     statusCode?: number,
     statusMessage?: string,
+    additionalProperties?: Map<string, any>,
   }) {
     this._statusCode = input.statusCode;
     this._statusMessage = input.statusMessage;
+    this._additionalProperties = input.additionalProperties;
   }
 
   get statusCode(): number | undefined { return this._statusCode; }
@@ -19,8 +20,8 @@ class GeneralReply {
   get statusMessage(): string | undefined { return this._statusMessage; }
   set statusMessage(statusMessage: string | undefined) { this._statusMessage = statusMessage; }
 
-  get additionalProperties(): Map<String, object | string | number | Array<unknown> | boolean | null> | undefined { return this._additionalProperties; }
-  set additionalProperties(additionalProperties: Map<String, object | string | number | Array<unknown> | boolean | null> | undefined) { this._additionalProperties = additionalProperties; }
+  get additionalProperties(): Map<string, any> | undefined { return this._additionalProperties; }
+  set additionalProperties(additionalProperties: Map<string, any> | undefined) { this._additionalProperties = additionalProperties; }
 
   public marshal() : string {
     let json = '{'
@@ -30,11 +31,10 @@ class GeneralReply {
     if(this.statusMessage !== undefined) {
       json += `"status_message": ${typeof this.statusMessage === 'number' || typeof this.statusMessage === 'boolean' ? this.statusMessage : JSON.stringify(this.statusMessage)},`; 
     }
-
     if(this.additionalProperties !== undefined) { 
-      for (const [key, value] of this.additionalProperties.entries()) {
-        //Only render additionalProperties which are not already a property
-        if(Object.keys(this).includes(String(key))) continue;
+    for (const [key, value] of this.additionalProperties.entries()) {
+      //Only unwrap those who are not already a property in the JSON object
+      if(Object.keys(this).includes(String(key))) continue;
         json += `"${key}": ${typeof value === 'number' || typeof value === 'boolean' ? value : JSON.stringify(value)},`;
       }
     }
@@ -54,13 +54,11 @@ class GeneralReply {
       instance.statusMessage = obj["status_message"];
     }
 
-    //Not part of core properties
-
     if (instance.additionalProperties === undefined) {instance.additionalProperties = new Map();}
-    for (const [key, value] of Object.entries(obj).filter((([key,]) => {return !["status_code","status_message"].includes(key);}))) {
-
-      instance.additionalProperties.set(key, value as any);
-    }
+      for (const [key, value] of Object.entries(obj).filter((([key,]) => {return !["statusCode","statusMessage","additionalProperties"].includes(key);}))) {
+        instance.additionalProperties.set(key, value as any);
+      }
+
     return instance;
   }
 }

examples/simple-reply/asyncapi-nats-client/src/models/TurnOnRequest.ts

@@ -1,31 +1,31 @@
 
-
 class TurnOnRequest {
   private _lumen: number;
-  private _additionalProperties?: Map<String, object | string | number | Array<unknown> | boolean | null>;
+  private _additionalProperties?: Map<string, any>;
 
   constructor(input: {
     lumen: number,
+    additionalProperties?: Map<string, any>,
   }) {
     this._lumen = input.lumen;
+    this._additionalProperties = input.additionalProperties;
   }
 
   get lumen(): number { return this._lumen; }
   set lumen(lumen: number) { this._lumen = lumen; }
 
-  get additionalProperties(): Map<String, object | string | number | Array<unknown> | boolean | null> | undefined { return this._additionalProperties; }
-  set additionalProperties(additionalProperties: Map<String, object | string | number | Array<unknown> | boolean | null> | undefined) { this._additionalProperties = additionalProperties; }
+  get additionalProperties(): Map<string, any> | undefined { return this._additionalProperties; }
+  set additionalProperties(additionalProperties: Map<string, any> | undefined) { this._additionalProperties = additionalProperties; }
 
   public marshal() : string {
     let json = '{'
     if(this.lumen !== undefined) {
       json += `"lumen": ${typeof this.lumen === 'number' || typeof this.lumen === 'boolean' ? this.lumen : JSON.stringify(this.lumen)},`; 
     }
-
     if(this.additionalProperties !== undefined) { 
-      for (const [key, value] of this.additionalProperties.entries()) {
-        //Only render additionalProperties which are not already a property
-        if(Object.keys(this).includes(String(key))) continue;
+    for (const [key, value] of this.additionalProperties.entries()) {
+      //Only unwrap those who are not already a property in the JSON object
+      if(Object.keys(this).includes(String(key))) continue;
         json += `"${key}": ${typeof value === 'number' || typeof value === 'boolean' ? value : JSON.stringify(value)},`;
       }
     }
@@ -42,13 +42,11 @@ class TurnOnRequest {
       instance.lumen = obj["lumen"];
     }
 
-    //Not part of core properties
-
     if (instance.additionalProperties === undefined) {instance.additionalProperties = new Map();}
-    for (const [key, value] of Object.entries(obj).filter((([key,]) => {return !["lumen"].includes(key);}))) {
-
-      instance.additionalProperties.set(key, value as any);
-    }
+      for (const [key, value] of Object.entries(obj).filter((([key,]) => {return !["lumen","additionalProperties"].includes(key);}))) {
+        instance.additionalProperties.set(key, value as any);
+      }
+
     return instance;
   }
 }

examples/simple-request/asyncapi-nats-client/src/models/GeneralReply.ts

@@ -1,16 +1,17 @@
 
-
 class GeneralReply {
   private _statusCode?: number;
   private _statusMessage?: string;
-  private _additionalProperties?: Map<String, object | string | number | Array<unknown> | boolean | null>;
+  private _additionalProperties?: Map<string, any>;
 
   constructor(input: {
     statusCode?: number,
     statusMessage?: string,
+    additionalProperties?: Map<string, any>,
   }) {
     this._statusCode = input.statusCode;
     this._statusMessage = input.statusMessage;
+    this._additionalProperties = input.additionalProperties;
   }
 
   get statusCode(): number | undefined { return this._statusCode; }
@@ -19,8 +20,8 @@ class GeneralReply {
   get statusMessage(): string | undefined { return this._statusMessage; }
   set statusMessage(statusMessage: string | undefined) { this._statusMessage = statusMessage; }
 
-  get additionalProperties(): Map<String, object | string | number | Array<unknown> | boolean | null> | undefined { return this._additionalProperties; }
-  set additionalProperties(additionalProperties: Map<String, object | string | number | Array<unknown> | boolean | null> | undefined) { this._additionalProperties = additionalProperties; }
+  get additionalProperties(): Map<string, any> | undefined { return this._additionalProperties; }
+  set additionalProperties(additionalProperties: Map<string, any> | undefined) { this._additionalProperties = additionalProperties; }
 
   public marshal() : string {
     let json = '{'
@@ -30,11 +31,10 @@ class GeneralReply {
     if(this.statusMessage !== undefined) {
       json += `"status_message": ${typeof this.statusMessage === 'number' || typeof this.statusMessage === 'boolean' ? this.statusMessage : JSON.stringify(this.statusMessage)},`; 
     }
-
     if(this.additionalProperties !== undefined) { 
-      for (const [key, value] of this.additionalProperties.entries()) {
-        //Only render additionalProperties which are not already a property
-        if(Object.keys(this).includes(String(key))) continue;
+    for (const [key, value] of this.additionalProperties.entries()) {
+      //Only unwrap those who are not already a property in the JSON object
+      if(Object.keys(this).includes(String(key))) continue;
         json += `"${key}": ${typeof value === 'number' || typeof value === 'boolean' ? value : JSON.stringify(value)},`;
       }
     }
@@ -54,13 +54,11 @@ class GeneralReply {
       instance.statusMessage = obj["status_message"];
     }
 
-    //Not part of core properties
-
     if (instance.additionalProperties === undefined) {instance.additionalProperties = new Map();}
-    for (const [key, value] of Object.entries(obj).filter((([key,]) => {return !["status_code","status_message"].includes(key);}))) {
-
-      instance.additionalProperties.set(key, value as any);
-    }
+      for (const [key, value] of Object.entries(obj).filter((([key,]) => {return !["statusCode","statusMessage","additionalProperties"].includes(key);}))) {
+        instance.additionalProperties.set(key, value as any);
+      }
+
     return instance;
   }
 }