node-html-parser 5.4.1 → 6.0.0

package/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.
 
+## [6.0.0](https://github.com/taoqf/node-fast-html-parser/compare/v5.4.2-0...v6.0.0) (2022-09-08)
+
+
+### Bug Fixes
+
+* Preserve invalid nested A tags in AST (see [#215](https://github.com/taoqf/node-fast-html-parser/issues/215) for detail) ([374188f](https://github.com/taoqf/node-fast-html-parser/commit/374188f1c6d6c6d0567348b8e8d20957f5a93fb8))
+
+### [5.4.2](https://github.com/taoqf/node-fast-html-parser/compare/v5.4.2-0...v5.4.2) (2022-08-30)
+
 ## [5.1.0](https://github.com/taoqf/node-fast-html-parser/compare/v4.1.5...v5.1.0) (2021-10-28)
 
 ### Features

package/dist/index.d.ts

@@ -1,7 +1,20 @@
-export { default as CommentNode } from './nodes/comment';
-export { default as HTMLElement, Options } from './nodes/html';
-export { default as parse, default } from './parse';
-export { default as valid } from './valid';
-export { default as Node } from './nodes/node';
-export { default as TextNode } from './nodes/text';
-export { default as NodeType } from './nodes/type';
+import CommentNode from './nodes/comment';
+import HTMLElement, { Options } from './nodes/html';
+import Node from './nodes/node';
+import TextNode from './nodes/text';
+import NodeType from './nodes/type';
+import baseParse from './parse';
+import valid from './valid';
+export { Options } from './nodes/html';
+export { parse, HTMLElement, CommentNode, valid, Node, TextNode, NodeType };
+declare function parse(data: string, options?: Partial<Options>): HTMLElement;
+declare namespace parse {
+    var parse: typeof baseParse;
+    var HTMLElement: typeof import("./nodes/html").default;
+    var CommentNode: typeof import("./nodes/comment").default;
+    var valid: typeof import("./valid").default;
+    var Node: typeof import("./nodes/node").default;
+    var TextNode: typeof import("./nodes/text").default;
+    var NodeType: typeof import("./nodes/type").default;
+}
+export default parse;

package/dist/index.js

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

package/dist/main.js

@@ -1042,7 +1042,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];
@@ -1393,7 +1393,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
         var match;
         // https://github.com/taoqf/node-html-parser/issues/38
         data = "<".concat(frameflag, ">").concat(data, "</").concat(frameflag, ">");
-        var lowerCaseTagName = options.lowerCaseTagName;
+        var lowerCaseTagName = options.lowerCaseTagName, fixNestedATags = options.fixNestedATags;
         var dataEndPos = data.length - (frameflag.length + 2);
         var frameFlagOffset = frameflag.length + 2;
         while ((match = kMarkupPattern.exec(data))) {
@@ -1445,7 +1445,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
                     }
                 }
                 // Prevent nested A tags by terminating the last A and starting a new one : see issue #144
