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

feat: Support for parsing optional properties (class & interface) (#80) · buehler/node-typescript-parser@94ea1cc

File tree

5 files changed

lines changed

- code-generators/typescript-generators

5 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@ export function generatePropertyDeclaration(`
`16`	`16`	`): string {`
`17`	`17`	return `${Array(tabSize + 1).join(' ')}` +
`18`	`18`	`${property.visibility !== undefined ? getVisibilityText(property.visibility) + ' ' : ''}` +
`19`		-`${property.name}${property.type ? `: ${property.type}` : ''};\n`;
	`19`	+`${property.name}${property.optional ? '?' : ''}${property.type ? `: ${property.type}` : ''};\n`;
`20`	`20`	`}`

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ export class PropertyDeclaration implements ScopedDeclaration, TypedDeclaration`
`14`	`14`	`public name: string,`
`15`	`15`	`public visibility: DeclarationVisibility \| undefined,`
`16`	`16`	`public type: string \| undefined,`
	`17`	`+public optional: boolean,`
`17`	`18`	`public start?: number,`
`18`	`19`	`public end?: number,`
`19`	`20`	`) { }`

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ export function parseCtorParams(`
`88`	`88`	`(o.name as Identifier).text,`
`89`	`89`	`getNodeVisibility(o),`
`90`	`90`	`getNodeType(o.type),`
	`91`	`+!!o.questionToken,`
`91`	`92`	`o.getStart(),`
`92`	`93`	`o.getEnd(),`
`93`	`94`	`),`
`@@ -137,6 +138,7 @@ export function parseClass(tsResource: Resource, node: ClassDeclaration): void {`
`137`	`138`	`(o.name as Identifier).text,`
`138`	`139`	`getNodeVisibility(o),`
`139`	`140`	`getNodeType(o.type),`
	`141`	`+!!o.questionToken,`
`140`	`142`	`o.getStart(),`
`141`	`143`	`o.getEnd(),`
`142`	`144`	`),`
`@@ -148,6 +150,7 @@ export function parseClass(tsResource: Resource, node: ClassDeclaration): void {`
`148`	`150`	`(o.name as Identifier).text,`
`149`	`151`	`getNodeVisibility(o),`
`150`	`152`	`getNodeType(o.type),`
	`153`	`+!!o.questionToken,`
`151`	`154`	`o.getStart(),`
`152`	`155`	`o.getEnd(),`
`153`	`156`	`),`

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ export function parseInterface(resource: Resource, node: InterfaceDeclaration):`
`37`	`37`	`(o.name as Identifier).text,`
`38`	`38`	`DeclarationVisibility.Public,`
`39`	`39`	`getNodeType(o.type),`
	`40`	`+!!o.questionToken,`
`40`	`41`	`o.getStart(),`
`41`	`42`	`o.getEnd(),`
`42`	`43`	`),`

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ ClassDeclaration {`
`65`	`65`	`PropertyDeclaration {`
`66`	`66`	`"end": 166,`
`67`	`67`	`"name": "param1",`
	`68`	`+ "optional": false,`
`68`	`69`	`"start": 145,`
`69`	`70`	`"type": "string",`
`70`	`71`	`"visibility": 2,`
`@@ -172,20 +173,23 @@ ClassDeclaration {`
`172`	`173`	`PropertyDeclaration {`
`173`	`174`	`"end": 363,`
`174`	`175`	`"name": "_property",`
	`176`	`+ "optional": false,`
`175`	`177`	`"start": 337,`
`176`	`178`	`"type": "string",`
`177`	`179`	`"visibility": 0,`
`178`	`180`	`},`
`179`	`181`	`PropertyDeclaration {`
`180`	`182`	`"end": 394,`
`181`	`183`	`"name": "protect",`
	`184`	`+ "optional": false,`
`182`	`185`	`"start": 368,`
`183`	`186`	`"type": "string",`
`184`	`187`	`"visibility": 1,`
`185`	`188`	`},`
`186`	`189`	`PropertyDeclaration {`
`187`	`190`	`"end": 418,`
`188`	`191`	`"name": "pub",`
	`192`	`+ "optional": false,`
`189`	`193`	`"start": 399,`
`190`	`194`	`"type": "string",`
`191`	`195`	`"visibility": 2,`
`@@ -653,13 +657,15 @@ InterfaceDeclaration {`
`653`	`657`	`PropertyDeclaration {`
`654`	`658`	`"end": 55,`
`655`	`659`	`"name": "property1",`
	`660`	`+ "optional": false,`
`656`	`661`	`"start": 37,`
`657`	`662`	`"type": "string",`
`658`	`663`	`"visibility": 2,`
`659`	`664`	`},`
`660`	`665`	`PropertyDeclaration {`
`661`	`666`	`"end": 78,`
`662`	`667`	`"name": "property2",`
	`668`	`+ "optional": false,`
`663`	`669`	`"start": 60,`
`664`	`670`	`"type": "number",`
`665`	`671`	`"visibility": 2,`
`@@ -743,13 +749,15 @@ InterfaceDeclaration {`
`743`	`749`	`PropertyDeclaration {`
`744`	`750`	`"end": 191,`
`745`	`751`	`"name": "property1",`
	`752`	`+ "optional": false,`
`746`	`753`	`"start": 173,`
`747`	`754`	`"type": "string",`
`748`	`755`	`"visibility": 2,`
`749`	`756`	`},`
`750`	`757`	`PropertyDeclaration {`
`751`	`758`	`"end": 214,`
`752`	`759`	`"name": "property2",`
	`760`	`+ "optional": false,`
`753`	`761`	`"start": 196,`
`754`	`762`	`"type": "number",`
`755`	`763`	`"visibility": 2,`