Merge pull request glayzzle#462 from czosel/prettier-tests-2

feat: lint tests as well

Author: czosel

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 2017,
+    ecmaVersion: 2018,
     sourceType: "module"
   },
   plugins: ["prettier"],
@@ -17,5 +17,13 @@ module.exports = {
     "prefer-const": "error",
     "no-var": "error",
     "prettier/prettier": "error"
-  }
+  },
+  overrides: [
+    {
+      files: ["test/**/*.js"],
+      rules: {
+        "no-console": "off"
+      }
+    }
+  ]
 };

babel.config.js

@@ -1,11 +1,11 @@
-module.exports = function (api) {
-    api.cache(true);
-  
-    const presets = ['@babel/preset-env'];
-    const plugins = [];
-  
-    return {
-      presets,
-      plugins
-    };
-  }
+module.exports = function(api) {
+  api.cache(true);
+
+  const presets = ["@babel/preset-env"];
+  const plugins = [];
+
+  return {
+    presets,
+    plugins
+  };
+};

package.json

@@ -11,7 +11,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "lint": "eslint 'src/**/*.js' --fix",
+    "lint": "eslint . --fix",
     "test": "jest",
     "prehusky": "npm run lint",
     "husky": "npm run test",

src/parser/array.js

@@ -84,8 +84,8 @@ module.exports = {
       value = this.read_variable(true, false);
     } else if (this.token === this.tok.T_ELLIPSIS && this.php74) {
       this.next();
-      if (this.token === '&') {
-        this.error()
+      if (this.token === "&") {
+        this.error();
       }
       unpack = true;
       value = this.read_expr();

test/ast.test.js

@@ -1,46 +1,45 @@
 const parser = require("./main");
 
 describe("Test AST class (edge cases)", function() {
-    it("test source without location", function() {
-        const test = parser.create({
-            ast: {
-                withPositions: false,
-                withSource: true
-            }
-        });
-        const ast = test.parseEval('echo $foo;');
-        const echo = ast.children[0];
-        expect(echo.loc.source).toBe("echo $foo;");
-        expect(echo.loc.start).not.toBeNull();
-        expect(echo.loc.end).not.toBeNull();
-
-        const variable = echo.expressions[0];
-        expect(variable.loc.source).toBe("$foo");
+  it("test source without location", function() {
+    const test = parser.create({
+      ast: {
+        withPositions: false,
+        withSource: true
+      }
     });
-    it("test undefined node", function() {
-        const test = parser.create();
-        expect(() => {
-            const node = test.parser.node('foo');
-            node();
-        }).toThrow(/foo/);
-    });    
-    it("test debug mode", function() {
-        const test = parser.create({
-            parser: {
-                debug: true
-            }
-        });
-        test.parseEval('1 + 1;');
+    const ast = test.parseEval("echo $foo;");
+    const echo = ast.children[0];
+    expect(echo.loc.source).toBe("echo $foo;");
+    expect(echo.loc.start).not.toBeNull();
+    expect(echo.loc.end).not.toBeNull();
+
+    const variable = echo.expressions[0];
+    expect(variable.loc.source).toBe("$foo");
+  });
+  it("test undefined node", function() {
+    const test = parser.create();
+    expect(() => {
+      const node = test.parser.node("foo");
+      node();
+    }).toThrow(/foo/);
+  });
+  it("test debug mode", function() {
+    const test = parser.create({
+      parser: {
+        debug: true
+      }
     });
-    it("test debug mode / errors", function() {
-        const test = parser.create({
-            parser: {
-                debug: true
-            }
-        });
-        expect(() => {
-            test.parseEval('1 + ;');
-        }).toThrow();        
+    test.parseEval("1 + 1;");
+  });
+  it("test debug mode / errors", function() {
+    const test = parser.create({
+      parser: {
+        debug: true
+      }
     });
-    
-});
+    expect(() => {
+      test.parseEval("1 + ;");
+    }).toThrow();
+  });
+});

test/debug.js

@@ -14,18 +14,20 @@
   ]
 }
  */
-const util = require('util');
+const util = require("util");
 const parser = require("../src/index");
-const ast = parser.parseCode(`
+const ast = parser.parseCode(
+  `
 <?php
 function iter() {
   yield 'ator' => $foo;
   yield from iter(50);
 }
 $a = fn($n) => $n * $factor;
-`, { 
+`,
+  {
     parser: {
-      debug: true,
+      debug: true
       //extractDoc: true
     },
     ast: {
@@ -34,6 +36,4 @@ $a = fn($n) => $n * $factor;
     }
   }
 );
-console.log(
-  util.inspect(ast, false, 10, true)
-);
+console.log(util.inspect(ast, false, 10, true));

test/location.test.js

@@ -1,8 +1,8 @@
-var parser = require("./main");
+const parser = require("./main");
 
 describe("Test offsets", function() {
   // init a new parser instance
-  var test = parser.create({
+  const test = parser.create({
     ast: {
       withPositions: true,
       withSource: true
@@ -16,9 +16,9 @@ describe("Test offsets", function() {
     }
   });
 
-  var lines = ["// a comment", 'echo "string";', "$a = true;"];
-  var text = lines.join("\r\n");
-  var ast = test.parseEval(text);
+  const lines = ["// a comment", 'echo "string";', "$a = true;"];
+  const text = lines.join("\r\n");
+  const ast = test.parseEval(text);
 
   describe("to program node", function() {
     it("test line", function() {
@@ -47,7 +47,7 @@ describe("Test offsets", function() {
     it("test offsets", function() {
       expect(ast.comments[0].loc.start.offset).toBe(0);
       expect(ast.comments[0].loc.end.offset).toBe(lines[0].length + 2);
-      expect(ast.comments[0].loc.source).toBe(lines[0] + '\r\n');
+      expect(ast.comments[0].loc.source).toBe(lines[0] + "\r\n");
     });
   });
 
@@ -130,11 +130,11 @@ describe("Test offsets", function() {
 
   describe("test block statements", function() {
     it("test if", function() {
-      const ast = test.parseEval('if(true) {}\n//foo\necho $bar;');
+      const ast = test.parseEval("if(true) {}\n//foo\necho $bar;");
       expect(ast.children[0].loc.start.line).toBe(1);
       expect(ast.children[0].loc.end.line).toBe(1);
       expect(ast.children[1].loc.start.line).toBe(3);
       expect(ast.children[1].loc.end.line).toBe(3);
     });
-  })
+  });
 });

test/main.js

@@ -5,7 +5,7 @@
  * @url http://glayzzle.com
  */
 
-var parser = require("../src/index");
+const parser = require("../src/index");
 // @todo : move here the debug code
 // @todo : add an automated token check (with php7)
 module.exports = parser;

test/perf.test.js

@@ -1,7 +1,7 @@
-var parser = require("./main");
+const parser = require("./main");
 
 describe("Performance tests", function() {
-  var code = `
+  const code = `
   <?php
   class foo extends bar {
     const A = 1, B = 2, C = 3;
@@ -16,18 +16,18 @@ describe("Performance tests", function() {
   `;
 
   it("tokenizer", function() {
-    var reader = new parser();
-    var tokSize = reader.tokenGetAll(code).length;
-    var hrTime = process.hrtime();
-    var iter = 100;
-    var start = hrTime[0] * 1000000 + hrTime[1] / 1000;
-    for (var i = 0; i < iter; i++) {
+    const reader = new parser();
+    const tokSize = reader.tokenGetAll(code).length;
+    let hrTime = process.hrtime();
+    const iter = 100;
+    const start = hrTime[0] * 1000000 + hrTime[1] / 1000;
+    for (let i = 0; i < iter; i++) {
       reader.tokenGetAll(code);
     }
     hrTime = process.hrtime();
-    var end = hrTime[0] * 1000000 + hrTime[1] / 1000;
-    var duration = (end - start) / 1000; // in MS
-    var speed = 1000 / duration * (tokSize * iter);
+    const end = hrTime[0] * 1000000 + hrTime[1] / 1000;
+    const duration = (end - start) / 1000; // in MS
+    let speed = (1000 / duration) * (tokSize * iter);
     // speed.should.be.greaterThan(10e5 * 0.8);
 
     if (speed > 1000) {
@@ -41,7 +41,7 @@ describe("Performance tests", function() {
     }
     console.log("    + Tokens speed  => " + speed + "/sec");
 
-    speed = 1000 / duration * (code.length * iter);
+    speed = (1000 / duration) * (code.length * iter);
     // speed.should.be.greaterThan(10e5 * 2 * 0.8);
 
     if (speed > 1024) {
@@ -57,36 +57,36 @@ describe("Performance tests", function() {
   });
 
   it("parser", function() {
-    var reader = new parser();
-    var nodeSize = 0;
-    var countNode = function(node) {
+    const reader = new parser();
+    let nodeSize = 0;
+    function countNode(node) {
       nodeSize++;
-      for (var k in node) {
+      for (const k in node) {
         if (node[k]) {
           if (node[k].kind) {
             countNode(node[k]);
           } else if (Array.isArray(node[k])) {
-            for (var i = 0; i < node[k].length; i++) {
+            for (let i = 0; i < node[k].length; i++) {
               if (node[k][i] && node[k][i].kind) {
                 countNode(node[k][i]);
               }
             }
           }
         }
       }
-    };
+    }
     countNode(reader.parseCode(code));
 
-    var hrTime = process.hrtime();
-    var iter = 100;
-    var start = hrTime[0] * 1000000 + hrTime[1] / 1000;
-    for (var i = 0; i < iter; i++) {
+    let hrTime = process.hrtime();
+    const iter = 100;
+    const start = hrTime[0] * 1000000 + hrTime[1] / 1000;
+    for (let i = 0; i < iter; i++) {
       reader.parseCode(code);
     }
     hrTime = process.hrtime();
-    var end = hrTime[0] * 1000000 + hrTime[1] / 1000;
-    var duration = (end - start) / 1000; // in MS
-    var speed = 1000 / duration * (nodeSize * iter);
+    const end = hrTime[0] * 1000000 + hrTime[1] / 1000;
+    const duration = (end - start) / 1000; // in MS
+    let speed = (1000 / duration) * (nodeSize * iter);
     // speed.should.be.greaterThan(10e4);
 
     if (speed > 1000) {
@@ -100,7 +100,7 @@ describe("Performance tests", function() {
     }
     console.log("    + Nodes speed  => " + speed + "/sec");
 
-    speed = 1000 / duration * (code.length * iter);
+    speed = (1000 / duration) * (code.length * iter);
     // speed.should.be.greaterThan(10e5 * 1 * 0.8);
 
     if (speed > 1024) {