Archived
1
0
Fork 0

feat(node): add fragment

feat(node): add async nodes
This commit is contained in:
Dmitriy Pleshevskiy 2022-03-16 22:23:29 +03:00
parent 0978aa8754
commit a0df5e48fa
3 changed files with 85 additions and 55 deletions

View file

@ -1,29 +1,75 @@
import { isNil, Nilable } from "./lang.mjs";
export type AnyNode = TextNode | Node;
export type AnyNode = AnySyncNode | AnyAsyncNode;
export type AnyAsyncNode = Promise<AnySyncNode>;
export type AnySyncNode = TextNode | Elem | Frag;
export class TextNode {
#text: string;
export class TextNode extends String {}
constructor(text: string) {
this.#text = text;
export function F(children: AnyNode[]): Frag {
return new Frag().withChildren(children);
}
export class Frag {
#children: Nilable<AnyNode[]>;
constructor() {
this.#children = undefined;
}
get text(): string {
return this.#text;
get children(): Nilable<AnyNode[]> {
return this.#children;
}
withText(text: string): this {
this.addText(text);
return this;
}
addText(text: string): void {
this.addChild(new TextNode(text));
}
maybeWithChildren(nodes?: Nilable<AnyNode[]>): this {
if (isNil(nodes)) return this;
return this.withChildren(nodes);
}
withChildren(nodes: AnyNode[]): this {
nodes.forEach((n) => this.addChild(n));
return this;
}
withChild(node: AnyNode): this {
this.addChild(node);
return this;
}
addChild(node: AnyNode): void {
if (isNil(this.#children)) this.#children = [];
this.#children.push(node);
}
}
export class Node {
export function E(
tagName: string,
attrs: ElemAttrs,
children?: Nilable<AnyNode[]>
): Elem {
return new Elem(tagName).withAttrs(attrs).maybeWithChildren(children);
}
export type ElemAttrs = Record<string, unknown>;
export class Elem extends Frag {
#tagName: string;
#attrs: Record<string, unknown>;
#children: Nilable<AnyNode[]>;
#attrs: ElemAttrs;
#isSelfClosed: boolean;
constructor(tagName: string) {
super();
this.#tagName = tagName;
this.#attrs = {};
this.#children = undefined;
this.#isSelfClosed = selfClosedTagNames.has(tagName);
}
@ -35,16 +81,12 @@ export class Node {
return this.#attrs;
}
get children(): Nilable<AnyNode[]> {
return this.#children;
}
withAttrs(attrs: Record<string, unknown>): Node {
withAttrs(attrs: Record<string, unknown>): Elem {
Object.entries(attrs).forEach(([key, value]) => this.addAttr(key, value));
return this;
}
withAttr(name: string, value: unknown): Node {
withAttr(name: string, value: unknown): Elem {
this.addAttr(name, value);
return this;
}
@ -53,30 +95,10 @@ export class Node {
this.#attrs[name] = value;
}
withText(text: string): Node {
this.addText(text);
return this;
}
addText(text: string): void {
this.addChild(new TextNode(text));
}
withChildren(nodes: AnyNode[]): Node {
nodes.forEach((n) => this.addChild(n));
return this;
}
withChild(node: AnyNode): Node {
this.addChild(node);
return this;
}
addChild(node: AnyNode): void {
addChild(node: AnySyncNode): void {
if (this.#isSelfClosed)
throw new Error("You cannot add child to self closed element");
if (isNil(this.#children)) this.#children = [];
this.#children.push(node);
super.addChild(node);
}
}

View file

@ -1,30 +1,38 @@
import { Renderer } from "./types.mjs";
import { AnyNode, Node, TextNode } from "./node.mjs";
import { isBool, isNil, Nullable } from "./lang.mjs";
import { AnyNode, Elem, Frag, TextNode } from "./nodes.mjs";
export class StrRenderer implements Renderer<string> {
async render(node: Node): Promise<string> {
return encodeNode(node);
async render(node: Elem | Promise<Elem>): Promise<string> {
return encodeNode(await node);
}
}
function encodeAnyNode(node: AnyNode): string {
return node instanceof TextNode ? encodeTextNode(node) : encodeNode(node);
async function encodeAnyNode(node: AnyNode): Promise<string> {
const syncNode = await node;
return syncNode instanceof TextNode
? encodeTextNode(syncNode)
: encodeNode(syncNode);
}
function encodeTextNode(node: TextNode): string {
return node.text;
return String(node);
}
function encodeNode(node: Node): string {
return encodeHtml(
node.tagName,
node.attrs,
node.children?.map(encodeAnyNode)
);
async function encodeNode(node: Elem | Frag): Promise<string> {
const encodedChildren = isNil(node.children)
? undefined
: await Promise.all(node.children.map(encodeAnyNode));
return node instanceof Elem
? encodeHtmlElement(node.tagName, node.attrs, encodedChildren)
: encodeHtmlFragment(encodedChildren);
}
function encodeHtml(
function encodeHtmlFragment(children?: string[]): string {
return children?.join("") ?? "";
}
function encodeHtmlElement(
tagName: string,
attrs?: Record<string, unknown>,
children?: string[]
@ -34,7 +42,7 @@ function encodeHtml(
return `${open}${children.join("")}</${tagName}>`;
}
function encodeAttrs(attrs?: Record<string, unknown>): string {
function encodeAttrs(attrs?: Record<string, unknown>): Nullable<string> {
if (!attrs) return "";
return Object.entries(attrs)

View file

@ -1,5 +1,5 @@
import { Node } from "./node.mjs";
import { Elem } from "./nodes.mjs";
export interface Renderer<T> {
render(node: Node): Promise<T>;
render(node: Elem | Promise<Elem>): Promise<T>;
}