Skip to content

fix: incorrect types #30

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
merged 2 commits into from
Mar 3, 2025
Merged

fix: incorrect types #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf38bf6
fix: incorrect types
yeonjuan Mar 3, 2025
f1e68cb
fix format
yeonjuan Mar 3, 2025
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
29 changes: 23 additions & 6 deletions src/types/node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,20 @@ import { NodeTypes } from "../constants";
import {
SimpleNode,
CompositeNode,
PartNode,
TemplateNode,
PartNodeBase,
TemplateNodeBase,
} from "./simple-node";
import { BaseNode } from "./base-node";

export { PartNode, TemplateNode };

export interface DocumentNode extends BaseNode {
type: NodeTypes.Document;
children: Array<
TextNode | TagNode | ScriptTagNode | StyleTagNode | CommentNode
| TextNode
| TagNode
| ScriptTagNode
| StyleTagNode
| CommentNode
| DoctypeNode
>;
}

Expand Down Expand Up @@ -128,6 +131,16 @@ export type DoctypeAttributeWrapperStartNode =
export type DoctypeAttributeWrapperEndNode =
SimpleNode<NodeTypes.DoctypeAttributeWrapperEnd>;

export type OpenTemplateNode = SimpleNode<NodeTypes.OpenTemplate>;

export type CloseTemplateNode = SimpleNode<NodeTypes.CloseTemplate>;

export type TemplateNode = TemplateNodeBase<
Exclude<NodeTypes, NodeTypes.Template | NodeTypes.Part>
>;

export type PartNode = PartNodeBase<Exclude<NodeTypes, NodeTypes.Part>>;

export type AnyNode =
| DocumentNode
| TextNode
Expand Down Expand Up @@ -160,4 +173,8 @@ export type AnyNode =
| DoctypeAttributeNode
| DoctypeAttributeValueNode
| DoctypeAttributeWrapperStartNode
| DoctypeAttributeWrapperEndNode;
| DoctypeAttributeWrapperEndNode
| PartNode
| TemplateNode
| OpenTemplateNode
| CloseTemplateNode;
13 changes: 9 additions & 4 deletions src/types/simple-node.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,25 @@ export interface SimpleNode<T extends NodeTypes> extends BaseNode {
value: string;
}

export interface PartNode<T extends NodeTypes> extends BaseNode {
export interface PartNodeBase<T extends Exclude<NodeTypes, NodeTypes.Part>>
extends BaseNode {
type: NodeTypes.Part;
partOf: T;
value: string;
}

export interface TemplateNode<T extends NodeTypes> extends BaseNode {
export interface TemplateNodeBase<
T extends Exclude<NodeTypes, NodeTypes.Template | NodeTypes.Part>
> extends BaseNode {
type: NodeTypes.Template;
partOf: T;
open?: SimpleNode<NodeTypes.OpenTemplate>;
close?: SimpleNode<NodeTypes.CloseTemplate>;
}

export interface CompositeNode<T extends NodeTypes> extends BaseNode {
parts: (PartNode<T> | TemplateNode<T>)[];
export interface CompositeNode<
T extends Exclude<NodeTypes, NodeTypes.Template | NodeTypes.Part>
> extends BaseNode {
parts: (PartNodeBase<T> | TemplateNodeBase<T>)[];
value: string;
}
Loading