node-html-parser 6.1.13 → 7.0.1

package/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [7.0.1](https://github.com/taoqf/node-fast-html-parser/compare/v7.0.0...v7.0.1) (2024-12-26)
+
+
+### Bug Fixes
+
+* upgrade node version ([efd77ff](https://github.com/taoqf/node-fast-html-parser/commit/efd77ff93593922512b12216984ba778b2f46593))
+
+## [7.0.0](https://github.com/taoqf/node-fast-html-parser/compare/v6.1.14...v7.0.0) (2024-12-26)
+
+
+### ⚠ BREAKING CHANGES
+
+* fix #277, for that change estarget to es6
+
+### Features
+
+* fix [#277](https://github.com/taoqf/node-fast-html-parser/issues/277), for that change estarget to es6 ([432a3e7](https://github.com/taoqf/node-fast-html-parser/commit/432a3e71ba219e76188bcc2e89e525e40911d164))
+
+
+### Bug Fixes
+
+* add tests for [#227](https://github.com/taoqf/node-fast-html-parser/issues/227) ([5856ee2](https://github.com/taoqf/node-fast-html-parser/commit/5856ee2ef2a0dfef43d75f6d4d13c37c213f25cf))
+
+### [6.1.14](https://github.com/taoqf/node-fast-html-parser/compare/v6.1.13...v6.1.14) (2024-05-14)
+
+
+### Bug Fixes
+
+* [#274](https://github.com/taoqf/node-fast-html-parser/issues/274) ([fef574d](https://github.com/taoqf/node-fast-html-parser/commit/fef574da98ce224980ce6fb9f9ea033d3331a161))
+
 ### [6.1.13](https://github.com/taoqf/node-fast-html-parser/compare/v6.1.12...v6.1.13) (2024-03-29)
 
 

package/README.md

@@ -6,7 +6,7 @@ DOM tree, with element query support.
 Per the design, it intends to parse massive HTML files in lowest price, thus the
 performance is the top priority.  For this reason, some malformatted HTML may not
 be able to parse correctly, but most usual errors are covered (eg. HTML4 style
-no closing `<li>`, `<td>` etc).
+no closing `<td>` etc).
 
 ## Install
 
@@ -81,15 +81,17 @@ Parse the data provided, and return the root of the generated DOM.
 
   ```js
   {
-    lowerCaseTagName: false,  // convert tag name to lower case (hurts performance heavily)
-    comment: false,            // retrieve comments (hurts performance slightly)
-    voidTag:{
+    lowerCaseTagName: false,		// convert tag name to lower case (hurts performance heavily)
+    comment: false,           		// retrieve comments (hurts performance slightly)
+    fixNestedATags: false,    		// fix invalid nested <a> HTML tags 
+    parseNoneClosedTags: false, 	// close none closed HTML tags instead of removing them 
+    voidTag: {
       tags: ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'],	// optional and case insensitive, default value is ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr']
-      closingSlash: true     // optional, default false. void tag serialisation, add a final slash <br/>
+      closingSlash: true	// optional, default false. void tag serialisation, add a final slash <br/>
     },
     blockTextElements: {
-      script: true,	// keep text content when parsing
-      noscript: true,	// keep text content when parsing
+      script: true,		// keep text content when parsing
+      noscript: true,		// keep text content when parsing
       style: true,		// keep text content when parsing
       pre: true			// keep text content when parsing
     }
@@ -214,9 +216,26 @@ Note: Use * for all elements.
 
 Query closest element by css selector. `null` if not found.
 
+### before(...nodesOrStrings)
+
+Insert one or multiple nodes or text before the current element. Does not work on root.
+
+### after(...nodesOrStrings)
+
+Insert one or multiple nodes or text after the current element. Does not work on root.
+
+### prepend(...nodesOrStrings)
+
+Insert one or multiple nodes or text to the first position of an element's child nodes.
+
+### append(...nodesOrStrings)
+
+Insert one or multiple nodes or text to the last position of an element's child nodes.
+This is similar to appendChild, but accepts arbitrarily many nodes and converts strings to text nodes.
+
 ### appendChild(node)
 
-Append a child node to childNodes
+Append a node to an element's child nodes.
 
 ### insertAdjacentHTML(where, html)
 
@@ -310,7 +329,7 @@ Get escaped (as-is) text value of current node and its children. May have
 
 ### tagName
 
-Get or Set tag name of HTMLElement. Notice: the returned value would be an uppercase string.
+Get or Set tag name of HTMLElement. Note that the returned value is an uppercase string.
 
 ### structuredText
 
@@ -320,13 +339,33 @@ Get structured Text.
 
 Get DOM structure.
 
+### childNodes
+
+Get all child nodes. A child node can be a TextNode, a CommentNode and a HTMLElement.
+
+### children
+
+Get all child elements, so all child nodes of type HTMLELement.
+
 ### firstChild
 
-Get first child node. `undefined` if no child.
+Get first child node. `undefined` if the node has no children.
 
 ### lastChild
 
-Get last child node. `undefined` if no child
+Get last child node. `undefined` if the node has no children.
+
+### firstElementChild
+
+Get the first child of type HTMLElement. `undefined` if none exists.
+
+### lastElementChild
+
+Get the first child of type HTMLElement. `undefined` if none exists.
+
+### childElementCount
+
+Get the number of children that are of type HTMLElement.
 
 ### innerHTML
 

package/dist/index.js

@@ -4,21 +4,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeType = exports.TextNode = exports.Node = exports.valid = exports.CommentNode = exports.HTMLElement = exports.parse = void 0;
-var comment_1 = __importDefault(require("./nodes/comment"));
+const comment_1 = __importDefault(require("./nodes/comment"));
 exports.CommentNode = comment_1.default;
-var html_1 = __importDefault(require("./nodes/html"));
+const html_1 = __importDefault(require("./nodes/html"));
 exports.HTMLElement = html_1.default;
-var node_1 = __importDefault(require("./nodes/node"));
+const node_1 = __importDefault(require("./nodes/node"));
 exports.Node = node_1.default;
-var text_1 = __importDefault(require("./nodes/text"));
+const text_1 = __importDefault(require("./nodes/text"));
 exports.TextNode = text_1.default;
-var type_1 = __importDefault(require("./nodes/type"));
+const type_1 = __importDefault(require("./nodes/type"));
 exports.NodeType = type_1.default;
-var parse_1 = __importDefault(require("./parse"));
-var valid_1 = __importDefault(require("./valid"));
+const parse_1 = __importDefault(require("./parse"));
+const valid_1 = __importDefault(require("./valid"));
 exports.valid = valid_1.default;
-function parse(data, options) {
-    if (options === void 0) { options = {}; }
+function parse(data, options = {}) {
     return (0, parse_1.default)(data, options);
 }
 exports.default = parse;

package/dist/main.js

@@ -535,7 +535,11 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             if (attr == null) {
                 return 'null';
             }
-            return JSON.stringify(attr.replace(/"/g, '"')).replace(/\\t/g, '\t').replace(/\\n/g, '\n').replace(/\\r/g, '\r').replace(/\\/g, '');
+            return JSON.stringify(attr.replace(/"/g, '"'))
+                .replace(/\\t/g, '\t')
+                .replace(/\\n/g, '\n')
+                .replace(/\\r/g, '\r')
+                .replace(/\\/g, '');
         };
         /**
          * Remove Child element from childNodes array
@@ -824,6 +828,15 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
                 _this.childNodes[o++] = node;
             });
             this.childNodes.length = o;
+            // remove whitespace between attributes
+            var attrs = Object.keys(this.rawAttributes)
+                .map(function (key) {
+                var val = _this.rawAttributes[key];
+                return "".concat(key, "=").concat(JSON.stringify(val));
+            })
+                .join(' ');
+            this.rawAttrs = attrs;
+            delete this._rawAttrs;
             return this;
         };
         /**
@@ -913,7 +926,6 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
                     if (child.id === id) {
                         return child;
                     }
-                    ;
                     // if children are existing push the current status to the stack and keep searching for elements in the level below
                     if (child.childNodes.length > 0) {
                         stack.push(index);
@@ -980,34 +992,9 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
          * @return {Node}      node appended
          */
         HTMLElement.prototype.appendChild = function (node) {
-            // remove the node from it's parent
-            node.remove();
-            this.childNodes.push(node);
-            node.parentNode = this;
+            this.append(node);
             return node;
         };
-        Object.defineProperty(HTMLElement.prototype, "firstChild", {
-            /**
-             * Get first child node
-             * @return {Node | undefined} first child node; or undefined if none
-             */
-            get: function () {
-                return this.childNodes[0];
-            },
-            enumerable: false,
-            configurable: true
-        });
-        Object.defineProperty(HTMLElement.prototype, "lastChild", {
-            /**
-             * Get last child node
-             * @return {Node | undefined} last child node; or undefined if none
-             */
-            get: function () {
-                return (0, back_1.default)(this.childNodes);
-            },
-            enumerable: false,
-            configurable: true
-        });
         Object.defineProperty(HTMLElement.prototype, "attrs", {
             /**
              * Get attributes
@@ -1053,7 +1040,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
                 }
                 var attrs = {};
                 if (this.rawAttrs) {
-                    var re = /([a-zA-Z()[\]#@$.?:][a-zA-Z0-9-_:()[\]#]*)(?:\s*=\s*((?:'[^']*')|(?:"[^"]*")|\S+))?/g;
+                    var re = /([a-zA-Z()[\]#@$.?:][a-zA-Z0-9-._:()[\]#]*)(?:\s*=\s*((?:'[^']*')|(?:"[^"]*")|\S+))?/g;
                     var match = void 0;
                     while ((match = re.exec(this.rawAttrs))) {
                         var key = match[1];
@@ -1166,42 +1153,70 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             return this;
         };
         HTMLElement.prototype.insertAdjacentHTML = function (where, html) {
-            var _a, _b, _c;
-            var _this = this;
             if (arguments.length < 2) {
                 throw new Error('2 arguments required');
             }
             var p = parse(html, this._parseOptions);
             if (where === 'afterend') {
-                var idx = this.parentNode.childNodes.findIndex(function (child) {
-                    return child === _this;
-                });
-                resetParent(p.childNodes, this.parentNode);
-                (_a = this.parentNode.childNodes).splice.apply(_a, __spreadArray([idx + 1, 0], p.childNodes, false));
+                this.after.apply(this, p.childNodes);
             }
             else if (where === 'afterbegin') {
-                resetParent(p.childNodes, this);
-                (_b = this.childNodes).unshift.apply(_b, p.childNodes);
+                this.prepend.apply(this, p.childNodes);
             }
             else if (where === 'beforeend') {
-                p.childNodes.forEach(function (n) {
-                    _this.appendChild(n);
-                });
+                this.append.apply(this, p.childNodes);
             }
             else if (where === 'beforebegin') {
-                var idx = this.parentNode.childNodes.findIndex(function (child) {
-                    return child === _this;
-                });
-                resetParent(p.childNodes, this.parentNode);
-                (_c = this.parentNode.childNodes).splice.apply(_c, __spreadArray([idx, 0], p.childNodes, false));
+                this.before.apply(this, p.childNodes);
             }
             else {
                 throw new Error("The value provided ('".concat(where, "') is not one of 'beforebegin', 'afterbegin', 'beforeend', or 'afterend'"));
             }
             return this;
-            // if (!where || html === undefined || html === null) {
-            // 	return;
-            // }
+        };
+        /** Prepend nodes or strings to this node's children. */
+        HTMLElement.prototype.prepend = function () {
+            var _a;
+            var insertable = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                insertable[_i] = arguments[_i];
+            }
+            var nodes = resolveInsertable(insertable);
+            resetParent(nodes, this);
+            (_a = this.childNodes).unshift.apply(_a, nodes);
+        };
+        /** Append nodes or strings to this node's children. */
+        HTMLElement.prototype.append = function () {
+            var _a;
+            var insertable = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                insertable[_i] = arguments[_i];
+            }
+            var nodes = resolveInsertable(insertable);
+            resetParent(nodes, this);
+            (_a = this.childNodes).push.apply(_a, nodes);
+        };
+        /** Insert nodes or strings before this node. */
+        HTMLElement.prototype.before = function () {
+            var insertable = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                insertable[_i] = arguments[_i];
+            }
+            var nodes = resolveInsertable(insertable);
+            var siblings = this.parentNode.childNodes;
+            resetParent(nodes, this.parentNode);
+            siblings.splice.apply(siblings, __spreadArray([siblings.indexOf(this), 0], nodes, false));
+        };
+        /** Insert nodes or strings after this node. */
+        HTMLElement.prototype.after = function () {
+            var insertable = [];
+            for (var _i = 0; _i < arguments.length; _i++) {
+                insertable[_i] = arguments[_i];
+            }
+            var nodes = resolveInsertable(insertable);
+            var siblings = this.parentNode.childNodes;
+            resetParent(nodes, this.parentNode);
+            siblings.splice.apply(siblings, __spreadArray([siblings.indexOf(this) + 1, 0], nodes, false));
         };
         Object.defineProperty(HTMLElement.prototype, "nextSibling", {
             get: function () {
@@ -1281,6 +1296,72 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             enumerable: false,
             configurable: true
         });
+        Object.defineProperty(HTMLElement.prototype, "children", {
+            /** Get all childNodes of type {@link HTMLElement}. */
+            get: function () {
+                var children = [];
+                for (var _i = 0, _a = this.childNodes; _i < _a.length; _i++) {
+                    var childNode = _a[_i];
+                    if (childNode instanceof HTMLElement) {
+                        children.push(childNode);
+                    }
+                }
+                return children;
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(HTMLElement.prototype, "firstChild", {
+            /**
+             * Get the first child node.
+             * @return The first child or undefined if none exists.
+             */
+            get: function () {
+                return this.childNodes[0];
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(HTMLElement.prototype, "firstElementChild", {
+            /**
+             * Get the first child node of type {@link HTMLElement}.
+             * @return The first child element or undefined if none exists.
+             */
+            get: function () {
+                return this.children[0];
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(HTMLElement.prototype, "lastChild", {
+            /**
+             * Get the last child node.
+             * @return The last child or undefined if none exists.
+             */
+            get: function () {
+                return (0, back_1.default)(this.childNodes);
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(HTMLElement.prototype, "lastElementChild", {
+            /**
+             * Get the last child node of type {@link HTMLElement}.
+             * @return The last child element or undefined if none exists.
+             */
+            get: function () {
+                return this.children[this.children.length - 1];
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(HTMLElement.prototype, "childElementCount", {
+            get: function () {
+                return this.children.length;
+            },
+            enumerable: false,
+            configurable: true
+        });
         Object.defineProperty(HTMLElement.prototype, "classNames", {
             get: function () {
                 return this.classList.toString();
@@ -1288,17 +1369,17 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             enumerable: false,
             configurable: true
         });
-        /**
-         * Clone this Node
-         */
+        /** Clone this Node */
         HTMLElement.prototype.clone = function () {
             return parse(this.toString(), this._parseOptions).firstChild;
         };
         return HTMLElement;
     }(node_2.default));
     exports.default = HTMLElement;
+    // #xB7 | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x203F-#x2040] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
     // https://html.spec.whatwg.org/multipage/custom-elements.html#valid-custom-element-name
-    var kMarkupPattern = /<!--[\s\S]*?-->|<(\/?)([a-zA-Z][-.:0-9_a-zA-Z]*)((?:\s+[^>]*?(?:(?:'[^']*')|(?:"[^"]*"))?)*)\s*(\/?)>/g;
+    var kMarkupPattern = /<!--[\s\S]*?-->|<(\/?)([a-zA-Z][-.:0-9_a-zA-Z@\xB7\xC0-\xD6\xD8-\xF6\u00F8-\u03A1\u03A3-\u03D9\u03DB-\u03EF\u03F7-\u03FF\u0400-\u04FF\u0500-\u052F\u1D00-\u1D2B\u1D6B-\u1D77\u1D79-\u1D9A\u1E00-\u1E9B\u1F00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2126\u212A-\u212B\u2132\u214E\u2160-\u2188\u2C60-\u2C7F\uA722-\uA787\uA78B-\uA78E\uA790-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA7FF\uAB30-\uAB5A\uAB5C-\uAB5F\uAB64-\uAB65\uFB00-\uFB06\uFB13-\uFB17\uFF21-\uFF3A\uFF41-\uFF5A\x37F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]*)((?:\s+[^>]*?(?:(?:'[^']*')|(?:"[^"]*"))?)*)\s*(\/?)>/gu;
+    // const kMarkupPattern = /<!--[\s\S]*?-->|<(\/?)([a-zA-Z][-.:0-9_a-zA-Z]*)((?:\s+[^>]*?(?:(?:'[^']*')|(?:"[^"]*"))?)*)\s*(\/?)>/g;
     var kAttributePattern = /(?:^|\s)(id|class)\s*=\s*((?:'[^']*')|(?:"[^"]*")|\S+)/gi;
     var kElementsClosedByOpening = {
         li: { li: true, LI: true },
@@ -1545,6 +1626,19 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
         return root;
     }
     exports.parse = parse;
+    /**
+     * Resolves a list of {@link NodeInsertable} to a list of nodes,
+     * and removes nodes from any potential parent.
+     */
+    function resolveInsertable(insertable) {
+        return insertable.map(function (val) {
+            if (typeof val === 'string') {
+                return new text_1.default(val);
+            }
+            val.remove();
+            return val;
+        });
+    }
     function resetParent(nodes, parent) {
         return nodes.map(function (node) {
             node.parentNode = parent;

package/dist/matcher.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var type_1 = __importDefault(require("./nodes/type"));
+const type_1 = __importDefault(require("./nodes/type"));
 function isTag(node) {
     return node && node.nodeType === type_1.default.ELEMENT_NODE;
 }
@@ -23,10 +23,10 @@ function getText(node) {
     return node.text;
 }
 function removeSubsets(nodes) {
-    var idx = nodes.length;
-    var node;
-    var ancestor;
-    var replace;
+    let idx = nodes.length;
+    let node;
+    let ancestor;
+    let replace;
     // Check if each node (or one of its ancestors) is already contained in the
     // array.
     while (--idx > -1) {
@@ -50,26 +50,26 @@ function removeSubsets(nodes) {
     return nodes;
 }
 function existsOne(test, elems) {
-    return elems.some(function (elem) {
+    return elems.some((elem) => {
         return isTag(elem) ? test(elem) || existsOne(test, getChildren(elem)) : false;
     });
 }
 function getSiblings(node) {
-    var parent = getParent(node);
+    const parent = getParent(node);
     return parent ? getChildren(parent) : [];
 }
 function hasAttrib(elem, name) {
     return getAttributeValue(elem, name) !== undefined;
 }
 function findOne(test, elems) {
-    var elem = null;
-    for (var i = 0, l = elems === null || elems === void 0 ? void 0 : elems.length; i < l && !elem; i++) {
-        var el = elems[i];
+    let elem = null;
+    for (let i = 0, l = elems === null || elems === void 0 ? void 0 : elems.length; i < l && !elem; i++) {
+        const el = elems[i];
         if (test(el)) {
             elem = el;
         }
         else {
-            var childs = getChildren(el);
+            const childs = getChildren(el);
             if (childs && childs.length > 0) {
                 elem = findOne(test, childs);
             }
@@ -78,29 +78,29 @@ function findOne(test, elems) {
     return elem;
 }
 function findAll(test, nodes) {
-    var result = [];
-    for (var i = 0, j = nodes.length; i < j; i++) {
+    let result = [];
+    for (let i = 0, j = nodes.length; i < j; i++) {
         if (!isTag(nodes[i]))
             continue;
         if (test(nodes[i]))
             result.push(nodes[i]);
-        var childs = getChildren(nodes[i]);
+        const childs = getChildren(nodes[i]);
         if (childs)
             result = result.concat(findAll(test, childs));
     }
     return result;
 }
 exports.default = {
-    isTag: isTag,
-    getAttributeValue: getAttributeValue,
-    getName: getName,
-    getChildren: getChildren,
-    getParent: getParent,
-    getText: getText,
-    removeSubsets: removeSubsets,
-    existsOne: existsOne,
-    getSiblings: getSiblings,
-    hasAttrib: hasAttrib,
-    findOne: findOne,
-    findAll: findAll
+    isTag,
+    getAttributeValue,
+    getName,
+    getChildren,
+    getParent,
+    getText,
+    removeSubsets,
+    existsOne,
+    getSiblings,
+    hasAttrib,
+    findOne,
+    findAll
 };

package/dist/nodes/comment.js

@@ -1,57 +1,33 @@
 "use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var node_1 = __importDefault(require("./node"));
-var type_1 = __importDefault(require("./type"));
-var CommentNode = /** @class */ (function (_super) {
-    __extends(CommentNode, _super);
-    function CommentNode(rawText, parentNode, range, rawTagName) {
-        if (parentNode === void 0) { parentNode = null; }
-        if (rawTagName === void 0) { rawTagName = '!--'; }
-        var _this = _super.call(this, parentNode, range) || this;
-        _this.rawText = rawText;
-        _this.rawTagName = rawTagName;
+const node_1 = __importDefault(require("./node"));
+const type_1 = __importDefault(require("./type"));
+class CommentNode extends node_1.default {
+    clone() {
+        return new CommentNode(this.rawText, null, undefined, this.rawTagName);
+    }
+    constructor(rawText, parentNode = null, range, rawTagName = '!--') {
+        super(parentNode, range);
+        this.rawText = rawText;
+        this.rawTagName = rawTagName;
         /**
          * Node Type declaration.
          * @type {Number}
          */
-        _this.nodeType = type_1.default.COMMENT_NODE;
-        return _this;
+        this.nodeType = type_1.default.COMMENT_NODE;
     }
-    CommentNode.prototype.clone = function () {
-        return new CommentNode(this.rawText, null, undefined, this.rawTagName);
-    };
-    Object.defineProperty(CommentNode.prototype, "text", {
-        /**
-         * Get unescaped text value of current node and its children.
-         * @return {string} text content
-         */
-        get: function () {
-            return this.rawText;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    CommentNode.prototype.toString = function () {
-        return "<!--".concat(this.rawText, "-->");
-    };
-    return CommentNode;
-}(node_1.default));
+    /**
+     * Get unescaped text value of current node and its children.
+     * @return {string} text content
+     */
+    get text() {
+        return this.rawText;
+    }
+    toString() {
+        return `<!--${this.rawText}-->`;
+    }
+}
 exports.default = CommentNode;