mirror of
https://github.com/danbulant/node-html-parser
synced 2026-05-19 04:18:52 +00:00
🐛 fix amd
This commit is contained in:
parent
eda0281d4e
commit
719e39b74b
2 changed files with 199 additions and 205 deletions
205
src/index.ts
205
src/index.ts
|
|
@ -1,208 +1,5 @@
|
|||
import arr_back from './back';
|
||||
import CommentNode from './nodes/comment';
|
||||
import HTMLElement from './nodes/html';
|
||||
import TextNode from './nodes/text';
|
||||
export { default as CommentNode } from './nodes/comment';
|
||||
export { default as HTMLElement } from './nodes/html';
|
||||
export { default as HTMLElement, parse, parse as default, Options } from './nodes/html';
|
||||
export { default as Node } from './nodes/node';
|
||||
export { default as TextNode } from './nodes/text';
|
||||
export { default as NodeType } from './nodes/type';
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/custom-elements.html#valid-custom-element-name
|
||||
const kMarkupPattern = /<!--[^]*?(?=-->)-->|<(\/?)([a-z][-.:0-9_a-z]*)\s*([^>]*?)(\/?)>/ig;
|
||||
const kAttributePattern = /(^|\s)(id|class)\s*=\s*("([^"]+)"|'([^']+)'|(\S+))/ig;
|
||||
const kSelfClosingElements = {
|
||||
area: true,
|
||||
base: true,
|
||||
br: true,
|
||||
col: true,
|
||||
hr: true,
|
||||
img: true,
|
||||
input: true,
|
||||
link: true,
|
||||
meta: true,
|
||||
source: true
|
||||
};
|
||||
const kElementsClosedByOpening = {
|
||||
li: { li: true },
|
||||
p: { p: true, div: true },
|
||||
b: { div: true },
|
||||
td: { td: true, th: true },
|
||||
th: { td: true, th: true },
|
||||
h1: { h1: true },
|
||||
h2: { h2: true },
|
||||
h3: { h3: true },
|
||||
h4: { h4: true },
|
||||
h5: { h5: true },
|
||||
h6: { h6: true }
|
||||
};
|
||||
const kElementsClosedByClosing = {
|
||||
li: { ul: true, ol: true },
|
||||
a: { div: true },
|
||||
b: { div: true },
|
||||
i: { div: true },
|
||||
p: { div: true },
|
||||
td: { tr: true, table: true },
|
||||
th: { tr: true, table: true }
|
||||
};
|
||||
const kBlockTextElements = {
|
||||
script: true,
|
||||
noscript: true,
|
||||
style: true,
|
||||
pre: true
|
||||
};
|
||||
|
||||
export interface Options {
|
||||
lowerCaseTagName?: boolean;
|
||||
noFix?: boolean;
|
||||
script?: boolean;
|
||||
style?: boolean;
|
||||
pre?: boolean;
|
||||
comment?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses HTML and returns a root element
|
||||
* Parse a chuck of HTML source.
|
||||
* @param {string} data html
|
||||
* @return {HTMLElement} root element
|
||||
*/
|
||||
export function parse(data: string, options = {} as Options) {
|
||||
const root = new HTMLElement(null, {});
|
||||
let currentParent = root;
|
||||
const stack = [root];
|
||||
let lastTextPos = -1;
|
||||
let match: RegExpExecArray;
|
||||
while (match = kMarkupPattern.exec(data)) {
|
||||
if (lastTextPos > -1) {
|
||||
if (lastTextPos + match[0].length < kMarkupPattern.lastIndex) {
|
||||
// if has content
|
||||
const text = data.substring(lastTextPos, kMarkupPattern.lastIndex - match[0].length);
|
||||
currentParent.appendChild(new TextNode(text));
|
||||
}
|
||||
}
|
||||
lastTextPos = kMarkupPattern.lastIndex;
|
||||
if (match[0][1] === '!') {
|
||||
// this is a comment
|
||||
if (options.comment) {
|
||||
// Only keep what is in between <!-- and -->
|
||||
const text = data.substring(lastTextPos - 3, lastTextPos - match[0].length + 4);
|
||||
currentParent.appendChild(new CommentNode(text));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (options.lowerCaseTagName)
|
||||
match[2] = match[2].toLowerCase();
|
||||
if (!match[1]) {
|
||||
// not </ tags
|
||||
const attrs = {};
|
||||
for (let attMatch; attMatch = kAttributePattern.exec(match[3]);) {
|
||||
attrs[attMatch[2]] = attMatch[4] || attMatch[5] || attMatch[6];
|
||||
}
|
||||
|
||||
const tagName = currentParent.tagName as 'li' | 'p' | 'b' | 'td' | 'th' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
|
||||
if (!match[4] && kElementsClosedByOpening[tagName]) {
|
||||
if (kElementsClosedByOpening[tagName][match[2]]) {
|
||||
stack.pop();
|
||||
currentParent = arr_back(stack);
|
||||
}
|
||||
}
|
||||
currentParent = currentParent.appendChild(
|
||||
new HTMLElement(match[2], attrs, match[3]));
|
||||
stack.push(currentParent);
|
||||
if (kBlockTextElements[match[2]]) {
|
||||
// a little test to find next </script> or </style> ...
|
||||
const closeMarkup = '</' + match[2] + '>';
|
||||
const index = (() => {
|
||||
if (options.lowerCaseTagName) {
|
||||
return data.toLocaleLowerCase().indexOf(closeMarkup, kMarkupPattern.lastIndex);
|
||||
} else {
|
||||
return data.indexOf(closeMarkup, kMarkupPattern.lastIndex);
|
||||
}
|
||||
})();
|
||||
if (options[match[2]]) {
|
||||
let text: string;
|
||||
if (index === -1) {
|
||||
// there is no matching ending for the text element.
|
||||
text = data.substr(kMarkupPattern.lastIndex);
|
||||
} else {
|
||||
text = data.substring(kMarkupPattern.lastIndex, index);
|
||||
}
|
||||
if (text.length > 0) {
|
||||
currentParent.appendChild(new TextNode(text));
|
||||
}
|
||||
}
|
||||
if (index === -1) {
|
||||
lastTextPos = kMarkupPattern.lastIndex = data.length + 1;
|
||||
} else {
|
||||
lastTextPos = kMarkupPattern.lastIndex = index + closeMarkup.length;
|
||||
match[1] = 'true';
|
||||
}
|
||||
}
|
||||
}
|
||||
if (match[1] || match[4] ||
|
||||
kSelfClosingElements[match[2]]) {
|
||||
// </ or /> or <br> etc.
|
||||
while (true) {
|
||||
if (currentParent.tagName === match[2]) {
|
||||
stack.pop();
|
||||
currentParent = arr_back(stack);
|
||||
break;
|
||||
} else {
|
||||
const tagName = currentParent.tagName as 'li' | 'a' | 'b' | 'i' | 'p' | 'td' | 'th';
|
||||
// Trying to close current tag, and move on
|
||||
if (kElementsClosedByClosing[tagName]) {
|
||||
if (kElementsClosedByClosing[tagName][match[2]]) {
|
||||
stack.pop();
|
||||
currentParent = arr_back(stack);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
// Use aggressive strategy to handle unmatching markups.
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
type Response = (HTMLElement | TextNode) & { valid: boolean };
|
||||
const valid = !!(stack.length === 1);
|
||||
if (!options.noFix) {
|
||||
const response = root as Response;
|
||||
response.valid = valid;
|
||||
while (stack.length > 1) {
|
||||
// Handle each error elements.
|
||||
const last = stack.pop();
|
||||
const oneBefore = arr_back(stack);
|
||||
if (last.parentNode && (last.parentNode as HTMLElement).parentNode) {
|
||||
if (last.parentNode === oneBefore && last.tagName === oneBefore.tagName) {
|
||||
// Pair error case <h3> <h3> handle : Fixes to <h3> </h3>
|
||||
oneBefore.removeChild(last);
|
||||
last.childNodes.forEach((child) => {
|
||||
(oneBefore.parentNode as HTMLElement).appendChild(child);
|
||||
});
|
||||
stack.pop();
|
||||
} else {
|
||||
// Single error <div> <h3> </div> handle: Just removes <h3>
|
||||
oneBefore.removeChild(last);
|
||||
last.childNodes.forEach((child) => {
|
||||
oneBefore.appendChild(child);
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// If it's final element just skip.
|
||||
}
|
||||
}
|
||||
response.childNodes.forEach((node) => {
|
||||
if (node instanceof HTMLElement) {
|
||||
node.parentNode = null;
|
||||
}
|
||||
});
|
||||
return response;
|
||||
} else {
|
||||
const response = new TextNode(data) as Response;
|
||||
response.valid = valid;
|
||||
return response;
|
||||
}
|
||||
}
|
||||
|
||||
export default parse;
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ import Node from './node';
|
|||
import NodeType from './type';
|
||||
import TextNode from './text';
|
||||
import Matcher from '../matcher';
|
||||
import { parse } from '../index';
|
||||
import arr_back from '../back';
|
||||
import CommentNode from './comment';
|
||||
|
||||
export interface KeyAttributes {
|
||||
id?: string;
|
||||
|
|
@ -537,3 +537,200 @@ export default class HTMLElement extends Node {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/custom-elements.html#valid-custom-element-name
|
||||
const kMarkupPattern = /<!--[^]*?(?=-->)-->|<(\/?)([a-z][-.:0-9_a-z]*)\s*([^>]*?)(\/?)>/ig;
|
||||
const kAttributePattern = /(^|\s)(id|class)\s*=\s*("([^"]+)"|'([^']+)'|(\S+))/ig;
|
||||
const kSelfClosingElements = {
|
||||
area: true,
|
||||
base: true,
|
||||
br: true,
|
||||
col: true,
|
||||
hr: true,
|
||||
img: true,
|
||||
input: true,
|
||||
link: true,
|
||||
meta: true,
|
||||
source: true
|
||||
};
|
||||
const kElementsClosedByOpening = {
|
||||
li: { li: true },
|
||||
p: { p: true, div: true },
|
||||
b: { div: true },
|
||||
td: { td: true, th: true },
|
||||
th: { td: true, th: true },
|
||||
h1: { h1: true },
|
||||
h2: { h2: true },
|
||||
h3: { h3: true },
|
||||
h4: { h4: true },
|
||||
h5: { h5: true },
|
||||
h6: { h6: true }
|
||||
};
|
||||
const kElementsClosedByClosing = {
|
||||
li: { ul: true, ol: true },
|
||||
a: { div: true },
|
||||
b: { div: true },
|
||||
i: { div: true },
|
||||
p: { div: true },
|
||||
td: { tr: true, table: true },
|
||||
th: { tr: true, table: true }
|
||||
};
|
||||
const kBlockTextElements = {
|
||||
script: true,
|
||||
noscript: true,
|
||||
style: true,
|
||||
pre: true
|
||||
};
|
||||
|
||||
export interface Options {
|
||||
lowerCaseTagName?: boolean;
|
||||
noFix?: boolean;
|
||||
script?: boolean;
|
||||
style?: boolean;
|
||||
pre?: boolean;
|
||||
comment?: boolean;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parses HTML and returns a root element
|
||||
* Parse a chuck of HTML source.
|
||||
* @param {string} data html
|
||||
* @return {HTMLElement} root element
|
||||
*/
|
||||
export function parse(data: string, options = {} as Options) {
|
||||
const root = new HTMLElement(null, {});
|
||||
let currentParent = root;
|
||||
const stack = [root];
|
||||
let lastTextPos = -1;
|
||||
let match: RegExpExecArray;
|
||||
while (match = kMarkupPattern.exec(data)) {
|
||||
if (lastTextPos > -1) {
|
||||
if (lastTextPos + match[0].length < kMarkupPattern.lastIndex) {
|
||||
// if has content
|
||||
const text = data.substring(lastTextPos, kMarkupPattern.lastIndex - match[0].length);
|
||||
currentParent.appendChild(new TextNode(text));
|
||||
}
|
||||
}
|
||||
lastTextPos = kMarkupPattern.lastIndex;
|
||||
if (match[0][1] === '!') {
|
||||
// this is a comment
|
||||
if (options.comment) {
|
||||
// Only keep what is in between <!-- and -->
|
||||
const text = data.substring(lastTextPos - 3, lastTextPos - match[0].length + 4);
|
||||
currentParent.appendChild(new CommentNode(text));
|
||||
}
|
||||
continue;
|
||||
}
|
||||
if (options.lowerCaseTagName)
|
||||
match[2] = match[2].toLowerCase();
|
||||
if (!match[1]) {
|
||||
// not </ tags
|
||||
const attrs = {};
|
||||
for (let attMatch; attMatch = kAttributePattern.exec(match[3]);) {
|
||||
attrs[attMatch[2]] = attMatch[4] || attMatch[5] || attMatch[6];
|
||||
}
|
||||
|
||||
const tagName = currentParent.tagName as 'li' | 'p' | 'b' | 'td' | 'th' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
|
||||
if (!match[4] && kElementsClosedByOpening[tagName]) {
|
||||
if (kElementsClosedByOpening[tagName][match[2]]) {
|
||||
stack.pop();
|
||||
currentParent = arr_back(stack);
|
||||
}
|
||||
}
|
||||
currentParent = currentParent.appendChild(
|
||||
new HTMLElement(match[2], attrs, match[3]));
|
||||
stack.push(currentParent);
|
||||
if (kBlockTextElements[match[2]]) {
|
||||
// a little test to find next </script> or </style> ...
|
||||
const closeMarkup = '</' + match[2] + '>';
|
||||
const index = (() => {
|
||||
if (options.lowerCaseTagName) {
|
||||
return data.toLocaleLowerCase().indexOf(closeMarkup, kMarkupPattern.lastIndex);
|
||||
} else {
|
||||
return data.indexOf(closeMarkup, kMarkupPattern.lastIndex);
|
||||
}
|
||||
})();
|
||||
if (options[match[2]]) {
|
||||
let text: string;
|
||||
if (index === -1) {
|
||||
// there is no matching ending for the text element.
|
||||
text = data.substr(kMarkupPattern.lastIndex);
|
||||
} else {
|
||||
text = data.substring(kMarkupPattern.lastIndex, index);
|
||||
}
|
||||
if (text.length > 0) {
|
||||
currentParent.appendChild(new TextNode(text));
|
||||
}
|
||||
}
|
||||
if (index === -1) {
|
||||
lastTextPos = kMarkupPattern.lastIndex = data.length + 1;
|
||||
} else {
|
||||
lastTextPos = kMarkupPattern.lastIndex = index + closeMarkup.length;
|
||||
match[1] = 'true';
|
||||
}
|
||||
}
|
||||
}
|
||||
if (match[1] || match[4] ||
|
||||
kSelfClosingElements[match[2]]) {
|
||||
// </ or /> or <br> etc.
|
||||
while (true) {
|
||||
if (currentParent.tagName === match[2]) {
|
||||
stack.pop();
|
||||
currentParent = arr_back(stack);
|
||||
break;
|
||||
} else {
|
||||
const tagName = currentParent.tagName as 'li' | 'a' | 'b' | 'i' | 'p' | 'td' | 'th';
|
||||
// Trying to close current tag, and move on
|
||||
if (kElementsClosedByClosing[tagName]) {
|
||||
if (kElementsClosedByClosing[tagName][match[2]]) {
|
||||
stack.pop();
|
||||
currentParent = arr_back(stack);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
// Use aggressive strategy to handle unmatching markups.
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
type Response = (HTMLElement | TextNode) & { valid: boolean };
|
||||
const valid = !!(stack.length === 1);
|
||||
if (!options.noFix) {
|
||||
const response = root as Response;
|
||||
response.valid = valid;
|
||||
while (stack.length > 1) {
|
||||
// Handle each error elements.
|
||||
const last = stack.pop();
|
||||
const oneBefore = arr_back(stack);
|
||||
if (last.parentNode && (last.parentNode as HTMLElement).parentNode) {
|
||||
if (last.parentNode === oneBefore && last.tagName === oneBefore.tagName) {
|
||||
// Pair error case <h3> <h3> handle : Fixes to <h3> </h3>
|
||||
oneBefore.removeChild(last);
|
||||
last.childNodes.forEach((child) => {
|
||||
(oneBefore.parentNode as HTMLElement).appendChild(child);
|
||||
});
|
||||
stack.pop();
|
||||
} else {
|
||||
// Single error <div> <h3> </div> handle: Just removes <h3>
|
||||
oneBefore.removeChild(last);
|
||||
last.childNodes.forEach((child) => {
|
||||
oneBefore.appendChild(child);
|
||||
});
|
||||
}
|
||||
} else {
|
||||
// If it's final element just skip.
|
||||
}
|
||||
}
|
||||
response.childNodes.forEach((node) => {
|
||||
if (node instanceof HTMLElement) {
|
||||
node.parentNode = null;
|
||||
}
|
||||
});
|
||||
return response;
|
||||
} else {
|
||||
const response = new TextNode(data) as Response;
|
||||
response.valid = valid;
|
||||
return response;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue