Fix: Exclude TSNode.flags when deeplyCopy fallback is used (refs #105) (#107)

JamesHenry · nzakas · commit 51ec64dc738c · 2016-10-29T14:33:39.000-07:00
diff --git a/lib/ast-converter.js b/lib/ast-converter.js
@@ -589,7 +589,7 @@ module.exports = function(ast, extra) {
         function deeplyCopy() {
             result.type = "TS" + SyntaxKind[node.kind];
             Object.keys(node).filter(function(key) {
-                return !(/^(?:kind|parent|pos|end)$/.test(key));
+                return !(/^(?:kind|parent|pos|end|flags)$/.test(key));
             }).forEach(function(key) {
                 if (key === "type") {
                     result.typeAnnotation = convertTypeAnnotation(node.type);
diff --git a/tests/fixtures/typescript/basics/abstract-class-with-abstract-method.result.js b/tests/fixtures/typescript/basics/abstract-class-with-abstract-method.result.js
@@ -140,7 +140,6 @@ module.exports = {
                                                 "column": 44
                                             }
                                         },
-                                        "flags": 0,
                                         "typeName": {
                                             "type": "Identifier",
                                             "range": [
@@ -175,8 +174,7 @@ module.exports = {
                                                         "line": 2,
                                                         "column": 43
                                                     }
-                                                },
-                                                "flags": 0
+                                                }
                                             }
                                         ]
                                     }
diff --git a/tests/fixtures/typescript/basics/arrow-function-with-type-parameters.result.js b/tests/fixtures/typescript/basics/arrow-function-with-type-parameters.result.js
@@ -110,7 +110,6 @@ module.exports = {
                     ],
                     "type": "TypeAnnotation",
                     "typeAnnotation": {
-                        "flags": 0,
                         "loc": {
                             "end": {
                                 "column": 12,
diff --git a/tests/fixtures/typescript/basics/declare-function.result.js b/tests/fixtures/typescript/basics/declare-function.result.js
@@ -103,8 +103,7 @@ module.exports = {
                             "line": 1,
                             "column": 41
                         }
-                    },
-                    "flags": 0
+                    }
                 }
             }
         }
diff --git a/tests/fixtures/typescript/basics/declare-namespace-with-exported-function.result.js b/tests/fixtures/typescript/basics/declare-namespace-with-exported-function.result.js
@@ -31,7 +31,6 @@ module.exports = {
                     "column": 1
                 }
             },
-            "flags": 65540,
             "modifiers": [
                 {
                     "type": "TSDeclareKeyword",
@@ -48,8 +47,7 @@ module.exports = {
                             "line": 1,
                             "column": 7
                         }
-                    },
-                    "flags": 0
+                    }
                 }
             ],
             "name": {
@@ -86,7 +84,6 @@ module.exports = {
                         "column": 1
                     }
                 },
-                "flags": 0,
                 "statements": [
                     {
                         "type": "TSNamespaceExportDeclaration",
@@ -179,7 +176,6 @@ module.exports = {
                                             "column": 58
                                         }
                                     },
-                                    "flags": 0,
                                     "typeName": {
                                         "type": "Identifier",
                                         "range": [
@@ -214,8 +210,7 @@ module.exports = {
                                                     "line": 2,
                                                     "column": 57
                                                 }
-                                            },
-                                            "flags": 0
+                                            }
                                         }
                                     ]
                                 }
diff --git a/tests/fixtures/typescript/basics/function-with-type-parameters.result.js b/tests/fixtures/typescript/basics/function-with-type-parameters.result.js
@@ -164,7 +164,6 @@ module.exports = {
                 ],
                 "type": "TypeAnnotation",
                 "typeAnnotation": {
-                    "flags": 0,
                     "loc": {
                         "end": {
                             "column": 22,
diff --git a/tests/fixtures/typescript/basics/function-with-types.result.js b/tests/fixtures/typescript/basics/function-with-types.result.js
@@ -156,8 +156,7 @@ module.exports = {
                             "line": 1,
                             "column": 36
                         }
-                    },
-                    "flags": 0
+                    }
                 }
             }
         }
