node-html-parser 6.1.15-0 → 7.0.2

package/dist/nodes/node.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var he_1 = require("he");
+const he_1 = require("he");
 /**
  * Node Class as base class for TextNode and HTMLElement.
  */
-var Node = /** @class */ (function () {
-    function Node(parentNode, range) {
-        if (parentNode === void 0) { parentNode = null; }
+class Node {
+    constructor(parentNode = null, range) {
         this.parentNode = parentNode;
         this.childNodes = [];
         Object.defineProperty(this, 'range', {
@@ -19,34 +18,24 @@ var Node = /** @class */ (function () {
     /**
      * Remove current node
      */
-    Node.prototype.remove = function () {
-        var _this = this;
+    remove() {
         if (this.parentNode) {
-            var children = this.parentNode.childNodes;
-            this.parentNode.childNodes = children.filter(function (child) {
-                return _this !== child;
+            const children = this.parentNode.childNodes;
+            this.parentNode.childNodes = children.filter((child) => {
+                return this !== child;
             });
             this.parentNode = null;
         }
         return this;
-    };
-    Object.defineProperty(Node.prototype, "innerText", {
-        get: function () {
-            return this.rawText;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(Node.prototype, "textContent", {
-        get: function () {
-            return (0, he_1.decode)(this.rawText);
-        },
-        set: function (val) {
-            this.rawText = (0, he_1.encode)(val);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return Node;
-}());
+    }
+    get innerText() {
+        return this.rawText;
+    }
+    get textContent() {
+        return (0, he_1.decode)(this.rawText);
+    }
+    set textContent(val) {
+        this.rawText = (0, he_1.encode)(val);
+    }
+}
 exports.default = Node;

package/dist/nodes/text.js

@@ -1,123 +1,84 @@
 "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 he_1 = require("he");
-var node_1 = __importDefault(require("./node"));
-var type_1 = __importDefault(require("./type"));
+const he_1 = require("he");
+const node_1 = __importDefault(require("./node"));
+const type_1 = __importDefault(require("./type"));
 /**
  * TextNode to contain a text element in DOM tree.
  * @param {string} value [description]
  */
-var TextNode = /** @class */ (function (_super) {
-    __extends(TextNode, _super);
-    function TextNode(rawText, parentNode, range) {
-        if (parentNode === void 0) { parentNode = null; }
-        var _this = _super.call(this, parentNode, range) || this;
+class TextNode extends node_1.default {
+    clone() {
+        return new TextNode(this._rawText, null);
+    }
+    constructor(rawText, parentNode = null, range) {
+        super(parentNode, range);
         /**
          * Node Type declaration.
          * @type {Number}
          */
-        _this.nodeType = type_1.default.TEXT_NODE;
-        _this.rawTagName = '';
-        _this._rawText = rawText;
-        return _this;
+        this.nodeType = type_1.default.TEXT_NODE;
+        this.rawTagName = '';
+        this._rawText = rawText;
     }
-    TextNode.prototype.clone = function () {
-        return new TextNode(this._rawText, null);
-    };
-    Object.defineProperty(TextNode.prototype, "rawText", {
-        get: function () {
-            return this._rawText;
-        },
-        /**
-         * Set rawText and invalidate trimmed caches
-         */
-        set: function (text) {
-            this._rawText = text;
-            this._trimmedRawText = void 0;
-            this._trimmedText = void 0;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(TextNode.prototype, "trimmedRawText", {
-        /**
-         * Returns raw text with all whitespace trimmed except single leading/trailing non-breaking space
-         */
-        get: function () {
-            if (this._trimmedRawText !== undefined)
-                return this._trimmedRawText;
-            this._trimmedRawText = trimText(this.rawText);
+    get rawText() {
+        return this._rawText;
+    }
+    /**
+     * Set rawText and invalidate trimmed caches
+     */
+    set rawText(text) {
+        this._rawText = text;
+        this._trimmedRawText = void 0;
+        this._trimmedText = void 0;
+    }
+    /**
+     * Returns raw text with all whitespace trimmed except single leading/trailing non-breaking space
+     */
+    get trimmedRawText() {
+        if (this._trimmedRawText !== undefined)
             return this._trimmedRawText;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(TextNode.prototype, "trimmedText", {
-        /**
-         * Returns text with all whitespace trimmed except single leading/trailing non-breaking space
-         */
-        get: function () {
-            if (this._trimmedText !== undefined)
-                return this._trimmedText;
-            this._trimmedText = trimText(this.text);
+        this._trimmedRawText = trimText(this.rawText);
+        return this._trimmedRawText;
+    }
+    /**
+     * Returns text with all whitespace trimmed except single leading/trailing non-breaking space
+     */
+    get trimmedText() {
+        if (this._trimmedText !== undefined)
             return this._trimmedText;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(TextNode.prototype, "text", {
-        /**
-         * Get unescaped text value of current node and its children.
-         * @return {string} text content
-         */
-        get: function () {
-            return (0, he_1.decode)(this.rawText);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(TextNode.prototype, "isWhitespace", {
-        /**
-         * Detect if the node contains only white space.
-         * @return {boolean}
-         */
-        get: function () {
-            return /^(\s| )*$/.test(this.rawText);
-        },
-        enumerable: false,
-        configurable: true
-    });
-    TextNode.prototype.toString = function () {
+        this._trimmedText = trimText(this.text);
+        return this._trimmedText;
+    }
+    /**
+     * Get unescaped text value of current node and its children.
+     * @return {string} text content
+     */
+    get text() {
+        return (0, he_1.decode)(this.rawText);
+    }
+    /**
+     * Detect if the node contains only white space.
+     * @return {boolean}
+     */
+    get isWhitespace() {
+        return /^(\s| )*$/.test(this.rawText);
+    }
+    toString() {
         return this.rawText;
-    };
-    return TextNode;
-}(node_1.default));
+    }
+}
 exports.default = TextNode;
 /**
  * Trim whitespace except single leading/trailing non-breaking space
  */
 function trimText(text) {
-    var i = 0;
-    var startPos;
-    var endPos;
+    let i = 0;
+    let startPos;
+    let endPos;
     while (i >= 0 && i < text.length) {
         if (/\S/.test(text[i])) {
             if (startPos === undefined) {
@@ -138,7 +99,7 @@ function trimText(text) {
         startPos = 0;
     if (endPos === undefined)
         endPos = text.length - 1;
-    var hasLeadingSpace = startPos > 0 && /[^\S\r\n]/.test(text[startPos - 1]);
-    var hasTrailingSpace = endPos < (text.length - 1) && /[^\S\r\n]/.test(text[endPos + 1]);
+    const hasLeadingSpace = startPos > 0 && /[^\S\r\n]/.test(text[startPos - 1]);
+    const hasTrailingSpace = endPos < (text.length - 1) && /[^\S\r\n]/.test(text[endPos + 1]);
     return (hasLeadingSpace ? ' ' : '') + text.slice(startPos, endPos + 1) + (hasTrailingSpace ? ' ' : '');
 }

package/dist/valid.js

@@ -1,13 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var html_1 = require("./nodes/html");
+const html_1 = require("./nodes/html");
 /**
  * Parses HTML and returns a root element
  * Parse a chuck of HTML source.
  */
-function valid(data, options) {
-    if (options === void 0) { options = {}; }
-    var stack = (0, html_1.base_parse)(data, options);
+function valid(data, options = {}) {
+    const stack = (0, html_1.base_parse)(data, options);
     return Boolean(stack.length === 1);
 }
 exports.default = valid;

package/dist/void-tag.js

@@ -1,29 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var VoidTag = /** @class */ (function () {
-    function VoidTag(addClosingSlash, tags) {
-        if (addClosingSlash === void 0) { addClosingSlash = false; }
+class VoidTag {
+    constructor(addClosingSlash = false, tags) {
         this.addClosingSlash = addClosingSlash;
         if (Array.isArray(tags)) {
-            this.voidTags = tags.reduce(function (set, tag) {
+            this.voidTags = tags.reduce((set, tag) => {
                 return set.add(tag.toLowerCase()).add(tag.toUpperCase()).add(tag);
             }, new Set());
         }
         else {
-            this.voidTags = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'].reduce(function (set, tag) {
+            this.voidTags = ['area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'param', 'source', 'track', 'wbr'].reduce((set, tag) => {
                 return set.add(tag.toLowerCase()).add(tag.toUpperCase()).add(tag);
             }, new Set());
         }
     }
-    VoidTag.prototype.formatNode = function (tag, attrs, innerHTML) {
-        var addClosingSlash = this.addClosingSlash;
-        var closingSpace = (addClosingSlash && attrs && !attrs.endsWith(' ')) ? ' ' : '';
-        var closingSlash = addClosingSlash ? "".concat(closingSpace, "/") : '';
-        return this.isVoidElement(tag.toLowerCase()) ? "<".concat(tag).concat(attrs).concat(closingSlash, ">") : "<".concat(tag).concat(attrs, ">").concat(innerHTML, "</").concat(tag, ">");
-    };
-    VoidTag.prototype.isVoidElement = function (tag) {
+    formatNode(tag, attrs, innerHTML) {
+        const addClosingSlash = this.addClosingSlash;
+        const closingSpace = (addClosingSlash && attrs && !attrs.endsWith(' ')) ? ' ' : '';
+        const closingSlash = addClosingSlash ? `${closingSpace}/` : '';
+        return this.isVoidElement(tag.toLowerCase()) ? `<${tag}${attrs}${closingSlash}>` : `<${tag}${attrs}>${innerHTML}</${tag}>`;
+    }
+    isVoidElement(tag) {
         return this.voidTags.has(tag);
-    };
-    return VoidTag;
-}());
+    }
+}
 exports.default = VoidTag;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-html-parser",
-	"version": "6.1.15-0",
+	"version": "7.0.2",
 	"description": "A very fast HTML parser, generating a simplified DOM, with basic element query support.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -87,7 +87,8 @@
 		"standard-version": "^9.5.0",
 		"travis-cov": "latest",
 		"ts-node": "^10.9.1",
-		"typescript": "latest"
+		"typescript": "latest",
+		"yarn": "^1.22.22"
 	},
 	"config": {
 		"blanket": {