herb 0.8.10-arm-linux-gnu → 0.9.0-arm-linux-gnu

data/templates/javascript/packages/core/src/nodes.ts.erb

@@ -1,7 +1,8 @@
 import { Location } from "./location.js"
 import { Token, SerializedToken } from "./token.js"
 import { HerbError } from "./errors.js"
-import { convertToUTF8 } from "./util.js"
+import { deserializePrismNode, inspectPrismSerialized } from "./prism/index.js"
+import type { PrismNode } from "./prism/index.js"
 
 import type { SerializedLocation } from "./location.js"
 import type { SerializedHerbError } from "./errors.js"
@@ -25,6 +26,7 @@ export abstract class Node implements BaseNodeProps {
   readonly type: NodeType
   readonly location: Location
   readonly errors: HerbError[]
+  source: string | null = null
 
   static from(node: SerializedNode): Node {
     return fromSerializedNode(node)
@@ -40,6 +42,11 @@ export abstract class Node implements BaseNodeProps {
     this.errors = errors
   }
 
+  setSource(source: string): void {
+    this.source = source
+    this.compactChildNodes().forEach(child => child.setSource(source))
+  }
+
   toJSON(): SerializedNode {
     return {
       type: this.type,
@@ -145,15 +152,19 @@ export interface Serialized<%= node.name %> extends SerializedNode {
   <%= field.name %>: string;
   <%- when Herb::Template::LocationField -%>
   <%= field.name %>: SerializedLocation | null;
-  <%- when Herb::Template::NodeField -%>
+  <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
   <%- if field.specific_kind -%>
   <%= field.name %>: Serialized<%= field.specific_kind %> | null;
+  <%- elsif field.union_kind -%>
+  <%= field.name %>: <%= field.union_kind.map { |k| "Serialized#{k}" }.join(" | ") %> | null;
   <%- else -%>
   <%= field.name %>: SerializedNode | null;
   <%- end -%>
   <%- when Herb::Template::ArrayField -%>
   <%= field.name %>: SerializedNode[];
-  <%- when Herb::Template::PrismNodeField, Herb::Template::AnalyzedRubyField -%>
+  <%- when Herb::Template::PrismSerializedField, Herb::Template::PrismNodeField -%>
+  <%= field.name %>: number[] | null;
+  <%- when Herb::Template::AnalyzedRubyField, Herb::Template::PrismContextField -%>
   // no-op for <%= field.name %>
   <%- else -%>
   <% raise "Unhandled class #{field.class}" %>
@@ -161,7 +172,8 @@ export interface Serialized<%= node.name %> extends SerializedNode {
   <%- end -%>
 }
 
-export interface <%= node.name %>Props extends BaseNodeProps {
+export interface <%= node.name %>Props extends Omit<BaseNodeProps, 'type'> {
+  type: "<%= node.type %>";
   <%- node.fields.each do |field| -%>
   <%- case field -%>
   <%- when Herb::Template::StringField -%>
@@ -174,9 +186,11 @@ export interface <%= node.name %>Props extends BaseNodeProps {
   <%= field.name %>: string;
   <%- when Herb::Template::LocationField -%>
   <%= field.name %>: Location | null;
-  <%- when Herb::Template::NodeField -%>
+  <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
   <%- if field.specific_kind -%>
   <%= field.name %>: <%= field.specific_kind %> | null;
+  <%- elsif field.union_kind -%>
+  <%= field.name %>: <%= field.union_kind.join(" | ") %> | null;
   <%- else -%>
   <%= field.name %>: Node | null;
   <%- end -%>
@@ -186,7 +200,9 @@ export interface <%= node.name %>Props extends BaseNodeProps {
   <%- else -%>
   <%= field.name %>: any[];
   <%- end -%>
-  <%- when Herb::Template::PrismNodeField, Herb::Template::AnalyzedRubyField -%>
+  <%- when Herb::Template::PrismSerializedField, Herb::Template::PrismNodeField -%>
+  <%= field.name %>: Uint8Array | null;
+  <%- when Herb::Template::AnalyzedRubyField, Herb::Template::PrismContextField -%>
   // no-op for <%= field.name %>
   <%- else -%>
   <% raise "Unhandled class #{field.class}" %>
@@ -195,6 +211,7 @@ export interface <%= node.name %>Props extends BaseNodeProps {
 }
 
 export class <%= node.name %> extends Node {
+  declare readonly type: "<%= node.type %>";
   <%- node.fields.each do |field| -%>
   <%- case field -%>
   <%- when Herb::Template::StringField -%>
@@ -207,9 +224,11 @@ export class <%= node.name %> extends Node {
   readonly <%= field.name %>: string;
   <%- when Herb::Template::LocationField -%>
   readonly <%= field.name %>: Location | null;
-  <%- when Herb::Template::NodeField -%>
+  <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
   <%- if field.specific_kind -%>
   readonly <%= field.name %>: <%= field.specific_kind %> | null;
+  <%- elsif field.union_kind -%>
+  readonly <%= field.name %>: <%= field.union_kind.join(" | ") %> | null;
   <%- else -%>
   readonly <%= field.name %>: Node | null;
   <%- end -%>
@@ -219,7 +238,9 @@ export class <%= node.name %> extends Node {
   <%- else -%>
   readonly <%= field.name %>: Node[];
   <%- end -%>
-  <%- when Herb::Template::PrismNodeField, Herb::Template::AnalyzedRubyField -%>
+  <%- when Herb::Template::PrismSerializedField, Herb::Template::PrismNodeField -%>
+  readonly <%= field.name %>: Uint8Array | null;
+  <%- when Herb::Template::AnalyzedRubyField, Herb::Template::PrismContextField -%>
   // no-op for <%= field.name %>
   <%- else -%>
   <% raise "Unhandled class #{field.class}" %>
@@ -247,11 +268,19 @@ export class <%= node.name %> extends Node {
       <%= field.name %>: data.<%= field.name %>,
       <%- when Herb::Template::LocationField -%>
       <%= field.name %>: data.<%= field.name %> ? Location.from(data.<%= field.name %>) : null,
-      <%- when Herb::Template::NodeField -%>
+      <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
+      <%- if field.union_kind -%>
+      <%= field.name %>: data.<%= field.name %> ? fromSerializedNode((data.<%= field.name %>)) as <%= field.union_kind.join(" | ") %> : null,
+      <%- elsif field.specific_kind -%>
+      <%= field.name %>: data.<%= field.name %> ? fromSerializedNode((data.<%= field.name %>)) as <%= field.specific_kind %> : null,
+      <%- else -%>
       <%= field.name %>: data.<%= field.name %> ? fromSerializedNode((data.<%= field.name %>)) : null,
+      <%- end -%>
       <%- when Herb::Template::ArrayField -%>
       <%= field.name %>: (data.<%= field.name %> || []).map(node => fromSerializedNode(node)),
-      <%- when Herb::Template::PrismNodeField, Herb::Template::AnalyzedRubyField -%>
+      <%- when Herb::Template::PrismSerializedField, Herb::Template::PrismNodeField -%>
+      <%= field.name %>: data.<%= field.name %> ? new Uint8Array(data.<%= field.name %>) : null,
+      <%- when Herb::Template::AnalyzedRubyField, Herb::Template::PrismContextField -%>
       // no-op for <%= field.name %>
       <%- else -%>
       <% raise "Unhandled class #{field.class}" %>
@@ -268,17 +297,19 @@ export class <%= node.name %> extends Node {
     this.<%= field.name %> = props.<%= field.name %>;
     <%- when Herb::Template::TokenField -%>
     this.<%= field.name %> = props.<%= field.name %>;
-    <%- when Herb::Template::NodeField -%>
+    <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
     this.<%= field.name %> = props.<%= field.name %>;
     <%- when Herb::Template::StringField -%>
-    this.<%= field.name %> = convertToUTF8(props.<%= field.name %>);
+    this.<%= field.name %> = props.<%= field.name %>;
     <%- when Herb::Template::BooleanField -%>
     this.<%= field.name %> = props.<%= field.name %>;
     <%- when Herb::Template::ElementSourceField -%>
     this.<%= field.name %> = props.<%= field.name %>;
     <%- when Herb::Template::LocationField -%>
     this.<%= field.name %> = props.<%= field.name %>;
-    <%- when Herb::Template::PrismNodeField, Herb::Template::AnalyzedRubyField -%>
+    <%- when Herb::Template::PrismSerializedField, Herb::Template::PrismNodeField -%>
+    this.<%= field.name %> = props.<%= field.name %>;
+    <%- when Herb::Template::AnalyzedRubyField, Herb::Template::PrismContextField -%>
     // no-op for <%= field.name %>
     <%- else -%>
     <% raise "Unhandled class #{field.class}" %>
@@ -294,7 +325,7 @@ export class <%= node.name %> extends Node {
     return [
       <%- node.fields.each do |field| -%>
       <%- case field -%>
-      <%- when Herb::Template::NodeField -%>
+      <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
       this.<%= field.name %>,
       <%- when Herb::Template::ArrayField -%>
       ...this.<%= field.name %>,
@@ -307,12 +338,20 @@ export class <%= node.name %> extends Node {
     return this.childNodes().filter(node => node !== null && node !== undefined)
   }
 
+  <%- if node.fields.any? { |f| f.is_a?(Herb::Template::PrismSerializedField) || f.is_a?(Herb::Template::PrismNodeField) } -%>
+  <%- prism_field = node.fields.find { |f| f.is_a?(Herb::Template::PrismSerializedField) || f.is_a?(Herb::Template::PrismNodeField) } -%>
+  get prismNode(): PrismNode | null {
+    if (!this.<%= prism_field.name %> || !this.source) return null;
+    return deserializePrismNode(this.<%= prism_field.name %>, this.source);
+  }
+  <%- end -%>
+
   recursiveErrors(): HerbError[] {
     return [
       ...this.errors,
       <%- node.fields.each do |field| -%>
       <%- case field -%>
-      <%- when Herb::Template::NodeField -%>
+      <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
       this.<%= field.name %> ? this.<%= field.name %>.recursiveErrors() : [],
       <%- when Herb::Template::ArrayField -%>
       ...this.<%= field.name %>.map(node => node.recursiveErrors()),
@@ -337,11 +376,13 @@ export class <%= node.name %> extends Node {
       <%= field.name %>: this.<%= field.name %>,
       <%- when Herb::Template::LocationField -%>
       <%= field.name %>: this.<%= field.name %> ? this.<%= field.name %>.toJSON() : null,
-      <%- when Herb::Template::NodeField -%>
+      <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
       <%= field.name %>: this.<%= field.name %> ? this.<%= field.name %>.toJSON() : null,
       <%- when Herb::Template::ArrayField -%>
       <%= field.name %>: this.<%= field.name %>.map(node => node.toJSON()),
-      <%- when Herb::Template::PrismNodeField, Herb::Template::AnalyzedRubyField -%>
+      <%- when Herb::Template::PrismSerializedField, Herb::Template::PrismNodeField -%>
+      <%= field.name %>: this.<%= field.name %> ? Array.from(this.<%= field.name %>) : null,
+      <%- when Herb::Template::AnalyzedRubyField, Herb::Template::PrismContextField -%>
       // no-op for <%= field.name %>
       <%- else -%>
       <% raise "Unhandled class #{field.class}" %>
@@ -355,29 +396,65 @@ export class <%= node.name %> extends Node {
 
     output += `@ <%= node.name %> ${this.location.treeInspectWithLabel()}\n`;
     output += `├── errors: ${this.inspectArray(this.errors, "<%= node.fields.any? ? "│   " : "    " %>")}`;
-    <%- node.fields.each do |field| -%>
-    <%- symbol = node.fields.last == field ? "└──" : "├──" -%>
-    <%- name = "#{symbol} #{field.name}: " -%>
+    <%- node.field_visibilities.each do |visibility| -%>
+    <%- field = visibility.field -%>
+    <%- next if field.always_invisible? -%>
+    <%- if field.conditionally_invisible? -%>
+    if (this.<%= field.name %>) {
+      output += `<%= visibility.symbol.strip %> <%= field.name %>: ${this.source ? inspectPrismSerialized(this.<%= field.name %>, this.source, "<%= visibility.prefix %>") : `(${this.<%= field.name %>.length} bytes)`}\n`;
+    }
+    <%- else -%>
+    <%- if visibility.dynamic_last? -%>
+    {
+      const isLast = !this.<%= visibility.prism_field_name %>;
+      const symbol = isLast ? "└──" : "├──";
+    <%- end -%>
     <%- case field -%>
-    <%- when Herb::Template::StringField -%>
-    output += `<%= name %>${this.<%= field.name %> ? JSON.stringify(this.<%= field.name %>) : "∅"}\n`;
+    <%- when Herb::Template::StringField, Herb::Template::ElementSourceField -%>
+    <%- if visibility.dynamic_last? -%>
+      output += `${symbol} <%= field.name %>: ${this.<%= field.name %> ? JSON.stringify(this.<%= field.name %>) : "∅"}\n`;
+    <%- else -%>
+    output += `<%= visibility.symbol.strip %> <%= field.name %>: ${this.<%= field.name %> ? JSON.stringify(this.<%= field.name %>) : "∅"}\n`;
+    <%- end -%>
     <%- when Herb::Template::TokenField -%>
-    output += `<%= name %>${this.<%= field.name %> ? this.<%= field.name %>.treeInspect() : "∅"}\n`;
+    <%- if visibility.dynamic_last? -%>
+      output += `${symbol} <%= field.name %>: ${this.<%= field.name %> ? this.<%= field.name %>.treeInspect() : "∅"}\n`;
+    <%- else -%>
+    output += `<%= visibility.symbol.strip %> <%= field.name %>: ${this.<%= field.name %> ? this.<%= field.name %>.treeInspect() : "∅"}\n`;
+    <%- end -%>
     <%- when Herb::Template::BooleanField -%>
-    output += `<%= name %>${typeof this.<%= field.name %> === 'boolean' ? String(this.<%= field.name %>) : "∅"}\n`;
-    <%- when Herb::Template::ElementSourceField -%>
-    output += `<%= name %>${this.<%= field.name %> ? JSON.stringify(this.<%= field.name %>) : "∅"}\n`;
+    <%- if visibility.dynamic_last? -%>
+      output += `${symbol} <%= field.name %>: ${typeof this.<%= field.name %> === 'boolean' ? String(this.<%= field.name %>) : "∅"}\n`;
+    <%- else -%>
+    output += `<%= visibility.symbol.strip %> <%= field.name %>: ${typeof this.<%= field.name %> === 'boolean' ? String(this.<%= field.name %>) : "∅"}\n`;
+    <%- end -%>
     <%- when Herb::Template::LocationField -%>
-    output += `<%= name %>${this.<%= field.name %> ? "(location: " + this.<%= field.name %>.treeInspect() + ")" : "∅"}\n`;
-    <%- when Herb::Template::NodeField -%>
-    output += `<%= name %>${this.inspectNode(this.<%= field.name %>, "<%= (node.fields.last == field) ? "    " : "│   " %>")}`;
+    <%- if visibility.dynamic_last? -%>
+      output += `${symbol} <%= field.name %>: ${this.<%= field.name %> ? "(location: " + this.<%= field.name %>.treeInspect() + ")" : "∅"}\n`;
+    <%- else -%>
+    output += `<%= visibility.symbol.strip %> <%= field.name %>: ${this.<%= field.name %> ? "(location: " + this.<%= field.name %>.treeInspect() + ")" : "∅"}\n`;
+    <%- end -%>
+    <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
+    <%- if visibility.dynamic_last? -%>
+      const childPrefix = isLast ? "    " : "│   ";
+      output += `${symbol} <%= field.name %>: ${this.inspectNode(this.<%= field.name %>, childPrefix)}`;
+    <%- else -%>
+    output += `<%= visibility.symbol.strip %> <%= field.name %>: ${this.inspectNode(this.<%= field.name %>, "<%= visibility.prefix %>")}`;
+    <%- end -%>
     <%- when Herb::Template::ArrayField -%>
-    output += `<%= name %>${this.inspectArray(this.<%= field.name %>, "<%= (node.fields.last == field) ? "    " : "│   " %>")}`;
-    <%- when Herb::Template::PrismNodeField, Herb::Template::AnalyzedRubyField -%>
-    // no-op for <%= field.name %>
+    <%- if visibility.dynamic_last? -%>
+      const childPrefix = isLast ? "    " : "│   ";
+      output += `${symbol} <%= field.name %>: ${this.inspectArray(this.<%= field.name %>, childPrefix)}`;
+    <%- else -%>
+    output += `<%= visibility.symbol.strip %> <%= field.name %>: ${this.inspectArray(this.<%= field.name %>, "<%= visibility.prefix %>")}`;
+    <%- end -%>
     <%- else -%>
     <% raise "Unhandled class #{field.class}" %>
     <%- end -%>
+    <%- if visibility.dynamic_last? -%>
+    }
+    <%- end -%>
+    <%- end -%>
     <%- end -%>
 
     return output

data/templates/javascript/packages/node/extension/error_helpers.cpp.erb

@@ -26,10 +26,10 @@ napi_value <%= error.name %>FromCStruct(napi_env env, <%= error.struct_type %>*
   napi_value result;
   napi_create_object(env, &result);
 
-  napi_value type = CreateString(env, error_type_to_string(&<%= error.human %>->base));
+  napi_value type = CreateStringFromHbString(env, error_type_to_string(&<%= error.human %>->base));
   napi_set_named_property(env, result, "type", type);
 
-  napi_value message = CreateString(env, <%= error.human %>->base.message);
+  napi_value message = CreateStringFromHbString(env, <%= error.human %>->base.message);
   napi_set_named_property(env, result, "message", message);
 
   napi_value location = CreateLocation(env, <%= error.human %>->base.location);
@@ -38,7 +38,7 @@ napi_value <%= error.name %>FromCStruct(napi_env env, <%= error.struct_type %>*
   <%- error.fields.each do |field| -%>
   <%- case field -%>
   <%- when Herb::Template::StringField -%>
-  napi_value <%= field.name %> = CreateString(env, <%= error.human %>-><%= field.name %>);
+  napi_value <%= field.name %> = CreateStringFromHbString(env, <%= error.human %>-><%= field.name %>);
   napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
 
   <%- when Herb::Template::NodeField -%>
@@ -50,7 +50,7 @@ napi_value <%= error.name %>FromCStruct(napi_env env, <%= error.struct_type %>*
   napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
 
   <%- when Herb::Template::TokenTypeField -%>
-  napi_value <%= field.name %> = CreateString(env, token_type_to_string(<%= error.human %>-><%= field.name %>));
+  napi_value <%= field.name %> = CreateStringFromHbString(env, token_type_to_string(<%= error.human %>-><%= field.name %>));
   napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
 
   <%- when Herb::Template::BooleanField -%>
@@ -58,6 +58,15 @@ napi_value <%= error.name %>FromCStruct(napi_env env, <%= error.struct_type %>*
   napi_get_boolean(env, <%= error.human %>-><%= field.name %>, &<%= field.name %>);
   napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
 
+  <%- when Herb::Template::PositionField -%>
+  napi_value <%= field.name %> = CreatePosition(env, <%= error.human %>-><%= field.name %>);
+  napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
+
+  <%- when Herb::Template::SizeTField -%>
+  napi_value <%= field.name %>;
+  napi_create_uint32(env, (uint32_t)<%= error.human %>-><%= field.name %>, &<%= field.name %>);
+  napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
+
   <%- when Herb::Template::ArrayField -%>
   napi_value <%= field.name %> = NodesArrayFromCArray(env, <%= error.human %>-><%= field.name %>);
   napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);

data/templates/javascript/packages/node/extension/nodes.cpp.erb

@@ -37,10 +37,10 @@ napi_value <%= node.human %>NodeFromCStruct(napi_env env, <%= node.struct_type %
   <%- node.fields.each do |field| -%>
   <%- case field -%>
   <%- when Herb::Template::StringField -%>
-  napi_value <%= field.name %> = CreateString(env, <%= node.human %>-><%= field.name %>);
+  napi_value <%= field.name %> = CreateStringFromHbString(env, <%= node.human %>-><%= field.name %>);
   napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
 
-  <%- when Herb::Template::NodeField -%>
+  <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
   napi_value <%= field.name %> = NodeFromCStruct(env, (AST_NODE_T*) <%= node.human %>-><%= field.name %>);
   napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
 
@@ -58,7 +58,7 @@ napi_value <%= node.human %>NodeFromCStruct(napi_env env, <%= node.struct_type %
   napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
 
   <%- when Herb::Template::ElementSourceField -%>
-  napi_value <%= field.name %> = CreateStringFromHbString(env, element_source_to_string(<%= node.human %>-><%= field.name %>));
+  napi_value <%= field.name %> = CreateStringFromHbString(env, <%= node.human %>-><%= field.name %>);
   napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
 
   <%- when Herb::Template::LocationField -%>
@@ -70,7 +70,44 @@ napi_value <%= node.human %>NodeFromCStruct(napi_env env, <%= node.struct_type %
   }
   napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
 
+  <%- when Herb::Template::PrismSerializedField -%>
+  napi_value <%= field.name %>;
+  if (<%= node.human %>-><%= field.name %>.data != NULL && <%= node.human %>-><%= field.name %>.length > 0) {
+    void* buffer_data;
+    napi_create_buffer_copy(env, <%= node.human %>-><%= field.name %>.length,
+      <%= node.human %>-><%= field.name %>.data, &buffer_data, &<%= field.name %>);
+  } else {
+    napi_get_null(env, &<%= field.name %>);
+  }
+  napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
+
+  <%- when Herb::Template::PrismNodeField -%>
+  napi_value <%= field.name %>;
+  if (<%= node.human %>-><%= field.name %>.node != NULL && <%= node.human %>-><%= field.name %>.parser != NULL) {
+    pm_buffer_t pm_buffer = { 0 };
+    pm_serialize(<%= node.human %>-><%= field.name %>.parser, <%= node.human %>-><%= field.name %>.node, &pm_buffer);
+
+    if (pm_buffer.length > 0) {
+      void* buffer_data;
+      napi_create_buffer_copy(env, pm_buffer.length, pm_buffer.value, &buffer_data, &<%= field.name %>);
+    } else {
+      napi_get_null(env, &<%= field.name %>);
+    }
+
+    pm_buffer_free(&pm_buffer);
+  } else {
+    napi_get_null(env, &<%= field.name %>);
+  }
+  napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
+
+  <%- when Herb::Template::AnalyzedRubyField, Herb::Template::PrismContextField, Herb::Template::VoidPointerField -%>
+  /* <%= field.name %> is internal parser state, not exposed to JavaScript */
+  napi_value <%= field.name %>;
+  napi_get_null(env, &<%= field.name %>);
+  napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
+
   <%- else -%>
+  /* Unhandled field type: <%= field.class.name %> */
   napi_value <%= field.name %>;
   napi_get_null(env, &<%= field.name %>);
   napi_set_named_property(env, result, "<%= field.name %>", <%= field.name %>);
@@ -87,11 +124,13 @@ napi_value NodesArrayFromCArray(napi_env env, hb_array_T* array) {
   napi_create_array(env, &result);
 
   if (array) {
+    uint32_t index = 0;
+
     for (size_t i = 0; i < hb_array_size(array); i++) {
       AST_NODE_T* child_node = (AST_NODE_T*) hb_array_get(array, i);
       if (child_node) {
         napi_value js_child = NodeFromCStruct(env, child_node);
-        napi_set_element(env, result, i, js_child);
+        napi_set_element(env, result, index++, js_child);
       }
     }
   }

data/templates/lib/herb/ast/nodes.rb.erb

@@ -1,11 +1,20 @@
+require_relative "../prism_inspect"
+
 module Herb
   module AST
     <%- nodes.each do |node| -%>
+    #: type serialized_<%= node.human %> = {
+      <%- node.fields.each do |field| -%>
+      <%- is_nilable = !%w[Array[Herb::AST::Node] Array[Herb::AST::ERBWhenNode] Array[Herb::AST::ERBInNode] bool nil].include?(field.ruby_type) -%>
+    #|  <%= field.name %>: <%= field.ruby_type %><%= if is_nilable then "?" end %>,
+      <%- end -%>
+    #| }
     class <%= node.name -%> < Node
       include Colors
 
       <%- node.fields.each do |field| -%>
-      attr_reader :<%= field.name %> #: <%= field.ruby_type %>
+      <%- is_nilable = !%w[Array[Herb::AST::Node] Array[Herb::AST::ERBWhenNode] Array[Herb::AST::ERBInNode] bool nil].include?(field.ruby_type) -%>
+      attr_reader :<%= field.name %> #: <%= field.ruby_type %><%= if is_nilable then "?" end %>
       <%- end -%>
 
       #: (<%= ["String", "Location", "Array[Herb::Errors::Error]", *node.fields.map(&:ruby_type)].join(", ") %>) -> void
@@ -20,6 +29,19 @@ module Herb
         <%- end -%>
       end
 
+      <%- if node.fields.any? { |f| f.is_a?(Herb::Template::PrismSerializedField) || f.is_a?(Herb::Template::PrismNodeField) } -%>
+      <%- prism_field = node.fields.find { |f| f.is_a?(Herb::Template::PrismSerializedField) || f.is_a?(Herb::Template::PrismNodeField) } -%>
+      #: () -> Prism::node?
+      def deserialized_prism_node
+        prism_node = @<%= prism_field.name %>
+        return nil unless prism_node
+        return nil unless source
+
+        require "prism"
+        Prism.load(source, prism_node).value
+      end
+
+      <%- end -%>
       #: () -> serialized_<%= node.human %>
       def to_hash
         super.merge({
@@ -37,10 +59,10 @@ module Herb
       #: () -> Array[Herb::AST::Node?]
       def child_nodes
         [<%= node.fields.map { |field|
-          if field.is_a?(Herb::Template::NodeField)
+          if field.is_a?(Herb::Template::NodeField) || field.is_a?(Herb::Template::BorrowedNodeField)
             field.name
-          elsif field.is_a?(Herb::Template::ArrayField) && field.specific_kind.end_with?("Node")
-            "*#{field.name}"
+          elsif field.is_a?(Herb::Template::ArrayField) && (field.specific_kind&.end_with?("Node") || field.union_kind&.all? { |k| k.end_with?("Node") })
+            "*(#{field.name} || [])"
           else
             nil
           end
@@ -72,56 +94,91 @@ module Herb
 
         output += inspect_errors(prefix: "<%= node.fields.any? ? "│   " : "    " %>")
 
-        <%- node.fields.each do |field| -%>
-        <%- symbol = node.fields.last == field ? "└──" : "├──" -%>
+        <%- node.field_visibilities.each do |visibility| -%>
+        <%- field = visibility.field -%>
+        <%- next if field.always_invisible? -%>
+        <%- if field.conditionally_invisible? -%>
+        if <%= field.name %> && source
+          output += white("<%= visibility.symbol.strip %> prism_node: ")
+          output += Herb::PrismInspect.inspect_prism_serialized(<%= field.name %>, source, "<%= visibility.prefix %>")
+          output += "\n"
+        end
+        <%- else -%>
+        <%- if visibility.dynamic_last? -%>
+        dynamic_symbol = <%= visibility.prism_field_name %> ? "├──" : "└──"
+        <%- end -%>
         <%- case field -%>
         <%- when Herb::Template::StringField -%>
-        output += white("<%= symbol %> <%= field.name %>: ") + green("#{<%= field.name %>.inspect}\n")
+        <%- if visibility.dynamic_last? -%>
+        output += white("#{dynamic_symbol} <%= field.name %>: ") + green("#{<%= field.name %>.inspect}\n")
+        <%- else -%>
+        output += white("<%= visibility.symbol.strip %> <%= field.name %>: ") + green("#{<%= field.name %>.inspect}\n")
+        <%- end -%>
         <%- when Herb::Template::TokenField -%>
-        output += white("<%= symbol %> <%= field.name %>: ")
+        <%- if visibility.dynamic_last? -%>
+        output += white("#{dynamic_symbol} <%= field.name %>: ")
+        <%- else -%>
+        output += white("<%= visibility.symbol.strip %> <%= field.name %>: ")
+        <%- end -%>
         output += <%= field.name %> ? <%= field.name %>.tree_inspect : magenta("∅")
         output += "\n"
         <%- when Herb::Template::BooleanField -%>
-        output += white("<%= symbol %> <%= field.name %>: ")
+        <%- if visibility.dynamic_last? -%>
+        output += white("#{dynamic_symbol} <%= field.name %>: ")
+        <%- else -%>
+        output += white("<%= visibility.symbol.strip %> <%= field.name %>: ")
+        <%- end -%>
         output += [true, false].include?(<%= field.name %>) ? bold(magenta(<%= field.name %>.to_s)) : magenta("∅")
         output += "\n"
         <%- when Herb::Template::LocationField -%>
-        output += white("<%= symbol %> <%= field.name %>: ")
+        <%- if visibility.dynamic_last? -%>
+        output += white("#{dynamic_symbol} <%= field.name %>: ")
+        <%- else -%>
+        output += white("<%= visibility.symbol.strip %> <%= field.name %>: ")
+        <%- end -%>
         output += <%= field.name %> ? dimmed("(location: #{<%= field.name %>.tree_inspect})") : magenta("∅")
         output += "\n"
         <%- when Herb::Template::ElementSourceField -%>
-        output += white("<%= symbol %> <%= field.name %>: #{green(<%= field.name %>.inspect)}\n")
-        <%- when Herb::Template::PrismNodeField -%>
-        # no-op for <%= field.name %>
-        <%- when Herb::Template::AnalyzedRubyField -%>
-        # no-op for <%= field.name %>
-        <%- when Herb::Template::NodeField -%>
-        output += white("<%= symbol %> <%= field.name %>: ")
+        <%- if visibility.dynamic_last? -%>
+        output += white("#{dynamic_symbol} <%= field.name %>: #{green(<%= field.name %>.inspect)}\n")
+        <%- else -%>
+        output += white("<%= visibility.symbol.strip %> <%= field.name %>: #{green(<%= field.name %>.inspect)}\n")
+        <%- end -%>
+        <%- when Herb::Template::NodeField, Herb::Template::BorrowedNodeField -%>
+        <%- if visibility.dynamic_last? -%>
+        dynamic_prefix = <%= visibility.prism_field_name %> ? "│   " : "    "
+        output += white("#{dynamic_symbol} <%= field.name %>: ")
         if <%= field.name %>
-          <%- prefix = (node.fields.last == field) ? "    " : "│   " -%>
           output += "\n"
-          <%- if (node.fields.last == field) -%>
-          output += "    └── "
-          <%- else -%>
-          output += "│   └── "
-          <%- end -%>
-          output += <%= field.name %>.tree_inspect(indent: indent, depth: depth + 1, depth_limit: depth_limit).gsub(/^/, "    " * (indent + 1)).lstrip.gsub(/^/, "<%= prefix %>").delete_prefix("<%= prefix %>")
-          <%- if false -%>
-          <%- unless node.fields.last == field -%>
+          output += dynamic_prefix + "└── "
+          output += <%= field.name %>.tree_inspect(indent: indent, depth: depth + 1, depth_limit: depth_limit).gsub(/^/, "    " * (indent + 1)).lstrip.gsub(/^/, dynamic_prefix).delete_prefix(dynamic_prefix)
+        else
+          output += magenta("∅\n")
+        end
+        <%- else -%>
+        output += white("<%= visibility.symbol.strip %> <%= field.name %>: ")
+        if <%= field.name %>
           output += "\n"
-          output += white("<%= prefix %>\n")
-          <%- end -%>
-          <%- end -%>
+          output += "<%= visibility.prefix %>└── "
+          output += <%= field.name %>.tree_inspect(indent: indent, depth: depth + 1, depth_limit: depth_limit).gsub(/^/, "    " * (indent + 1)).lstrip.gsub(/^/, "<%= visibility.prefix %>").delete_prefix("<%= visibility.prefix %>")
         else
           output += magenta("∅\n")
         end
+        <%- end -%>
         <%- when Herb::Template::ArrayField -%>
-        output += white("<%= symbol %> <%= field.name %>: ")
-        output += inspect_array(<%= field.name %>, prefix: "<%= (node.fields.last == field) ? "    " : "│   " %>", indent: indent, depth: depth + 1, depth_limit: depth_limit)
+        <%- if visibility.dynamic_last? -%>
+        dynamic_prefix = <%= visibility.prism_field_name %> ? "│   " : "    "
+        output += white("#{dynamic_symbol} <%= field.name %>: ")
+        output += inspect_array(<%= field.name %>, prefix: dynamic_prefix, indent: indent, depth: depth + 1, depth_limit: depth_limit)
+        <%- else -%>
+        output += white("<%= visibility.symbol.strip %> <%= field.name %>: ")
+        output += inspect_array(<%= field.name %>, prefix: "<%= visibility.prefix %>", indent: indent, depth: depth + 1, depth_limit: depth_limit)
+        <%- end -%>
         <%- else -%>
         <%- raise "Unhandled type: #{field.class}" -%>
         <%- end -%>
         <%- end -%>
+        <%- end -%>
         output += "\n"
 
         output.gsub(/^/, "    " * indent)

data/templates/lib/herb/errors.rb.erb

@@ -1,5 +1,10 @@
-<%- base_arguments = [["type", "String"], ["location", "Location"], ["message", "String"]] -%>
+<%- base_arguments = [["type", "String"], ["location", "Location?"], ["message", "String"]] -%>
 module Herb
+  #: type serialized_error = {
+  #|  type: String,
+  #|  location: serialized_location?,
+  #|  message: String
+  #| }
   module Errors
     class Error
       <%- base_arguments.each do |argument, type| -%>
@@ -49,7 +54,12 @@ module Herb
       <%- if error.fields.any? -%>
 
       <%- error.fields.each do |field| -%>
-      attr_reader :<%= field.name %> #: <%= field.ruby_type %>
+      #|  <%= "#{field.name}: #{field.ruby_type}?," %>
+      <%- end -%>
+      #| }
+
+      <%- error.fields.each do |field| -%>
+      attr_reader :<%= field.name %> #: <%= field.ruby_type %>?
       <%- end -%>
 
       #: (<%= [*base_arguments.map(&:last), *error.fields.map(&:ruby_type)].join(", ") %>) -> void
@@ -81,7 +91,7 @@ module Herb
       def tree_inspect(indent: 0, depth: 0, depth_limit: 25)
         output = +""
 
-        output += white("@ #{bold(red(error_name))} #{dimmed("(location: #{location.tree_inspect})\n")}")
+        output += white("@ #{bold(red(error_name))} #{dimmed("(location: #{location&.tree_inspect})\n")}")
         <%- symbol = error.fields.none? ? "└──" : "├──" -%>
         output += white("<%= symbol %> message: #{green(message.inspect)}\n")
         <%- error.fields.each do |field| -%>
@@ -99,6 +109,8 @@ module Herb
         output += white("<%= symbol %> <%= field.name %>: #{green(<%= field.name %>.inspect)}\n")
         <%- when Herb::Template::StringField -%>
         output += white("<%= symbol %> <%= field.name %>: #{green(<%= field.name %>.inspect)}\n")
+        <%- when Herb::Template::SizeTField -%>
+        output += white("<%= symbol %> <%= field.name %>: #{green(<%= field.name %>.inspect)}\n")
         <%- else -%>
         output += white("<%= symbol %> <%= field.name %>: ") + '#{<%= field.name %>.class}'\n"
         <%- end -%>