refactor: migrate to es-next syntax

Author: Scrum

index.js

@@ -1,13 +1,11 @@
-'use strict';
-
-var { Parser } = require('htmlparser2');
+const { Parser } = require('htmlparser2');
 
 /**
  * @see https://github.com/fb55/htmlparser2/wiki/Parser-options
  */
-var defaultOptions = {lowerCaseTags: false, lowerCaseAttributeNames: false};
+const defaultOptions = {lowerCaseTags: false, lowerCaseAttributeNames: false};
 
-var defaultDirectives = [{name: '!doctype', start: '<', end: '>'}];
+const defaultDirectives = [{name: '!doctype', start: '<', end: '>'}];
 
 /**
  * Parse html to PostHTMLTree
@@ -16,34 +14,34 @@ var defaultDirectives = [{name: '!doctype', start: '<', end: '>'}];
  * @return {PostHTMLTree}
  */
 function postHTMLParser(html, options) {
-    var bufArray = [],
-        results = [];
+    const bufArray = [];
+    const results = [];
 
     bufArray.last = function() {
         return this[this.length - 1];
     };
 
-    function isDirective(directive, tag) {
-        if (directive.name instanceof RegExp) {
-            var regex = RegExp(directive.name.source, 'i');
+    function isDirective({name}, tag) {
+        if (name instanceof RegExp) {
+            const regex = RegExp(name.source, 'i');
 
             return regex.test(tag);
         }
 
-        if (tag !== directive.name) {
+        if (tag !== name) {
             return false;
         }
 
         return true;
     }
 
     function parserDirective(name, data) {
-        var directives = [].concat(defaultDirectives, options.directives || []);
-        var last = bufArray.last();
+        const directives = [].concat(defaultDirectives, options.directives || []);
+        const last = bufArray.last();
 
-        for (var i = 0; i < directives.length; i++) {
-            var directive = directives[i];
-            var directiveText = directive.start + data + directive.end;
+        for (let i = 0; i < directives.length; i++) {
+            const directive = directives[i];
+            const directiveText = directive.start + data + directive.end;
 
             name = name.toLowerCase();
             if (isDirective(directive, name)) {
@@ -59,21 +57,21 @@ function postHTMLParser(html, options) {
     }
 
     function normalizeArributes(attrs) {
-        var result = {};
-        Object.keys(attrs).forEach(function(key) {
-            var obj = {};
-                obj[key] = attrs[key].replace(/&quot;/g, '"');
+        const result = {};
+        Object.keys(attrs).forEach(key => {
+            const obj = {};
+            obj[key] = attrs[key].replace(/&quot;/g, '"');
             Object.assign(result, obj);
         });
 
         return result;
     }
 
-    var parser = new Parser({
+    const parser = new Parser({
         onprocessinginstruction: parserDirective,
-        oncomment: function(data) {
-            var comment = '<!--' + data + '-->',
-                last = bufArray.last();
+        oncomment(data) {
+            const comment = `<!--${data}-->`;
+            const last = bufArray.last();
 
             if (!last) {
                 results.push(comment);
@@ -83,32 +81,32 @@ function postHTMLParser(html, options) {
             last.content || (last.content = []);
             last.content.push(comment);
         },
-        onopentag: function(tag, attrs) {
-            var buf = { tag: tag };
+        onopentag(tag, attrs) {
+            const buf = { tag };
 
             if (Object.keys(attrs).length) {
                 buf.attrs = normalizeArributes(attrs);
             }
 
             bufArray.push(buf);
         },
-        onclosetag: function() {
-            var buf = bufArray.pop();
+        onclosetag() {
+            const buf = bufArray.pop();
 
             if (!bufArray.length) {
                 results.push(buf);
                 return;
             }
 
-            var last = bufArray.last();
+            const last = bufArray.last();
             if (!Array.isArray(last.content)) {
                 last.content = [];
             }
 
             last.content.push(buf);
         },
-        ontext: function(text) {
-            var last = bufArray.last();
+        ontext(text) {
+            const last = bufArray.last();
             if (!last) {
                 results.push(text);
                 return;
@@ -125,25 +123,25 @@ function postHTMLParser(html, options) {
     return results;
 }
 
-function parserWrapper() {
-    var option;
+function parserWrapper(...args) {
+    let option;
 
     function parser(html) {
-        var opt = Object.assign({}, defaultOptions, option);
+        const opt = Object.assign({}, defaultOptions, option);
         return postHTMLParser(html, opt);
     }
 
     if (
-      arguments.length === 1 &&
-      Boolean(arguments[0]) &&
-      arguments[0].constructor.name === 'Object'
+        args.length === 1 &&
+        Boolean(args[0]) &&
+        args[0].constructor.name === 'Object'
     ) {
-        option = arguments[0];
+        option = args[0];
         return parser;
     }
 
-    option = arguments[1];
-    return parser(arguments[0]);
+    option = args[1];
+    return parser(args[0]);
 }
 
 module.exports = parserWrapper;

test/test.js

@@ -1,27 +1,25 @@
-var parser = require('..');
-var parserWithMockedDeps = require('rewire')('..');
-var describe = require('mocha').describe;
-var it = require('mocha').it;
-var beforeEach = require('mocha').beforeEach;
-var chai = require('chai');
-var sinon = require('sinon');
-var expect = chai.expect;
+const parser = require('..');
+const parserWithMockedDeps = require('rewire')('..');
+const describe = require('mocha').describe;
+const it = require('mocha').it;
+const beforeEach = require('mocha').beforeEach;
+const chai = require('chai');
+const sinon = require('sinon');
+const expect = chai.expect;
 chai.use(require('sinon-chai'));
 
 describe('PostHTML-Parser test', function() {
     describe('Call signatures', function() {
-        var customOptions = {lowerCaseTags: false, lowerCaseAttributeNames: false};
-        var MockedHtmlParser2;
-        var parserSpy;
+        const customOptions = {lowerCaseTags: false, lowerCaseAttributeNames: false};
+        let MockedHtmlParser2;
+        let parserSpy;
 
         beforeEach(function() {
-            // jscs:disable requireFunctionDeclarations
             MockedHtmlParser2 = function() {};
             MockedHtmlParser2.prototype = {
-                write: function() {},
-                end: function() {}
+                write() {},
+                end() {}
             };
-            // jscs:enable requireFunctionDeclarations
 
             // Create spy on mocked htmlparser2 to collect call stats
             parserSpy = sinon.spy(MockedHtmlParser2);
@@ -43,7 +41,7 @@ describe('PostHTML-Parser test', function() {
         });
 
         it('should use custom params when called as factory function', function() {
-            var factory = parserWithMockedDeps(customOptions);
+            const factory = parserWithMockedDeps(customOptions);
             expect(factory).to.be.a('function');
             expect(factory('')).to.be.an('array');
             expect(parserSpy.firstCall.args[1]).to.eql(customOptions);
@@ -64,7 +62,23 @@ describe('PostHTML-Parser test', function() {
     });
 
     it('should be parse tag with escape object in attribute', function() {
-        var htmlString = '<button data-bem="{&quot;button&quot;:{&quot;checkedView&quot;:&quot;extra&quot;}}"' +
+        const htmlString = '<button data-bem="{&quot;button&quot;:{&quot;checkedView&quot;:&quot;extra&quot;}}"' +
+            ' type="submit"></button>';
+        const tree = [
+            {
+                tag: 'button',
+                attrs: {
+                    type: 'submit',
+                    'data-bem': '{"button":{"checkedView":"extra"}}'
+                }
+            }
+        ];
+
+        expect(parser(htmlString)).to.eql(tree);
+    });
+
+    it.skip('should be parse tag with object in attribute data witchout escape', function() {
+        var htmlString = '<button data-bem="{"button":{"checkedView":"extra"}}"' +
             ' type="submit"></button>';
         // console.log(htmlString);
         var tree = [
@@ -80,40 +94,23 @@ describe('PostHTML-Parser test', function() {
         expect(parser(htmlString)).to.eql(tree);
     });
 
-    // it('should be parse tag with object in attribute data witchout escape', function() {
-    //     var htmlString = '<button data-bem="{"button":{"checkedView":"extra"}}"' +
-    //         ' type="submit"></button>';
-    //     // console.log(htmlString);
-    //     var tree = [
-    //         {
-    //             tag: 'button',
-    //             attrs: {
-    //                 type: 'submit',
-    //                 'data-bem': '{"button":{"checkedView":"extra"}}'
-    //             }
-    //         }
-    //     ];
-
-    //     expect(parser(htmlString)).to.eql(tree);
-    // });
-
-    // it('should be parse tag with object in attribute data escape', function() {
-    //     var json = JSON.stringify({button: {checkedView:'extra'}});
-    //     var htmlString = '<button data-bem="' + json + '"' +
-    //         ' type="submit"></button>';
-    //     // console.log(htmlString);
-    //     var tree = [
-    //         {
-    //             tag: 'button',
-    //             attrs: {
-    //                 type: 'submit',
-    //                 'data-bem': '{"button":{"checkedView":"extra"}}'
-    //             }
-    //         }
-    //     ];
-
-    //     expect(parser(htmlString)).to.eql(tree);
-    // });
+    it.skip('should be parse tag with object in attribute data escape', function() {
+        var json = JSON.stringify({button: {checkedView:'extra'}});
+        var htmlString = '<button data-bem="' + json + '"' +
+            ' type="submit"></button>';
+        // console.log(htmlString);
+        var tree = [
+            {
+                tag: 'button',
+                attrs: {
+                    type: 'submit',
+                    'data-bem': '{"button":{"checkedView":"extra"}}'
+                }
+            }
+        ];
+
+        expect(parser(htmlString)).to.eql(tree);
+    });
 
     it('should be parse comment in content', function() {
         expect(parser('<div><!--comment--></div>')).to.eql([{tag: 'div', content: ['<!--comment-->']}]);
@@ -124,7 +121,7 @@ describe('PostHTML-Parser test', function() {
     });
 
     it('should be parse directive', function() {
-        var options = {
+        const options = {
             directives: [
                 { name: '?php', start: '<', end: '>' }
             ]
@@ -134,7 +131,7 @@ describe('PostHTML-Parser test', function() {
     });
 
     it('should be parse regular expression directive', function() {
-        var options = {
+        const options = {
             directives: [
                 { name: /\?(php|=).*/, start: '<', end: '>' }
             ]
@@ -145,15 +142,15 @@ describe('PostHTML-Parser test', function() {
     });
 
     it('should be parse directives and tag', function() {
-        var options = {
+        const options = {
             directives: [
                 { name: '!doctype', start: '<', end: '>' },
                 { name: '?php', start: '<', end: '>' }
             ]
         };
 
-        var html = '<!doctype html><header><?php echo \"Hello word\"; ?></header><body>{{%njk test %}}</body>';
-        var tree = [
+        const html = '<!doctype html><header><?php echo \"Hello word\"; ?></header><body>{{%njk test %}}</body>';
+        const tree = [
             '<!doctype html>',
             {
                 content: ['<?php echo \"Hello word\"; ?>'],