node-html-parser 5.3.0 → 5.3.3

package/README.md

@@ -20,17 +20,17 @@ npm install --save node-html-parser
 ## Performance
 
 ```shell
-cheerio         :12.0726 ms/file ± 7.31605
-parse5          :8.18615 ms/file ± 6.15337
-node-html-parser (last release):2.16533 ms/file ± 1.56924
-htmlparser      :17.0658 ms/file ± 120.901
-htmlparser2     :2.62695 ms/file ± 4.17579
-node-html-parser:2.14907 ms/file ± 1.66632
-html-parser     :24.6505 ms/file ± 18.9996
-htmljs-parser   :5.81797 ms/file ± 6.55537
-html-dom-parser :2.52265 ms/file ± 3.54858
-html5parser     :2.01144 ms/file ± 2.53570
-high5           :3.91342 ms/file ± 2.65563
+html-parser     :24.2329 ms/file ± 18.8092
+htmljs-parser   :4.78952 ms/file ± 5.50403
+html-dom-parser :2.19594 ms/file ± 3.07470
+html5parser     :1.72007 ms/file ± 2.22713
+cheerio         :12.2220 ms/file ± 8.14063
+parse5          :6.77691 ms/file ± 4.12002
+htmlparser2     :2.33526 ms/file ± 3.43847
+htmlparser      :17.6260 ms/file ± 122.314
+high5           :3.85676 ms/file ± 2.48878
+node-html-parser:2.04585 ms/file ± 1.23787
+node-html-parser (last release):2.00236 ms/file ± 1.22263
 ```
 
 Tested with [htmlparser-benchmark](https://github.com/AndreasMadsen/htmlparser-benchmark).

package/dist/main.js

@@ -73,6 +73,20 @@ define("nodes/node", ["require", "exports", "he"], function (require, exports, h
                 value: range !== null && range !== void 0 ? range : [-1, -1]
             });
         }
+        /**
+         * Remove current node
+         */
+        Node.prototype.remove = function () {
+            var _this = this;
+            if (this.parentNode) {
+                var children = this.parentNode.childNodes;
+                this.parentNode.childNodes = children.filter(function (child) {
+                    return _this !== child;
+                });
+                this.parentNode = null;
+            }
+            return this;
+        };
         Object.defineProperty(Node.prototype, "innerText", {
             get: function () {
                 return this.rawText;
@@ -485,18 +499,6 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             }
             return JSON.stringify(attr.replace(/"/g, '"'));
         };
-        /**
-         * Remove current element
-         */
-        HTMLElement.prototype.remove = function () {
-            var _this = this;
-            if (this.parentNode) {
-                var children = this.parentNode.childNodes;
-                this.parentNode.childNodes = children.filter(function (child) {
-                    return _this !== child;
-                });
-            }
-        };
         /**
          * Remove Child element from childNodes array
          * @param {HTMLElement} node     node to remove
@@ -505,6 +507,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             this.childNodes = this.childNodes.filter(function (child) {
                 return child !== node;
             });
+            return this;
         };
         /**
          * Exchanges given child with new child
@@ -519,6 +522,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
                 }
                 return child;
             });
+            return this;
         };
         Object.defineProperty(HTMLElement.prototype, "tagName", {
             get: function () {
@@ -647,7 +651,10 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             set: function (content) {
                 //const r = parse(content, global.options); // TODO global.options ?
                 var r = parse(content);
-                this.childNodes = r.childNodes.length ? r.childNodes : [new text_1.default(content, this)];
+                var nodes = r.childNodes.length ? r.childNodes : [new text_1.default(content, this)];
+                resetParent(nodes, this);
+                resetParent(this.childNodes, null);
+                this.childNodes = nodes;
             },
             enumerable: false,
             configurable: true
@@ -661,7 +668,10 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
                 var r = parse(content, options);
                 content = r.childNodes.length ? r.childNodes : [new text_1.default(content, this)];
             }
+            resetParent(this.childNodes, null);
+            resetParent(content, this);
             this.childNodes = content;
+            return this;
         };
         HTMLElement.prototype.replaceWith = function () {
             var _this = this;
@@ -669,6 +679,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             for (var _i = 0; _i < arguments.length; _i++) {
                 nodes[_i] = arguments[_i];
             }
+            var parent = this.parentNode;
             var content = nodes
                 .map(function (node) {
                 if (node instanceof node_2.default) {
@@ -682,10 +693,11 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
                 return [];
             })
                 .flat();
-            var idx = this.parentNode.childNodes.findIndex(function (child) {
+            var idx = parent.childNodes.findIndex(function (child) {
                 return child === _this;
             });
-            this.parentNode.childNodes = __spreadArray(__spreadArray(__spreadArray([], this.parentNode.childNodes.slice(0, idx), true), content, true), this.parentNode.childNodes.slice(idx + 1), true);
+            resetParent([this], null);
+            parent.childNodes = __spreadArray(__spreadArray(__spreadArray([], parent.childNodes.slice(0, idx), true), resetParent(content, parent), true), parent.childNodes.slice(idx + 1), true);
         };
         Object.defineProperty(HTMLElement.prototype, "outerHTML", {
             get: function () {
@@ -924,7 +936,8 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
          * @return {Node}      node appended
          */
         HTMLElement.prototype.appendChild = function (node) {
-            // node.parentNode = this;
+            // remove the node from it's parent
+            node.remove();
             this.childNodes.push(node);
             node.parentNode = this;
             return node;
@@ -1033,6 +1046,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             if (key === 'id') {
                 this.id = '';
             }
+            return this;
         };
         HTMLElement.prototype.hasAttribute = function (key) {
             return key.toLowerCase() in this.attrs;
@@ -1104,6 +1118,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
                 return "".concat(name, "=").concat(_this.quoteAttribute(String(val)));
             })
                 .join(' ');
+            return this;
         };
         HTMLElement.prototype.insertAdjacentHTML = function (where, html) {
             var _a, _b, _c;
@@ -1116,14 +1131,11 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
                 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));
