node-html-parser 1.4.5 → 1.4.9

package/README.md

@@ -62,7 +62,7 @@ var HTMLParser = require('node-html-parser');
 var root = HTMLParser.parse('<ul id="list"><li>Hello World</li></ul>');
 ```
 
-## HTMLElement Methods
+## Global Methods
 
 ### parse(data[, options])
 
@@ -84,6 +84,8 @@ Parse given data, and return root of the generated DOM.
   }
   ```
 
+## HTMLElement Methods
+
 ### HTMLElement#trimRight()
 
 Trim element from right (in block) after seeing pattern in a TextNode.
@@ -140,6 +142,10 @@ Same as [outerHTML](#htmlelementouterhtml)
 
 Set content. **Notice**: Do not set content of the **root** node.
 
+### HTMLElement#remove()
+
+Remove current element.
+
 ## HTMLElement Properties
 
 ### HTMLElement#text
@@ -175,3 +181,11 @@ Get innerHTML.
 ### HTMLElement#outerHTML
 
 Get outerHTML.
+
+### HTMLElement#nextSibling
+
+Returns a reference to the next child node of the current element's parent.
+
+### HTMLElement#nextElementSibling
+
+Returns a reference to the next child element of the current element's parent.

package/dist/esm/matcher.js

@@ -161,31 +161,21 @@ export default class Matcher {
             let attr_key = '';
             let value = '';
             if (tagName && tagName !== '*') {
-                let reg;
                 if (tagName.startsWith('#')) {
                     // source += 'if (el.id != ' + JSON.stringify(tagName.substr(1)) + ') return false;';// 1
                     function_name += '1';
                 }
                 else {
-                    reg = /^\[\s*(\S+)\s*(=|!=)\s*((((["'])([^\6]*)\6))|(\S*?))\]\s*/.exec(tagName);
+                    // https://github.com/taoqf/node-html-parser/issues/86
+                    // const reg = /\[\s*([\w-]+)(\s*=\s*(((?<quote>'|")\s*(.*)(\k<quote>))|(\S*)))?\s*\]/.exec(tagName);
+                    // `[a-b]`,`[ a-b ]`,`[a-b=c]`, `[a-b=c'd]`,`[a-b='c\' d"e ']`,`[ a-b = 'c\' d"e ' ]`,`[a-b="c' d\"e " ]`,`[ a-b = "c' d\"e " ]`
+                    const reg = /\[\s*([\w-]+)(\s*=\s*(('\s*(.*)'|"\s*(.*)")|(\S*)))?\s*\]/.exec(tagName);
                     if (reg) {
                         attr_key = reg[1];
-                        let method = reg[2];
-                        if (method !== '=' && method !== '!=') {
-                            // eslint-disable-next-line no-template-curly-in-string
-                            throw new Error('Selector not supported, Expect [key${op}value].op must be =,!=');
-                        }
-                        if (method === '=') {
-                            method = '==';
-                        }
-                        value = reg[7] || reg[8];
+                        value = reg[5] || reg[6] || reg[7];
                         // source += `let attrs = el.attributes;for (let key in attrs){const val = attrs[key]; if (key == "${attr_key}" && val == "${value}"){return true;}} return false;`;// 2
                         function_name += '2';
                     }
-                    else if ((reg = /^\[(.*?)\]/.exec(tagName))) {
-                        attr_key = reg[1];
-                        function_name += '5';
-                    }
                     else {
                         // source += 'if (el.tagName != ' + JSON.stringify(tagName) + ') return false;';// 3
                         function_name += '3';

package/dist/esm/nodes/html.js

@@ -71,6 +71,17 @@ export default class HTMLElement extends Node {
             }
         }
     }
+    /**
+     * Remove current element
+     */
+    remove() {
+        if (this.parentNode) {
+            const children = this.parentNode.childNodes;
+            this.parentNode.childNodes = children.filter((child) => {
+                return this !== child;
+            });
+        }
+    }
     /**
      * Remove Child element from childNodes array
      * @param {HTMLElement} node     node to remove
@@ -86,14 +97,13 @@ export default class HTMLElement extends Node {
      * @param {HTMLElement} newNode     new node
      */
     exchangeChild(oldNode, newNode) {
-        let idx = -1;
-        for (let i = 0; i < this.childNodes.length; i++) {
-            if (this.childNodes[i] === oldNode) {
-                idx = i;
-                break;
+        const children = this.childNodes;
+        this.childNodes = children.map((child) => {
+            if (child === oldNode) {
+                return newNode;
             }
-        }
-        this.childNodes[idx] = newNode;
+            return child;
+        });
     }
     get tagName() {
         return this.rawTagName ? this.rawTagName.toUpperCase() : this.rawTagName;
@@ -545,6 +555,38 @@ export default class HTMLElement extends Node {
         // 	return;
         // }
     }
+    get nextSibling() {
+        if (this.parentNode) {
+            const children = this.parentNode.childNodes;
+            let i = 0;
+            while (i < children.length) {
+                const child = children[i++];
+                if (this === child) {
+                    return children[i] || null;
+                }
+            }
+            return null;
+        }
+    }
+    get nextElementSibling() {
+        if (this.parentNode) {
+            const children = this.parentNode.childNodes;
+            let i = 0;
+            let find = false;
+            while (i < children.length) {
+                const child = children[i++];
+                if (find) {
+                    if (child instanceof HTMLElement) {
+                        return child || null;
+                    }
+                }
+                else if (this === child) {
+                    find = true;
+                }
+            }
+            return null;
+        }
+    }
 }
 // https://html.spec.whatwg.org/multipage/custom-elements.html#valid-custom-element-name
 const kMarkupPattern = /<!--[^]*?(?=-->)-->|<(\/?)([a-z][-.:0-9_a-z]*)\s*([^>]*?)(\/?)>/ig;

package/dist/main.js

@@ -312,31 +312,21 @@ define("matcher", ["require", "exports"], function (require, exports) {
                 var attr_key = '';
                 var value = '';
                 if (tagName && tagName !== '*') {
-                    var reg = void 0;
                     if (tagName.startsWith('#')) {
                         // source += 'if (el.id != ' + JSON.stringify(tagName.substr(1)) + ') return false;';// 1
                         function_name += '1';
                     }
                     else {
-                        reg = /^\[\s*(\S+)\s*(=|!=)\s*((((["'])([^\6]*)\6))|(\S*?))\]\s*/.exec(tagName);
+                        // https://github.com/taoqf/node-html-parser/issues/86
+                        // const reg = /\[\s*([\w-]+)(\s*=\s*(((?<quote>'|")\s*(.*)(\k<quote>))|(\S*)))?\s*\]/.exec(tagName);
+                        // `[a-b]`,`[ a-b ]`,`[a-b=c]`, `[a-b=c'd]`,`[a-b='c\' d"e ']`,`[ a-b = 'c\' d"e ' ]`,`[a-b="c' d\"e " ]`,`[ a-b = "c' d\"e " ]`
+                        var reg = /\[\s*([\w-]+)(\s*=\s*(('\s*(.*)'|"\s*(.*)")|(\S*)))?\s*\]/.exec(tagName);
                         if (reg) {
                             attr_key = reg[1];
-                            var method = reg[2];
-                            if (method !== '=' && method !== '!=') {
-                                // eslint-disable-next-line no-template-curly-in-string
-                                throw new Error('Selector not supported, Expect [key${op}value].op must be =,!=');
-                            }
-                            if (method === '=') {
-                                method = '==';
-                            }
-                            value = reg[7] || reg[8];
+                            value = reg[5] || reg[6] || reg[7];
                             // source += `let attrs = el.attributes;for (let key in attrs){const val = attrs[key]; if (key == "${attr_key}" && val == "${value}"){return true;}} return false;`;// 2
                             function_name += '2';
                         }
-                        else if ((reg = /^\[(.*?)\]/.exec(tagName))) {
-                            attr_key = reg[1];
-                            function_name += '5';
-                        }
                         else {
                             // source += 'if (el.tagName != ' + JSON.stringify(tagName) + ') return false;';// 3
                             function_name += '3';
@@ -487,6 +477,18 @@ define("nodes/html", ["require", "exports", "he", "nodes/node", "nodes/type", "n
             }
             return _this;
         }
+        /**
+         * 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
@@ -502,14 +504,13 @@ define("nodes/html", ["require", "exports", "he", "nodes/node", "nodes/type", "n
          * @param {HTMLElement} newNode     new node
          */
         HTMLElement.prototype.exchangeChild = function (oldNode, newNode) {
-            var idx = -1;
-            for (var i = 0; i < this.childNodes.length; i++) {
-                if (this.childNodes[i] === oldNode) {
-                    idx = i;
-                    break;
+            var children = this.childNodes;
+            this.childNodes = children.map(function (child) {
+                if (child === oldNode) {
+                    return newNode;
                 }
-            }
-            this.childNodes[idx] = newNode;
+                return child;
+            });
         };
         Object.defineProperty(HTMLElement.prototype, "tagName", {
             get: function () {
@@ -1011,6 +1012,46 @@ define("nodes/html", ["require", "exports", "he", "nodes/node", "nodes/type", "n
             // 	return;
             // }
         };
+        Object.defineProperty(HTMLElement.prototype, "nextSibling", {
+            get: function () {
+                if (this.parentNode) {
+                    var children = this.parentNode.childNodes;
+                    var i = 0;
+                    while (i < children.length) {
+                        var child = children[i++];
+                        if (this === child) {
+                            return children[i] || null;
+                        }
+                    }
+                    return null;
+                }
+            },
+            enumerable: false,
+            configurable: true
+        });
+        Object.defineProperty(HTMLElement.prototype, "nextElementSibling", {
+            get: function () {
+                if (this.parentNode) {
+                    var children = this.parentNode.childNodes;
+                    var i = 0;
+                    var find = false;
+                    while (i < children.length) {
+                        var child = children[i++];
+                        if (find) {
+                            if (child instanceof HTMLElement) {
+                                return child || null;
+                            }
+                        }
+                        else if (this === child) {
+                            find = true;
+                        }
+                    }
+                    return null;
+                }
+            },
+            enumerable: false,
+            configurable: true
+        });
         return HTMLElement;
     }(node_3.default));
     exports.default = HTMLElement;

package/dist/matcher.js

@@ -163,31 +163,21 @@ var Matcher = /** @class */ (function () {
             var attr_key = '';
             var value = '';
             if (tagName && tagName !== '*') {
-                var reg = void 0;
                 if (tagName.startsWith('#')) {
                     // source += 'if (el.id != ' + JSON.stringify(tagName.substr(1)) + ') return false;';// 1
                     function_name += '1';
                 }
                 else {
-                    reg = /^\[\s*(\S+)\s*(=|!=)\s*((((["'])([^\6]*)\6))|(\S*?))\]\s*/.exec(tagName);
+                    // https://github.com/taoqf/node-html-parser/issues/86
+                    // const reg = /\[\s*([\w-]+)(\s*=\s*(((?<quote>'|")\s*(.*)(\k<quote>))|(\S*)))?\s*\]/.exec(tagName);
+                    // `[a-b]`,`[ a-b ]`,`[a-b=c]`, `[a-b=c'd]`,`[a-b='c\' d"e ']`,`[ a-b = 'c\' d"e ' ]`,`[a-b="c' d\"e " ]`,`[ a-b = "c' d\"e " ]`
+                    var reg = /\[\s*([\w-]+)(\s*=\s*(('\s*(.*)'|"\s*(.*)")|(\S*)))?\s*\]/.exec(tagName);
                     if (reg) {
                         attr_key = reg[1];
-                        var method = reg[2];
-                        if (method !== '=' && method !== '!=') {
-                            // eslint-disable-next-line no-template-curly-in-string
-                            throw new Error('Selector not supported, Expect [key${op}value].op must be =,!=');
-                        }
-                        if (method === '=') {
-                            method = '==';
-                        }
-                        value = reg[7] || reg[8];
+                        value = reg[5] || reg[6] || reg[7];
                         // source += `let attrs = el.attributes;for (let key in attrs){const val = attrs[key]; if (key == "${attr_key}" && val == "${value}"){return true;}} return false;`;// 2
                         function_name += '2';
                     }
-                    else if ((reg = /^\[(.*?)\]/.exec(tagName))) {
-                        attr_key = reg[1];
-                        function_name += '5';
-                    }
                     else {
                         // source += 'if (el.tagName != ' + JSON.stringify(tagName) + ') return false;';// 3
                         function_name += '3';

package/dist/nodes/html.d.ts

@@ -42,6 +42,10 @@ export default class HTMLElement extends Node {
      * @memberof HTMLElement
      */
     constructor(tagName: string, keyAttrs: KeyAttributes, rawAttrs?: string, parentNode?: Node);
+    /**
+     * Remove current element
+     */
+    remove(): void;
     /**
      * Remove Child element from childNodes array
      * @param {HTMLElement} node     node to remove
@@ -148,6 +152,8 @@ export default class HTMLElement extends Node {
      */
     setAttributes(attributes: Attributes): void;
     insertAdjacentHTML(where: InsertPosition, html: string): void;
+    get nextSibling(): Node;
+    get nextElementSibling(): HTMLElement;
 }
 export interface Options {
     lowerCaseTagName: boolean;

package/dist/nodes/html.js

@@ -101,6 +101,18 @@ var HTMLElement = /** @class */ (function (_super) {
         }
         return _this;
     }
+    /**
+     * 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
@@ -116,14 +128,13 @@ var HTMLElement = /** @class */ (function (_super) {
      * @param {HTMLElement} newNode     new node
      */
     HTMLElement.prototype.exchangeChild = function (oldNode, newNode) {
-        var idx = -1;
-        for (var i = 0; i < this.childNodes.length; i++) {
-            if (this.childNodes[i] === oldNode) {
-                idx = i;
-                break;
+        var children = this.childNodes;
+        this.childNodes = children.map(function (child) {
+            if (child === oldNode) {
+                return newNode;
             }
-        }
-        this.childNodes[idx] = newNode;
+            return child;
+        });
     };
     Object.defineProperty(HTMLElement.prototype, "tagName", {
         get: function () {
@@ -625,6 +636,46 @@ var HTMLElement = /** @class */ (function (_super) {
         // 	return;
         // }
     };
+    Object.defineProperty(HTMLElement.prototype, "nextSibling", {
+        get: function () {
+            if (this.parentNode) {
+                var children = this.parentNode.childNodes;
+                var i = 0;
+                while (i < children.length) {
+                    var child = children[i++];
+                    if (this === child) {
+                        return children[i] || null;
+                    }
+                }
+                return null;
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(HTMLElement.prototype, "nextElementSibling", {
+        get: function () {
+            if (this.parentNode) {
+                var children = this.parentNode.childNodes;
+                var i = 0;
+                var find = false;
+                while (i < children.length) {
+                    var child = children[i++];
+                    if (find) {
+                        if (child instanceof HTMLElement) {
+                            return child || null;
+                        }
+                    }
+                    else if (this === child) {
+                        find = true;
+                    }
+                }
+                return null;
+            }
+        },
+        enumerable: false,
+        configurable: true
+    });
     return HTMLElement;
 }(node_1.default));
 exports.default = HTMLElement;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-html-parser",
-	"version": "1.4.5",
+	"version": "1.4.9",
 	"description": "A very fast HTML parser, generating a simplified DOM, with basic element query support.",
 	"main": "dist/index.js",
 	"module": "dist/esm/index.js",
@@ -13,11 +13,14 @@
 		"ts:amd": "tsc -t es5 -m amd -d false --outFile ./dist/main.js",
 		"ts:esm": "tsc -t esnext -m esnext -d false --outDir ./dist/esm/",
 		"build": "npm run lint && npm run clean && npm run ts:cjs && npm run ts:amd && npm run ts:esm",
-		"dev": "tsc -w",
+		"dev": "tsc -w & mocha -w ./test/*.js",
 		"pretest": "tsc -m commonjs"
 	},
 	"keywords": [
-		"fast html parser nodejs typescript"
+		"parser",
+		"html",
+		"nodejs",
+		"typescript"
 	],
 	"author": "Xiaoyi Shi <ashi009@gmail.com>",
 	"contributors": [