Fix: Add missing typeAnnotation to class properties (fixes eslint#190) (eslint#191)

Pajn · JamesHenry · commit cc9d4b3b324e · 2017-03-18T15:06:08.000Z
diff --git a/lib/ast-converter.js b/lib/ast-converter.js
@@ -1082,7 +1082,8 @@ module.exports = function(ast, extra) {
                     accessibility: getTSNodeAccessibility(node),
                     decorators: (node.decorators) ? node.decorators.map(function(d) {
                         return convertChild(d.expression);
-                    }) : []
+                    }) : [],
+                    typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null
                 });
                 break;
 
diff --git a/tests/fixtures/typescript/basics/class-with-accessibility-modifiers.result.js b/tests/fixtures/typescript/basics/class-with-accessibility-modifiers.result.js
@@ -90,7 +90,41 @@ module.exports = {
                         "computed": false,
                         "static": false,
                         "accessibility": "private",
-                        "decorators": []
+                        "decorators": [],
+                        "typeAnnotation": {
+                            "loc": {
+                                "end": {
+                                    "column": 22,
+                                    "line": 2
+                                },
+                                "start": {
+                                    "column": 16,
+                                    "line": 2
+                                }
+                            },
+                            "range": [
+                                28,
+                                34
+                            ],
+                            "type": "TypeAnnotation",
+                            "typeAnnotation": {
+                                "loc": {
+                                    "end": {
+                                        "column": 22,
+                                        "line": 2
+                                    },
+                                    "start": {
+                                        "column": 16,
+                                        "line": 2
+                                    }
+                                },
+                                "range": [
+                                    28,
+                                    34
+                                ],
+                                "type": "TSStringKeyword"
+                            }
+                        }
                     },
                     {
                         "type": "ClassProperty",
@@ -130,7 +164,42 @@ module.exports = {
                         "computed": false,
                         "static": true,
                         "accessibility": "public",
-                        "decorators": []
+                        "decorators": [],
+                        "typeAnnotation": {
+                            "loc": {
+                                "end": {
+                                    "column": 28,
+                                    "line": 3
+                                },
+                                "start": {
+                                    "column": 22,
+                                    "line": 3
+                                }
+                            },
+                            "range": [
+                                58,
+                                64
+                            ],
+                            "type": "TypeAnnotation",
+                            "typeAnnotation": {
+                                "loc": {
+                                    "end": {
+                                        "column": 28,
+                                        "line": 3
+                                    },
+                                    "start": {
+                                        "column": 22,
+                                        "line": 3
+                                    }
+                                },
+                                "range": [
+                                    58,
+                                    64
+                                ],
+                                "type": "TSNumberKeyword"
+                            }
+                        }
+
                     },
                     {
                         "type": "MethodDefinition",
diff --git a/tests/fixtures/typescript/decorators/property-decorators/property-decorator-factory-instance-member.result.js b/tests/fixtures/typescript/decorators/property-decorators/property-decorator-factory-instance-member.result.js
@@ -127,7 +127,8 @@ module.exports = {
                                 },
                                 "arguments": []
                             }
-                        ]
+                        ],
+                        "typeAnnotation": null
                     },
                     {
                         "type": "ClassProperty",
@@ -239,7 +240,8 @@ module.exports = {
                                 },
                                 "arguments": []
                             }
-                        ]
+                        ],
+                        "typeAnnotation": null
                     }
                 ],
                 "range": [
@@ -643,4 +645,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/typescript/decorators/property-decorators/property-decorator-factory-static-member.result.js b/tests/fixtures/typescript/decorators/property-decorators/property-decorator-factory-static-member.result.js
@@ -147,7 +147,8 @@ module.exports = {
                                     }
                                 ]
                             }
-                        ]
+                        ],
+                        "typeAnnotation": null
                     },
                     {
                         "type": "ClassProperty",
@@ -244,7 +245,8 @@ module.exports = {
                                     }
                                 ]
                             }