-                if (tagName === 'a' || tagName === 'A') {
+                if (fixNestedATags && (tagName === 'a' || tagName === 'A')) {
                     if (noNestedTagIndex !== undefined) {
                         stack.splice(noNestedTagIndex);
                         currentParent = (0, back_1.default)(stack);
@@ -1484,7 +1484,7 @@ define("nodes/html", ["require", "exports", "css-select", "he", "back", "matcher
             // Handle closing tags or self-closed elements (ie </tag> or <br>)
             if (leadingSlash || closingSlash || kSelfClosingElements[tagName]) {
                 while (true) {
-                    if (tagName === 'a' || tagName === 'A')
+                    if (noNestedTagIndex != null && (tagName === 'a' || tagName === 'A'))
                         noNestedTagIndex = undefined;
                     if (currentParent.rawTagName === tagName) {
                         // Update range end for closed tag
@@ -1628,16 +1628,37 @@ define("valid", ["require", "exports", "nodes/html"], function (require, exports
     }
     exports.default = valid;
 });
-define("index", ["require", "exports", "nodes/comment", "nodes/html", "parse", "valid", "nodes/node", "nodes/text", "nodes/type"], function (require, exports, comment_2, html_3, parse_1, valid_1, node_4, text_2, type_5) {
+define("index", ["require", "exports", "nodes/comment", "nodes/html", "nodes/node", "nodes/text", "nodes/type", "parse", "valid"], function (require, exports, comment_2, html_3, node_4, text_2, type_5, parse_1, valid_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
-    exports.NodeType = exports.TextNode = exports.Node = exports.valid = exports.default = exports.parse = exports.HTMLElement = exports.CommentNode = void 0;
-    Object.defineProperty(exports, "CommentNode", { enumerable: true, get: function () { return __importDefault(comment_2).default; } });
-    Object.defineProperty(exports, "HTMLElement", { enumerable: true, get: function () { return __importDefault(html_3).default; } });
-    Object.defineProperty(exports, "parse", { enumerable: true, get: function () { return __importDefault(parse_1).default; } });
-    Object.defineProperty(exports, "default", { enumerable: true, get: function () { return __importDefault(parse_1).default; } });
-    Object.defineProperty(exports, "valid", { enumerable: true, get: function () { return __importDefault(valid_1).default; } });
-    Object.defineProperty(exports, "Node", { enumerable: true, get: function () { return __importDefault(node_4).default; } });
-    Object.defineProperty(exports, "TextNode", { enumerable: true, get: function () { return __importDefault(text_2).default; } });
-    Object.defineProperty(exports, "NodeType", { enumerable: true, get: function () { return __importDefault(type_5).default; } });
+    exports.NodeType = exports.TextNode = exports.Node = exports.valid = exports.CommentNode = exports.HTMLElement = exports.parse = void 0;
+    comment_2 = __importDefault(comment_2);
+    html_3 = __importDefault(html_3);
+    node_4 = __importDefault(node_4);
+    text_2 = __importDefault(text_2);
+    type_5 = __importDefault(type_5);
+    parse_1 = __importDefault(parse_1);
+    valid_1 = __importDefault(valid_1);
+    exports.CommentNode = comment_2.default;
+    exports.HTMLElement = html_3.default;
+    exports.Node = node_4.default;
+    exports.TextNode = text_2.default;
+    exports.NodeType = type_5.default;
+    exports.valid = valid_1.default;
+    function parse(data, options) {
+        if (options === void 0) { options = {
+            lowerCaseTagName: false,
+            comment: false
+        }; }
+        return (0, parse_1.default)(data, options);
+    }
+    exports.default = parse;
+    exports.parse = parse;
+    parse.parse = parse_1.default;
+    parse.HTMLElement = html_3.default;
+    parse.CommentNode = comment_2.default;
+    parse.valid = valid_1.default;
+    parse.Node = node_4.default;
+    parse.TextNode = text_2.default;
+    parse.NodeType = type_5.default;
 });

package/dist/nodes/html.d.ts

@@ -203,6 +203,10 @@ export default class HTMLElement extends Node {
 export interface Options {
     lowerCaseTagName: boolean;
     comment: boolean;
+    /**
+     * @see PR #215 for explanation
+     */
+    fixNestedATags?: boolean;
     parseNoneClosedTags?: boolean;
     blockTextElements: {
         [tag: string]: boolean;

package/dist/nodes/html.js

@@ -709,7 +709,7 @@ var HTMLElement = /** @class */ (function (_super) {
             }
             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];
@@ -1060,7 +1060,7 @@ function base_parse(data, options) {
     var match;
     // https://github.com/taoqf/node-html-parser/issues/38
     data = "<".concat(frameflag, ">").concat(data, "</").concat(frameflag, ">");
-    var lowerCaseTagName = options.lowerCaseTagName;
+    var lowerCaseTagName = options.lowerCaseTagName, fixNestedATags = options.fixNestedATags;
     var dataEndPos = data.length - (frameflag.length + 2);
     var frameFlagOffset = frameflag.length + 2;
     while ((match = kMarkupPattern.exec(data))) {
@@ -1112,7 +1112,7 @@ function base_parse(data, options) {
                 }
             }
             // Prevent nested A tags by terminating the last A and starting a new one : see issue #144
-            if (tagName === 'a' || tagName === 'A') {
+            if (fixNestedATags && (tagName === 'a' || tagName === 'A')) {
                 if (noNestedTagIndex !== undefined) {
                     stack.splice(noNestedTagIndex);
                     currentParent = (0, back_1.default)(stack);
@@ -1151,7 +1151,7 @@ function base_parse(data, options) {
         // Handle closing tags or self-closed elements (ie </tag> or <br>)
         if (leadingSlash || closingSlash || kSelfClosingElements[tagName]) {
             while (true) {
-                if (tagName === 'a' || tagName === 'A')
+                if (noNestedTagIndex != null && (tagName === 'a' || tagName === 'A'))
                     noNestedTagIndex = undefined;
                 if (currentParent.rawTagName === tagName) {
                     // Update range end for closed tag

package/package.json

@@ -1,14 +1,9 @@
 {
 	"name": "node-html-parser",
-	"version": "5.4.1",
+	"version": "6.0.0",
 	"description": "A very fast HTML parser, generating a simplified DOM, with basic element query support.",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
-	"exports": {
-		"require": "./dist/index.js",
-		"import": "./esm/index.js",
-		"types": "./dist/index.d.ts"
-	},
 	"scripts": {
 		"compile": "tsc",
 		"build": "npm run lint && npm run clean && npm run compile:cjs && npm run compile:amd",
@@ -38,7 +33,6 @@
 	],
 	"files": [
 		"dist",
-		"esm",
 		"README.md",
 		"LICENSE",
 		"CHANGELOG.md"

package/esm/index.js

@@ -1,11 +0,0 @@
-import nhp from '../dist/index.js'
-
-export const CommentNode = nhp.CommentNode;
-export const HTMLElement = nhp.HTMLElement;
-export const parse = nhp.parse;
-export const valid = nhp.valid;
-export const Node = nhp.Node;
-export const TextNode = nhp.TextNode;
-export const NodeType = nhp.NodeType;
-
-export default nhp;

package/esm/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "module"
-}