port babel-eslint path-based introspection, fixup tests

Author: hzoo

acorn-to-esprima.js

@@ -175,73 +175,74 @@ function convertTemplateType(tokens) {
 var astTransformVisitor = {
   noScope: true,
   exit: function (node, parent) {
-    if (t.isSpreadProperty(node)) {
+    if (this.isSpreadProperty()) {
       node.type = "Property";
       node.kind = "init";
       node.computed = true;
       node.key = node.value = node.argument;
       delete node.argument;
     }
 
-    if (t.isRestElement(node)) {
+    if (this.isRestElement()) {
       return node.argument;
     }
 
     // flow
-    if (t.isTypeCastExpression(node)) {
+    if (this.isTypeCastExpression()) {
       return node.expression;
     }
 
-    if (t.isFlow(node)) {
+    if (this.isFlow()) {
       return this.remove();
     }
 
     // modules
 
-    if (t.isImportDeclaration(node)) {
+    if (this.isImportDeclaration()) {
       delete node.isType;
     }
 
-    if (t.isExportDeclaration(node)) {
-      if (t.isClassExpression(node.declaration)) {
+    if (this.isExportDeclaration()) {
+      var declar = this.get("declaration");
+      if (declar.isClassExpression()) {
         node.declaration.type = "ClassDeclaration";
-      } else if (t.isFunctionExpression(node.declaration)) {
+      } else if (declar.isFunctionExpression()) {
         node.declaration.type = "FunctionDeclaration";
       }
     }
 
-    if (t.isFunctionDeclaration(node) || t.isFunctionExpression(node)) {
+    if (this.isFunctionDeclaration() || this.isFunctionExpression()) {
       if (!node.defaults) {
         node.defaults = [];
       }
     }
 
     // classes
 
-    if (t.isReferencedIdentifier(node, parent, { name: "super" })) {
+    if (this.isReferencedIdentifier({ name: "super" })) {
       return t.inherits(t.thisExpression(), node);
     }
 
-    if (t.isClassProperty(node)) {
+    if (this.isClassProperty()) {
       delete node.key;
     }
 
     // functions
 
-    if (t.isFunction(node)) {
+    if (this.isFunction()) {
       if (node.async) node.generator = true;
       delete node.async;
     }
 
-    if (t.isAwaitExpression(node)) {
+    if (this.isAwaitExpression()) {
       node.type = "YieldExpression";
       node.delegate = node.all;
       delete node.all;
     }
 
     // template strings
 
-    if (t.isTemplateLiteral(node)) {
+    if (this.isTemplateLiteral()) {
       node.quasis.forEach(function (q) {
         q.range[0] -= 1;
         if (q.tail) {

test/babel-jscs.js

@@ -118,15 +118,13 @@ describe("acorn-to-esprima", function () {
     });
 
     it("template with destructuring", function () {
-      verifyAndAssertMessages([
+      parseAndAssertSame([
         "module.exports = {",
           "render() {",
             "var {name} = this.props;",
             "return Math.max(null, `Name: ${name}, Name: ${name}`);",
           "}",
-        "};"].join("\n"),
-        { "comma-spacing": 1 },
-        []
+        "};"].join("\n")
       );
     });
   });

test/non-regression.js

@@ -76,7 +76,7 @@ describe("verify", function () {
           "return Math.max(null, `Name: ${name}, Name: ${name}`);",
         "}",
       "};"].join("\n"),
-      { "comma-spacing": 1 },
+      {},
       []
     );
   });