feat: assign optional arguments in the constructor for JS generator (#…

…586)
asyncapi · Jan 15, 2022 · 5622923 · 5622923
1 parent 8ff4bb9
commit 5622923
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 6 deletions.
diff --git a/examples/generate-javascript-models/__snapshots__/index.spec.ts.snap b/examples/generate-javascript-models/__snapshots__/index.spec.ts.snap
@@ -6,7 +6,9 @@ Array [
   email;
 
   constructor(input) {
-  
+    if (input.hasOwnProperty('email')) {
+      this.email = input.email;
+    }
   }
 
   get email() { return this.email; }

diff --git a/examples/javascript-use-cjs/__snapshots__/index.spec.ts.snap b/examples/javascript-use-cjs/__snapshots__/index.spec.ts.snap
@@ -8,7 +8,9 @@ class Person {
   email;
 
   constructor(input) {
-  
+    if (input.hasOwnProperty('email')) {
+      this.email = input.email;
+    }
   }
 
   get email() { return this.email; }
@@ -26,7 +28,9 @@ class Root {
   person;
 
   constructor(input) {
-  
+    if (input.hasOwnProperty('person')) {
+      this.person = input.person;
+    }
   }
 
   get person() { return this.person; }

diff --git a/examples/javascript-use-esm/__snapshots__/index.spec.ts.snap b/examples/javascript-use-esm/__snapshots__/index.spec.ts.snap
@@ -8,7 +8,9 @@ class Person {
   email;
 
   constructor(input) {
-  
+    if (input.hasOwnProperty('email')) {
+      this.email = input.email;
+    }
   }
 
   get email() { return this.email; }
@@ -27,7 +29,9 @@ class Root {
   person;
 
   constructor(input) {
-  
+    if (input.hasOwnProperty('person')) {
+      this.person = input.person;
+    }
   }
 
   get person() { return this.person; }

diff --git a/src/generators/javascript/renderers/ClassRenderer.ts b/src/generators/javascript/renderers/ClassRenderer.ts
@@ -71,7 +71,13 @@ export const JS_DEFAULT_CLASS_PRESET: ClassPreset<ClassRenderer> = {
   },
   ctor({ renderer, model }) {
     const properties = model.properties || {};
-    const assigments = Object.entries(properties).filter(([propertyName]) => model.isRequired(propertyName)).map(([propertyName, property]) => {
+    const assigments = Object.entries(properties).map(([propertyName, property]) => {
+      if (!model.isRequired(propertyName)) {
+        propertyName = renderer.nameProperty(propertyName, property);
+        return `if (input.hasOwnProperty('${propertyName}')) {
+  this.${propertyName} = input.${propertyName};
+}`;
+      }
       propertyName = renderer.nameProperty(propertyName, property);
       return `this.${propertyName} = input.${propertyName};`;
     });

diff --git a/test/generators/javascript/JavaScriptGenerator.spec.ts b/test/generators/javascript/JavaScriptGenerator.spec.ts
@@ -78,6 +78,12 @@ describe('JavaScriptGenerator', () => {
     this.city = input.city;
     this.state = input.state;
     this.houseNumber = input.houseNumber;
+    if (input.hasOwnProperty('marriage')) {
+      this.marriage = input.marriage;
+    }
+    if (input.hasOwnProperty('members')) {
+      this.members = input.members;
+    }
     this.arrayType = input.arrayType;
   }
 

diff --git a/test/generators/javascript/__snapshots__/JavaScriptGenerator.spec.ts.snap b/test/generators/javascript/__snapshots__/JavaScriptGenerator.spec.ts.snap
@@ -20,7 +20,16 @@ class Address {
     this.city = input.city;
     this.state = input.state;
     this.houseNumber = input.houseNumber;
+    if (input.hasOwnProperty('marriage')) {
+      this.marriage = input.marriage;
+    }
+    if (input.hasOwnProperty('members')) {
+      this.members = input.members;
+    }
     this.arrayType = input.arrayType;
+    if (input.hasOwnProperty('otherModel')) {
+      this.otherModel = input.otherModel;
+    }
   }
 
   get streetName() { return this.streetName; }
@@ -96,7 +105,16 @@ class Address {
     this.city = input.city;
     this.state = input.state;
     this.houseNumber = input.houseNumber;
+    if (input.hasOwnProperty('marriage')) {
+      this.marriage = input.marriage;
+    }
+    if (input.hasOwnProperty('members')) {
+      this.members = input.members;
+    }
     this.arrayType = input.arrayType;
+    if (input.hasOwnProperty('otherModel')) {
+      this.otherModel = input.otherModel;
+    }
   }
 
   get streetName() { return this.streetName; }