feat: Support for parsing optional properties (class & interface) (#80)

Related to #80.
buehler · Jul 30, 2018 · 94ea1cc · 94ea1cc
1 parent 596e150
commit 94ea1cc
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/src/code-generators/typescript-generators/propertyDeclaration.ts b/src/code-generators/typescript-generators/propertyDeclaration.ts
@@ -16,5 +16,5 @@ export function generatePropertyDeclaration(
 ): string {
     return `${Array(tabSize + 1).join(' ')}` +
             `${property.visibility !== undefined ? getVisibilityText(property.visibility) + ' ' : ''}` +
-            `${property.name}${property.type ? `: ${property.type}` : ''};\n`;
+            `${property.name}${property.optional ? '?' : ''}${property.type ? `: ${property.type}` : ''};\n`;
 }
diff --git a/src/declarations/PropertyDeclaration.ts b/src/declarations/PropertyDeclaration.ts
@@ -14,6 +14,7 @@ export class PropertyDeclaration implements ScopedDeclaration, TypedDeclaration
         public name: string,
         public visibility: DeclarationVisibility | undefined,
         public type: string | undefined,
+        public optional: boolean,
         public start?: number,
         public end?: number,
     ) { }

diff --git a/src/node-parser/class-parser.ts b/src/node-parser/class-parser.ts
@@ -88,6 +88,7 @@ export function parseCtorParams(
                     (o.name as Identifier).text,
                     getNodeVisibility(o),
                     getNodeType(o.type),
+                    !!o.questionToken,
                     o.getStart(),
                     o.getEnd(),
                 ),
@@ -137,6 +138,7 @@ export function parseClass(tsResource: Resource, node: ClassDeclaration): void {
                             (o.name as Identifier).text,
                             getNodeVisibility(o),
                             getNodeType(o.type),
+                            !!o.questionToken,
                             o.getStart(),
                             o.getEnd(),
                         ),
@@ -148,6 +150,7 @@ export function parseClass(tsResource: Resource, node: ClassDeclaration): void {
                             (o.name as Identifier).text,
                             getNodeVisibility(o),
                             getNodeType(o.type),
+                            !!o.questionToken,
                             o.getStart(),
                             o.getEnd(),
                         ),

diff --git a/src/node-parser/interface-parser.ts b/src/node-parser/interface-parser.ts
@@ -37,6 +37,7 @@ export function parseInterface(resource: Resource, node: InterfaceDeclaration):
                         (o.name as Identifier).text,
                         DeclarationVisibility.Public,
                         getNodeType(o.type),
+                        !!o.questionToken,
                         o.getStart(),
                         o.getEnd(),
                     ),

diff --git a/test/__snapshots__/TypescriptParser.spec.ts.snap b/test/__snapshots__/TypescriptParser.spec.ts.snap
@@ -65,6 +65,7 @@ ClassDeclaration {
     PropertyDeclaration {
       "end": 166,
       "name": "param1",
+      "optional": false,
       "start": 145,
       "type": "string",
       "visibility": 2,
@@ -172,20 +173,23 @@ ClassDeclaration {
     PropertyDeclaration {
       "end": 363,
       "name": "_property",
+      "optional": false,
       "start": 337,
       "type": "string",
       "visibility": 0,
     },
     PropertyDeclaration {
       "end": 394,
       "name": "protect",
+      "optional": false,
       "start": 368,
       "type": "string",
       "visibility": 1,
     },
     PropertyDeclaration {
       "end": 418,
       "name": "pub",
+      "optional": false,
       "start": 399,
       "type": "string",
       "visibility": 2,
@@ -653,13 +657,15 @@ InterfaceDeclaration {
     PropertyDeclaration {
       "end": 55,
       "name": "property1",
+      "optional": false,
       "start": 37,
       "type": "string",
       "visibility": 2,
     },
     PropertyDeclaration {
       "end": 78,
       "name": "property2",
+      "optional": false,
       "start": 60,
       "type": "number",
       "visibility": 2,
@@ -743,13 +749,15 @@ InterfaceDeclaration {
     PropertyDeclaration {
       "end": 191,
       "name": "property1",
+      "optional": false,
       "start": 173,
       "type": "string",
       "visibility": 2,
     },
     PropertyDeclaration {
       "end": 214,
       "name": "property2",
+      "optional": false,
       "start": 196,
       "type": "number",
       "visibility": 2,