-                p.childNodes.forEach(function (n) {
-                    if (n instanceof HTMLElement) {
-                        n.parentNode = _this.parentNode;
-                    }
-                });
             }
             else if (where === 'afterbegin') {
+                resetParent(p.childNodes, this);
                 (_b = this.childNodes).unshift.apply(_b, p.childNodes);
             }
             else if (where === 'beforeend') {
@@ -1135,16 +1147,13 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
                 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));
-                p.childNodes.forEach(function (n) {
-                    if (n instanceof HTMLElement) {
-                        n.parentNode = _this.parentNode;
-                    }
-                });
             }
             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;
             // }
@@ -1519,6 +1528,12 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
         return root;
     }
     exports.parse = parse;
+    function resetParent(nodes, parent) {
+        return nodes.map(function (node) {
+            node.parentNode = parent;
+            return node;
+        });
+    }
 });
 define("nodes/comment", ["require", "exports", "nodes/node", "nodes/type"], function (require, exports, node_3, type_4) {
     "use strict";

package/dist/nodes/html.d.ts

@@ -60,21 +60,17 @@ export default class HTMLElement extends Node {
      * @memberof HTMLElement
      */
     constructor(tagName: string, keyAttrs: KeyAttributes, rawAttrs: string, parentNode: HTMLElement | null, range?: [number, number]);
-    /**
-     * Remove current element
-     */
-    remove(): void;
     /**
      * Remove Child element from childNodes array
      * @param {HTMLElement} node     node to remove
      */
-    removeChild(node: Node): void;
+    removeChild(node: Node): this;
     /**
      * Exchanges given child with new child
      * @param {HTMLElement} oldNode     node to exchange
      * @param {HTMLElement} newNode     new node
      */
-    exchangeChild(oldNode: Node, newNode: Node): void;
+    exchangeChild(oldNode: Node, newNode: Node): this;
     get tagName(): string;
     set tagName(newname: string);
     get localName(): string;
@@ -99,7 +95,7 @@ export default class HTMLElement extends Node {
     toString(): string;
     get innerHTML(): string;
     set innerHTML(content: string);
-    set_content(content: string | Node | Node[], options?: Options): void;
+    set_content(content: string | Node | Node[], options?: Partial<Options>): this;
     replaceWith(...nodes: (string | Node)[]): void;
     get outerHTML(): string;
     /**
@@ -173,7 +169,7 @@ export default class HTMLElement extends Node {
      * @return {Object} parsed attributes
      */
     get rawAttributes(): RawAttributes;
-    removeAttribute(key: string): void;
+    removeAttribute(key: string): this;
     hasAttribute(key: string): boolean;
     /**
      * Get an attribute
@@ -190,8 +186,8 @@ export default class HTMLElement extends Node {
      * Replace all the attributes of the HTMLElement by the provided attributes
      * @param {Attributes} attributes the new attribute set
      */
-    setAttributes(attributes: Attributes): void;
-    insertAdjacentHTML(where: InsertPosition, html: string): void;
+    setAttributes(attributes: Attributes): this;
+    insertAdjacentHTML(where: InsertPosition, html: string): this;
     get nextSibling(): Node;
     get nextElementSibling(): HTMLElement;
     get previousSibling(): Node;

package/dist/nodes/html.js

@@ -197,18 +197,6 @@ var HTMLElement = /** @class */ (function (_super) {
         }
         return JSON.stringify(attr.replace(/"/g, '"'));
     };
-    /**
-     * Remove current element
-     */
-    HTMLElement.prototype.remove = function () {
-        var _this = this;
-        if (this.parentNode) {
-            var children = this.parentNode.childNodes;
-            this.parentNode.childNodes = children.filter(function (child) {
-                return _this !== child;
-            });
-        }
-    };
     /**
      * Remove Child element from childNodes array
      * @param {HTMLElement} node     node to remove
@@ -217,6 +205,7 @@ var HTMLElement = /** @class */ (function (_super) {
         this.childNodes = this.childNodes.filter(function (child) {
             return child !== node;
         });
+        return this;
     };
     /**
      * Exchanges given child with new child
@@ -231,6 +220,7 @@ var HTMLElement = /** @class */ (function (_super) {
             }
             return child;
         });
+        return this;
     };
     Object.defineProperty(HTMLElement.prototype, "tagName", {
         get: function () {
@@ -359,7 +349,10 @@ var HTMLElement = /** @class */ (function (_super) {
         set: function (content) {
             //const r = parse(content, global.options); // TODO global.options ?
             var r = parse(content);
-            this.childNodes = r.childNodes.length ? r.childNodes : [new text_1.default(content, this)];
+            var nodes = r.childNodes.length ? r.childNodes : [new text_1.default(content, this)];
+            resetParent(nodes, this);
+            resetParent(this.childNodes, null);
+            this.childNodes = nodes;
         },
         enumerable: false,
         configurable: true
@@ -373,7 +366,10 @@ var HTMLElement = /** @class */ (function (_super) {
             var r = parse(content, options);
             content = r.childNodes.length ? r.childNodes : [new text_1.default(content, this)];
         }
+        resetParent(this.childNodes, null);
+        resetParent(content, this);
         this.childNodes = content;
+        return this;
     };
     HTMLElement.prototype.replaceWith = function () {
         var _this = this;
@@ -381,6 +377,7 @@ var HTMLElement = /** @class */ (function (_super) {
         for (var _i = 0; _i < arguments.length; _i++) {
             nodes[_i] = arguments[_i];
         }
+        var parent = this.parentNode;
         var content = nodes
             .map(function (node) {
             if (node instanceof node_1.default) {
@@ -394,10 +391,11 @@ var HTMLElement = /** @class */ (function (_super) {
             return [];
         })
             .flat();
-        var idx = this.parentNode.childNodes.findIndex(function (child) {
+        var idx = parent.childNodes.findIndex(function (child) {
             return child === _this;
         });
-        this.parentNode.childNodes = __spreadArray(__spreadArray(__spreadArray([], this.parentNode.childNodes.slice(0, idx), true), content, true), this.parentNode.childNodes.slice(idx + 1), true);
+        resetParent([this], null);
+        parent.childNodes = __spreadArray(__spreadArray(__spreadArray([], parent.childNodes.slice(0, idx), true), resetParent(content, parent), true), parent.childNodes.slice(idx + 1), true);
     };
     Object.defineProperty(HTMLElement.prototype, "outerHTML", {
         get: function () {
@@ -636,7 +634,8 @@ var HTMLElement = /** @class */ (function (_super) {
      * @return {Node}      node appended
      */
     HTMLElement.prototype.appendChild = function (node) {
-        // node.parentNode = this;
+        // remove the node from it's parent
+        node.remove();
         this.childNodes.push(node);
         node.parentNode = this;
         return node;
@@ -745,6 +744,7 @@ var HTMLElement = /** @class */ (function (_super) {
         if (key === 'id') {
             this.id = '';
         }
+        return this;
     };
     HTMLElement.prototype.hasAttribute = function (key) {
         return key.toLowerCase() in this.attrs;
@@ -816,6 +816,7 @@ var HTMLElement = /** @class */ (function (_super) {
             return "".concat(name, "=").concat(_this.quoteAttribute(String(val)));
         })
             .join(' ');
+        return this;
     };
     HTMLElement.prototype.insertAdjacentHTML = function (where, html) {
         var _a, _b, _c;
@@ -828,14 +829,11 @@ var HTMLElement = /** @class */ (function (_super) {
             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));
-            p.childNodes.forEach(function (n) {
-                if (n instanceof HTMLElement) {
-                    n.parentNode = _this.parentNode;
-                }
-            });
         }
         else if (where === 'afterbegin') {
+            resetParent(p.childNodes, this);
             (_b = this.childNodes).unshift.apply(_b, p.childNodes);
         }
         else if (where === 'beforeend') {
@@ -847,16 +845,13 @@ var HTMLElement = /** @class */ (function (_super) {
             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));
-            p.childNodes.forEach(function (n) {
-                if (n instanceof HTMLElement) {
-                    n.parentNode = _this.parentNode;
-                }
-            });
         }
         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;
         // }
@@ -1231,3 +1226,9 @@ function parse(data, options) {
     return root;
 }
 exports.parse = parse;
+function resetParent(nodes, parent) {
+    return nodes.map(function (node) {
+        node.parentNode = parent;
+        return node;
+    });
+}

package/dist/nodes/node.d.ts

@@ -13,6 +13,10 @@ export default abstract class Node {
     abstract toString(): string;
     abstract clone(): Node;
     constructor(parentNode?: HTMLElement, range?: [number, number]);
+    /**
+     * Remove current node
+     */
+    remove(): this;
     get innerText(): string;
     get textContent(): string;
     set textContent(val: string);

package/dist/nodes/node.js

@@ -16,6 +16,20 @@ var Node = /** @class */ (function () {
             value: range !== null && range !== void 0 ? range : [-1, -1]
         });
     }
+    /**
+     * Remove current node
+     */
+    Node.prototype.remove = function () {
+        var _this = this;
+        if (this.parentNode) {
+            var children = this.parentNode.childNodes;
+            this.parentNode.childNodes = children.filter(function (child) {
+                return _this !== child;
+            });
+            this.parentNode = null;
+        }
+        return this;
+    };
     Object.defineProperty(Node.prototype, "innerText", {
         get: function () {
             return this.rawText;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-html-parser",
-	"version": "5.3.0",
+	"version": "5.3.3",
 	"description": "A very fast HTML parser, generating a simplified DOM, with basic element query support.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -31,8 +31,8 @@
 		"prepare": "cd test && yarn install"
 	},
 	"keywords": [
-		"parser",
 		"html",
+		"parser",
 		"nodejs",
 		"typescript"
 	],