fix: non-required properties are required by constructor (#553)

asyncapi · Jan 10, 2022 · d84b8b5 · d84b8b5
1 parent b203752
commit d84b8b5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 17 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,7 @@ Array [
   email;
 
   constructor(input) {
-    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,7 @@ class Person {
   email;
 
   constructor(input) {
-    this.email = input.email;
+  
   }
 
   get email() { return this.email; }
@@ -26,7 +26,7 @@ class Root {
   person;
 
   constructor(input) {
-    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,7 @@ class Person {
   email;
 
   constructor(input) {
-    this.email = input.email;
+  
   }
 
   get email() { return this.email; }
@@ -27,7 +27,7 @@ class Root {
   person;
 
   constructor(input) {
-    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,7 @@ export const JS_DEFAULT_CLASS_PRESET: ClassPreset<ClassRenderer> = {
   },
   ctor({ renderer, model }) {
     const properties = model.properties || {};
-    const assigments = Object.entries(properties).map(([propertyName, property]) => {
+    const assigments = Object.entries(properties).filter(([propertyName]) => model.isRequired(propertyName)).map(([propertyName, property]) => {
       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
@@ -14,7 +14,8 @@ describe('JavaScriptGenerator', () => {
         enum: { type: 'string' },
         reservedEnum: { type: 'string' }
       },
-      additionalProperties: false
+      additionalProperties: false,
+      required: ['reservedEnum', 'enum'],
     };
     const expected = `class Address {
   reservedReservedEnum;
@@ -77,8 +78,6 @@ describe('JavaScriptGenerator', () => {
     this.city = input.city;
     this.state = input.state;
     this.houseNumber = input.houseNumber;
-    this.marriage = input.marriage;
-    this.members = input.members;
     this.arrayType = input.arrayType;
   }
 
@@ -201,7 +200,7 @@ describe('JavaScriptGenerator', () => {
         marriage: { type: 'boolean', description: 'Status if marriage live in given house' },
         members: { oneOf: [{ type: 'string' }, { type: 'number' }, { type: 'boolean' }], },
         array_type: { type: 'array', items: [{ type: 'string' }, { type: 'number' }] },
-        other_model: { type: 'object', $id: 'OtherModel', properties: { street_name: { type: 'string' } } },
+        other_model: { type: 'object', $id: 'OtherModel', properties: { street_name: { type: 'string' } }, required: ['street_name'] },
       },
       patternProperties: {
         '^S(.?*)test&': {
@@ -227,7 +226,7 @@ describe('JavaScriptGenerator', () => {
         marriage: { type: 'boolean', description: 'Status if marriage live in given house' },
         members: { oneOf: [{ type: 'string' }, { type: 'number' }, { type: 'boolean' }], },
         array_type: { type: 'array', items: [{ type: 'string' }, { type: 'number' }] },
-        other_model: { type: 'object', $id: 'OtherModel', properties: { street_name: { type: 'string' } } },
+        other_model: { type: 'object', $id: 'OtherModel', properties: { street_name: { type: 'string' } }, required: ['street_name'] },
       },
       patternProperties: {
         '^S(.?*)test&': {

diff --git a/test/generators/javascript/__snapshots__/JavaScriptGenerator.spec.ts.snap b/test/generators/javascript/__snapshots__/JavaScriptGenerator.spec.ts.snap
@@ -20,10 +20,7 @@ class Address {
     this.city = input.city;
     this.state = input.state;
     this.houseNumber = input.houseNumber;
-    this.marriage = input.marriage;
-    this.members = input.members;
     this.arrayType = input.arrayType;
-    this.otherModel = input.otherModel;
   }
 
   get streetName() { return this.streetName; }
@@ -99,10 +96,7 @@ class Address {
     this.city = input.city;
     this.state = input.state;
     this.houseNumber = input.houseNumber;
-    this.marriage = input.marriage;
-    this.members = input.members;
     this.arrayType = input.arrayType;
-    this.otherModel = input.otherModel;
   }
 
   get streetName() { return this.streetName; }
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ Array [ @@
       email;
       constructor(input) {
-        this.email = input.email;
       }
       get email() { return this.email; }
@@ Expand Down @@