Skip to content

Commit

Permalink
refactor: expose createTextNode on defaultTreeAdapter (#1040)
Browse files Browse the repository at this point in the history
  • Loading branch information
jmsjtu authored Nov 4, 2023
1 parent dfd1b89 commit 50dd730
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 16 deletions.
12 changes: 6 additions & 6 deletions packages/parse5-htmlparser2-tree-adapter/lib/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ export type Htmlparser2TreeAdapterMap = TreeAdapterTypeMap<
ProcessingInstruction
>;

function createTextNode(value: string): Text {
return new Text(value);
}

function enquoteDoctypeId(id: string): string {
const quote = id.includes('"') ? "'" : '"';

Expand Down Expand Up @@ -99,6 +95,10 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
return new Comment(data);
},

createTextNode(value: string): Text {
return new Text(value);
},

//Tree mutation
appendChild(parentNode: ParentNode, newNode: ChildNode): void {
const prev = parentNode.children[parentNode.children.length - 1];
Expand Down Expand Up @@ -189,7 +189,7 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
if (lastChild && isText(lastChild)) {
lastChild.data += text;
} else {
adapter.appendChild(parentNode, createTextNode(text));
adapter.appendChild(parentNode, adapter.createTextNode(text));
}
},

Expand All @@ -199,7 +199,7 @@ export const adapter: TreeAdapter<Htmlparser2TreeAdapterMap> = {
if (prevNode && isText(prevNode)) {
prevNode.data += text;
} else {
adapter.insertBefore(parentNode, createTextNode(text), referenceNode);
adapter.insertBefore(parentNode, adapter.createTextNode(text), referenceNode);
}
},

Expand Down
20 changes: 10 additions & 10 deletions packages/parse5/lib/tree-adapters/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,6 @@ export type DefaultTreeAdapterMap = TreeAdapterTypeMap<
DocumentType
>;

function createTextNode(value: string): TextNode {
return {
nodeName: '#text',
value,
parentNode: null,
};
}

export const defaultTreeAdapter: TreeAdapter<DefaultTreeAdapterMap> = {
//Node construction
createDocument(): Document {
Expand Down Expand Up @@ -146,6 +138,14 @@ export const defaultTreeAdapter: TreeAdapter<DefaultTreeAdapterMap> = {
};
},

createTextNode(value: string): TextNode {
return {
nodeName: '#text',
value,
parentNode: null,
};
},

//Tree mutation
appendChild(parentNode: ParentNode, newNode: ChildNode): void {
parentNode.childNodes.push(newNode);
Expand Down Expand Up @@ -213,7 +213,7 @@ export const defaultTreeAdapter: TreeAdapter<DefaultTreeAdapterMap> = {
}
}

defaultTreeAdapter.appendChild(parentNode, createTextNode(text));
defaultTreeAdapter.appendChild(parentNode, defaultTreeAdapter.createTextNode(text));
},

insertTextBefore(parentNode: ParentNode, text: string, referenceNode: ChildNode): void {
Expand All @@ -222,7 +222,7 @@ export const defaultTreeAdapter: TreeAdapter<DefaultTreeAdapterMap> = {
if (prevNode && defaultTreeAdapter.isTextNode(prevNode)) {
prevNode.value += text;
} else {
defaultTreeAdapter.insertBefore(parentNode, createTextNode(text), referenceNode);
defaultTreeAdapter.insertBefore(parentNode, defaultTreeAdapter.createTextNode(text), referenceNode);
}
},

Expand Down
7 changes: 7 additions & 0 deletions packages/parse5/lib/tree-adapters/interface.ts
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ export interface TreeAdapter<T extends TreeAdapterTypeMap = TreeAdapterTypeMap>
*/
createCommentNode(data: string): T['commentNode'];

/**
* Creates a text node.
*
* @param value - Text.
*/
createTextNode(value: string): T['textNode'];

/**
* Creates a document node.
*/
Expand Down

0 comments on commit 50dd730

Please sign in to comment.