-                        ]
+                        ],
+                        "typeAnnotation": null
                     }
                 ],
                 "range": [
@@ -630,4 +632,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/typescript/decorators/property-decorators/property-decorator-instance-member.result.js b/tests/fixtures/typescript/decorators/property-decorators/property-decorator-instance-member.result.js
@@ -109,7 +109,8 @@ module.exports = {
                                 },
                                 "name": "foo"
                             }
-                        ]
+                        ],
+                        "typeAnnotation": null
                     },
                     {
                         "type": "ClassProperty",
@@ -168,7 +169,8 @@ module.exports = {
                                 },
                                 "name": "bar"
                             }
-                        ]
+                        ],
+                        "typeAnnotation": null
                     }
                 ],
                 "range": [
@@ -410,4 +412,4 @@ module.exports = {
             }
         }
     ]
-};
+};
diff --git a/tests/fixtures/typescript/decorators/property-decorators/property-decorator-static-member.result.js b/tests/fixtures/typescript/decorators/property-decorators/property-decorator-static-member.result.js
@@ -109,7 +109,8 @@ module.exports = {
                                 },
                                 "name": "baz"
                             }
-                        ]
+                        ],
+                        "typeAnnotation": null
                     },
                     {
                         "type": "ClassProperty",
@@ -168,7 +169,8 @@ module.exports = {
                                 },
                                 "name": "qux"
                             }
-                        ]
+                        ],
+                        "typeAnnotation": null
                     }
                 ],
                 "range": [
@@ -446,4 +448,4 @@ module.exports = {
             }
         }
     ]
-};
+};

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,8 @@ module.exports = {`
`127`	`127`	`},`
`128`	`128`	`"arguments": []`
`129`	`129`	`}`
`130`		`- ]`
	`130`	`+ ],`
	`131`	`+ "typeAnnotation": null`
`131`	`132`	`},`
`132`	`133`	`{`
`133`	`134`	`"type": "ClassProperty",`
`@@ -239,7 +240,8 @@ module.exports = {`
`239`	`240`	`},`
`240`	`241`	`"arguments": []`
`241`	`242`	`}`
`242`		`- ]`
	`243`	`+ ],`
	`244`	`+ "typeAnnotation": null`
`243`	`245`	`}`
`244`	`246`	`],`
`245`	`247`	`"range": [`
`@@ -643,4 +645,4 @@ module.exports = {`
`643`	`645`	`}`
`644`	`646`	`}`
`645`	`647`	`]`
`646`		`-};`
	`648`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,8 @@ module.exports = {`
`147`	`147`	`}`
`148`	`148`	`]`
`149`	`149`	`}`
`150`		`- ]`
	`150`	`+ ],`
	`151`	`+ "typeAnnotation": null`
`151`	`152`	`},`
`152`	`153`	`{`
`153`	`154`	`"type": "ClassProperty",`
`@@ -244,7 +245,8 @@ module.exports = {`
`244`	`245`	`}`
`245`	`246`	`]`
`246`	`247`	`}`
`247`		`- ]`
	`248`	`+ ],`
	`249`	`+ "typeAnnotation": null`
`248`	`250`	`}`
`249`	`251`	`],`
`250`	`252`	`"range": [`
`@@ -630,4 +632,4 @@ module.exports = {`
`630`	`632`	`}`
`631`	`633`	`}`
`632`	`634`	`]`
`633`		`-};`
	`635`	`+};`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,8 @@ module.exports = {`
`109`	`109`	`},`
`110`	`110`	`"name": "foo"`
`111`	`111`	`}`
`112`		`- ]`
	`112`	`+ ],`
	`113`	`+ "typeAnnotation": null`
`113`	`114`	`},`
`114`	`115`	`{`
`115`	`116`	`"type": "ClassProperty",`
`@@ -168,7 +169,8 @@ module.exports = {`
`168`	`169`	`},`
`169`	`170`	`"name": "bar"`
`170`	`171`	`}`
`171`		`- ]`
	`172`	`+ ],`
	`173`	`+ "typeAnnotation": null`
`172`	`174`	`}`
`173`	`175`	`],`
`174`	`176`	`"range": [`
`@@ -410,4 +412,4 @@ module.exports = {`
`410`	`412`	`}`
`411`	`413`	`}`
`412`	`414`	`]`
`413`		`-};`
	`415`	`+};`