Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Support root nodes in querying fns #1850

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fb55 merged 1 commit into from
Dec 24, 2024
Merged

Support root nodes in querying fns #1850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 21 additions & 10 deletions src/querying.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { ElementType } from "domelementtype";
describe("querying", () => {
const manyNodesWide = parseDocument(
`<body>${"<div></div>".repeat(200_000)}Text</body>`,
).children;
);

describe("find", () => {
it("should accept many children without RangeError", () =>
Expand Down Expand Up @@ -65,7 +65,7 @@ describe("querying", () => {
expect(
filter(
(elem) => elem.type === ElementType.Tag,
manyNodesWide[0],
manyNodesWide.children[0],
),
).toHaveLength(200_001));
});
Expand All @@ -75,29 +75,37 @@ describe("querying", () => {
expect(
findOneChild(
(elem) => isTag(elem) && elem.name === "body",
manyNodesWide,
manyNodesWide.children,
),
).toBe(manyNodesWide[0]));
).toBe(manyNodesWide.children[0]));

it("should only query direct children", () =>
expect(
findOneChild(
(elem) => isTag(elem) && elem.name === "div",
manyNodesWide,
manyNodesWide.children,
),
).toBeUndefined());
});

describe("findOne", () => {
it("should find elements", () =>
expect(
findOne((elem) => elem.name === "body", manyNodesWide, true),
).toBe(manyNodesWide[0]));
findOne(
(elem) => elem.name === "body",
manyNodesWide.children,
true,
),
).toBe(manyNodesWide.children[0]));

it("should find elements in children", () =>
expect(
findOne((elem) => elem.name === "div", manyNodesWide, true),
).toBe((manyNodesWide[0] as Element).children[0]));
findOne(
(elem) => elem.name === "div",
manyNodesWide.children,
true,
),
).toBe((manyNodesWide.children[0] as Element).children[0]));

it("should not find elements in children if recurse is false", () =>
expect(
Expand All @@ -116,7 +124,10 @@ describe("querying", () => {

it("should find elements in children", () =>
expect(
existsOne((elem) => elem.name === "div", manyNodesWide),
existsOne(
(elem) => elem.name === "div",
manyNodesWide.children,
),
).toBeTruthy());

it("should return `false` if nothing is found", () =>
Expand Down
47 changes: 22 additions & 25 deletions src/querying.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { isTag, hasChildren, Element, AnyNode } from "domhandler";
import { isTag, hasChildren, Element, AnyNode, ParentNode } from "domhandler";

/**
* Search a node and its children for nodes passing a test function. If `node` is not an array, it will be wrapped in one.
Expand Down Expand Up @@ -31,13 +31,13 @@ export function filter(
*/
export function find(
test: (elem: AnyNode) => boolean,
nodes: AnyNode[],
nodes: AnyNode[] | ParentNode,
recurse: boolean,
limit: number,
): AnyNode[] {
const result: AnyNode[] = [];
/** Stack of the arrays we are looking at. */
const nodeStack = [nodes];
const nodeStack: AnyNode[][] = [Array.isArray(nodes) ? nodes : [nodes]];
/** Stack of the indices within the arrays. */
const indexStack = [0];

Expand Down Expand Up @@ -102,23 +102,21 @@ export function findOneChild<T>(
*/
export function findOne(
test: (elem: Element) => boolean,
nodes: AnyNode[],
nodes: AnyNode[] | ParentNode,
recurse = true,
): Element | null {
let elem = null;

for (let i = 0; i < nodes.length && !elem; i++) {
const node = nodes[i];
if (!isTag(node)) {
continue;
} else if (test(node)) {
elem = node;
} else if (recurse && node.children.length > 0) {
elem = findOne(test, node.children, true);
const searchedNodes = Array.isArray(nodes) ? nodes : [nodes];
for (let i = 0; i < searchedNodes.length; i++) {
const node = searchedNodes[i];
if (isTag(node) && test(node)) {
return node;
}
if (recurse && hasChildren(node) && node.children.length > 0) {
return findOne(test, node.children, true);
}
}

return elem;
return null;
}

/**
Expand All @@ -131,12 +129,12 @@ export function findOne(
*/
export function existsOne(
test: (elem: Element) => boolean,
nodes: AnyNode[],
nodes: AnyNode[] | ParentNode,
): boolean {
return nodes.some(
(checked) =>
isTag(checked) &&
(test(checked) || existsOne(test, checked.children)),
return (Array.isArray(nodes) ? nodes : [nodes]).some(
(node) =>
(isTag(node) && test(node)) ||
(hasChildren(node) && existsOne(test, node.children)),
);
}

Expand All @@ -152,10 +150,10 @@ export function existsOne(
*/
export function findAll(
test: (elem: Element) => boolean,
nodes: AnyNode[],
nodes: AnyNode[] | ParentNode,
): Element[] {
const result = [];
const nodeStack = [nodes];
const nodeStack = [Array.isArray(nodes) ? nodes : [nodes]];
const indexStack = [0];

for (;;) {
Expand All @@ -174,10 +172,9 @@ export function findAll(

const elem = nodeStack[0][indexStack[0]++];

if (!isTag(elem)) continue;
if (test(elem)) result.push(elem);
if (isTag(elem) && test(elem)) result.push(elem);

if (elem.children.length > 0) {
if (hasChildren(elem) && elem.children.length > 0) {
indexStack.unshift(0);
nodeStack.unshift(elem.children);
}
Expand Down
Loading