@herb-tools/core 0.5.0 → 0.6.1

package/src/nodes.ts

@@ -1,5 +1,5 @@
 // NOTE: This file is generated by the templates/template.rb script and should not
-// be modified manually. See /Users/marcoroth/Development/herb-release-0.5.0/templates/javascript/packages/core/src/nodes.ts.erb
+// be modified manually. See /Users/marcoroth/Development/herb-release-0.6.1/templates/javascript/packages/core/src/nodes.ts.erb
 
 import { Location } from "./location.js"
 import { Token, SerializedToken } from "./token.js"
@@ -33,6 +33,10 @@ export abstract class Node implements BaseNodeProps {
     return fromSerializedNode(node)
   }
 
+  static get type(): NodeType {
+    throw new Error("AST_NODE")
+  }
+
   constructor(type: NodeType, location: Location, errors: HerbError[]) {
     this.type = type
     this.location = location
@@ -51,6 +55,14 @@ export abstract class Node implements BaseNodeProps {
     return this.treeInspect(0)
   }
 
+  is<T extends Node>(nodeClass: { new(...args: any[]): T; prototype: T, type: NodeType }): this is T {
+    return this.type === nodeClass.type
+  }
+
+  isOfType<T extends Node>(type: NodeType): this is T {
+    return this.type === type
+  }
+
   get isSingleLine(): boolean {
     return this.location.start.line === this.location.end.line
   }
@@ -133,6 +145,10 @@ export interface DocumentNodeProps extends BaseNodeProps {
 export class DocumentNode extends Node {
   readonly children: Node[];
 
+  static get type(): NodeType {
+    return "AST_DOCUMENT_NODE"
+  }
+
   static from(data: SerializedDocumentNode): DocumentNode {
     return new DocumentNode({
       type: data.type,
@@ -183,8 +199,6 @@ export class DocumentNode extends Node {
     output += `├── errors: ${this.inspectArray(this.errors, "│   ")}`;
     output += `└── children: ${this.inspectArray(this.children, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -201,6 +215,10 @@ export interface LiteralNodeProps extends BaseNodeProps {
 export class LiteralNode extends Node {
   readonly content: string;
 
+  static get type(): NodeType {
+    return "AST_LITERAL_NODE"
+  }
+
   static from(data: SerializedLiteralNode): LiteralNode {
     return new LiteralNode({
       type: data.type,
@@ -249,8 +267,6 @@ export class LiteralNode extends Node {
     output += `├── errors: ${this.inspectArray(this.errors, "│   ")}`;
     output += `└── content: ${this.content ? JSON.stringify(this.content) : "∅"}\n`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -279,6 +295,10 @@ export class HTMLOpenTagNode extends Node {
   readonly children: Node[];
   readonly is_void: boolean;
 
+  static get type(): NodeType {
+    return "AST_HTML_OPEN_TAG_NODE"
+  }
+
   static from(data: SerializedHTMLOpenTagNode): HTMLOpenTagNode {
     return new HTMLOpenTagNode({
       type: data.type,
@@ -345,8 +365,6 @@ export class HTMLOpenTagNode extends Node {
     output += `├── children: ${this.inspectArray(this.children, "│   ")}`;
     output += `└── is_void: ${typeof this.is_void === 'boolean' ? String(this.is_void) : "∅"}\n`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -355,20 +373,27 @@ export interface SerializedHTMLCloseTagNode extends SerializedNode {
   type: "AST_HTML_CLOSE_TAG_NODE";
   tag_opening: SerializedToken | null;
   tag_name: SerializedToken | null;
+  children: SerializedNode[];
   tag_closing: SerializedToken | null;
 }
 
 export interface HTMLCloseTagNodeProps extends BaseNodeProps {
   tag_opening: Token | null;
   tag_name: Token | null;
+  children: Node[];
   tag_closing: Token | null;
 }
 
 export class HTMLCloseTagNode extends Node {
   readonly tag_opening: Token | null;
   readonly tag_name: Token | null;
+  readonly children: Node[];
   readonly tag_closing: Token | null;
 
+  static get type(): NodeType {
+    return "AST_HTML_CLOSE_TAG_NODE"
+  }
+
   static from(data: SerializedHTMLCloseTagNode): HTMLCloseTagNode {
     return new HTMLCloseTagNode({
       type: data.type,
@@ -376,6 +401,7 @@ export class HTMLCloseTagNode extends Node {
       errors: (data.errors || []).map(error => HerbError.from(error)),
       tag_opening: data.tag_opening ? Token.from(data.tag_opening) : null,
       tag_name: data.tag_name ? Token.from(data.tag_name) : null,
+      children: (data.children || []).map(node => fromSerializedNode(node)),
       tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
     })
   }
@@ -384,6 +410,7 @@ export class HTMLCloseTagNode extends Node {
     super(props.type, props.location, props.errors);
     this.tag_opening = props.tag_opening;
     this.tag_name = props.tag_name;
+    this.children = props.children;
     this.tag_closing = props.tag_closing;
   }
 
@@ -393,6 +420,7 @@ export class HTMLCloseTagNode extends Node {
 
   childNodes(): (Node | null | undefined)[] {
     return [
+      ...this.children,
     ];
   }
 
@@ -403,6 +431,7 @@ export class HTMLCloseTagNode extends Node {
   recursiveErrors(): HerbError[] {
     return [
       ...this.errors,
+      ...this.children.map(node => node.recursiveErrors()),
     ].flat();
   }
 
@@ -412,6 +441,7 @@ export class HTMLCloseTagNode extends Node {
       type: "AST_HTML_CLOSE_TAG_NODE",
       tag_opening: this.tag_opening ? this.tag_opening.toJSON() : null,
       tag_name: this.tag_name ? this.tag_name.toJSON() : null,
+      children: this.children.map(node => node.toJSON()),
       tag_closing: this.tag_closing ? this.tag_closing.toJSON() : null,
     };
   }
@@ -423,143 +453,50 @@ export class HTMLCloseTagNode extends Node {
     output += `├── errors: ${this.inspectArray(this.errors, "│   ")}`;
     output += `├── tag_opening: ${this.tag_opening ? this.tag_opening.treeInspect() : "∅"}\n`;
     output += `├── tag_name: ${this.tag_name ? this.tag_name.treeInspect() : "∅"}\n`;
+    output += `├── children: ${this.inspectArray(this.children, "│   ")}`;
     output += `└── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
 
-    // output += "\n";
-
-    return output
-  }
-}
-
-export interface SerializedHTMLSelfCloseTagNode extends SerializedNode {
-  type: "AST_HTML_SELF_CLOSE_TAG_NODE";
-  tag_opening: SerializedToken | null;
-  tag_name: SerializedToken | null;
-  attributes: SerializedNode[];
-  tag_closing: SerializedToken | null;
-  is_void: boolean;
-}
-
-export interface HTMLSelfCloseTagNodeProps extends BaseNodeProps {
-  tag_opening: Token | null;
-  tag_name: Token | null;
-  attributes: any[];
-  tag_closing: Token | null;
-  is_void: boolean;
-}
-
-export class HTMLSelfCloseTagNode extends Node {
-  readonly tag_opening: Token | null;
-  readonly tag_name: Token | null;
-  readonly attributes: any[];
-  readonly tag_closing: Token | null;
-  readonly is_void: boolean;
-
-  static from(data: SerializedHTMLSelfCloseTagNode): HTMLSelfCloseTagNode {
-    return new HTMLSelfCloseTagNode({
-      type: data.type,
-      location: Location.from(data.location),
-      errors: (data.errors || []).map(error => HerbError.from(error)),
-      tag_opening: data.tag_opening ? Token.from(data.tag_opening) : null,
-      tag_name: data.tag_name ? Token.from(data.tag_name) : null,
-      attributes: (data.attributes || []).map(node => fromSerializedNode(node)),
-      tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
-      is_void: data.is_void,
-    })
-  }
-
-  constructor(props: HTMLSelfCloseTagNodeProps) {
-    super(props.type, props.location, props.errors);
-    this.tag_opening = props.tag_opening;
-    this.tag_name = props.tag_name;
-    this.attributes = props.attributes;
-    this.tag_closing = props.tag_closing;
-    this.is_void = props.is_void;
-  }
-
-  accept(visitor: Visitor): void {
-    visitor.visitHTMLSelfCloseTagNode(this)
-  }
-
-  childNodes(): (Node | null | undefined)[] {
-    return [
-      ...this.attributes,
-    ];
-  }
-
-  compactChildNodes(): Node[] {
-    return this.childNodes().filter(node => node !== null && node !== undefined)
-  }
-
-  recursiveErrors(): HerbError[] {
-    return [
-      ...this.errors,
-      ...this.attributes.map(node => node.recursiveErrors()),
-    ].flat();
-  }
-
-  toJSON(): SerializedHTMLSelfCloseTagNode {
-    return {
-      ...super.toJSON(),
-      type: "AST_HTML_SELF_CLOSE_TAG_NODE",
-      tag_opening: this.tag_opening ? this.tag_opening.toJSON() : null,
-      tag_name: this.tag_name ? this.tag_name.toJSON() : null,
-      attributes: this.attributes.map(node => node.toJSON()),
-      tag_closing: this.tag_closing ? this.tag_closing.toJSON() : null,
-      is_void: this.is_void,
-    };
-  }
-
-  treeInspect(): string {
-    let output = "";
-
-    output += `@ HTMLSelfCloseTagNode ${this.location.treeInspectWithLabel()}\n`;
-    output += `├── errors: ${this.inspectArray(this.errors, "│   ")}`;
-    output += `├── tag_opening: ${this.tag_opening ? this.tag_opening.treeInspect() : "∅"}\n`;
-    output += `├── tag_name: ${this.tag_name ? this.tag_name.treeInspect() : "∅"}\n`;
-    output += `├── attributes: ${this.inspectArray(this.attributes, "│   ")}`;
-    output += `├── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
-    output += `└── is_void: ${typeof this.is_void === 'boolean' ? String(this.is_void) : "∅"}\n`;
-
-    // output += "\n";
-
     return output
   }
 }
 
 export interface SerializedHTMLElementNode extends SerializedNode {
   type: "AST_HTML_ELEMENT_NODE";
-  open_tag: SerializedNode | null;
+  open_tag: SerializedHTMLOpenTagNode | null;
   tag_name: SerializedToken | null;
   body: SerializedNode[];
-  close_tag: SerializedNode | null;
+  close_tag: SerializedHTMLCloseTagNode | null;
   is_void: boolean;
 }
 
 export interface HTMLElementNodeProps extends BaseNodeProps {
-  open_tag: Node | null;
+  open_tag: HTMLOpenTagNode | null;
   tag_name: Token | null;
   body: Node[];
-  close_tag: Node | null;
+  close_tag: HTMLCloseTagNode | null;
   is_void: boolean;
 }
 
 export class HTMLElementNode extends Node {
-  readonly open_tag: Node | null;
+  readonly open_tag: HTMLOpenTagNode | null;
   readonly tag_name: Token | null;
   readonly body: Node[];
-  readonly close_tag: Node | null;
+  readonly close_tag: HTMLCloseTagNode | null;
   readonly is_void: boolean;
 
+  static get type(): NodeType {
+    return "AST_HTML_ELEMENT_NODE"
+  }
+
   static from(data: SerializedHTMLElementNode): HTMLElementNode {
     return new HTMLElementNode({
       type: data.type,
       location: Location.from(data.location),
       errors: (data.errors || []).map(error => HerbError.from(error)),
-      open_tag: data.open_tag ? fromSerializedNode((data.open_tag as any)) : null,
+      open_tag: data.open_tag ? fromSerializedNode((data.open_tag)) : null,
       tag_name: data.tag_name ? Token.from(data.tag_name) : null,
       body: (data.body || []).map(node => fromSerializedNode(node)),
-      close_tag: data.close_tag ? fromSerializedNode((data.close_tag as any)) : null,
+      close_tag: data.close_tag ? fromSerializedNode((data.close_tag)) : null,
       is_void: data.is_void,
     })
   }
@@ -621,8 +558,6 @@ export class HTMLElementNode extends Node {
     output += `├── close_tag: ${this.inspectNode(this.close_tag, "│   ")}`;
     output += `└── is_void: ${typeof this.is_void === 'boolean' ? String(this.is_void) : "∅"}\n`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -648,6 +583,10 @@ export class HTMLAttributeValueNode extends Node {
   readonly close_quote: Token | null;
   readonly quoted: boolean;
 
+  static get type(): NodeType {
+    return "AST_HTML_ATTRIBUTE_VALUE_NODE"
+  }
+
   static from(data: SerializedHTMLAttributeValueNode): HTMLAttributeValueNode {
     return new HTMLAttributeValueNode({
       type: data.type,
@@ -710,36 +649,38 @@ export class HTMLAttributeValueNode extends Node {
     output += `├── close_quote: ${this.close_quote ? this.close_quote.treeInspect() : "∅"}\n`;
     output += `└── quoted: ${typeof this.quoted === 'boolean' ? String(this.quoted) : "∅"}\n`;
 
-    // output += "\n";
-
     return output
   }
 }
 
 export interface SerializedHTMLAttributeNameNode extends SerializedNode {
   type: "AST_HTML_ATTRIBUTE_NAME_NODE";
-  name: SerializedToken | null;
+  children: SerializedNode[];
 }
 
 export interface HTMLAttributeNameNodeProps extends BaseNodeProps {
-  name: Token | null;
+  children: Node[];
 }
 
 export class HTMLAttributeNameNode extends Node {
-  readonly name: Token | null;
+  readonly children: Node[];
+
+  static get type(): NodeType {
+    return "AST_HTML_ATTRIBUTE_NAME_NODE"
+  }
 
   static from(data: SerializedHTMLAttributeNameNode): HTMLAttributeNameNode {
     return new HTMLAttributeNameNode({
       type: data.type,
       location: Location.from(data.location),
       errors: (data.errors || []).map(error => HerbError.from(error)),
-      name: data.name ? Token.from(data.name) : null,
+      children: (data.children || []).map(node => fromSerializedNode(node)),
     })
   }
 
   constructor(props: HTMLAttributeNameNodeProps) {
     super(props.type, props.location, props.errors);
-    this.name = props.name;
+    this.children = props.children;
   }
 
   accept(visitor: Visitor): void {
@@ -748,6 +689,7 @@ export class HTMLAttributeNameNode extends Node {
 
   childNodes(): (Node | null | undefined)[] {
     return [
+      ...this.children,
     ];
   }
 
@@ -758,6 +700,7 @@ export class HTMLAttributeNameNode extends Node {
   recursiveErrors(): HerbError[] {
     return [
       ...this.errors,
+      ...this.children.map(node => node.recursiveErrors()),
     ].flat();
   }
 
@@ -765,7 +708,7 @@ export class HTMLAttributeNameNode extends Node {
     return {
       ...super.toJSON(),
       type: "AST_HTML_ATTRIBUTE_NAME_NODE",
-      name: this.name ? this.name.toJSON() : null,
+      children: this.children.map(node => node.toJSON()),
     };
   }
 
@@ -774,9 +717,7 @@ export class HTMLAttributeNameNode extends Node {
 
     output += `@ HTMLAttributeNameNode ${this.location.treeInspectWithLabel()}\n`;
     output += `├── errors: ${this.inspectArray(this.errors, "│   ")}`;
-    output += `└── name: ${this.name ? this.name.treeInspect() : "∅"}\n`;
-
-    // output += "\n";
+    output += `└── children: ${this.inspectArray(this.children, "    ")}`;
 
     return output
   }
@@ -784,30 +725,34 @@ export class HTMLAttributeNameNode extends Node {
 
 export interface SerializedHTMLAttributeNode extends SerializedNode {
   type: "AST_HTML_ATTRIBUTE_NODE";
-  name: SerializedNode | null;
+  name: SerializedHTMLAttributeNameNode | null;
   equals: SerializedToken | null;
-  value: SerializedNode | null;
+  value: SerializedHTMLAttributeValueNode | null;
 }
 
 export interface HTMLAttributeNodeProps extends BaseNodeProps {
-  name: Node | null;
+  name: HTMLAttributeNameNode | null;
   equals: Token | null;
-  value: Node | null;
+  value: HTMLAttributeValueNode | null;
 }
 
 export class HTMLAttributeNode extends Node {
-  readonly name: Node | null;
+  readonly name: HTMLAttributeNameNode | null;
   readonly equals: Token | null;
-  readonly value: Node | null;
+  readonly value: HTMLAttributeValueNode | null;
+
+  static get type(): NodeType {
+    return "AST_HTML_ATTRIBUTE_NODE"
+  }
 
   static from(data: SerializedHTMLAttributeNode): HTMLAttributeNode {
     return new HTMLAttributeNode({
       type: data.type,
       location: Location.from(data.location),
       errors: (data.errors || []).map(error => HerbError.from(error)),
-      name: data.name ? fromSerializedNode((data.name as any)) : null,
+      name: data.name ? fromSerializedNode((data.name)) : null,
       equals: data.equals ? Token.from(data.equals) : null,
-      value: data.value ? fromSerializedNode((data.value as any)) : null,
+      value: data.value ? fromSerializedNode((data.value)) : null,
     })
   }
 
@@ -860,8 +805,6 @@ export class HTMLAttributeNode extends Node {
     output += `├── equals: ${this.equals ? this.equals.treeInspect() : "∅"}\n`;
     output += `└── value: ${this.inspectNode(this.value, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -878,6 +821,10 @@ export interface HTMLTextNodeProps extends BaseNodeProps {
 export class HTMLTextNode extends Node {
   readonly content: string;
 
+  static get type(): NodeType {
+    return "AST_HTML_TEXT_NODE"
+  }
+
   static from(data: SerializedHTMLTextNode): HTMLTextNode {
     return new HTMLTextNode({
       type: data.type,
@@ -926,8 +873,6 @@ export class HTMLTextNode extends Node {
     output += `├── errors: ${this.inspectArray(this.errors, "│   ")}`;
     output += `└── content: ${this.content ? JSON.stringify(this.content) : "∅"}\n`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -950,6 +895,10 @@ export class HTMLCommentNode extends Node {
   readonly children: Node[];
   readonly comment_end: Token | null;
 
+  static get type(): NodeType {
+    return "AST_HTML_COMMENT_NODE"
+  }
+
   static from(data: SerializedHTMLCommentNode): HTMLCommentNode {
     return new HTMLCommentNode({
       type: data.type,
@@ -1008,8 +957,6 @@ export class HTMLCommentNode extends Node {
     output += `├── children: ${this.inspectArray(this.children, "│   ")}`;
     output += `└── comment_end: ${this.comment_end ? this.comment_end.treeInspect() : "∅"}\n`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -1032,6 +979,10 @@ export class HTMLDoctypeNode extends Node {
   readonly children: Node[];
   readonly tag_closing: Token | null;
 
+  static get type(): NodeType {
+    return "AST_HTML_DOCTYPE_NODE"
+  }
+
   static from(data: SerializedHTMLDoctypeNode): HTMLDoctypeNode {
     return new HTMLDoctypeNode({
       type: data.type,
@@ -1090,7 +1041,173 @@ export class HTMLDoctypeNode extends Node {
     output += `├── children: ${this.inspectArray(this.children, "│   ")}`;
     output += `└── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
 
-    // output += "\n";
+    return output
+  }
+}
+
+export interface SerializedXMLDeclarationNode extends SerializedNode {
+  type: "AST_XML_DECLARATION_NODE";
+  tag_opening: SerializedToken | null;
+  children: SerializedNode[];
+  tag_closing: SerializedToken | null;
+}
+
+export interface XMLDeclarationNodeProps extends BaseNodeProps {
+  tag_opening: Token | null;
+  children: Node[];
+  tag_closing: Token | null;
+}
+
+export class XMLDeclarationNode extends Node {
+  readonly tag_opening: Token | null;
+  readonly children: Node[];
+  readonly tag_closing: Token | null;
+
+  static get type(): NodeType {
+    return "AST_XML_DECLARATION_NODE"
+  }
+
+  static from(data: SerializedXMLDeclarationNode): XMLDeclarationNode {
+    return new XMLDeclarationNode({
+      type: data.type,
+      location: Location.from(data.location),
+      errors: (data.errors || []).map(error => HerbError.from(error)),
+      tag_opening: data.tag_opening ? Token.from(data.tag_opening) : null,
+      children: (data.children || []).map(node => fromSerializedNode(node)),
+      tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
+    })
+  }
+
+  constructor(props: XMLDeclarationNodeProps) {
+    super(props.type, props.location, props.errors);
+    this.tag_opening = props.tag_opening;
+    this.children = props.children;
+    this.tag_closing = props.tag_closing;
+  }
+
+  accept(visitor: Visitor): void {
+    visitor.visitXMLDeclarationNode(this)
+  }
+
+  childNodes(): (Node | null | undefined)[] {
+    return [
+      ...this.children,
+    ];
+  }
+
+  compactChildNodes(): Node[] {
+    return this.childNodes().filter(node => node !== null && node !== undefined)
+  }
+
+  recursiveErrors(): HerbError[] {
+    return [
+      ...this.errors,
+      ...this.children.map(node => node.recursiveErrors()),
+    ].flat();
+  }
+
+  toJSON(): SerializedXMLDeclarationNode {
+    return {
+      ...super.toJSON(),
+      type: "AST_XML_DECLARATION_NODE",
+      tag_opening: this.tag_opening ? this.tag_opening.toJSON() : null,
+      children: this.children.map(node => node.toJSON()),
+      tag_closing: this.tag_closing ? this.tag_closing.toJSON() : null,
+    };
+  }
+
+  treeInspect(): string {
+    let output = "";
+
+    output += `@ XMLDeclarationNode ${this.location.treeInspectWithLabel()}\n`;
+    output += `├── errors: ${this.inspectArray(this.errors, "│   ")}`;
+    output += `├── tag_opening: ${this.tag_opening ? this.tag_opening.treeInspect() : "∅"}\n`;
+    output += `├── children: ${this.inspectArray(this.children, "│   ")}`;
+    output += `└── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
+
+    return output
+  }
+}
+
+export interface SerializedCDATANode extends SerializedNode {
+  type: "AST_CDATA_NODE";
+  tag_opening: SerializedToken | null;
+  children: SerializedNode[];
+  tag_closing: SerializedToken | null;
+}
+
+export interface CDATANodeProps extends BaseNodeProps {
+  tag_opening: Token | null;
+  children: Node[];
+  tag_closing: Token | null;
+}
+
+export class CDATANode extends Node {
+  readonly tag_opening: Token | null;
+  readonly children: Node[];
+  readonly tag_closing: Token | null;
+
+  static get type(): NodeType {
+    return "AST_CDATA_NODE"
+  }
+
+  static from(data: SerializedCDATANode): CDATANode {
+    return new CDATANode({
+      type: data.type,
+      location: Location.from(data.location),
+      errors: (data.errors || []).map(error => HerbError.from(error)),
+      tag_opening: data.tag_opening ? Token.from(data.tag_opening) : null,
+      children: (data.children || []).map(node => fromSerializedNode(node)),
+      tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
+    })
+  }
+
+  constructor(props: CDATANodeProps) {
+    super(props.type, props.location, props.errors);
+    this.tag_opening = props.tag_opening;
+    this.children = props.children;
+    this.tag_closing = props.tag_closing;
+  }
+
+  accept(visitor: Visitor): void {
+    visitor.visitCDATANode(this)
+  }
+
+  childNodes(): (Node | null | undefined)[] {
+    return [
+      ...this.children,
+    ];
+  }
+
+  compactChildNodes(): Node[] {
+    return this.childNodes().filter(node => node !== null && node !== undefined)
+  }
+
+  recursiveErrors(): HerbError[] {
+    return [
+      ...this.errors,
+      ...this.children.map(node => node.recursiveErrors()),
+    ].flat();
+  }
+
+  toJSON(): SerializedCDATANode {
+    return {
+      ...super.toJSON(),
+      type: "AST_CDATA_NODE",
+      tag_opening: this.tag_opening ? this.tag_opening.toJSON() : null,
+      children: this.children.map(node => node.toJSON()),
+      tag_closing: this.tag_closing ? this.tag_closing.toJSON() : null,
+    };
+  }
+
+  treeInspect(): string {
+    let output = "";
+
+    output += `@ CDATANode ${this.location.treeInspectWithLabel()}\n`;
+    output += `├── errors: ${this.inspectArray(this.errors, "│   ")}`;
+    output += `├── tag_opening: ${this.tag_opening ? this.tag_opening.treeInspect() : "∅"}\n`;
+    output += `├── children: ${this.inspectArray(this.children, "│   ")}`;
+    output += `└── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
 
     return output
   }
@@ -1108,6 +1225,10 @@ export interface WhitespaceNodeProps extends BaseNodeProps {
 export class WhitespaceNode extends Node {
   readonly value: Token | null;
 
+  static get type(): NodeType {
+    return "AST_WHITESPACE_NODE"
+  }
+
   static from(data: SerializedWhitespaceNode): WhitespaceNode {
     return new WhitespaceNode({
       type: data.type,
@@ -1156,8 +1277,6 @@ export class WhitespaceNode extends Node {
     output += `├── errors: ${this.inspectArray(this.errors, "│   ")}`;
     output += `└── value: ${this.value ? this.value.treeInspect() : "∅"}\n`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -1189,6 +1308,10 @@ export class ERBContentNode extends Node {
   readonly parsed: boolean;
   readonly valid: boolean;
 
+  static get type(): NodeType {
+    return "AST_ERB_CONTENT_NODE"
+  }
+
   static from(data: SerializedERBContentNode): ERBContentNode {
     return new ERBContentNode({
       type: data.type,
@@ -1257,8 +1380,6 @@ export class ERBContentNode extends Node {
     output += `├── parsed: ${typeof this.parsed === 'boolean' ? String(this.parsed) : "∅"}\n`;
     output += `└── valid: ${typeof this.valid === 'boolean' ? String(this.valid) : "∅"}\n`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -1281,6 +1402,10 @@ export class ERBEndNode extends Node {
   readonly content: Token | null;
   readonly tag_closing: Token | null;
 
+  static get type(): NodeType {
+    return "AST_ERB_END_NODE"
+  }
+
   static from(data: SerializedERBEndNode): ERBEndNode {
     return new ERBEndNode({
       type: data.type,
@@ -1337,8 +1462,6 @@ export class ERBEndNode extends Node {
     output += `├── content: ${this.content ? this.content.treeInspect() : "∅"}\n`;
     output += `└── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -1364,6 +1487,10 @@ export class ERBElseNode extends Node {
   readonly tag_closing: Token | null;
   readonly statements: Node[];
 
+  static get type(): NodeType {
+    return "AST_ERB_ELSE_NODE"
+  }
+
   static from(data: SerializedERBElseNode): ERBElseNode {
     return new ERBElseNode({
       type: data.type,
@@ -1426,8 +1553,6 @@ export class ERBElseNode extends Node {
     output += `├── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
     output += `└── statements: ${this.inspectArray(this.statements, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -1439,7 +1564,7 @@ export interface SerializedERBIfNode extends SerializedNode {
   tag_closing: SerializedToken | null;
   statements: SerializedNode[];
   subsequent: SerializedNode | null;
-  end_node: SerializedNode | null;
+  end_node: SerializedERBEndNode | null;
 }
 
 export interface ERBIfNodeProps extends BaseNodeProps {
@@ -1448,7 +1573,7 @@ export interface ERBIfNodeProps extends BaseNodeProps {
   tag_closing: Token | null;
   statements: Node[];
   subsequent: Node | null;
-  end_node: Node | null;
+  end_node: ERBEndNode | null;
 }
 
 export class ERBIfNode extends Node {
@@ -1457,7 +1582,11 @@ export class ERBIfNode extends Node {
   readonly tag_closing: Token | null;
   readonly statements: Node[];
   readonly subsequent: Node | null;
-  readonly end_node: Node | null;
+  readonly end_node: ERBEndNode | null;
+
+  static get type(): NodeType {
+    return "AST_ERB_IF_NODE"
+  }
 
   static from(data: SerializedERBIfNode): ERBIfNode {
     return new ERBIfNode({
@@ -1468,8 +1597,8 @@ export class ERBIfNode extends Node {
       content: data.content ? Token.from(data.content) : null,
       tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
       statements: (data.statements || []).map(node => fromSerializedNode(node)),
-      subsequent: data.subsequent ? fromSerializedNode((data.subsequent as any)) : null,
-      end_node: data.end_node ? fromSerializedNode((data.end_node as any)) : null,
+      subsequent: data.subsequent ? fromSerializedNode((data.subsequent)) : null,
+      end_node: data.end_node ? fromSerializedNode((data.end_node)) : null,
     })
   }
 
@@ -1533,8 +1662,6 @@ export class ERBIfNode extends Node {
     output += `├── subsequent: ${this.inspectNode(this.subsequent, "│   ")}`;
     output += `└── end_node: ${this.inspectNode(this.end_node, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -1545,7 +1672,7 @@ export interface SerializedERBBlockNode extends SerializedNode {
   content: SerializedToken | null;
   tag_closing: SerializedToken | null;
   body: SerializedNode[];
-  end_node: SerializedNode | null;
+  end_node: SerializedERBEndNode | null;
 }
 
 export interface ERBBlockNodeProps extends BaseNodeProps {
@@ -1553,7 +1680,7 @@ export interface ERBBlockNodeProps extends BaseNodeProps {
   content: Token | null;
   tag_closing: Token | null;
   body: Node[];
-  end_node: Node | null;
+  end_node: ERBEndNode | null;
 }
 
 export class ERBBlockNode extends Node {
@@ -1561,7 +1688,11 @@ export class ERBBlockNode extends Node {
   readonly content: Token | null;
   readonly tag_closing: Token | null;
   readonly body: Node[];
-  readonly end_node: Node | null;
+  readonly end_node: ERBEndNode | null;
+
+  static get type(): NodeType {
+    return "AST_ERB_BLOCK_NODE"
+  }
 
   static from(data: SerializedERBBlockNode): ERBBlockNode {
     return new ERBBlockNode({
@@ -1572,7 +1703,7 @@ export class ERBBlockNode extends Node {
       content: data.content ? Token.from(data.content) : null,
       tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
       body: (data.body || []).map(node => fromSerializedNode(node)),
-      end_node: data.end_node ? fromSerializedNode((data.end_node as any)) : null,
+      end_node: data.end_node ? fromSerializedNode((data.end_node)) : null,
     })
   }
 
@@ -1631,8 +1762,6 @@ export class ERBBlockNode extends Node {
     output += `├── body: ${this.inspectArray(this.body, "│   ")}`;
     output += `└── end_node: ${this.inspectNode(this.end_node, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -1658,6 +1787,10 @@ export class ERBWhenNode extends Node {
   readonly tag_closing: Token | null;
   readonly statements: Node[];
 
+  static get type(): NodeType {
+    return "AST_ERB_WHEN_NODE"
+  }
+
   static from(data: SerializedERBWhenNode): ERBWhenNode {
     return new ERBWhenNode({
       type: data.type,
@@ -1720,8 +1853,6 @@ export class ERBWhenNode extends Node {
     output += `├── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
     output += `└── statements: ${this.inspectArray(this.statements, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -1733,8 +1864,8 @@ export interface SerializedERBCaseNode extends SerializedNode {
   tag_closing: SerializedToken | null;
   children: SerializedNode[];
   conditions: SerializedNode[];
-  else_clause: SerializedNode | null;
-  end_node: SerializedNode | null;
+  else_clause: SerializedERBElseNode | null;
+  end_node: SerializedERBEndNode | null;
 }
 
 export interface ERBCaseNodeProps extends BaseNodeProps {
@@ -1743,8 +1874,8 @@ export interface ERBCaseNodeProps extends BaseNodeProps {
   tag_closing: Token | null;
   children: Node[];
   conditions: any[];
-  else_clause: Node | null;
-  end_node: Node | null;
+  else_clause: ERBElseNode | null;
+  end_node: ERBEndNode | null;
 }
 
 export class ERBCaseNode extends Node {
@@ -1752,9 +1883,13 @@ export class ERBCaseNode extends Node {
   readonly content: Token | null;
   readonly tag_closing: Token | null;
   readonly children: Node[];
-  readonly conditions: any[];
-  readonly else_clause: Node | null;
-  readonly end_node: Node | null;
+  readonly conditions: Node[];
+  readonly else_clause: ERBElseNode | null;
+  readonly end_node: ERBEndNode | null;
+
+  static get type(): NodeType {
+    return "AST_ERB_CASE_NODE"
+  }
 
   static from(data: SerializedERBCaseNode): ERBCaseNode {
     return new ERBCaseNode({
@@ -1766,8 +1901,8 @@ export class ERBCaseNode extends Node {
       tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
       children: (data.children || []).map(node => fromSerializedNode(node)),
       conditions: (data.conditions || []).map(node => fromSerializedNode(node)),
-      else_clause: data.else_clause ? fromSerializedNode((data.else_clause as any)) : null,
-      end_node: data.end_node ? fromSerializedNode((data.end_node as any)) : null,
+      else_clause: data.else_clause ? fromSerializedNode((data.else_clause)) : null,
+      end_node: data.end_node ? fromSerializedNode((data.end_node)) : null,
     })
   }
 
@@ -1836,8 +1971,6 @@ export class ERBCaseNode extends Node {
     output += `├── else_clause: ${this.inspectNode(this.else_clause, "│   ")}`;
     output += `└── end_node: ${this.inspectNode(this.end_node, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -1849,8 +1982,8 @@ export interface SerializedERBCaseMatchNode extends SerializedNode {
   tag_closing: SerializedToken | null;
   children: SerializedNode[];
   conditions: SerializedNode[];
-  else_clause: SerializedNode | null;
-  end_node: SerializedNode | null;
+  else_clause: SerializedERBElseNode | null;
+  end_node: SerializedERBEndNode | null;
 }
 
 export interface ERBCaseMatchNodeProps extends BaseNodeProps {
@@ -1859,8 +1992,8 @@ export interface ERBCaseMatchNodeProps extends BaseNodeProps {
   tag_closing: Token | null;
   children: Node[];
   conditions: any[];
-  else_clause: Node | null;
-  end_node: Node | null;
+  else_clause: ERBElseNode | null;
+  end_node: ERBEndNode | null;
 }
 
 export class ERBCaseMatchNode extends Node {
@@ -1868,9 +2001,13 @@ export class ERBCaseMatchNode extends Node {
   readonly content: Token | null;
   readonly tag_closing: Token | null;
   readonly children: Node[];
-  readonly conditions: any[];
-  readonly else_clause: Node | null;
-  readonly end_node: Node | null;
+  readonly conditions: Node[];
+  readonly else_clause: ERBElseNode | null;
+  readonly end_node: ERBEndNode | null;
+
+  static get type(): NodeType {
+    return "AST_ERB_CASE_MATCH_NODE"
+  }
 
   static from(data: SerializedERBCaseMatchNode): ERBCaseMatchNode {
     return new ERBCaseMatchNode({
@@ -1882,8 +2019,8 @@ export class ERBCaseMatchNode extends Node {
       tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
       children: (data.children || []).map(node => fromSerializedNode(node)),
       conditions: (data.conditions || []).map(node => fromSerializedNode(node)),
-      else_clause: data.else_clause ? fromSerializedNode((data.else_clause as any)) : null,
-      end_node: data.end_node ? fromSerializedNode((data.end_node as any)) : null,
+      else_clause: data.else_clause ? fromSerializedNode((data.else_clause)) : null,
+      end_node: data.end_node ? fromSerializedNode((data.end_node)) : null,
     })
   }
 
@@ -1952,8 +2089,6 @@ export class ERBCaseMatchNode extends Node {
     output += `├── else_clause: ${this.inspectNode(this.else_clause, "│   ")}`;
     output += `└── end_node: ${this.inspectNode(this.end_node, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -1964,7 +2099,7 @@ export interface SerializedERBWhileNode extends SerializedNode {
   content: SerializedToken | null;
   tag_closing: SerializedToken | null;
   statements: SerializedNode[];
-  end_node: SerializedNode | null;
+  end_node: SerializedERBEndNode | null;
 }
 
 export interface ERBWhileNodeProps extends BaseNodeProps {
@@ -1972,7 +2107,7 @@ export interface ERBWhileNodeProps extends BaseNodeProps {
   content: Token | null;
   tag_closing: Token | null;
   statements: Node[];
-  end_node: Node | null;
+  end_node: ERBEndNode | null;
 }
 
 export class ERBWhileNode extends Node {
@@ -1980,7 +2115,11 @@ export class ERBWhileNode extends Node {
   readonly content: Token | null;
   readonly tag_closing: Token | null;
   readonly statements: Node[];
-  readonly end_node: Node | null;
+  readonly end_node: ERBEndNode | null;
+
+  static get type(): NodeType {
+    return "AST_ERB_WHILE_NODE"
+  }
 
   static from(data: SerializedERBWhileNode): ERBWhileNode {
     return new ERBWhileNode({
@@ -1991,7 +2130,7 @@ export class ERBWhileNode extends Node {
       content: data.content ? Token.from(data.content) : null,
       tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
       statements: (data.statements || []).map(node => fromSerializedNode(node)),
-      end_node: data.end_node ? fromSerializedNode((data.end_node as any)) : null,
+      end_node: data.end_node ? fromSerializedNode((data.end_node)) : null,
     })
   }
 
@@ -2050,8 +2189,6 @@ export class ERBWhileNode extends Node {
     output += `├── statements: ${this.inspectArray(this.statements, "│   ")}`;
     output += `└── end_node: ${this.inspectNode(this.end_node, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -2062,7 +2199,7 @@ export interface SerializedERBUntilNode extends SerializedNode {
   content: SerializedToken | null;
   tag_closing: SerializedToken | null;
   statements: SerializedNode[];
-  end_node: SerializedNode | null;
+  end_node: SerializedERBEndNode | null;
 }
 
 export interface ERBUntilNodeProps extends BaseNodeProps {
@@ -2070,7 +2207,7 @@ export interface ERBUntilNodeProps extends BaseNodeProps {
   content: Token | null;
   tag_closing: Token | null;
   statements: Node[];
-  end_node: Node | null;
+  end_node: ERBEndNode | null;
 }
 
 export class ERBUntilNode extends Node {
@@ -2078,7 +2215,11 @@ export class ERBUntilNode extends Node {
   readonly content: Token | null;
   readonly tag_closing: Token | null;
   readonly statements: Node[];
-  readonly end_node: Node | null;
+  readonly end_node: ERBEndNode | null;
+
+  static get type(): NodeType {
+    return "AST_ERB_UNTIL_NODE"
+  }
 
   static from(data: SerializedERBUntilNode): ERBUntilNode {
     return new ERBUntilNode({
@@ -2089,7 +2230,7 @@ export class ERBUntilNode extends Node {
       content: data.content ? Token.from(data.content) : null,
       tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
       statements: (data.statements || []).map(node => fromSerializedNode(node)),
-      end_node: data.end_node ? fromSerializedNode((data.end_node as any)) : null,
+      end_node: data.end_node ? fromSerializedNode((data.end_node)) : null,
     })
   }
 
@@ -2148,8 +2289,6 @@ export class ERBUntilNode extends Node {
     output += `├── statements: ${this.inspectArray(this.statements, "│   ")}`;
     output += `└── end_node: ${this.inspectNode(this.end_node, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -2160,7 +2299,7 @@ export interface SerializedERBForNode extends SerializedNode {
   content: SerializedToken | null;
   tag_closing: SerializedToken | null;
   statements: SerializedNode[];
-  end_node: SerializedNode | null;
+  end_node: SerializedERBEndNode | null;
 }
 
 export interface ERBForNodeProps extends BaseNodeProps {
@@ -2168,7 +2307,7 @@ export interface ERBForNodeProps extends BaseNodeProps {
   content: Token | null;
   tag_closing: Token | null;
   statements: Node[];
-  end_node: Node | null;
+  end_node: ERBEndNode | null;
 }
 
 export class ERBForNode extends Node {
@@ -2176,7 +2315,11 @@ export class ERBForNode extends Node {
   readonly content: Token | null;
   readonly tag_closing: Token | null;
   readonly statements: Node[];
-  readonly end_node: Node | null;
+  readonly end_node: ERBEndNode | null;
+
+  static get type(): NodeType {
+    return "AST_ERB_FOR_NODE"
+  }
 
   static from(data: SerializedERBForNode): ERBForNode {
     return new ERBForNode({
@@ -2187,7 +2330,7 @@ export class ERBForNode extends Node {
       content: data.content ? Token.from(data.content) : null,
       tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
       statements: (data.statements || []).map(node => fromSerializedNode(node)),
-      end_node: data.end_node ? fromSerializedNode((data.end_node as any)) : null,
+      end_node: data.end_node ? fromSerializedNode((data.end_node)) : null,
     })
   }
 
@@ -2246,8 +2389,6 @@ export class ERBForNode extends Node {
     output += `├── statements: ${this.inspectArray(this.statements, "│   ")}`;
     output += `└── end_node: ${this.inspectNode(this.end_node, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -2258,7 +2399,7 @@ export interface SerializedERBRescueNode extends SerializedNode {
   content: SerializedToken | null;
   tag_closing: SerializedToken | null;
   statements: SerializedNode[];
-  subsequent: SerializedNode | null;
+  subsequent: SerializedERBRescueNode | null;
 }
 
 export interface ERBRescueNodeProps extends BaseNodeProps {
@@ -2266,7 +2407,7 @@ export interface ERBRescueNodeProps extends BaseNodeProps {
   content: Token | null;
   tag_closing: Token | null;
   statements: Node[];
-  subsequent: Node | null;
+  subsequent: ERBRescueNode | null;
 }
 
 export class ERBRescueNode extends Node {
@@ -2274,7 +2415,11 @@ export class ERBRescueNode extends Node {
   readonly content: Token | null;
   readonly tag_closing: Token | null;
   readonly statements: Node[];
-  readonly subsequent: Node | null;
+  readonly subsequent: ERBRescueNode | null;
+
+  static get type(): NodeType {
+    return "AST_ERB_RESCUE_NODE"
+  }
 
   static from(data: SerializedERBRescueNode): ERBRescueNode {
     return new ERBRescueNode({
@@ -2285,7 +2430,7 @@ export class ERBRescueNode extends Node {
       content: data.content ? Token.from(data.content) : null,
       tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
       statements: (data.statements || []).map(node => fromSerializedNode(node)),
-      subsequent: data.subsequent ? fromSerializedNode((data.subsequent as any)) : null,
+      subsequent: data.subsequent ? fromSerializedNode((data.subsequent)) : null,
     })
   }
 
@@ -2344,8 +2489,6 @@ export class ERBRescueNode extends Node {
     output += `├── statements: ${this.inspectArray(this.statements, "│   ")}`;
     output += `└── subsequent: ${this.inspectNode(this.subsequent, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -2371,6 +2514,10 @@ export class ERBEnsureNode extends Node {
   readonly tag_closing: Token | null;
   readonly statements: Node[];
 
+  static get type(): NodeType {
+    return "AST_ERB_ENSURE_NODE"
+  }
+
   static from(data: SerializedERBEnsureNode): ERBEnsureNode {
     return new ERBEnsureNode({
       type: data.type,
@@ -2433,8 +2580,6 @@ export class ERBEnsureNode extends Node {
     output += `├── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
     output += `└── statements: ${this.inspectArray(this.statements, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -2445,10 +2590,10 @@ export interface SerializedERBBeginNode extends SerializedNode {
   content: SerializedToken | null;
   tag_closing: SerializedToken | null;
   statements: SerializedNode[];
-  rescue_clause: SerializedNode | null;
-  else_clause: SerializedNode | null;
-  ensure_clause: SerializedNode | null;
-  end_node: SerializedNode | null;
+  rescue_clause: SerializedERBRescueNode | null;
+  else_clause: SerializedERBElseNode | null;
+  ensure_clause: SerializedERBEnsureNode | null;
+  end_node: SerializedERBEndNode | null;
 }
 
 export interface ERBBeginNodeProps extends BaseNodeProps {
@@ -2456,10 +2601,10 @@ export interface ERBBeginNodeProps extends BaseNodeProps {
   content: Token | null;
   tag_closing: Token | null;
   statements: Node[];
-  rescue_clause: Node | null;
-  else_clause: Node | null;
-  ensure_clause: Node | null;
-  end_node: Node | null;
+  rescue_clause: ERBRescueNode | null;
+  else_clause: ERBElseNode | null;
+  ensure_clause: ERBEnsureNode | null;
+  end_node: ERBEndNode | null;
 }
 
 export class ERBBeginNode extends Node {
@@ -2467,10 +2612,14 @@ export class ERBBeginNode extends Node {
   readonly content: Token | null;
   readonly tag_closing: Token | null;
   readonly statements: Node[];
-  readonly rescue_clause: Node | null;
-  readonly else_clause: Node | null;
-  readonly ensure_clause: Node | null;
-  readonly end_node: Node | null;
+  readonly rescue_clause: ERBRescueNode | null;
+  readonly else_clause: ERBElseNode | null;
+  readonly ensure_clause: ERBEnsureNode | null;
+  readonly end_node: ERBEndNode | null;
+
+  static get type(): NodeType {
+    return "AST_ERB_BEGIN_NODE"
+  }
 
   static from(data: SerializedERBBeginNode): ERBBeginNode {
     return new ERBBeginNode({
@@ -2481,10 +2630,10 @@ export class ERBBeginNode extends Node {
       content: data.content ? Token.from(data.content) : null,
       tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
       statements: (data.statements || []).map(node => fromSerializedNode(node)),
-      rescue_clause: data.rescue_clause ? fromSerializedNode((data.rescue_clause as any)) : null,
-      else_clause: data.else_clause ? fromSerializedNode((data.else_clause as any)) : null,
-      ensure_clause: data.ensure_clause ? fromSerializedNode((data.ensure_clause as any)) : null,
-      end_node: data.end_node ? fromSerializedNode((data.end_node as any)) : null,
+      rescue_clause: data.rescue_clause ? fromSerializedNode((data.rescue_clause)) : null,
+      else_clause: data.else_clause ? fromSerializedNode((data.else_clause)) : null,
+      ensure_clause: data.ensure_clause ? fromSerializedNode((data.ensure_clause)) : null,
+      end_node: data.end_node ? fromSerializedNode((data.end_node)) : null,
     })
   }
 
@@ -2558,8 +2707,6 @@ export class ERBBeginNode extends Node {
     output += `├── ensure_clause: ${this.inspectNode(this.ensure_clause, "│   ")}`;
     output += `└── end_node: ${this.inspectNode(this.end_node, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -2570,8 +2717,8 @@ export interface SerializedERBUnlessNode extends SerializedNode {
   content: SerializedToken | null;
   tag_closing: SerializedToken | null;
   statements: SerializedNode[];
-  else_clause: SerializedNode | null;
-  end_node: SerializedNode | null;
+  else_clause: SerializedERBElseNode | null;
+  end_node: SerializedERBEndNode | null;
 }
 
 export interface ERBUnlessNodeProps extends BaseNodeProps {
@@ -2579,8 +2726,8 @@ export interface ERBUnlessNodeProps extends BaseNodeProps {
   content: Token | null;
   tag_closing: Token | null;
   statements: Node[];
-  else_clause: Node | null;
-  end_node: Node | null;
+  else_clause: ERBElseNode | null;
+  end_node: ERBEndNode | null;
 }
 
 export class ERBUnlessNode extends Node {
@@ -2588,8 +2735,12 @@ export class ERBUnlessNode extends Node {
   readonly content: Token | null;
   readonly tag_closing: Token | null;
   readonly statements: Node[];
-  readonly else_clause: Node | null;
-  readonly end_node: Node | null;
+  readonly else_clause: ERBElseNode | null;
+  readonly end_node: ERBEndNode | null;
+
+  static get type(): NodeType {
+    return "AST_ERB_UNLESS_NODE"
+  }
 
   static from(data: SerializedERBUnlessNode): ERBUnlessNode {
     return new ERBUnlessNode({
@@ -2600,8 +2751,8 @@ export class ERBUnlessNode extends Node {
       content: data.content ? Token.from(data.content) : null,
       tag_closing: data.tag_closing ? Token.from(data.tag_closing) : null,
       statements: (data.statements || []).map(node => fromSerializedNode(node)),
-      else_clause: data.else_clause ? fromSerializedNode((data.else_clause as any)) : null,
-      end_node: data.end_node ? fromSerializedNode((data.end_node as any)) : null,
+      else_clause: data.else_clause ? fromSerializedNode((data.else_clause)) : null,
+      end_node: data.end_node ? fromSerializedNode((data.end_node)) : null,
     })
   }
 
@@ -2665,8 +2816,6 @@ export class ERBUnlessNode extends Node {
     output += `├── else_clause: ${this.inspectNode(this.else_clause, "│   ")}`;
     output += `└── end_node: ${this.inspectNode(this.end_node, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -2689,6 +2838,10 @@ export class ERBYieldNode extends Node {
   readonly content: Token | null;
   readonly tag_closing: Token | null;
 
+  static get type(): NodeType {
+    return "AST_ERB_YIELD_NODE"
+  }
+
   static from(data: SerializedERBYieldNode): ERBYieldNode {
     return new ERBYieldNode({
       type: data.type,
@@ -2745,8 +2898,6 @@ export class ERBYieldNode extends Node {
     output += `├── content: ${this.content ? this.content.treeInspect() : "∅"}\n`;
     output += `└── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
 
-    // output += "\n";
-
     return output
   }
 }
@@ -2772,6 +2923,10 @@ export class ERBInNode extends Node {
   readonly tag_closing: Token | null;
   readonly statements: Node[];
 
+  static get type(): NodeType {
+    return "AST_ERB_IN_NODE"
+  }
+
   static from(data: SerializedERBInNode): ERBInNode {
     return new ERBInNode({
       type: data.type,
@@ -2834,20 +2989,52 @@ export class ERBInNode extends Node {
     output += `├── tag_closing: ${this.tag_closing ? this.tag_closing.treeInspect() : "∅"}\n`;
     output += `└── statements: ${this.inspectArray(this.statements, "    ")}`;
 
-    // output += "\n";
-
     return output
   }
 }
 
 
+export type ConcreteNode =
+  DocumentNode |  LiteralNode |  HTMLOpenTagNode |  HTMLCloseTagNode |  HTMLElementNode |  HTMLAttributeValueNode |  HTMLAttributeNameNode |  HTMLAttributeNode |  HTMLTextNode |  HTMLCommentNode |  HTMLDoctypeNode |  XMLDeclarationNode |  CDATANode |  WhitespaceNode |  ERBContentNode |  ERBEndNode |  ERBElseNode |  ERBIfNode |  ERBBlockNode |  ERBWhenNode |  ERBCaseNode |  ERBCaseMatchNode |  ERBWhileNode |  ERBUntilNode |  ERBForNode |  ERBRescueNode |  ERBEnsureNode |  ERBBeginNode |  ERBUnlessNode |  ERBYieldNode |  ERBInNode
+export function fromSerializedNode(node: SerializedDocumentNode): DocumentNode;
+export function fromSerializedNode(node: SerializedLiteralNode): LiteralNode;
+export function fromSerializedNode(node: SerializedHTMLOpenTagNode): HTMLOpenTagNode;
+export function fromSerializedNode(node: SerializedHTMLCloseTagNode): HTMLCloseTagNode;
+export function fromSerializedNode(node: SerializedHTMLElementNode): HTMLElementNode;
+export function fromSerializedNode(node: SerializedHTMLAttributeValueNode): HTMLAttributeValueNode;
+export function fromSerializedNode(node: SerializedHTMLAttributeNameNode): HTMLAttributeNameNode;
+export function fromSerializedNode(node: SerializedHTMLAttributeNode): HTMLAttributeNode;
+export function fromSerializedNode(node: SerializedHTMLTextNode): HTMLTextNode;
+export function fromSerializedNode(node: SerializedHTMLCommentNode): HTMLCommentNode;
+export function fromSerializedNode(node: SerializedHTMLDoctypeNode): HTMLDoctypeNode;
+export function fromSerializedNode(node: SerializedXMLDeclarationNode): XMLDeclarationNode;
+export function fromSerializedNode(node: SerializedCDATANode): CDATANode;
+export function fromSerializedNode(node: SerializedWhitespaceNode): WhitespaceNode;
+export function fromSerializedNode(node: SerializedERBContentNode): ERBContentNode;
+export function fromSerializedNode(node: SerializedERBEndNode): ERBEndNode;
+export function fromSerializedNode(node: SerializedERBElseNode): ERBElseNode;
+export function fromSerializedNode(node: SerializedERBIfNode): ERBIfNode;
+export function fromSerializedNode(node: SerializedERBBlockNode): ERBBlockNode;
+export function fromSerializedNode(node: SerializedERBWhenNode): ERBWhenNode;
+export function fromSerializedNode(node: SerializedERBCaseNode): ERBCaseNode;
+export function fromSerializedNode(node: SerializedERBCaseMatchNode): ERBCaseMatchNode;
+export function fromSerializedNode(node: SerializedERBWhileNode): ERBWhileNode;
+export function fromSerializedNode(node: SerializedERBUntilNode): ERBUntilNode;
+export function fromSerializedNode(node: SerializedERBForNode): ERBForNode;
+export function fromSerializedNode(node: SerializedERBRescueNode): ERBRescueNode;
+export function fromSerializedNode(node: SerializedERBEnsureNode): ERBEnsureNode;
+export function fromSerializedNode(node: SerializedERBBeginNode): ERBBeginNode;
+export function fromSerializedNode(node: SerializedERBUnlessNode): ERBUnlessNode;
+export function fromSerializedNode(node: SerializedERBYieldNode): ERBYieldNode;
+export function fromSerializedNode(node: SerializedERBInNode): ERBInNode;
+export function fromSerializedNode(node: SerializedNode): Node;
+
 export function fromSerializedNode(node: SerializedNode): Node {
   switch (node.type) {
     case "AST_DOCUMENT_NODE": return DocumentNode.from(node as SerializedDocumentNode);
     case "AST_LITERAL_NODE": return LiteralNode.from(node as SerializedLiteralNode);
     case "AST_HTML_OPEN_TAG_NODE": return HTMLOpenTagNode.from(node as SerializedHTMLOpenTagNode);
     case "AST_HTML_CLOSE_TAG_NODE": return HTMLCloseTagNode.from(node as SerializedHTMLCloseTagNode);
-    case "AST_HTML_SELF_CLOSE_TAG_NODE": return HTMLSelfCloseTagNode.from(node as SerializedHTMLSelfCloseTagNode);
     case "AST_HTML_ELEMENT_NODE": return HTMLElementNode.from(node as SerializedHTMLElementNode);
     case "AST_HTML_ATTRIBUTE_VALUE_NODE": return HTMLAttributeValueNode.from(node as SerializedHTMLAttributeValueNode);
     case "AST_HTML_ATTRIBUTE_NAME_NODE": return HTMLAttributeNameNode.from(node as SerializedHTMLAttributeNameNode);
@@ -2855,6 +3042,8 @@ export function fromSerializedNode(node: SerializedNode): Node {
     case "AST_HTML_TEXT_NODE": return HTMLTextNode.from(node as SerializedHTMLTextNode);
     case "AST_HTML_COMMENT_NODE": return HTMLCommentNode.from(node as SerializedHTMLCommentNode);
     case "AST_HTML_DOCTYPE_NODE": return HTMLDoctypeNode.from(node as SerializedHTMLDoctypeNode);
+    case "AST_XML_DECLARATION_NODE": return XMLDeclarationNode.from(node as SerializedXMLDeclarationNode);
+    case "AST_CDATA_NODE": return CDATANode.from(node as SerializedCDATANode);
     case "AST_WHITESPACE_NODE": return WhitespaceNode.from(node as SerializedWhitespaceNode);
     case "AST_ERB_CONTENT_NODE": return ERBContentNode.from(node as SerializedERBContentNode);
     case "AST_ERB_END_NODE": return ERBEndNode.from(node as SerializedERBEndNode);
@@ -2884,7 +3073,6 @@ export type NodeType =
   | "AST_LITERAL_NODE"
   | "AST_HTML_OPEN_TAG_NODE"
   | "AST_HTML_CLOSE_TAG_NODE"
-  | "AST_HTML_SELF_CLOSE_TAG_NODE"
   | "AST_HTML_ELEMENT_NODE"
   | "AST_HTML_ATTRIBUTE_VALUE_NODE"
   | "AST_HTML_ATTRIBUTE_NAME_NODE"
@@ -2892,6 +3080,8 @@ export type NodeType =
   | "AST_HTML_TEXT_NODE"
   | "AST_HTML_COMMENT_NODE"
   | "AST_HTML_DOCTYPE_NODE"
+  | "AST_XML_DECLARATION_NODE"
+  | "AST_CDATA_NODE"
   | "AST_WHITESPACE_NODE"
   | "AST_ERB_CONTENT_NODE"
   | "AST_ERB_END_NODE"
@@ -2951,8 +3141,3 @@ export const ERBNodeClasses = [
   ERBYieldNode,
   ERBInNode,
 ]
-
-export function isERBNode(node: Node): node is ERBNode {
-  
-  return node.constructor.name.startsWith("ERB")
-}