fix types

Author: yeonjuan

src/types/node.ts

@@ -1,5 +1,5 @@
 import { NodeTypes } from "../constants";
-import { SimpleNode, TemplatesContainerNode } from "./simple-node";
+import { SimpleNode, CompositeNode } from "./simple-node";
 import { BaseNode } from "./base-node";
 
 export interface DocumentNode extends BaseNode {
@@ -9,7 +9,7 @@ export interface DocumentNode extends BaseNode {
   >;
 }
 
-export type TextNode = TemplatesContainerNode<NodeTypes.Text>;
+export type TextNode = CompositeNode<NodeTypes.Text>;
 
 export interface TagNode extends BaseNode {
   type: NodeTypes.Tag;
@@ -38,10 +38,9 @@ export interface AttributeNode extends BaseNode {
   endWrapper?: AttributeValueWrapperEndNode;
 }
 
-export type AttributeKeyNode = TemplatesContainerNode<NodeTypes.AttributeKey>;
+export type AttributeKeyNode = CompositeNode<NodeTypes.AttributeKey>;
 
-export type AttributeValueNode =
-  TemplatesContainerNode<NodeTypes.AttributeValue>;
+export type AttributeValueNode = CompositeNode<NodeTypes.AttributeValue>;
 
 export type AttributeValueWrapperStartNode =
   SimpleNode<NodeTypes.AttributeValueWrapperStart>;
@@ -63,8 +62,7 @@ export type CloseScriptTagNode = SimpleNode<NodeTypes.CloseScriptTag>;
 
 export type OpenScriptTagEndNode = SimpleNode<NodeTypes.OpenScriptTagEnd>;
 
-export type ScriptTagContentNode =
-  TemplatesContainerNode<NodeTypes.ScriptTagContent>;
+export type ScriptTagContentNode = CompositeNode<NodeTypes.ScriptTagContent>;
 
 export interface StyleTagNode extends BaseNode {
   type: NodeTypes.StyleTag;
@@ -79,8 +77,7 @@ export type OpenStyleTagStartNode = SimpleNode<NodeTypes.OpenStyleTagStart>;
 
 export type OpenStyleTagEndNode = SimpleNode<NodeTypes.OpenStyleTagEnd>;
 
-export type StyleTagContentNode =
-  TemplatesContainerNode<NodeTypes.StyleTagContent>;
+export type StyleTagContentNode = CompositeNode<NodeTypes.StyleTagContent>;
 
 export type CloseStyleTagNode = SimpleNode<NodeTypes.CloseStyleTag>;
 
@@ -95,8 +92,7 @@ export type CommentOpenNode = SimpleNode<NodeTypes.CommentOpen>;
 
 export type CommentCloseNode = SimpleNode<NodeTypes.CommentClose>;
 
-export type CommentContentNode =
-  TemplatesContainerNode<NodeTypes.CommentContent>;
+export type CommentContentNode = CompositeNode<NodeTypes.CommentContent>;
 
 export interface DoctypeNode extends BaseNode {
   type: NodeTypes.Doctype;

src/types/simple-node.ts

@@ -6,13 +6,12 @@ export interface SimpleNode<T extends NodeTypes> extends BaseNode {
   value: string;
 }
 
-export interface TemplatableNode<T extends NodeTypes> extends BaseNode {
+export interface PartNode<T extends NodeTypes> extends BaseNode {
   type: T;
   value: string;
-  isTemplate?: boolean;
 }
 
-export interface TemplatesContainerNode<T extends NodeTypes> extends BaseNode {
-  templates: TemplatableNode<T>[];
+export interface CompositeNode<T extends NodeTypes> extends BaseNode {
+  parts: PartNode<T>[];
   value: string;
 }

src/utils/create-node-from.ts

@@ -12,14 +12,9 @@ export function createNodeFrom<T extends AnyToken>(token: T): unknown {
     range,
   };
   // @ts-ignore
-  if (token.templates) {
+  if (token.parts) {
     // @ts-ignore
-    ret.templates = token.templates;
-  }
-  // @ts-ignore
-  if (token.isTemplate) {
-    // @ts-ignore
-    ret.isTemplate = token.isTemplate;
+    ret.parts = token.parts;
   }
 
   return ret;