Fix: Class implements conversion (fixes eslint#39) (eslint#43)

Author: nzakas

lib/ast-converter.js

@@ -447,6 +447,22 @@ module.exports = function(ast, extra) {
             };
         }
 
+        /**
+         * Converts a child into a class implements node. This creates an intermediary
+         * ClassImplements node to match what Flow does.
+         * @param {TSNode} child The TypeScript AST node to convert.
+         * @returns {ESTreeNode} The type annotation node.
+         */
+        function convertClassImplements(child) {
+            var id = convertChild(child.expression);
+            return {
+                type: "ClassImplements",
+                loc: id.loc,
+                range: id.range,
+                id: id
+            };
+        }
+
         /**
          * For nodes that are copied directly from the TypeScript AST into
          * ESTree mostly as-is. The only difference is the addition of a type
@@ -1171,12 +1187,22 @@ module.exports = function(ast, extra) {
 
             case SyntaxKind.ClassDeclaration:
             case SyntaxKind.ClassExpression:
-                var lastClassToken = node.heritageClauses ? node.heritageClauses[node.heritageClauses.length - 1] : node.name;
+                var heritageClauses = node.heritageClauses || [];
+                var lastClassToken = heritageClauses.length ? heritageClauses[heritageClauses.length - 1] : node.name;
                 if (!lastClassToken) { // no name
                     lastClassToken = node.getFirstToken();
                 }
 
-                var openBrace = ts.findNextToken(lastClassToken, ast);
+                var openBrace = ts.findNextToken(lastClassToken, ast),
+                    hasExtends = (heritageClauses.length && node.heritageClauses[0].token === SyntaxKind.ExtendsKeyword),
+                    superClass,
+                    hasImplements = false;
+
+                if (hasExtends) {
+                    superClass = heritageClauses.shift();
+                }
+
+                hasImplements = heritageClauses.length > 0;
 
                 assign(result, {
                     type: SyntaxKind[node.kind],
@@ -1189,7 +1215,8 @@ module.exports = function(ast, extra) {
                         range: [ openBrace.getStart(), result.range[1] ],
                         loc: getLocFor(openBrace.getStart(), node.end, ast)
                     },
-                    superClass: (node.heritageClauses ? convertChild(node.heritageClauses[0].types[0].expression) : null)
+                    superClass: (superClass ? convertChild(superClass.types[0].expression) : null),
+                    implements: hasImplements ? heritageClauses[0].types.map(convertClassImplements) : []
                 });
 
                 var filteredMembers = node.members.filter(isESTreeClassMember);

tests/fixtures/ecma-features/classes/class-accessor-properties.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -606,4 +607,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-computed-static-method.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -420,4 +421,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-expression.result.js

@@ -49,6 +49,7 @@ module.exports = {
                 ],
                 "id": null,
                 "superClass": null,
+                "implements": [],
                 "body": {
                     "type": "ClassBody",
                     "loc": {
@@ -181,4 +182,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-method-named-prototype.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -348,4 +349,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-method-named-static.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -366,4 +367,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-one-method-super.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -473,4 +474,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-one-method.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -348,4 +349,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-static-method-named-prototype.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -403,4 +404,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-static-method-named-static.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -384,4 +385,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-static-method.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -384,4 +385,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-static-methods-and-accessor-properties.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -809,4 +810,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-two-computed-static-methods.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -641,4 +642,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-two-methods-computed-constructor.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -553,4 +554,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-two-methods-semi.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -533,4 +534,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-two-methods-three-semi.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -569,4 +570,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-two-methods-two-semi.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -551,4 +552,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-two-methods.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -515,4 +516,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-two-static-methods-named-constructor.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -551,4 +552,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/class-with-constructor.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -348,4 +349,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/derived-class-assign-to-var.result.js

@@ -119,6 +119,7 @@ module.exports = {
                             "value": 0,
                             "raw": "0"
                         },
+                        "implements": [],
                         "body": {
                             "type": "ClassBody",
                             "loc": {
@@ -326,4 +327,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/derived-class-expression.result.js

@@ -67,6 +67,7 @@ module.exports = {
                     "value": 0,
                     "raw": "0"
                 },
+                "implements": [],
                 "body": {
                     "type": "ClassBody",
                     "loc": {
@@ -235,4 +236,4 @@ module.exports = {
             ]
         }
     ]
-};
+};

tests/fixtures/ecma-features/classes/empty-class-double-semi.result.js

@@ -50,6 +50,7 @@ module.exports = {
                 "name": "A"
             },
             "superClass": null,
+            "implements": [],
             "body": {
                 "type": "ClassBody",
                 "loc": {
@@ -180,4 +181,4 @@ module.exports = {
             ]
         }
     ]
-};
+};