diff --git a/tests/fixtures/typescript/basics/type-alias-declaration.result.js b/tests/fixtures/typescript/basics/type-alias-declaration.result.js
@@ -91,7 +91,6 @@ module.exports = {
                         "type": "TypeParameterDeclaration"
                     },
                     "init": {
-                        "flags": 0,
                         "loc": {
                             "end": {
                                 "column": 37,
@@ -109,7 +108,6 @@ module.exports = {
                         "type": "TSUnionType",
                         "types": [
                             {
-                                "flags": 0,
                                 "loc": {
                                     "end": {
                                         "column": 27,
@@ -127,7 +125,6 @@ module.exports = {
                                 "type": "TSTypeReference",
                                 "typeArguments": [
                                     {
-                                        "flags": 0,
                                         "loc": {
                                             "end": {
                                                 "column": 26,
@@ -183,7 +180,6 @@ module.exports = {
                                 }
                             },
                             {
-                                "flags": 0,
                                 "loc": {
                                     "end": {
                                         "column": 37,
diff --git a/tests/fixtures/typescript/basics/var-with-type.result.js b/tests/fixtures/typescript/basics/var-with-type.result.js
@@ -96,8 +96,7 @@ module.exports = {
                                         "line": 1,
                                         "column": 15
                                     }
-                                },
-                                "flags": 0
+                                }
                             }
                         }
                     },

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,6 @@ module.exports = {`
`140`	`140`	`"column": 44`
`141`	`141`	`}`
`142`	`142`	`},`
`143`		`- "flags": 0,`
`144`	`143`	`"typeName": {`
`145`	`144`	`"type": "Identifier",`
`146`	`145`	`"range": [`
`@@ -175,8 +174,7 @@ module.exports = {`
`175`	`174`	`"line": 2,`
`176`	`175`	`"column": 43`
`177`	`176`	`}`
`178`		`- },`
`179`		`- "flags": 0`
	`177`	`+ }`
`180`	`178`	`}`
`181`	`179`	`]`
`182`	`180`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,7 @@ module.exports = {`
`103`	`103`	`"line": 1,`
`104`	`104`	`"column": 41`
`105`	`105`	`}`
`106`		`- },`
`107`		`- "flags": 0`
	`106`	`+ }`
`108`	`107`	`}`
`109`	`108`	`}`
`110`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,6 @@ module.exports = {`
`31`	`31`	`"column": 1`
`32`	`32`	`}`
`33`	`33`	`},`
`34`		`- "flags": 65540,`
`35`	`34`	`"modifiers": [`
`36`	`35`	`{`
`37`	`36`	`"type": "TSDeclareKeyword",`
`@@ -48,8 +47,7 @@ module.exports = {`
`48`	`47`	`"line": 1,`
`49`	`48`	`"column": 7`
`50`	`49`	`}`
`51`		`- },`
`52`		`- "flags": 0`
	`50`	`+ }`
`53`	`51`	`}`
`54`	`52`	`],`
`55`	`53`	`"name": {`
`@@ -86,7 +84,6 @@ module.exports = {`
`86`	`84`	`"column": 1`
`87`	`85`	`}`
`88`	`86`	`},`
`89`		`- "flags": 0,`
`90`	`87`	`"statements": [`
`91`	`88`	`{`
`92`	`89`	`"type": "TSNamespaceExportDeclaration",`
`@@ -179,7 +176,6 @@ module.exports = {`
`179`	`176`	`"column": 58`
`180`	`177`	`}`
`181`	`178`	`},`
`182`		`- "flags": 0,`
`183`	`179`	`"typeName": {`
`184`	`180`	`"type": "Identifier",`
`185`	`181`	`"range": [`
`@@ -214,8 +210,7 @@ module.exports = {`
`214`	`210`	`"line": 2,`
`215`	`211`	`"column": 57`
`216`	`212`	`}`
`217`		`- },`
`218`		`- "flags": 0`
	`213`	`+ }`
`219`	`214`	`}`
`220`	`215`	`]`
`221`	`216`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,8 +156,7 @@ module.exports = {`
`156`	`156`	`"line": 1,`
`157`	`157`	`"column": 36`
`158`	`158`	`}`
`159`		`- },`
`160`		`- "flags": 0`
	`159`	`+ }`
`161`	`160`	`}`
`162`	`161`	`}`
`163`	`162`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,8 +96,7 @@ module.exports = {`
`96`	`96`	`"line": 1,`
`97`	`97`	`"column": 15`
`98`	`98`	`}`
`99`		`- },`
`100`		`- "flags": 0`
	`99`	`+ }`
`101`	`100`	`}`
`102`	`101`	`}`
`103`	`102`	`},`