From e3828129227984ad3216aaccd6cc2833331955a8 Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Tue, 6 Jan 2026 10:59:20 -0300
Subject: [PATCH] refactor: decompose `emit/mod.rs` into focused modules

---
 .../emit/{codegen_tests.rs => emit_tests.rs}  |  44 +-
 crates/plotnik-lib/src/emit/emitter.rs        | 291 ++++++
 crates/plotnik-lib/src/emit/error.rs          |  41 +
 crates/plotnik-lib/src/emit/mod.rs            | 984 +-----------------
 ...t__emit_tests__alternations_captured.snap} |   2 +-
 ..._tests__alternations_captured_tagged.snap} |   2 +-
 ...it_tests__alternations_in_quantifier.snap} |   2 +-
 ...it__emit_tests__alternations_labeled.snap} |   2 +-
 ...s__alternations_no_internal_captures.snap} |   2 +-
 ...t_tests__alternations_null_injection.snap} |   2 +-
 ...ernations_tagged_in_field_constraint.snap} |   2 +-
 ...ernations_tagged_with_definition_ref.snap} |   2 +-
 ...__emit_tests__alternations_unlabeled.snap} |   2 +-
 ...emit_tests__anchors_between_siblings.snap} |   2 +-
 ...mit__emit_tests__anchors_first_child.snap} |   2 +-
 ...emit__emit_tests__anchors_last_child.snap} |   2 +-
 ..._emit__emit_tests__anchors_no_anchor.snap} |   2 +-
 ...__emit_tests__anchors_with_anonymous.snap} |   2 +-
 ...ib__emit__emit_tests__captures_basic.snap} |   2 +-
 ...__emit_tests__captures_deeply_nested.snap} |   2 +-
 ...__captures_enum_with_type_annotation.snap} |   2 +-
 ..._emit__emit_tests__captures_multiple.snap} |   2 +-
 ...it__emit_tests__captures_nested_flat.snap} |   2 +-
 ...ts__captures_optional_wrapper_struct.snap} |   2 +-
 ...t__emit_tests__captures_struct_scope.snap} |   2 +-
 ...captures_struct_with_type_annotation.snap} |   2 +-
 ...mit_tests__captures_with_type_custom.snap} |   2 +-
 ...mit_tests__captures_with_type_string.snap} |   2 +-
 ..._emit_tests__captures_wrapper_struct.snap} |   2 +-
 ...ests__comprehensive_multi_definition.snap} |   2 +-
 ...it__emit_tests__definitions_multiple.snap} |   2 +-
 ...it_tests__definitions_nested_capture.snap} |   2 +-
 ...t__emit_tests__definitions_reference.snap} |   2 +-
 ...emit__emit_tests__definitions_single.snap} |   2 +-
 ...emit__emit_tests__fields_alternation.snap} |   2 +-
 ...b__emit__emit_tests__fields_multiple.snap} |   2 +-
 ...ib__emit__emit_tests__fields_negated.snap} |   2 +-
 ...lib__emit__emit_tests__fields_single.snap} |   2 +-
 ...b__emit__emit_tests__nodes_anonymous.snap} |   2 +-
 ...k_lib__emit__emit_tests__nodes_error.snap} |   2 +-
 ...lib__emit__emit_tests__nodes_missing.snap} |   2 +-
 ...k_lib__emit__emit_tests__nodes_named.snap} |   2 +-
 ...emit__emit_tests__nodes_wildcard_any.snap} |   2 +-
 ...it__emit_tests__nodes_wildcard_named.snap} |   2 +-
 ...it__emit_tests__optional_first_child.snap} |   2 +-
 ..._emit_tests__optional_null_injection.snap} |   2 +-
 ...tests__quantifiers_first_child_array.snap} |   2 +-
 ...it__emit_tests__quantifiers_optional.snap} |   2 +-
 ...ests__quantifiers_optional_nongreedy.snap} |   2 +-
 ...__emit__emit_tests__quantifiers_plus.snap} |   2 +-
 ...it_tests__quantifiers_plus_nongreedy.snap} |   2 +-
 ...tests__quantifiers_repeat_navigation.snap} |   2 +-
 ...__quantifiers_sequence_in_called_def.snap} |   2 +-
 ...__emit__emit_tests__quantifiers_star.snap} |   2 +-
 ...it_tests__quantifiers_star_nongreedy.snap} |   2 +-
 ...emit_tests__quantifiers_struct_array.snap} |   2 +-
 ...__emit__emit_tests__recursion_simple.snap} |   2 +-
 ...ts__recursion_with_structured_result.snap} |   2 +-
 ...b__emit__emit_tests__sequences_basic.snap} |   2 +-
 ..._emit_tests__sequences_in_quantifier.snap} |   2 +-
 ...__emit__emit_tests__sequences_nested.snap} |   2 +-
 ..._emit_tests__sequences_with_captures.snap} |   2 +-
 crates/plotnik-lib/src/emit/string_table.rs   | 129 +++
 .../src/emit/string_table_tests.rs            | 120 +++
 crates/plotnik-lib/src/emit/type_table.rs     | 539 ++++++++++
 .../plotnik-lib/src/emit/type_table_tests.rs  |  30 +
 crates/plotnik-lib/src/engine/engine_tests.rs |  36 +-
 docs/binary-format/07-dump-format.md          |  16 +-
 docs/binary-format/08-trace-format.md         |   1 +
 69 files changed, 1250 insertions(+), 1097 deletions(-)
 rename crates/plotnik-lib/src/emit/{codegen_tests.rs => emit_tests.rs} (82%)
 create mode 100644 crates/plotnik-lib/src/emit/emitter.rs
 create mode 100644 crates/plotnik-lib/src/emit/error.rs
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__alternations_captured.snap => plotnik_lib__emit__emit_tests__alternations_captured.snap} (93%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__alternations_captured_tagged.snap => plotnik_lib__emit__emit_tests__alternations_captured_tagged.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__alternations_in_quantifier.snap => plotnik_lib__emit__emit_tests__alternations_in_quantifier.snap} (97%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__alternations_labeled.snap => plotnik_lib__emit__emit_tests__alternations_labeled.snap} (94%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__alternations_no_internal_captures.snap => plotnik_lib__emit__emit_tests__alternations_no_internal_captures.snap} (94%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__alternations_null_injection.snap => plotnik_lib__emit__emit_tests__alternations_null_injection.snap} (94%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__alternations_tagged_in_field_constraint.snap => plotnik_lib__emit__emit_tests__alternations_tagged_in_field_constraint.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__alternations_tagged_with_definition_ref.snap => plotnik_lib__emit__emit_tests__alternations_tagged_with_definition_ref.snap} (96%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__alternations_unlabeled.snap => plotnik_lib__emit__emit_tests__alternations_unlabeled.snap} (94%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__anchors_between_siblings.snap => plotnik_lib__emit__emit_tests__anchors_between_siblings.snap} (93%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__anchors_first_child.snap => plotnik_lib__emit__emit_tests__anchors_first_child.snap} (93%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__anchors_last_child.snap => plotnik_lib__emit__emit_tests__anchors_last_child.snap} (94%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__anchors_no_anchor.snap => plotnik_lib__emit__emit_tests__anchors_no_anchor.snap} (93%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__anchors_with_anonymous.snap => plotnik_lib__emit__emit_tests__anchors_with_anonymous.snap} (93%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__captures_basic.snap => plotnik_lib__emit__emit_tests__captures_basic.snap} (92%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__captures_deeply_nested.snap => plotnik_lib__emit__emit_tests__captures_deeply_nested.snap} (96%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__captures_enum_with_type_annotation.snap => plotnik_lib__emit__emit_tests__captures_enum_with_type_annotation.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__captures_multiple.snap => plotnik_lib__emit__emit_tests__captures_multiple.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__captures_nested_flat.snap => plotnik_lib__emit__emit_tests__captures_nested_flat.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__captures_optional_wrapper_struct.snap => plotnik_lib__emit__emit_tests__captures_optional_wrapper_struct.snap} (96%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__captures_struct_scope.snap => plotnik_lib__emit__emit_tests__captures_struct_scope.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__captures_struct_with_type_annotation.snap => plotnik_lib__emit__emit_tests__captures_struct_with_type_annotation.snap} (94%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__captures_with_type_custom.snap => plotnik_lib__emit__emit_tests__captures_with_type_custom.snap} (93%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__captures_with_type_string.snap => plotnik_lib__emit__emit_tests__captures_with_type_string.snap} (92%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__captures_wrapper_struct.snap => plotnik_lib__emit__emit_tests__captures_wrapper_struct.snap} (97%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__comprehensive_multi_definition.snap => plotnik_lib__emit__emit_tests__comprehensive_multi_definition.snap} (97%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__definitions_multiple.snap => plotnik_lib__emit__emit_tests__definitions_multiple.snap} (94%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__definitions_nested_capture.snap => plotnik_lib__emit__emit_tests__definitions_nested_capture.snap} (97%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__definitions_reference.snap => plotnik_lib__emit__emit_tests__definitions_reference.snap} (96%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__definitions_single.snap => plotnik_lib__emit__emit_tests__definitions_single.snap} (92%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__fields_alternation.snap => plotnik_lib__emit__emit_tests__fields_alternation.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__fields_multiple.snap => plotnik_lib__emit__emit_tests__fields_multiple.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__fields_negated.snap => plotnik_lib__emit__emit_tests__fields_negated.snap} (94%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__fields_single.snap => plotnik_lib__emit__emit_tests__fields_single.snap} (93%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__nodes_anonymous.snap => plotnik_lib__emit__emit_tests__nodes_anonymous.snap} (93%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__nodes_error.snap => plotnik_lib__emit__emit_tests__nodes_error.snap} (92%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__nodes_missing.snap => plotnik_lib__emit__emit_tests__nodes_missing.snap} (92%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__nodes_named.snap => plotnik_lib__emit__emit_tests__nodes_named.snap} (92%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__nodes_wildcard_any.snap => plotnik_lib__emit__emit_tests__nodes_wildcard_any.snap} (93%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__nodes_wildcard_named.snap => plotnik_lib__emit__emit_tests__nodes_wildcard_named.snap} (93%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__optional_first_child.snap => plotnik_lib__emit__emit_tests__optional_first_child.snap} (96%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__quantifiers_optional.snap => plotnik_lib__emit__emit_tests__optional_null_injection.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__quantifiers_first_child_array.snap => plotnik_lib__emit__emit_tests__quantifiers_first_child_array.snap} (97%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__optional_null_injection.snap => plotnik_lib__emit__emit_tests__quantifiers_optional.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__quantifiers_optional_nongreedy.snap => plotnik_lib__emit__emit_tests__quantifiers_optional_nongreedy.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__quantifiers_plus.snap => plotnik_lib__emit__emit_tests__quantifiers_plus.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__quantifiers_plus_nongreedy.snap => plotnik_lib__emit__emit_tests__quantifiers_plus_nongreedy.snap} (95%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__quantifiers_repeat_navigation.snap => plotnik_lib__emit__emit_tests__quantifiers_repeat_navigation.snap} (96%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__quantifiers_sequence_in_called_def.snap => plotnik_lib__emit__emit_tests__quantifiers_sequence_in_called_def.snap} (97%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__quantifiers_star.snap => plotnik_lib__emit__emit_tests__quantifiers_star.snap} (96%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__quantifiers_star_nongreedy.snap => plotnik_lib__emit__emit_tests__quantifiers_star_nongreedy.snap} (96%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__quantifiers_struct_array.snap => plotnik_lib__emit__emit_tests__quantifiers_struct_array.snap} (97%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__recursion_simple.snap => plotnik_lib__emit__emit_tests__recursion_simple.snap} (96%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__recursion_with_structured_result.snap => plotnik_lib__emit__emit_tests__recursion_with_structured_result.snap} (97%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__sequences_basic.snap => plotnik_lib__emit__emit_tests__sequences_basic.snap} (93%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__sequences_in_quantifier.snap => plotnik_lib__emit__emit_tests__sequences_in_quantifier.snap} (96%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__sequences_nested.snap => plotnik_lib__emit__emit_tests__sequences_nested.snap} (94%)
 rename crates/plotnik-lib/src/emit/snapshots/{plotnik_lib__emit__codegen_tests__sequences_with_captures.snap => plotnik_lib__emit__emit_tests__sequences_with_captures.snap} (94%)
 create mode 100644 crates/plotnik-lib/src/emit/string_table.rs
 create mode 100644 crates/plotnik-lib/src/emit/string_table_tests.rs
 create mode 100644 crates/plotnik-lib/src/emit/type_table.rs
 create mode 100644 crates/plotnik-lib/src/emit/type_table_tests.rs

diff --git a/crates/plotnik-lib/src/emit/codegen_tests.rs b/crates/plotnik-lib/src/emit/emit_tests.rs
similarity index 82%
rename from crates/plotnik-lib/src/emit/codegen_tests.rs
rename to crates/plotnik-lib/src/emit/emit_tests.rs
index 4f654d77..2be50782 100644
--- a/crates/plotnik-lib/src/emit/codegen_tests.rs
+++ b/crates/plotnik-lib/src/emit/emit_tests.rs
@@ -18,9 +18,7 @@ macro_rules! snap {
     }};
 }
 
-// ============================================================================
-// 1. NODES
-// ============================================================================
+// Nodes
 
 #[test]
 fn nodes_named() {
@@ -64,9 +62,7 @@ fn nodes_missing() {
     "#});
 }
 
-// ============================================================================
-// 2. CAPTURES
-// ============================================================================
+// Captures
 
 #[test]
 fn captures_basic() {
@@ -147,9 +143,7 @@ fn captures_enum_with_type_annotation() {
     "#});
 }
 
-// ============================================================================
-// 3. FIELDS
-// ============================================================================
+// Fields
 
 #[test]
 fn fields_single() {
@@ -184,9 +178,7 @@ fn fields_alternation() {
     "#});
 }
 
-// ============================================================================
-// 4. QUANTIFIERS
-// ============================================================================
+// Quantifiers
 
 #[test]
 fn quantifiers_optional() {
@@ -262,9 +254,7 @@ fn quantifiers_sequence_in_called_def() {
     "#});
 }
 
-// ============================================================================
-// 5. SEQUENCES
-// ============================================================================
+// Sequences
 
 #[test]
 fn sequences_basic() {
@@ -294,9 +284,7 @@ fn sequences_in_quantifier() {
     "#});
 }
 
-// ============================================================================
-// 6. ALTERNATIONS
-// ============================================================================
+// Alternations
 
 #[test]
 fn alternations_unlabeled() {
@@ -368,9 +356,7 @@ fn alternations_tagged_in_field_constraint() {
     "#});
 }
 
-// ============================================================================
-// 7. ANCHORS
-// ============================================================================
+// Anchors
 
 #[test]
 fn anchors_between_siblings() {
@@ -407,9 +393,7 @@ fn anchors_no_anchor() {
     "#});
 }
 
-// ============================================================================
-// 8. NAMED EXPRESSIONS
-// ============================================================================
+// Named expressions
 
 #[test]
 fn definitions_single() {
@@ -442,9 +426,7 @@ fn definitions_nested_capture() {
     "#});
 }
 
-// ============================================================================
-// 9. RECURSION
-// ============================================================================
+// Recursion
 
 #[test]
 fn recursion_simple() {
@@ -468,9 +450,7 @@ fn recursion_with_structured_result() {
     "#});
 }
 
-// ============================================================================
-// 10. OPTIONALS
-// ============================================================================
+// Optionals
 
 #[test]
 fn optional_first_child() {
@@ -486,9 +466,7 @@ fn optional_null_injection() {
     "#});
 }
 
-// ============================================================================
-// 11. COMPREHENSIVE
-// ============================================================================
+// Comprehensive
 
 #[test]
 fn comprehensive_multi_definition() {
diff --git a/crates/plotnik-lib/src/emit/emitter.rs b/crates/plotnik-lib/src/emit/emitter.rs
new file mode 100644
index 00000000..b1f6dd46
--- /dev/null
+++ b/crates/plotnik-lib/src/emit/emitter.rs
@@ -0,0 +1,291 @@
+//! Core bytecode emission logic.
+//!
+//! Contains the main entry points for emitting bytecode from compiled queries.
+
+use indexmap::IndexMap;
+use plotnik_core::{Interner, NodeFieldId, NodeTypeId, Symbol};
+
+use crate::analyze::symbol_table::SymbolTable;
+use crate::analyze::type_check::{TypeContext, TypeId};
+use crate::bytecode::ir::Label;
+use crate::bytecode::{
+    Entrypoint, FieldSymbol, Header, NodeSymbol, SECTION_ALIGN, TriviaEntry, TypeMetaHeader,
+};
+use crate::compile::Compiler;
+use crate::query::query::LinkedQuery;
+
+use super::EmitError;
+use super::layout::CacheAligned;
+use super::string_table::StringTableBuilder;
+use super::type_table::TypeTableBuilder;
+
+/// Emit bytecode from type context only (no node validation).
+pub fn emit(
+    type_ctx: &TypeContext,
+    interner: &Interner,
+    symbol_table: &SymbolTable,
+) -> Result<Vec<u8>, EmitError> {
+    emit_inner(type_ctx, interner, symbol_table, None, None)
+}
+
+/// Emit bytecode from a LinkedQuery (includes node type/field validation info).
+pub fn emit_linked(query: &LinkedQuery) -> Result<Vec<u8>, EmitError> {
+    emit_inner(
+        query.type_context(),
+        query.interner(),
+        &query.symbol_table,
+        Some(query.node_type_ids()),
+        Some(query.node_field_ids()),
+    )
+}
+
+/// Shared bytecode emission logic.
+fn emit_inner(
+    type_ctx: &TypeContext,
+    interner: &Interner,
+    symbol_table: &SymbolTable,
+    node_type_ids: Option<&IndexMap<Symbol, NodeTypeId>>,
+    node_field_ids: Option<&IndexMap<Symbol, NodeFieldId>>,
+) -> Result<Vec<u8>, EmitError> {
+    let is_linked = node_type_ids.is_some();
+    let mut strings = StringTableBuilder::new();
+    let mut types = TypeTableBuilder::new();
+    types.build(type_ctx, interner, &mut strings)?;
+
+    // Compile transitions (strings are interned here for unlinked mode)
+    let compile_result = Compiler::compile(
+        interner,
+        type_ctx,
+        symbol_table,
+        &mut strings,
+        node_type_ids,
+        node_field_ids,
+    )
+    .map_err(EmitError::Compile)?;
+
+    // Layout with cache alignment
+    // Preamble entry FIRST ensures it gets the lowest address (step 0)
+    let mut entry_labels: Vec<Label> = vec![compile_result.preamble_entry];
+    entry_labels.extend(compile_result.def_entries.values().copied());
+    let layout = CacheAligned::layout(&compile_result.instructions, &entry_labels);
+
+    // Validate transition count
+    if layout.total_steps as usize > 65535 {
+        return Err(EmitError::TooManyTransitions(layout.total_steps as usize));
+    }
+
+    // Collect node symbols (empty if not linked)
+    let mut node_symbols: Vec<NodeSymbol> = Vec::new();
+    if let Some(ids) = node_type_ids {
+        for (&sym, &node_id) in ids {
+            let name = strings.get_or_intern(sym, interner)?;
+            node_symbols.push(NodeSymbol {
+                id: node_id.get(),
+                name,
+            });
+        }
+    }
+
+    // Collect field symbols (empty if not linked)
+    let mut field_symbols: Vec<FieldSymbol> = Vec::new();
+    if let Some(ids) = node_field_ids {
+        for (&sym, &field_id) in ids {
+            let name = strings.get_or_intern(sym, interner)?;
+            field_symbols.push(FieldSymbol {
+                id: field_id.get(),
+                name,
+            });
+        }
+    }
+
+    // Collect entrypoints with actual targets from layout
+    let mut entrypoints: Vec<Entrypoint> = Vec::new();
+    for (def_id, type_id) in type_ctx.iter_def_types() {
+        let name_sym = type_ctx.def_name_sym(def_id);
+        let name = strings.get_or_intern(name_sym, interner)?;
+        let result_type = types.resolve_type(type_id, type_ctx)?;
+
+        // Get actual target from compiled result
+        let target = compile_result
+            .def_entries
+            .get(&def_id)
+            .and_then(|label| layout.label_to_step.get(label))
+            .copied()
+            .expect("entrypoint must have compiled target");
+
+        entrypoints.push(Entrypoint {
+            name,
+            target,
+            result_type,
+            _pad: 0,
+        });
+    }
+
+    // Validate counts
+    strings.validate()?;
+    types.validate()?;
+    if entrypoints.len() > 65535 {
+        return Err(EmitError::TooManyEntrypoints(entrypoints.len()));
+    }
+
+    // Trivia (empty for now)
+    let trivia_entries: Vec<TriviaEntry> = Vec::new();
+
+    // Resolve and serialize transitions
+    let transitions_bytes =
+        emit_transitions(&compile_result.instructions, &layout, &types, &strings);
+
+    // Emit all byte sections
+    let (str_blob, str_table) = strings.emit();
+    let (type_defs_bytes, type_members_bytes, type_names_bytes) = types.emit();
+
+    let node_types_bytes = emit_node_symbols(&node_symbols);
+    let node_fields_bytes = emit_field_symbols(&field_symbols);
+    let trivia_bytes = emit_trivia(&trivia_entries);
+    let entrypoints_bytes = emit_entrypoints(&entrypoints);
+
+    // Build output with sections
+    let mut output = vec![0u8; 64]; // Reserve header space
+
+    let str_blob_offset = emit_section(&mut output, &str_blob);
+    let str_table_offset = emit_section(&mut output, &str_table);
+    let node_types_offset = emit_section(&mut output, &node_types_bytes);
+    let node_fields_offset = emit_section(&mut output, &node_fields_bytes);
+    let trivia_offset = emit_section(&mut output, &trivia_bytes);
+
+    // Type metadata section (header + 3 aligned sub-sections)
+    let type_meta_offset = emit_section(
+        &mut output,
+        &TypeMetaHeader {
+            type_defs_count: types.type_defs_count() as u16,
+            type_members_count: types.type_members_count() as u16,
+            type_names_count: types.type_names_count() as u16,
+            _pad: 0,
+        }
+        .to_bytes(),
+    );
+    emit_section(&mut output, &type_defs_bytes);
+    emit_section(&mut output, &type_members_bytes);
+    emit_section(&mut output, &type_names_bytes);
+
+    let entrypoints_offset = emit_section(&mut output, &entrypoints_bytes);
+    let transitions_offset = emit_section(&mut output, &transitions_bytes);
+
+    pad_to_section(&mut output);
+    let total_size = output.len() as u32;
+
+    // Build and write header
+    let mut header = Header {
+        str_blob_offset,
+        str_table_offset,
+        node_types_offset,
+        node_fields_offset,
+        trivia_offset,
+        type_meta_offset,
+        entrypoints_offset,
+        transitions_offset,
+        str_table_count: strings.len() as u16,
+        node_types_count: node_symbols.len() as u16,
+        node_fields_count: field_symbols.len() as u16,
+        trivia_count: trivia_entries.len() as u16,
+        entrypoints_count: entrypoints.len() as u16,
+        transitions_count: layout.total_steps,
+        total_size,
+        ..Default::default()
+    };
+    header.set_linked(is_linked);
+    header.checksum = crc32fast::hash(&output[64..]);
+    output[..64].copy_from_slice(&header.to_bytes());
+
+    Ok(output)
+}
+
+/// Pad a buffer to the section alignment boundary.
+fn pad_to_section(buf: &mut Vec<u8>) {
+    let rem = buf.len() % SECTION_ALIGN;
+    if rem != 0 {
+        let padding = SECTION_ALIGN - rem;
+        buf.resize(buf.len() + padding, 0);
+    }
+}
+
+/// Emit transitions section from instructions and layout.
+fn emit_transitions(
+    instructions: &[crate::bytecode::ir::Instruction],
+    layout: &crate::bytecode::ir::LayoutResult,
+    types: &TypeTableBuilder,
+    strings: &StringTableBuilder,
+) -> Vec<u8> {
+    // Allocate buffer for all steps (8 bytes each)
+    let mut bytes = vec![0u8; layout.total_steps as usize * 8];
+
+    // Create resolver closures for member indices.
+    // lookup_member: for struct fields (deduplicated by field identity)
+    // get_member_base: for enum variants (parent_type + relative_index)
+    let lookup_member = |field_name: Symbol, field_type: TypeId| {
+        types.lookup_member(field_name, field_type, strings)
+    };
+    let get_member_base = |type_id: TypeId| types.get_member_base(type_id);
+
+    for instr in instructions {
+        let label = instr.label();
+        let Some(&step_id) = layout.label_to_step.get(&label) else {
+            continue;
+        };
+
+        let offset = step_id as usize * 8; // STEP_SIZE
+        let resolved = instr.resolve(&layout.label_to_step, lookup_member, get_member_base);
+
+        // Copy instruction bytes to the correct position
+        let end = offset + resolved.len();
+        if end <= bytes.len() {
+            bytes[offset..end].copy_from_slice(&resolved);
+        }
+    }
+
+    bytes
+}
+
+fn emit_section(output: &mut Vec<u8>, data: &[u8]) -> u32 {
+    pad_to_section(output);
+    let offset = output.len() as u32;
+    output.extend_from_slice(data);
+    offset
+}
+
+fn emit_node_symbols(symbols: &[NodeSymbol]) -> Vec<u8> {
+    let mut bytes = Vec::with_capacity(symbols.len() * 4);
+    for sym in symbols {
+        bytes.extend_from_slice(&sym.id.to_le_bytes());
+        bytes.extend_from_slice(&sym.name.get().to_le_bytes());
+    }
+    bytes
+}
+
+fn emit_field_symbols(symbols: &[FieldSymbol]) -> Vec<u8> {
+    let mut bytes = Vec::with_capacity(symbols.len() * 4);
+    for sym in symbols {
+        bytes.extend_from_slice(&sym.id.to_le_bytes());
+        bytes.extend_from_slice(&sym.name.get().to_le_bytes());
+    }
+    bytes
+}
+
+fn emit_trivia(entries: &[TriviaEntry]) -> Vec<u8> {
+    let mut bytes = Vec::with_capacity(entries.len() * 2);
+    for entry in entries {
+        bytes.extend_from_slice(&entry.node_type.to_le_bytes());
+    }
+    bytes
+}
+
+fn emit_entrypoints(entrypoints: &[Entrypoint]) -> Vec<u8> {
+    let mut bytes = Vec::with_capacity(entrypoints.len() * 8);
+    for ep in entrypoints {
+        bytes.extend_from_slice(&ep.name.get().to_le_bytes());
+        bytes.extend_from_slice(&ep.target.to_le_bytes());
+        bytes.extend_from_slice(&ep.result_type.0.to_le_bytes());
+        bytes.extend_from_slice(&ep._pad.to_le_bytes());
+    }
+    bytes
+}
diff --git a/crates/plotnik-lib/src/emit/error.rs b/crates/plotnik-lib/src/emit/error.rs
new file mode 100644
index 00000000..8680c637
--- /dev/null
+++ b/crates/plotnik-lib/src/emit/error.rs
@@ -0,0 +1,41 @@
+//! Error types for bytecode emission.
+
+use plotnik_core::Symbol;
+
+/// Error during bytecode emission.
+#[derive(Clone, Debug)]
+pub enum EmitError {
+    /// Query has validation errors (must be valid before emitting).
+    InvalidQuery,
+    /// Too many strings (exceeds u16 max).
+    TooManyStrings(usize),
+    /// Too many types (exceeds u16 max).
+    TooManyTypes(usize),
+    /// Too many type members (exceeds u16 max).
+    TooManyTypeMembers(usize),
+    /// Too many entrypoints (exceeds u16 max).
+    TooManyEntrypoints(usize),
+    /// Too many transitions (exceeds u16 max).
+    TooManyTransitions(usize),
+    /// String not found in interner.
+    StringNotFound(Symbol),
+    /// Compilation error.
+    Compile(crate::compile::CompileError),
+}
+
+impl std::fmt::Display for EmitError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::InvalidQuery => write!(f, "query has validation errors"),
+            Self::TooManyStrings(n) => write!(f, "too many strings: {n} (max 65534)"),
+            Self::TooManyTypes(n) => write!(f, "too many types: {n} (max 65533)"),
+            Self::TooManyTypeMembers(n) => write!(f, "too many type members: {n} (max 65535)"),
+            Self::TooManyEntrypoints(n) => write!(f, "too many entrypoints: {n} (max 65535)"),
+            Self::TooManyTransitions(n) => write!(f, "too many transitions: {n} (max 65535)"),
+            Self::StringNotFound(sym) => write!(f, "string not found for symbol: {sym:?}"),
+            Self::Compile(e) => write!(f, "compilation error: {e}"),
+        }
+    }
+}
+
+impl std::error::Error for EmitError {}
diff --git a/crates/plotnik-lib/src/emit/mod.rs b/crates/plotnik-lib/src/emit/mod.rs
index 36daf192..ef0b661b 100644
--- a/crates/plotnik-lib/src/emit/mod.rs
+++ b/crates/plotnik-lib/src/emit/mod.rs
@@ -10,980 +10,22 @@
 //! - [`emit`]: Emit bytecode without language linking
 //! - [`emit_linked`]: Emit bytecode with node type/field validation
 
+mod emitter;
+mod error;
 pub mod layout;
+mod string_table;
+mod type_table;
 
 #[cfg(all(test, feature = "plotnik-langs"))]
-mod codegen_tests;
+mod emit_tests;
 #[cfg(test)]
 mod layout_tests;
+#[cfg(test)]
+mod string_table_tests;
+#[cfg(test)]
+mod type_table_tests;
 
-use std::collections::{HashMap, HashSet};
-
-use indexmap::IndexMap;
-use plotnik_core::{Interner, NodeFieldId, NodeTypeId, Symbol};
-
-use crate::bytecode::ir::Label;
-use crate::bytecode::{
-    Entrypoint, FieldSymbol, Header, NodeSymbol, QTypeId, SECTION_ALIGN, StringId, TriviaEntry,
-    TypeDef, TypeMember, TypeMetaHeader, TypeName,
-};
-use crate::type_system::TypeKind;
-
-use crate::analyze::symbol_table::SymbolTable;
-use crate::analyze::type_check::{
-    FieldInfo, TYPE_NODE, TYPE_STRING, TYPE_VOID, TypeContext, TypeId, TypeShape,
-};
-use crate::compile::Compiler;
-use crate::query::query::LinkedQuery;
-use layout::CacheAligned;
-
-/// Error during bytecode emission.
-#[derive(Clone, Debug)]
-pub enum EmitError {
-    /// Query has validation errors (must be valid before emitting).
-    InvalidQuery,
-    /// Too many strings (exceeds u16 max).
-    TooManyStrings(usize),
-    /// Too many types (exceeds u16 max).
-    TooManyTypes(usize),
-    /// Too many type members (exceeds u16 max).
-    TooManyTypeMembers(usize),
-    /// Too many entrypoints (exceeds u16 max).
-    TooManyEntrypoints(usize),
-    /// Too many transitions (exceeds u16 max).
-    TooManyTransitions(usize),
-    /// String not found in interner.
-    StringNotFound(Symbol),
-    /// Compilation error.
-    Compile(crate::compile::CompileError),
-}
-
-impl std::fmt::Display for EmitError {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::InvalidQuery => write!(f, "query has validation errors"),
-            Self::TooManyStrings(n) => write!(f, "too many strings: {n} (max 65534)"),
-            Self::TooManyTypes(n) => write!(f, "too many types: {n} (max 65533)"),
-            Self::TooManyTypeMembers(n) => write!(f, "too many type members: {n} (max 65535)"),
-            Self::TooManyEntrypoints(n) => write!(f, "too many entrypoints: {n} (max 65535)"),
-            Self::TooManyTransitions(n) => write!(f, "too many transitions: {n} (max 65535)"),
-            Self::StringNotFound(sym) => write!(f, "string not found for symbol: {sym:?}"),
-            Self::Compile(e) => write!(f, "compilation error: {e}"),
-        }
-    }
-}
-
-impl std::error::Error for EmitError {}
-
-/// Easter egg string at index 0 (Dostoevsky, The Idiot).
-/// StringId(0) is reserved and never referenced by instructions.
-pub const EASTER_EGG: &str = "Beauty will save the world";
-
-/// Builds the string table, remapping query Symbols to bytecode StringIds.
-///
-/// The bytecode format requires a subset of the query interner's strings.
-/// This builder collects only the strings that are actually used and assigns
-/// compact StringId indices.
-///
-/// StringId(0) is reserved for an easter egg and is never referenced by
-/// instructions. Actual strings start at index 1.
-#[derive(Debug)]
-pub struct StringTableBuilder {
-    /// Map from query Symbol to bytecode StringId.
-    mapping: HashMap<Symbol, StringId>,
-    /// Reverse lookup from string content to StringId (for intern_str).
-    str_lookup: HashMap<String, StringId>,
-    /// Ordered strings for the binary.
-    strings: Vec<String>,
-}
-
-impl StringTableBuilder {
-    pub fn new() -> Self {
-        let mut builder = Self {
-            mapping: HashMap::new(),
-            str_lookup: HashMap::new(),
-            strings: Vec::new(),
-        };
-        // Reserve index 0 for easter egg (never looked up via str_lookup)
-        builder.strings.push(EASTER_EGG.to_string());
-        builder
-    }
-
-    /// Get or create a StringId for a Symbol.
-    pub fn get_or_intern(
-        &mut self,
-        sym: Symbol,
-        interner: &Interner,
-    ) -> Result<StringId, EmitError> {
-        if let Some(&id) = self.mapping.get(&sym) {
-            return Ok(id);
-        }
-
-        let text = interner
-            .try_resolve(sym)
-            .ok_or(EmitError::StringNotFound(sym))?;
-
-        let id = StringId::new(self.strings.len() as u16);
-        self.strings.push(text.to_string());
-        self.str_lookup.insert(text.to_string(), id);
-        self.mapping.insert(sym, id);
-        Ok(id)
-    }
-
-    /// Intern a string directly (for generated strings not in the query interner).
-    pub fn intern_str(&mut self, s: &str) -> StringId {
-        if let Some(&id) = self.str_lookup.get(s) {
-            return id;
-        }
-
-        let id = StringId::new(self.strings.len() as u16);
-        self.strings.push(s.to_string());
-        self.str_lookup.insert(s.to_string(), id);
-        id
-    }
-
-    /// Number of interned strings.
-    pub fn len(&self) -> usize {
-        self.strings.len()
-    }
-
-    /// Whether the builder is empty.
-    pub fn is_empty(&self) -> bool {
-        self.strings.is_empty()
-    }
-
-    /// Validate that the string count fits in u16.
-    pub fn validate(&self) -> Result<(), EmitError> {
-        // Max count is 65534 because the table needs count+1 entries.
-        // Index 0 is reserved for the easter egg, so we can have 65533 user strings.
-        if self.strings.len() > 65534 {
-            return Err(EmitError::TooManyStrings(self.strings.len()));
-        }
-        Ok(())
-    }
-
-    /// Get the StringId for a Symbol, if it was interned.
-    pub fn get(&self, sym: Symbol) -> Option<StringId> {
-        self.mapping.get(&sym).copied()
-    }
-
-    /// Emit the string blob and offset table.
-    ///
-    /// Returns (blob_bytes, table_bytes).
-    pub fn emit(&self) -> (Vec<u8>, Vec<u8>) {
-        let mut blob = Vec::new();
-        let mut offsets: Vec<u32> = Vec::with_capacity(self.strings.len() + 1);
-
-        for s in &self.strings {
-            offsets.push(blob.len() as u32);
-            blob.extend_from_slice(s.as_bytes());
-        }
-        offsets.push(blob.len() as u32); // sentinel
-
-        // Convert offsets to bytes
-        let table_bytes: Vec<u8> = offsets.iter().flat_map(|o| o.to_le_bytes()).collect();
-
-        (blob, table_bytes)
-    }
-}
-
-impl Default for StringTableBuilder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-/// Builds the type metadata, remapping query TypeIds to bytecode QTypeIds.
-#[derive(Debug)]
-pub struct TypeTableBuilder {
-    /// Map from query TypeId to bytecode QTypeId.
-    mapping: HashMap<TypeId, QTypeId>,
-    /// Type definitions (4 bytes each).
-    type_defs: Vec<TypeDef>,
-    /// Type members for structs/enums (4 bytes each).
-    type_members: Vec<TypeMember>,
-    /// Type names for named types (4 bytes each).
-    type_names: Vec<TypeName>,
-    /// Cache for dynamically created Optional wrappers: base_type -> Optional(base_type)
-    optional_wrappers: HashMap<QTypeId, QTypeId>,
-    /// Cache for deduplicated members: (StringId, QTypeId) -> member_index.
-    /// Same (name, type) pair → same member index globally.
-    /// This enables call-site scoping where uncaptured refs share the caller's scope.
-    member_cache: HashMap<(StringId, QTypeId), u16>,
-}
-
-impl TypeTableBuilder {
-    pub fn new() -> Self {
-        Self {
-            mapping: HashMap::new(),
-            type_defs: Vec::new(),
-            type_members: Vec::new(),
-            type_names: Vec::new(),
-            optional_wrappers: HashMap::new(),
-            member_cache: HashMap::new(),
-        }
-    }
-
-    /// Build type table from TypeContext.
-    ///
-    /// Types are collected in definition order, depth-first, to mirror query structure.
-    /// Used builtins are emitted first, then custom types - no reserved slots.
-    pub fn build(
-        &mut self,
-        type_ctx: &TypeContext,
-        interner: &Interner,
-        strings: &mut StringTableBuilder,
-    ) -> Result<(), EmitError> {
-        // Collect custom types in definition order, depth-first
-        let mut ordered_types: Vec<TypeId> = Vec::new();
-        let mut seen: HashSet<TypeId> = HashSet::new();
-
-        // First walk from definition types (maintains order for entrypoints)
-        for (_def_id, type_id) in type_ctx.iter_def_types() {
-            collect_types_dfs(type_id, type_ctx, &mut ordered_types, &mut seen);
-        }
-
-        // Then collect any remaining interned types not reachable from definitions
-        // (e.g., enum types inside named nodes that don't propagate TypeFlow::Scalar)
-        for (type_id, _) in type_ctx.iter_types() {
-            collect_types_dfs(type_id, type_ctx, &mut ordered_types, &mut seen);
-        }
-
-        // Determine which builtins are actually used by scanning all types
-        let mut used_builtins = [false; 3]; // [Void, Node, String]
-        let mut seen = HashSet::new();
-        for &type_id in &ordered_types {
-            collect_builtin_refs(type_id, type_ctx, &mut used_builtins, &mut seen);
-        }
-        // Also check entrypoint result types directly
-        for (_def_id, type_id) in type_ctx.iter_def_types() {
-            if type_id == TYPE_VOID {
-                used_builtins[0] = true;
-            } else if type_id == TYPE_NODE {
-                used_builtins[1] = true;
-            } else if type_id == TYPE_STRING {
-                used_builtins[2] = true;
-            }
-        }
-
-        // Phase 1: Emit used builtins first (in order: Void, Node, String)
-        let builtin_types = [
-            (TYPE_VOID, TypeKind::Void),
-            (TYPE_NODE, TypeKind::Node),
-            (TYPE_STRING, TypeKind::String),
-        ];
-        for (i, &(builtin_id, kind)) in builtin_types.iter().enumerate() {
-            if used_builtins[i] {
-                let bc_id = QTypeId(self.type_defs.len() as u16);
-                self.mapping.insert(builtin_id, bc_id);
-                self.type_defs.push(TypeDef {
-                    data: 0,
-                    count: 0,
-                    kind: kind as u8,
-                });
-            }
-        }
-
-        // Phase 2: Pre-assign QTypeIds for custom types and reserve slots
-        for &type_id in &ordered_types {
-            let bc_id = QTypeId(self.type_defs.len() as u16);
-            self.mapping.insert(type_id, bc_id);
-            self.type_defs.push(TypeDef {
-                data: 0,
-                count: 0,
-                kind: 0, // Placeholder
-            });
-        }
-
-        // Phase 3: Fill in custom type definitions
-        // We need to calculate slot index as offset from where custom types start
-        let builtin_count = used_builtins.iter().filter(|&&b| b).count();
-        for (i, &type_id) in ordered_types.iter().enumerate() {
-            let slot_index = builtin_count + i;
-            let type_shape = type_ctx
-                .get_type(type_id)
-                .expect("collected type must exist");
-            self.emit_type_at_slot(slot_index, type_id, type_shape, type_ctx, interner, strings)?;
-        }
-
-        // Collect TypeName entries for named definitions
-        for (def_id, type_id) in type_ctx.iter_def_types() {
-            let name_sym = type_ctx.def_name_sym(def_id);
-            let name = strings.get_or_intern(name_sym, interner)?;
-            let bc_type_id = self.mapping.get(&type_id).copied().unwrap_or(QTypeId(0));
-            self.type_names.push(TypeName {
-                name,
-                type_id: bc_type_id,
-            });
-        }
-
-        // Collect TypeName entries for explicit type annotations on struct captures
-        // e.g., `{(fn) @fn} @outer :: FunctionInfo` names the struct "FunctionInfo"
-        for (type_id, name_sym) in type_ctx.iter_type_names() {
-            if let Some(&bc_type_id) = self.mapping.get(&type_id) {
-                let name = strings.get_or_intern(name_sym, interner)?;
-                self.type_names.push(TypeName {
-                    name,
-                    type_id: bc_type_id,
-                });
-            }
-        }
-
-        Ok(())
-    }
-
-    /// Fill in a TypeDef at a pre-allocated slot.
-    fn emit_type_at_slot(
-        &mut self,
-        slot_index: usize,
-        _type_id: TypeId,
-        type_shape: &TypeShape,
-        type_ctx: &TypeContext,
-        interner: &Interner,
-        strings: &mut StringTableBuilder,
-    ) -> Result<(), EmitError> {
-        match type_shape {
-            TypeShape::Void | TypeShape::Node | TypeShape::String => {
-                // Builtins - should not reach here
-                unreachable!("builtins should be handled separately")
-            }
-
-            TypeShape::Custom(sym) => {
-                // Custom type annotation: @x :: Identifier → type Identifier = Node
-                let bc_type_id = QTypeId(slot_index as u16);
-
-                // Add TypeName entry for the custom type
-                let name = strings.get_or_intern(*sym, interner)?;
-                self.type_names.push(TypeName {
-                    name,
-                    type_id: bc_type_id,
-                });
-
-                // Custom types alias Node - look up Node's actual bytecode ID
-                let node_bc_id = self.mapping.get(&TYPE_NODE).copied().unwrap_or(QTypeId(0));
-                self.type_defs[slot_index] = TypeDef {
-                    data: node_bc_id.0,
-                    count: 0,
-                    kind: TypeKind::Alias as u8,
-                };
-                Ok(())
-            }
-
-            TypeShape::Optional(inner) => {
-                let inner_bc = self.resolve_type(*inner, type_ctx)?;
-
-                self.type_defs[slot_index] = TypeDef {
-                    data: inner_bc.0,
-                    count: 0,
-                    kind: TypeKind::Optional as u8,
-                };
-                Ok(())
-            }
-
-            TypeShape::Array { element, non_empty } => {
-                let element_bc = self.resolve_type(*element, type_ctx)?;
-
-                let kind = if *non_empty {
-                    TypeKind::ArrayOneOrMore
-                } else {
-                    TypeKind::ArrayZeroOrMore
-                };
-                self.type_defs[slot_index] = TypeDef {
-                    data: element_bc.0,
-                    count: 0,
-                    kind: kind as u8,
-                };
-                Ok(())
-            }
-
-            TypeShape::Struct(fields) => {
-                // Resolve field types (this may create Optional wrappers at later indices)
-                let mut resolved_fields = Vec::with_capacity(fields.len());
-                for (field_sym, field_info) in fields {
-                    let field_name = strings.get_or_intern(*field_sym, interner)?;
-                    let field_type = self.resolve_field_type(field_info, type_ctx)?;
-                    resolved_fields.push((field_name, field_type));
-                }
-
-                // Emit members contiguously for this struct
-                let member_start = self.type_members.len() as u16;
-                for (field_name, field_type) in resolved_fields {
-                    self.type_members.push(TypeMember {
-                        name: field_name,
-                        type_id: field_type,
-                    });
-                }
-
-                let member_count = fields.len() as u8;
-                self.type_defs[slot_index] = TypeDef {
-                    data: member_start,
-                    count: member_count,
-                    kind: TypeKind::Struct as u8,
-                };
-                Ok(())
-            }
-
-            TypeShape::Enum(variants) => {
-                // Resolve variant types (this may create types at later indices)
-                let mut resolved_variants = Vec::with_capacity(variants.len());
-                for (variant_sym, variant_type_id) in variants {
-                    let variant_name = strings.get_or_intern(*variant_sym, interner)?;
-                    let variant_type = self.resolve_type(*variant_type_id, type_ctx)?;
-                    resolved_variants.push((variant_name, variant_type));
-                }
-
-                // Now emit the members and update the placeholder
-                let member_start = self.type_members.len() as u16;
-                for (variant_name, variant_type) in resolved_variants {
-                    self.type_members.push(TypeMember {
-                        name: variant_name,
-                        type_id: variant_type,
-                    });
-                }
-
-                let member_count = variants.len() as u8;
-                self.type_defs[slot_index] = TypeDef {
-                    data: member_start,
-                    count: member_count,
-                    kind: TypeKind::Enum as u8,
-                };
-                Ok(())
-            }
-
-            TypeShape::Ref(_def_id) => {
-                // Ref types are not emitted - they resolve to their target
-                unreachable!("Ref types should not be collected for emission")
-            }
-        }
-    }
-
-    /// Resolve a query TypeId to bytecode QTypeId.
-    ///
-    /// Handles Ref types by following the reference chain to the actual type.
-    pub fn resolve_type(
-        &self,
-        type_id: TypeId,
-        type_ctx: &TypeContext,
-    ) -> Result<QTypeId, EmitError> {
-        // Check if already mapped
-        if let Some(&bc_id) = self.mapping.get(&type_id) {
-            return Ok(bc_id);
-        }
-
-        // Handle Ref types by following the reference
-        if let Some(type_shape) = type_ctx.get_type(type_id)
-            && let TypeShape::Ref(def_id) = type_shape
-            && let Some(def_type_id) = type_ctx.get_def_type(*def_id)
-        {
-            return self.resolve_type(def_type_id, type_ctx);
-        }
-
-        // If not found, default to first type (should not happen for well-formed types)
-        Ok(QTypeId(0))
-    }
-
-    /// Resolve a field's type, handling optionality.
-    fn resolve_field_type(
-        &mut self,
-        field_info: &FieldInfo,
-        type_ctx: &TypeContext,
-    ) -> Result<QTypeId, EmitError> {
-        let base_type = self.resolve_type(field_info.type_id, type_ctx)?;
-
-        // If the field is optional, wrap it in Optional
-        if field_info.optional {
-            self.get_or_create_optional(base_type)
-        } else {
-            Ok(base_type)
-        }
-    }
-
-    /// Get or create an Optional wrapper for a base type.
-    fn get_or_create_optional(&mut self, base_type: QTypeId) -> Result<QTypeId, EmitError> {
-        // Check cache first
-        if let Some(&optional_id) = self.optional_wrappers.get(&base_type) {
-            return Ok(optional_id);
-        }
-
-        // Create new Optional wrapper at the next available index
-        let optional_id = QTypeId(self.type_defs.len() as u16);
-
-        self.type_defs.push(TypeDef {
-            data: base_type.0,
-            count: 0,
-            kind: TypeKind::Optional as u8,
-        });
-
-        self.optional_wrappers.insert(base_type, optional_id);
-        Ok(optional_id)
-    }
-
-    /// Validate that counts fit in u16.
-    pub fn validate(&self) -> Result<(), EmitError> {
-        if self.type_defs.len() > 65535 {
-            return Err(EmitError::TooManyTypes(self.type_defs.len()));
-        }
-        if self.type_members.len() > 65535 {
-            return Err(EmitError::TooManyTypeMembers(self.type_members.len()));
-        }
-        Ok(())
-    }
-
-    /// Get the bytecode QTypeId for a query TypeId.
-    pub fn get(&self, type_id: TypeId) -> Option<QTypeId> {
-        self.mapping.get(&type_id).copied()
-    }
-
-    /// Get the absolute member base index for a struct/enum type.
-    ///
-    /// For Struct and Enum types, returns the starting index in the TypeMembers table.
-    /// Fields/variants are at indices [base..base+count).
-    pub fn get_member_base(&self, type_id: TypeId) -> Option<u16> {
-        let bc_type_id = self.mapping.get(&type_id)?;
-        let type_def = self.type_defs.get(bc_type_id.0 as usize)?;
-
-        // Only Struct and Enum have member bases
-        let kind = TypeKind::from_u8(type_def.kind)?;
-        if kind.is_composite() {
-            Some(type_def.data)
-        } else {
-            None
-        }
-    }
-
-    /// Look up member index by field identity (name Symbol, value TypeId).
-    ///
-    /// Members are deduplicated globally: same (name, type) pair → same index.
-    /// This enables call-site scoping where uncaptured refs share the caller's scope.
-    pub fn lookup_member(
-        &self,
-        field_name: Symbol,
-        field_type: TypeId,
-        strings: &StringTableBuilder,
-    ) -> Option<u16> {
-        // Convert query-level identifiers to bytecode-level identifiers
-        let string_id = strings.get(field_name)?;
-        let type_id = self.mapping.get(&field_type)?;
-        self.member_cache.get(&(string_id, *type_id)).copied()
-    }
-
-    /// Emit type definitions, members, and names as bytes.
-    ///
-    /// Returns (type_defs_bytes, type_members_bytes, type_names_bytes).
-    pub fn emit(&self) -> (Vec<u8>, Vec<u8>, Vec<u8>) {
-        let mut defs_bytes = Vec::with_capacity(self.type_defs.len() * 4);
-        for def in &self.type_defs {
-            defs_bytes.extend_from_slice(&def.data.to_le_bytes());
-            defs_bytes.push(def.count);
-            defs_bytes.push(def.kind);
-        }
-
-        let mut members_bytes = Vec::with_capacity(self.type_members.len() * 4);
-        for member in &self.type_members {
-            members_bytes.extend_from_slice(&member.name.get().to_le_bytes());
-            members_bytes.extend_from_slice(&member.type_id.0.to_le_bytes());
-        }
-
-        let mut names_bytes = Vec::with_capacity(self.type_names.len() * 4);
-        for type_name in &self.type_names {
-            names_bytes.extend_from_slice(&type_name.name.get().to_le_bytes());
-            names_bytes.extend_from_slice(&type_name.type_id.0.to_le_bytes());
-        }
-
-        (defs_bytes, members_bytes, names_bytes)
-    }
-
-    /// Number of type definitions.
-    pub fn type_defs_count(&self) -> usize {
-        self.type_defs.len()
-    }
-
-    /// Number of type members.
-    pub fn type_members_count(&self) -> usize {
-        self.type_members.len()
-    }
-
-    /// Number of type names.
-    pub fn type_names_count(&self) -> usize {
-        self.type_names.len()
-    }
-}
-
-impl Default for TypeTableBuilder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-/// Collect types depth-first starting from a root type.
-fn collect_types_dfs(
-    type_id: TypeId,
-    type_ctx: &TypeContext,
-    out: &mut Vec<TypeId>,
-    seen: &mut HashSet<TypeId>,
-) {
-    // Skip builtins and already-seen types
-    if type_id.is_builtin() || seen.contains(&type_id) {
-        return;
-    }
-
-    let Some(type_shape) = type_ctx.get_type(type_id) else {
-        return;
-    };
-
-    // Resolve Ref types to their target
-    if let TypeShape::Ref(def_id) = type_shape {
-        if let Some(target_id) = type_ctx.get_def_type(*def_id) {
-            collect_types_dfs(target_id, type_ctx, out, seen);
-        }
-        return;
-    }
-
-    seen.insert(type_id);
-
-    // Collect children first (depth-first), then add self
-    match type_shape {
-        TypeShape::Struct(fields) => {
-            for field_info in fields.values() {
-                collect_types_dfs(field_info.type_id, type_ctx, out, seen);
-            }
-            out.push(type_id);
-        }
-        TypeShape::Enum(variants) => {
-            for &variant_type_id in variants.values() {
-                collect_types_dfs(variant_type_id, type_ctx, out, seen);
-            }
-            out.push(type_id);
-        }
-        TypeShape::Array { element, .. } => {
-            // Collect element type first, then add the Array itself
-            collect_types_dfs(*element, type_ctx, out, seen);
-            out.push(type_id);
-        }
-        TypeShape::Optional(inner) => {
-            // Collect inner type first, then add the Optional itself
-            collect_types_dfs(*inner, type_ctx, out, seen);
-            out.push(type_id);
-        }
-        TypeShape::Custom(_) => {
-            // Custom types alias Node, no children to collect
-            out.push(type_id);
-        }
-        _ => {}
-    }
-}
-
-/// Collect which builtin types are referenced by a type.
-fn collect_builtin_refs(
-    type_id: TypeId,
-    type_ctx: &TypeContext,
-    used: &mut [bool; 3],
-    seen: &mut HashSet<TypeId>,
-) {
-    if !seen.insert(type_id) {
-        return;
-    }
-
-    let Some(type_shape) = type_ctx.get_type(type_id) else {
-        return;
-    };
-
-    match type_shape {
-        TypeShape::Void => used[0] = true,
-        TypeShape::Node => used[1] = true,
-        TypeShape::String => used[2] = true,
-        TypeShape::Custom(_) => used[1] = true, // Custom types alias Node
-        TypeShape::Struct(fields) => {
-            for field_info in fields.values() {
-                collect_builtin_refs(field_info.type_id, type_ctx, used, seen);
-            }
-        }
-        TypeShape::Enum(variants) => {
-            for &variant_type_id in variants.values() {
-                collect_builtin_refs(variant_type_id, type_ctx, used, seen);
-            }
-        }
-        TypeShape::Array { element, .. } => {
-            collect_builtin_refs(*element, type_ctx, used, seen);
-        }
-        TypeShape::Optional(inner) => {
-            collect_builtin_refs(*inner, type_ctx, used, seen);
-        }
-        TypeShape::Ref(def_id) => {
-            if let Some(target_id) = type_ctx.get_def_type(*def_id) {
-                collect_builtin_refs(target_id, type_ctx, used, seen);
-            }
-        }
-    }
-}
-
-/// Pad a buffer to the section alignment boundary.
-fn pad_to_section(buf: &mut Vec<u8>) {
-    let rem = buf.len() % SECTION_ALIGN;
-    if rem != 0 {
-        let padding = SECTION_ALIGN - rem;
-        buf.resize(buf.len() + padding, 0);
-    }
-}
-
-/// Emit bytecode from type context only (no node validation).
-pub fn emit(
-    type_ctx: &TypeContext,
-    interner: &Interner,
-    symbol_table: &SymbolTable,
-) -> Result<Vec<u8>, EmitError> {
-    emit_inner(type_ctx, interner, symbol_table, None, None)
-}
-
-/// Emit bytecode from a LinkedQuery (includes node type/field validation info).
-pub fn emit_linked(query: &LinkedQuery) -> Result<Vec<u8>, EmitError> {
-    emit_inner(
-        query.type_context(),
-        query.interner(),
-        &query.symbol_table,
-        Some(query.node_type_ids()),
-        Some(query.node_field_ids()),
-    )
-}
-
-/// Shared bytecode emission logic.
-fn emit_inner(
-    type_ctx: &TypeContext,
-    interner: &Interner,
-    symbol_table: &SymbolTable,
-    node_type_ids: Option<&IndexMap<Symbol, NodeTypeId>>,
-    node_field_ids: Option<&IndexMap<Symbol, NodeFieldId>>,
-) -> Result<Vec<u8>, EmitError> {
-    let is_linked = node_type_ids.is_some();
-    let mut strings = StringTableBuilder::new();
-    let mut types = TypeTableBuilder::new();
-    types.build(type_ctx, interner, &mut strings)?;
-
-    // Compile transitions (strings are interned here for unlinked mode)
-    let compile_result = Compiler::compile(
-        interner,
-        type_ctx,
-        symbol_table,
-        &mut strings,
-        node_type_ids,
-        node_field_ids,
-    )
-    .map_err(EmitError::Compile)?;
-
-    // Layout with cache alignment
-    // Preamble entry FIRST ensures it gets the lowest address (step 0)
-    let mut entry_labels: Vec<Label> = vec![compile_result.preamble_entry];
-    entry_labels.extend(compile_result.def_entries.values().copied());
-    let layout = CacheAligned::layout(&compile_result.instructions, &entry_labels);
-
-    // Validate transition count
-    if layout.total_steps as usize > 65535 {
-        return Err(EmitError::TooManyTransitions(layout.total_steps as usize));
-    }
-
-    // Collect node symbols (empty if not linked)
-    let mut node_symbols: Vec<NodeSymbol> = Vec::new();
-    if let Some(ids) = node_type_ids {
-        for (&sym, &node_id) in ids {
-            let name = strings.get_or_intern(sym, interner)?;
-            node_symbols.push(NodeSymbol {
-                id: node_id.get(),
-                name,
-            });
-        }
-    }
-
-    // Collect field symbols (empty if not linked)
-    let mut field_symbols: Vec<FieldSymbol> = Vec::new();
-    if let Some(ids) = node_field_ids {
-        for (&sym, &field_id) in ids {
-            let name = strings.get_or_intern(sym, interner)?;
-            field_symbols.push(FieldSymbol {
-                id: field_id.get(),
-                name,
-            });
-        }
-    }
-
-    // Collect entrypoints with actual targets from layout
-    let mut entrypoints: Vec<Entrypoint> = Vec::new();
-    for (def_id, type_id) in type_ctx.iter_def_types() {
-        let name_sym = type_ctx.def_name_sym(def_id);
-        let name = strings.get_or_intern(name_sym, interner)?;
-        let result_type = types.resolve_type(type_id, type_ctx)?;
-
-        // Get actual target from compiled result
-        let target = compile_result
-            .def_entries
-            .get(&def_id)
-            .and_then(|label| layout.label_to_step.get(label))
-            .copied()
-            .expect("entrypoint must have compiled target");
-
-        entrypoints.push(Entrypoint {
-            name,
-            target,
-            result_type,
-            _pad: 0,
-        });
-    }
-
-    // Validate counts
-    strings.validate()?;
-    types.validate()?;
-    if entrypoints.len() > 65535 {
-        return Err(EmitError::TooManyEntrypoints(entrypoints.len()));
-    }
-
-    // Trivia (empty for now)
-    let trivia_entries: Vec<TriviaEntry> = Vec::new();
-
-    // Resolve and serialize transitions
-    let transitions_bytes =
-        emit_transitions(&compile_result.instructions, &layout, &types, &strings);
-
-    // Emit all byte sections
-    let (str_blob, str_table) = strings.emit();
-    let (type_defs_bytes, type_members_bytes, type_names_bytes) = types.emit();
-
-    let node_types_bytes = emit_node_symbols(&node_symbols);
-    let node_fields_bytes = emit_field_symbols(&field_symbols);
-    let trivia_bytes = emit_trivia(&trivia_entries);
-    let entrypoints_bytes = emit_entrypoints(&entrypoints);
-
-    // Build output with sections
-    let mut output = vec![0u8; 64]; // Reserve header space
-
-    let str_blob_offset = emit_section(&mut output, &str_blob);
-    let str_table_offset = emit_section(&mut output, &str_table);
-    let node_types_offset = emit_section(&mut output, &node_types_bytes);
-    let node_fields_offset = emit_section(&mut output, &node_fields_bytes);
-    let trivia_offset = emit_section(&mut output, &trivia_bytes);
-
-    // Type metadata section (header + 3 aligned sub-sections)
-    let type_meta_offset = emit_section(
-        &mut output,
-        &TypeMetaHeader {
-            type_defs_count: types.type_defs_count() as u16,
-            type_members_count: types.type_members_count() as u16,
-            type_names_count: types.type_names_count() as u16,
-            _pad: 0,
-        }
-        .to_bytes(),
-    );
-    emit_section(&mut output, &type_defs_bytes);
-    emit_section(&mut output, &type_members_bytes);
-    emit_section(&mut output, &type_names_bytes);
-
-    let entrypoints_offset = emit_section(&mut output, &entrypoints_bytes);
-    let transitions_offset = emit_section(&mut output, &transitions_bytes);
-
-    pad_to_section(&mut output);
-    let total_size = output.len() as u32;
-
-    // Build and write header
-    let mut header = Header {
-        str_blob_offset,
-        str_table_offset,
-        node_types_offset,
-        node_fields_offset,
-        trivia_offset,
-        type_meta_offset,
-        entrypoints_offset,
-        transitions_offset,
-        str_table_count: strings.len() as u16,
-        node_types_count: node_symbols.len() as u16,
-        node_fields_count: field_symbols.len() as u16,
-        trivia_count: trivia_entries.len() as u16,
-        entrypoints_count: entrypoints.len() as u16,
-        transitions_count: layout.total_steps,
-        total_size,
-        ..Default::default()
-    };
-    header.set_linked(is_linked);
-    header.checksum = crc32fast::hash(&output[64..]);
-    output[..64].copy_from_slice(&header.to_bytes());
-
-    Ok(output)
-}
-
-/// Emit transitions section from instructions and layout.
-fn emit_transitions(
-    instructions: &[crate::bytecode::ir::Instruction],
-    layout: &crate::bytecode::ir::LayoutResult,
-    types: &TypeTableBuilder,
-    strings: &StringTableBuilder,
-) -> Vec<u8> {
-    // Allocate buffer for all steps (8 bytes each)
-    let mut bytes = vec![0u8; layout.total_steps as usize * 8];
-
-    // Create resolver closures for member indices.
-    // lookup_member: for struct fields (deduplicated by field identity)
-    // get_member_base: for enum variants (parent_type + relative_index)
-    let lookup_member = |field_name: Symbol, field_type: TypeId| {
-        types.lookup_member(field_name, field_type, strings)
-    };
-    let get_member_base = |type_id: TypeId| types.get_member_base(type_id);
-
-    for instr in instructions {
-        let label = instr.label();
-        let Some(&step_id) = layout.label_to_step.get(&label) else {
-            continue;
-        };
-
-        let offset = step_id as usize * 8; // STEP_SIZE
-        let resolved = instr.resolve(&layout.label_to_step, lookup_member, get_member_base);
-
-        // Copy instruction bytes to the correct position
-        let end = offset + resolved.len();
-        if end <= bytes.len() {
-            bytes[offset..end].copy_from_slice(&resolved);
-        }
-    }
-
-    bytes
-}
-
-fn emit_section(output: &mut Vec<u8>, data: &[u8]) -> u32 {
-    pad_to_section(output);
-    let offset = output.len() as u32;
-    output.extend_from_slice(data);
-    offset
-}
-
-fn emit_node_symbols(symbols: &[NodeSymbol]) -> Vec<u8> {
-    let mut bytes = Vec::with_capacity(symbols.len() * 4);
-    for sym in symbols {
-        bytes.extend_from_slice(&sym.id.to_le_bytes());
-        bytes.extend_from_slice(&sym.name.get().to_le_bytes());
-    }
-    bytes
-}
-
-fn emit_field_symbols(symbols: &[FieldSymbol]) -> Vec<u8> {
-    let mut bytes = Vec::with_capacity(symbols.len() * 4);
-    for sym in symbols {
-        bytes.extend_from_slice(&sym.id.to_le_bytes());
-        bytes.extend_from_slice(&sym.name.get().to_le_bytes());
-    }
-    bytes
-}
-
-fn emit_trivia(entries: &[TriviaEntry]) -> Vec<u8> {
-    let mut bytes = Vec::with_capacity(entries.len() * 2);
-    for entry in entries {
-        bytes.extend_from_slice(&entry.node_type.to_le_bytes());
-    }
-    bytes
-}
-
-fn emit_entrypoints(entrypoints: &[Entrypoint]) -> Vec<u8> {
-    let mut bytes = Vec::with_capacity(entrypoints.len() * 8);
-    for ep in entrypoints {
-        bytes.extend_from_slice(&ep.name.get().to_le_bytes());
-        bytes.extend_from_slice(&ep.target.to_le_bytes());
-        bytes.extend_from_slice(&ep.result_type.0.to_le_bytes());
-        bytes.extend_from_slice(&ep._pad.to_le_bytes());
-    }
-    bytes
-}
+pub use emitter::{emit, emit_linked};
+pub use error::EmitError;
+pub use string_table::StringTableBuilder;
+pub use type_table::TypeTableBuilder;
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_captured.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured.snap
similarity index 93%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_captured.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured.snap
index caa3d8cd..5f5bc17c 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_captured.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = [(identifier) (number)] @value
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_captured_tagged.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured_tagged.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_captured_tagged.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured_tagged.snap
index 36ebee8e..bc6517fe 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_captured_tagged.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_captured_tagged.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = [A: (identifier) @a  B: (number) @b] @item
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_in_quantifier.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_in_quantifier.snap
similarity index 97%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_in_quantifier.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_in_quantifier.snap
index 964c95fd..c81acee8 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_in_quantifier.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_in_quantifier.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (object { [A: (pair) @a  B: (shorthand_property_identifier) @b] @item }* @items)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_labeled.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_labeled.snap
similarity index 94%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_labeled.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_labeled.snap
index 85f6e97a..f9833499 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_labeled.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_labeled.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = [
     A: (identifier) @a
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_no_internal_captures.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_no_internal_captures.snap
similarity index 94%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_no_internal_captures.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_no_internal_captures.snap
index edd54eaf..e871df09 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_no_internal_captures.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_no_internal_captures.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (program [(identifier) (number)] @x)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_null_injection.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_null_injection.snap
similarity index 94%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_null_injection.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_null_injection.snap
index ab0a7056..9f3a1127 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_null_injection.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_null_injection.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = [(identifier) @x (number) @y]
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_tagged_in_field_constraint.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_in_field_constraint.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_tagged_in_field_constraint.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_in_field_constraint.snap
index c219a955..de28a18d 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_tagged_in_field_constraint.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_in_field_constraint.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (foo field: [A: (x) @a B: (y)] @kind)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_tagged_with_definition_ref.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_with_definition_ref.snap
similarity index 96%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_tagged_with_definition_ref.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_with_definition_ref.snap
index eb29ed85..67684563 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_tagged_with_definition_ref.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_tagged_with_definition_ref.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Inner = (identifier) @name
 Test = [A: (Inner)  B: (number) @b] @item
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_unlabeled.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_unlabeled.snap
similarity index 94%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_unlabeled.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_unlabeled.snap
index a0b142e7..06cf3926 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__alternations_unlabeled.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__alternations_unlabeled.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = [(identifier) @id (string) @str]
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_between_siblings.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_between_siblings.snap
similarity index 93%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_between_siblings.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_between_siblings.snap
index eb7618b3..06c6c832 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_between_siblings.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_between_siblings.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (parent (a) . (b))
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_first_child.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_first_child.snap
similarity index 93%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_first_child.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_first_child.snap
index ad5371a5..65dc1103 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_first_child.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_first_child.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (parent . (first))
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_last_child.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_last_child.snap
similarity index 94%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_last_child.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_last_child.snap
index 90643aa1..2661121a 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_last_child.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_last_child.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (parent (last) .)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_no_anchor.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_no_anchor.snap
similarity index 93%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_no_anchor.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_no_anchor.snap
index d5785a7e..44890a0b 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_no_anchor.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_no_anchor.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (parent (a) (b))
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_with_anonymous.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_with_anonymous.snap
similarity index 93%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_with_anonymous.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_with_anonymous.snap
index e85919c0..b5edf8fb 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__anchors_with_anonymous.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__anchors_with_anonymous.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (parent "+" . (next))
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_basic.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_basic.snap
similarity index 92%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_basic.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_basic.snap
index 42c350d3..c01fac16 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_basic.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_basic.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (identifier) @name
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_deeply_nested.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_deeply_nested.snap
similarity index 96%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_deeply_nested.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_deeply_nested.snap
index 202ed61c..35f2172e 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_deeply_nested.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_deeply_nested.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (a (b (c (d) @d) @c) @b) @a
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_enum_with_type_annotation.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_enum_with_type_annotation.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_enum_with_type_annotation.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_enum_with_type_annotation.snap
index b0598e97..6f1f4744 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_enum_with_type_annotation.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_enum_with_type_annotation.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = [A: (identifier) @id B: (number) @num] @expr :: Expression
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_multiple.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_multiple.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_multiple.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_multiple.snap
index e255bdd0..59a6b26b 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_multiple.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_multiple.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (binary_expression (identifier) @a (number) @b)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_nested_flat.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_nested_flat.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_nested_flat.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_nested_flat.snap
index 43a7714b..2523aeaf 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_nested_flat.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_nested_flat.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (a (b (c) @c) @b) @a
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_optional_wrapper_struct.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_optional_wrapper_struct.snap
similarity index 96%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_optional_wrapper_struct.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_optional_wrapper_struct.snap
index 99aee9a7..482a155b 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_optional_wrapper_struct.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_optional_wrapper_struct.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = {{(identifier) @id} @inner}? @outer
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_struct_scope.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_scope.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_struct_scope.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_scope.snap
index f2c4d35b..d5b104cd 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_struct_scope.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_scope.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = {(a) @a (b) @b} @item
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_struct_with_type_annotation.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_with_type_annotation.snap
similarity index 94%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_struct_with_type_annotation.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_with_type_annotation.snap
index d9aef9d0..c741f454 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_struct_with_type_annotation.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_struct_with_type_annotation.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = {(identifier) @fn} @outer :: FunctionInfo
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_with_type_custom.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_custom.snap
similarity index 93%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_with_type_custom.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_custom.snap
index a85839f4..ed8b5855 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_with_type_custom.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_custom.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (identifier) @name :: Identifier
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_with_type_string.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_string.snap
similarity index 92%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_with_type_string.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_string.snap
index 04731ca5..ca30e638 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_with_type_string.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_with_type_string.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (identifier) @name :: string
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_wrapper_struct.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_wrapper_struct.snap
similarity index 97%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_wrapper_struct.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_wrapper_struct.snap
index 67b8447a..7d02f790 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__captures_wrapper_struct.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__captures_wrapper_struct.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = {{(identifier) @id (number) @num} @row}* @rows
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__comprehensive_multi_definition.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__comprehensive_multi_definition.snap
similarity index 97%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__comprehensive_multi_definition.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__comprehensive_multi_definition.snap
index 6d714f8e..3685bb61 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__comprehensive_multi_definition.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__comprehensive_multi_definition.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Ident = (identifier) @name :: string
 Expression = [
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_multiple.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_multiple.snap
similarity index 94%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_multiple.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_multiple.snap
index e1ce3c74..8403b2b8 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_multiple.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_multiple.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Foo = (identifier) @id
 Bar = (string) @str
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_nested_capture.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_nested_capture.snap
similarity index 97%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_nested_capture.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_nested_capture.snap
index 4e82a4bd..03d41c62 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_nested_capture.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_nested_capture.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Inner = (call (identifier) @name)
 Outer = (parent {(Inner) @item}* @items)
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_reference.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_reference.snap
similarity index 96%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_reference.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_reference.snap
index fd993de0..e5c466d3 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_reference.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_reference.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Expression = [(identifier) @name (number) @value]
 Root = (function_declaration name: (identifier) @name)
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_single.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_single.snap
similarity index 92%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_single.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_single.snap
index a41929cc..97bb257d 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__definitions_single.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__definitions_single.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Foo = (identifier) @id
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_alternation.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_alternation.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_alternation.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_alternation.snap
index a6f8b3cf..168d3511 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_alternation.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_alternation.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (call_expression function: [(identifier) @fn (number) @num])
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_multiple.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_multiple.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_multiple.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_multiple.snap
index 37bd54da..52992d5c 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_multiple.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_multiple.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (binary_expression
     left: (_) @left
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_negated.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_negated.snap
similarity index 94%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_negated.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_negated.snap
index d1e086b6..e27c1da5 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_negated.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_negated.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (function_declaration name: (identifier) @name -type_parameters)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_single.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_single.snap
similarity index 93%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_single.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_single.snap
index 7b20dfc7..bdfdfe85 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__fields_single.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__fields_single.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (function_declaration name: (identifier) @name)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_anonymous.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_anonymous.snap
similarity index 93%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_anonymous.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_anonymous.snap
index e6b7ccf8..f9579b89 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_anonymous.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_anonymous.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (binary_expression "+" @op)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_error.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_error.snap
similarity index 92%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_error.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_error.snap
index 1991ef0a..f7f007bb 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_error.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_error.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (ERROR) @err
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_missing.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_missing.snap
similarity index 92%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_missing.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_missing.snap
index c757f0e7..bfed4138 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_missing.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_missing.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (MISSING) @m
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_named.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_named.snap
similarity index 92%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_named.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_named.snap
index 5ac51568..47291bd4 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_named.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_named.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (identifier) @id
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_wildcard_any.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_any.snap
similarity index 93%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_wildcard_any.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_any.snap
index b826ae5b..f41d05e1 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_wildcard_any.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_any.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (pair key: _ @key)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_wildcard_named.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_named.snap
similarity index 93%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_wildcard_named.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_named.snap
index 83b3ded0..1cf04d26 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__nodes_wildcard_named.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__nodes_wildcard_named.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (pair key: (_) @key)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__optional_first_child.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_first_child.snap
similarity index 96%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__optional_first_child.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_first_child.snap
index 2ef1b60d..fc1475be 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__optional_first_child.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_first_child.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (program (identifier)? @id (number) @n)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_optional.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_null_injection.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_optional.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_null_injection.snap
index ac30fb28..dc20973d 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_optional.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__optional_null_injection.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (function_declaration (decorator)? @dec)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_first_child_array.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_first_child_array.snap
similarity index 97%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_first_child_array.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_first_child_array.snap
index 02ebafc2..bcceafb0 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_first_child_array.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_first_child_array.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (array (identifier)* @ids (number) @n)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__optional_null_injection.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__optional_null_injection.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional.snap
index ac30fb28..dc20973d 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__optional_null_injection.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (function_declaration (decorator)? @dec)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_optional_nongreedy.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional_nongreedy.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_optional_nongreedy.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional_nongreedy.snap
index 436967ae..d64bef9c 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_optional_nongreedy.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_optional_nongreedy.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (function_declaration (decorator)?? @dec)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_plus.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_plus.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus.snap
index e6639dab..e56a1c68 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_plus.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (identifier)+ @items
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_plus_nongreedy.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus_nongreedy.snap
similarity index 95%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_plus_nongreedy.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus_nongreedy.snap
index 7245533b..02836e65 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_plus_nongreedy.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_plus_nongreedy.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (identifier)+? @items
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_repeat_navigation.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_repeat_navigation.snap
similarity index 96%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_repeat_navigation.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_repeat_navigation.snap
index 56788735..adb22792 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_repeat_navigation.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_repeat_navigation.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (function_declaration (decorator)* @decs)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_sequence_in_called_def.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_sequence_in_called_def.snap
similarity index 97%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_sequence_in_called_def.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_sequence_in_called_def.snap
index 679cd498..e9a4e8ce 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_sequence_in_called_def.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_sequence_in_called_def.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Item = (identifier) @name
 Collect = {(Item) @item}* @items
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_star.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star.snap
similarity index 96%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_star.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star.snap
index aa7a1027..050ee9e2 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_star.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (identifier)* @items
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_star_nongreedy.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star_nongreedy.snap
similarity index 96%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_star_nongreedy.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star_nongreedy.snap
index 52fc73bc..ae8ecb54 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_star_nongreedy.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_star_nongreedy.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (identifier)*? @items
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_struct_array.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_struct_array.snap
similarity index 97%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_struct_array.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_struct_array.snap
index 19408e5b..69fb02a8 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__quantifiers_struct_array.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__quantifiers_struct_array.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (array {(identifier) @a (number) @b}* @items)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__recursion_simple.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_simple.snap
similarity index 96%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__recursion_simple.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_simple.snap
index b7c9a7b8..b771baec 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__recursion_simple.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_simple.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Expr = [
     Lit: (number) @value :: string
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__recursion_with_structured_result.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_with_structured_result.snap
similarity index 97%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__recursion_with_structured_result.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_with_structured_result.snap
index b89c7614..73153463 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__recursion_with_structured_result.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__recursion_with_structured_result.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Expr = [
   Lit: (number) @value :: string
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_basic.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_basic.snap
similarity index 93%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_basic.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_basic.snap
index 28ee12ed..70f4032a 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_basic.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_basic.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (parent {(a) (b)})
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_in_quantifier.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_in_quantifier.snap
similarity index 96%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_in_quantifier.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_in_quantifier.snap
index 46b818f7..d6881223 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_in_quantifier.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_in_quantifier.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (parent {(a) (b)}* @items)
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_nested.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_nested.snap
similarity index 94%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_nested.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_nested.snap
index d709e52f..502fb1ac 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_nested.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_nested.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (parent {(a) {(b) (c)} (d)})
 ---
diff --git a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_with_captures.snap b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_with_captures.snap
similarity index 94%
rename from crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_with_captures.snap
rename to crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_with_captures.snap
index 6b04dec8..21ba2c45 100644
--- a/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__codegen_tests__sequences_with_captures.snap
+++ b/crates/plotnik-lib/src/emit/snapshots/plotnik_lib__emit__emit_tests__sequences_with_captures.snap
@@ -1,5 +1,5 @@
 ---
-source: crates/plotnik-lib/src/emit/codegen_tests.rs
+source: crates/plotnik-lib/src/emit/emit_tests.rs
 ---
 Test = (parent {(a) @a (b) @b})
 ---
diff --git a/crates/plotnik-lib/src/emit/string_table.rs b/crates/plotnik-lib/src/emit/string_table.rs
new file mode 100644
index 00000000..438e4112
--- /dev/null
+++ b/crates/plotnik-lib/src/emit/string_table.rs
@@ -0,0 +1,129 @@
+//! String table builder for bytecode emission.
+//!
+//! Builds the string table section, remapping query Symbols to bytecode StringIds.
+
+use std::collections::HashMap;
+
+use plotnik_core::{Interner, Symbol};
+
+use crate::bytecode::StringId;
+
+use super::EmitError;
+
+/// Easter egg string at index 0 (Dostoevsky, The Idiot).
+/// StringId(0) is reserved and never referenced by instructions.
+pub const EASTER_EGG: &str = "Beauty will save the world";
+
+/// Builds the string table, remapping query Symbols to bytecode StringIds.
+///
+/// The bytecode format requires a subset of the query interner's strings.
+/// This builder collects only the strings that are actually used and assigns
+/// compact StringId indices.
+///
+/// StringId(0) is reserved for an easter egg and is never referenced by
+/// instructions. Actual strings start at index 1.
+#[derive(Debug)]
+pub struct StringTableBuilder {
+    /// Map from query Symbol to bytecode StringId.
+    mapping: HashMap<Symbol, StringId>,
+    /// Reverse lookup from string content to StringId (for intern_str).
+    str_lookup: HashMap<String, StringId>,
+    /// Ordered strings for the binary.
+    strings: Vec<String>,
+}
+
+impl StringTableBuilder {
+    pub fn new() -> Self {
+        let mut builder = Self {
+            mapping: HashMap::new(),
+            str_lookup: HashMap::new(),
+            strings: Vec::new(),
+        };
+        // Reserve index 0 for easter egg (never looked up via str_lookup)
+        builder.strings.push(EASTER_EGG.to_string());
+        builder
+    }
+
+    /// Get or create a StringId for a Symbol.
+    pub fn get_or_intern(
+        &mut self,
+        sym: Symbol,
+        interner: &Interner,
+    ) -> Result<StringId, EmitError> {
+        if let Some(&id) = self.mapping.get(&sym) {
+            return Ok(id);
+        }
+
+        let text = interner
+            .try_resolve(sym)
+            .ok_or(EmitError::StringNotFound(sym))?;
+
+        let id = StringId::new(self.strings.len() as u16);
+        self.strings.push(text.to_string());
+        self.str_lookup.insert(text.to_string(), id);
+        self.mapping.insert(sym, id);
+        Ok(id)
+    }
+
+    /// Intern a string directly (for generated strings not in the query interner).
+    pub fn intern_str(&mut self, s: &str) -> StringId {
+        if let Some(&id) = self.str_lookup.get(s) {
+            return id;
+        }
+
+        let id = StringId::new(self.strings.len() as u16);
+        self.strings.push(s.to_string());
+        self.str_lookup.insert(s.to_string(), id);
+        id
+    }
+
+    /// Number of interned strings.
+    pub fn len(&self) -> usize {
+        self.strings.len()
+    }
+
+    /// Whether the builder is empty.
+    pub fn is_empty(&self) -> bool {
+        self.strings.is_empty()
+    }
+
+    /// Validate that the string count fits in u16.
+    pub fn validate(&self) -> Result<(), EmitError> {
+        // Max count is 65534 because the table needs count+1 entries.
+        // Index 0 is reserved for the easter egg, so we can have 65533 user strings.
+        if self.strings.len() > 65534 {
+            return Err(EmitError::TooManyStrings(self.strings.len()));
+        }
+        Ok(())
+    }
+
+    /// Get the StringId for a Symbol, if it was interned.
+    pub fn get(&self, sym: Symbol) -> Option<StringId> {
+        self.mapping.get(&sym).copied()
+    }
+
+    /// Emit the string blob and offset table.
+    ///
+    /// Returns (blob_bytes, table_bytes).
+    pub fn emit(&self) -> (Vec<u8>, Vec<u8>) {
+        let mut blob = Vec::new();
+        let mut offsets: Vec<u32> = Vec::with_capacity(self.strings.len() + 1);
+
+        for s in &self.strings {
+            offsets.push(blob.len() as u32);
+            blob.extend_from_slice(s.as_bytes());
+        }
+        offsets.push(blob.len() as u32); // sentinel
+
+        // Convert offsets to bytes
+        let table_bytes: Vec<u8> = offsets.iter().flat_map(|o| o.to_le_bytes()).collect();
+
+        (blob, table_bytes)
+    }
+}
+
+impl Default for StringTableBuilder {
+    fn default() -> Self {
+        Self::new()
+    }
+}
diff --git a/crates/plotnik-lib/src/emit/string_table_tests.rs b/crates/plotnik-lib/src/emit/string_table_tests.rs
new file mode 100644
index 00000000..71753413
--- /dev/null
+++ b/crates/plotnik-lib/src/emit/string_table_tests.rs
@@ -0,0 +1,120 @@
+//! Unit tests for StringTableBuilder.
+
+use plotnik_core::Interner;
+
+use super::string_table::{EASTER_EGG, StringTableBuilder};
+
+#[test]
+fn new_builder_has_easter_egg_at_index_zero() {
+    let builder = StringTableBuilder::new();
+
+    assert_eq!(builder.len(), 1);
+    assert!(!builder.is_empty());
+
+    let (blob, _) = builder.emit();
+    assert_eq!(std::str::from_utf8(&blob).unwrap(), EASTER_EGG);
+}
+
+#[test]
+fn intern_symbol_twice_returns_same_id() {
+    let mut interner = Interner::new();
+    let sym = interner.intern("hello");
+
+    let mut builder = StringTableBuilder::new();
+
+    let id1 = builder.get_or_intern(sym, &interner).unwrap();
+    let id2 = builder.get_or_intern(sym, &interner).unwrap();
+
+    assert_eq!(id1, id2);
+    assert_eq!(builder.len(), 2); // easter egg + "hello"
+}
+
+#[test]
+fn intern_different_symbols_returns_different_ids() {
+    let mut interner = Interner::new();
+    let sym1 = interner.intern("hello");
+    let sym2 = interner.intern("world");
+
+    let mut builder = StringTableBuilder::new();
+
+    let id1 = builder.get_or_intern(sym1, &interner).unwrap();
+    let id2 = builder.get_or_intern(sym2, &interner).unwrap();
+
+    assert_ne!(id1, id2);
+    assert_eq!(builder.len(), 3); // easter egg + "hello" + "world"
+}
+
+#[test]
+fn intern_str_deduplicates() {
+    let mut builder = StringTableBuilder::new();
+
+    let id1 = builder.intern_str("test");
+    let id2 = builder.intern_str("test");
+    let id3 = builder.intern_str("other");
+
+    assert_eq!(id1, id2);
+    assert_ne!(id1, id3);
+    assert_eq!(builder.len(), 3); // easter egg + "test" + "other"
+}
+
+#[test]
+fn get_returns_none_for_unknown_symbol() {
+    let mut interner = Interner::new();
+    let known = interner.intern("known");
+    let unknown = interner.intern("unknown");
+
+    let mut builder = StringTableBuilder::new();
+    builder.get_or_intern(known, &interner).unwrap();
+
+    assert!(builder.get(known).is_some());
+    assert!(builder.get(unknown).is_none());
+}
+
+#[test]
+fn validate_passes_for_normal_counts() {
+    let builder = StringTableBuilder::new();
+
+    assert!(builder.validate().is_ok());
+}
+
+#[test]
+fn emit_produces_correct_format() {
+    let mut builder = StringTableBuilder::new();
+    builder.intern_str("abc");
+    builder.intern_str("defgh");
+
+    let (blob, table) = builder.emit();
+
+    // Blob should contain: EASTER_EGG + "abc" + "defgh"
+    let expected_blob = format!("{EASTER_EGG}abcdefgh");
+    assert_eq!(blob, expected_blob.as_bytes());
+
+    // Table should have 4 entries (3 strings + sentinel)
+    // Each entry is 4 bytes (u32 le)
+    assert_eq!(table.len(), 4 * 4);
+
+    // Verify offsets
+    let offsets: Vec<u32> = table
+        .chunks(4)
+        .map(|chunk| u32::from_le_bytes(chunk.try_into().unwrap()))
+        .collect();
+
+    assert_eq!(offsets[0], 0); // EASTER_EGG starts at 0
+    assert_eq!(offsets[1], EASTER_EGG.len() as u32); // "abc" starts after easter egg
+    assert_eq!(offsets[2], (EASTER_EGG.len() + 3) as u32); // "defgh" starts after "abc"
+    assert_eq!(offsets[3], (EASTER_EGG.len() + 8) as u32); // sentinel
+}
+
+#[test]
+fn string_not_found_error_for_unknown_symbol() {
+    let mut interner = Interner::new();
+    let sym = interner.intern("exists");
+
+    // Create a different interner without the symbol
+    let other_interner = Interner::new();
+
+    let mut builder = StringTableBuilder::new();
+    let result = builder.get_or_intern(sym, &other_interner);
+
+    assert!(result.is_err());
+}
diff --git a/crates/plotnik-lib/src/emit/type_table.rs b/crates/plotnik-lib/src/emit/type_table.rs
new file mode 100644
index 00000000..3dd265f1
--- /dev/null
+++ b/crates/plotnik-lib/src/emit/type_table.rs
@@ -0,0 +1,539 @@
+//! Type table builder for bytecode emission.
+//!
+//! Converts query-level types (TypeContext) into bytecode-level types (QTypeId).
+
+use std::collections::{HashMap, HashSet};
+
+use plotnik_core::{Interner, Symbol};
+
+use crate::analyze::type_check::{
+    FieldInfo, TYPE_NODE, TYPE_STRING, TYPE_VOID, TypeContext, TypeId, TypeShape,
+};
+use crate::bytecode::{QTypeId, StringId, TypeDef, TypeMember, TypeName};
+use crate::type_system::TypeKind;
+
+use super::{EmitError, StringTableBuilder};
+
+/// Builds the type metadata, remapping query TypeIds to bytecode QTypeIds.
+#[derive(Debug)]
+pub struct TypeTableBuilder {
+    /// Map from query TypeId to bytecode QTypeId.
+    mapping: HashMap<TypeId, QTypeId>,
+    /// Type definitions (4 bytes each).
+    type_defs: Vec<TypeDef>,
+    /// Type members for structs/enums (4 bytes each).
+    type_members: Vec<TypeMember>,
+    /// Type names for named types (4 bytes each).
+    type_names: Vec<TypeName>,
+    /// Cache for dynamically created Optional wrappers: base_type -> Optional(base_type)
+    optional_wrappers: HashMap<QTypeId, QTypeId>,
+    /// Cache for deduplicated members: (StringId, QTypeId) -> member_index.
+    /// Same (name, type) pair → same member index globally.
+    /// This enables call-site scoping where uncaptured refs share the caller's scope.
+    member_cache: HashMap<(StringId, QTypeId), u16>,
+}
+
+impl TypeTableBuilder {
+    pub fn new() -> Self {
+        Self {
+            mapping: HashMap::new(),
+            type_defs: Vec::new(),
+            type_members: Vec::new(),
+            type_names: Vec::new(),
+            optional_wrappers: HashMap::new(),
+            member_cache: HashMap::new(),
+        }
+    }
+
+    /// Build type table from TypeContext.
+    ///
+    /// Types are collected in definition order, depth-first, to mirror query structure.
+    /// Used builtins are emitted first, then custom types - no reserved slots.
+    pub fn build(
+        &mut self,
+        type_ctx: &TypeContext,
+        interner: &Interner,
+        strings: &mut StringTableBuilder,
+    ) -> Result<(), EmitError> {
+        // Collect custom types in definition order, depth-first
+        let mut ordered_types: Vec<TypeId> = Vec::new();
+        let mut seen: HashSet<TypeId> = HashSet::new();
+
+        // First walk from definition types (maintains order for entrypoints)
+        for (_def_id, type_id) in type_ctx.iter_def_types() {
+            collect_types_dfs(type_id, type_ctx, &mut ordered_types, &mut seen);
+        }
+
+        // Then collect any remaining interned types not reachable from definitions
+        // (e.g., enum types inside named nodes that don't propagate TypeFlow::Scalar)
+        for (type_id, _) in type_ctx.iter_types() {
+            collect_types_dfs(type_id, type_ctx, &mut ordered_types, &mut seen);
+        }
+
+        // Determine which builtins are actually used by scanning all types
+        let mut used_builtins = [false; 3]; // [Void, Node, String]
+        let mut seen = HashSet::new();
+        for &type_id in &ordered_types {
+            collect_builtin_refs(type_id, type_ctx, &mut used_builtins, &mut seen);
+        }
+        // Also check entrypoint result types directly
+        for (_def_id, type_id) in type_ctx.iter_def_types() {
+            if type_id == TYPE_VOID {
+                used_builtins[0] = true;
+            } else if type_id == TYPE_NODE {
+                used_builtins[1] = true;
+            } else if type_id == TYPE_STRING {
+                used_builtins[2] = true;
+            }
+        }
+
+        // Phase 1: Emit used builtins first (in order: Void, Node, String)
+        let builtin_types = [
+            (TYPE_VOID, TypeKind::Void),
+            (TYPE_NODE, TypeKind::Node),
+            (TYPE_STRING, TypeKind::String),
+        ];
+        for (i, &(builtin_id, kind)) in builtin_types.iter().enumerate() {
+            if used_builtins[i] {
+                let bc_id = QTypeId(self.type_defs.len() as u16);
+                self.mapping.insert(builtin_id, bc_id);
+                self.type_defs.push(TypeDef {
+                    data: 0,
+                    count: 0,
+                    kind: kind as u8,
+                });
+            }
+        }
+
+        // Phase 2: Pre-assign QTypeIds for custom types and reserve slots
+        for &type_id in &ordered_types {
+            let bc_id = QTypeId(self.type_defs.len() as u16);
+            self.mapping.insert(type_id, bc_id);
+            self.type_defs.push(TypeDef {
+                data: 0,
+                count: 0,
+                kind: 0, // Placeholder
+            });
+        }
+
+        // Phase 3: Fill in custom type definitions
+        // We need to calculate slot index as offset from where custom types start
+        let builtin_count = used_builtins.iter().filter(|&&b| b).count();
+        for (i, &type_id) in ordered_types.iter().enumerate() {
+            let slot_index = builtin_count + i;
+            let type_shape = type_ctx
+                .get_type(type_id)
+                .expect("collected type must exist");
+            self.emit_type_at_slot(slot_index, type_id, type_shape, type_ctx, interner, strings)?;
+        }
+
+        // Collect TypeName entries for named definitions
+        for (def_id, type_id) in type_ctx.iter_def_types() {
+            let name_sym = type_ctx.def_name_sym(def_id);
+            let name = strings.get_or_intern(name_sym, interner)?;
+            let bc_type_id = self.mapping.get(&type_id).copied().unwrap_or(QTypeId(0));
+            self.type_names.push(TypeName {
+                name,
+                type_id: bc_type_id,
+            });
+        }
+
+        // Collect TypeName entries for explicit type annotations on struct captures
+        // e.g., `{(fn) @fn} @outer :: FunctionInfo` names the struct "FunctionInfo"
+        for (type_id, name_sym) in type_ctx.iter_type_names() {
+            if let Some(&bc_type_id) = self.mapping.get(&type_id) {
+                let name = strings.get_or_intern(name_sym, interner)?;
+                self.type_names.push(TypeName {
+                    name,
+                    type_id: bc_type_id,
+                });
+            }
+        }
+
+        Ok(())
+    }
+
+    /// Fill in a TypeDef at a pre-allocated slot.
+    fn emit_type_at_slot(
+        &mut self,
+        slot_index: usize,
+        _type_id: TypeId,
+        type_shape: &TypeShape,
+        type_ctx: &TypeContext,
+        interner: &Interner,
+        strings: &mut StringTableBuilder,
+    ) -> Result<(), EmitError> {
+        match type_shape {
+            TypeShape::Void | TypeShape::Node | TypeShape::String => {
+                // Builtins - should not reach here
+                unreachable!("builtins should be handled separately")
+            }
+
+            TypeShape::Custom(sym) => {
+                // Custom type annotation: @x :: Identifier → type Identifier = Node
+                let bc_type_id = QTypeId(slot_index as u16);
+
+                // Add TypeName entry for the custom type
+                let name = strings.get_or_intern(*sym, interner)?;
+                self.type_names.push(TypeName {
+                    name,
+                    type_id: bc_type_id,
+                });
+
+                // Custom types alias Node - look up Node's actual bytecode ID
+                let node_bc_id = self.mapping.get(&TYPE_NODE).copied().unwrap_or(QTypeId(0));
+                self.type_defs[slot_index] = TypeDef {
+                    data: node_bc_id.0,
+                    count: 0,
+                    kind: TypeKind::Alias as u8,
+                };
+                Ok(())
+            }
+
+            TypeShape::Optional(inner) => {
+                let inner_bc = self.resolve_type(*inner, type_ctx)?;
+
+                self.type_defs[slot_index] = TypeDef {
+                    data: inner_bc.0,
+                    count: 0,
+                    kind: TypeKind::Optional as u8,
+                };
+                Ok(())
+            }
+
+            TypeShape::Array { element, non_empty } => {
+                let element_bc = self.resolve_type(*element, type_ctx)?;
+
+                let kind = if *non_empty {
+                    TypeKind::ArrayOneOrMore
+                } else {
+                    TypeKind::ArrayZeroOrMore
+                };
+                self.type_defs[slot_index] = TypeDef {
+                    data: element_bc.0,
+                    count: 0,
+                    kind: kind as u8,
+                };
+                Ok(())
+            }
+
+            TypeShape::Struct(fields) => {
+                // Resolve field types (this may create Optional wrappers at later indices)
+                let mut resolved_fields = Vec::with_capacity(fields.len());
+                for (field_sym, field_info) in fields {
+                    let field_name = strings.get_or_intern(*field_sym, interner)?;
+                    let field_type = self.resolve_field_type(field_info, type_ctx)?;
+                    resolved_fields.push((field_name, field_type));
+                }
+
+                // Emit members contiguously for this struct
+                let member_start = self.type_members.len() as u16;
+                for (field_name, field_type) in resolved_fields {
+                    self.type_members.push(TypeMember {
+                        name: field_name,
+                        type_id: field_type,
+                    });
+                }
+
+                let member_count = fields.len() as u8;
+                self.type_defs[slot_index] = TypeDef {
+                    data: member_start,
+                    count: member_count,
+                    kind: TypeKind::Struct as u8,
+                };
+                Ok(())
+            }
+
+            TypeShape::Enum(variants) => {
+                // Resolve variant types (this may create types at later indices)
+                let mut resolved_variants = Vec::with_capacity(variants.len());
+                for (variant_sym, variant_type_id) in variants {
+                    let variant_name = strings.get_or_intern(*variant_sym, interner)?;
+                    let variant_type = self.resolve_type(*variant_type_id, type_ctx)?;
+                    resolved_variants.push((variant_name, variant_type));
+                }
+
+                // Now emit the members and update the placeholder
+                let member_start = self.type_members.len() as u16;
+                for (variant_name, variant_type) in resolved_variants {
+                    self.type_members.push(TypeMember {
+                        name: variant_name,
+                        type_id: variant_type,
+                    });
+                }
+
+                let member_count = variants.len() as u8;
+                self.type_defs[slot_index] = TypeDef {
+                    data: member_start,
+                    count: member_count,
+                    kind: TypeKind::Enum as u8,
+                };
+                Ok(())
+            }
+
+            TypeShape::Ref(_def_id) => {
+                // Ref types are not emitted - they resolve to their target
+                unreachable!("Ref types should not be collected for emission")
+            }
+        }
+    }
+
+    /// Resolve a query TypeId to bytecode QTypeId.
+    ///
+    /// Handles Ref types by following the reference chain to the actual type.
+    pub fn resolve_type(
+        &self,
+        type_id: TypeId,
+        type_ctx: &TypeContext,
+    ) -> Result<QTypeId, EmitError> {
+        // Check if already mapped
+        if let Some(&bc_id) = self.mapping.get(&type_id) {
+            return Ok(bc_id);
+        }
+
+        // Handle Ref types by following the reference
+        if let Some(type_shape) = type_ctx.get_type(type_id)
+            && let TypeShape::Ref(def_id) = type_shape
+            && let Some(def_type_id) = type_ctx.get_def_type(*def_id)
+        {
+            return self.resolve_type(def_type_id, type_ctx);
+        }
+
+        // If not found, default to first type (should not happen for well-formed types)
+        Ok(QTypeId(0))
+    }
+
+    /// Resolve a field's type, handling optionality.
+    fn resolve_field_type(
+        &mut self,
+        field_info: &FieldInfo,
+        type_ctx: &TypeContext,
+    ) -> Result<QTypeId, EmitError> {
+        let base_type = self.resolve_type(field_info.type_id, type_ctx)?;
+
+        // If the field is optional, wrap it in Optional
+        if field_info.optional {
+            self.get_or_create_optional(base_type)
+        } else {
+            Ok(base_type)
+        }
+    }
+
+    /// Get or create an Optional wrapper for a base type.
+    fn get_or_create_optional(&mut self, base_type: QTypeId) -> Result<QTypeId, EmitError> {
+        // Check cache first
+        if let Some(&optional_id) = self.optional_wrappers.get(&base_type) {
+            return Ok(optional_id);
+        }
+
+        // Create new Optional wrapper at the next available index
+        let optional_id = QTypeId(self.type_defs.len() as u16);
+
+        self.type_defs.push(TypeDef {
+            data: base_type.0,
+            count: 0,
+            kind: TypeKind::Optional as u8,
+        });
+
+        self.optional_wrappers.insert(base_type, optional_id);
+        Ok(optional_id)
+    }
+
+    /// Validate that counts fit in u16.
+    pub fn validate(&self) -> Result<(), EmitError> {
+        if self.type_defs.len() > 65535 {
+            return Err(EmitError::TooManyTypes(self.type_defs.len()));
+        }
+        if self.type_members.len() > 65535 {
+            return Err(EmitError::TooManyTypeMembers(self.type_members.len()));
+        }
+        Ok(())
+    }
+
+    /// Get the bytecode QTypeId for a query TypeId.
+    pub fn get(&self, type_id: TypeId) -> Option<QTypeId> {
+        self.mapping.get(&type_id).copied()
+    }
+
+    /// Get the absolute member base index for a struct/enum type.
+    ///
+    /// For Struct and Enum types, returns the starting index in the TypeMembers table.
+    /// Fields/variants are at indices [base..base+count).
+    pub fn get_member_base(&self, type_id: TypeId) -> Option<u16> {
+        let bc_type_id = self.mapping.get(&type_id)?;
+        let type_def = self.type_defs.get(bc_type_id.0 as usize)?;
+
+        // Only Struct and Enum have member bases
+        let kind = TypeKind::from_u8(type_def.kind)?;
+        if kind.is_composite() {
+            Some(type_def.data)
+        } else {
+            None
+        }
+    }
+
+    /// Look up member index by field identity (name Symbol, value TypeId).
+    ///
+    /// Members are deduplicated globally: same (name, type) pair → same index.
+    /// This enables call-site scoping where uncaptured refs share the caller's scope.
+    pub fn lookup_member(
+        &self,
+        field_name: Symbol,
+        field_type: TypeId,
+        strings: &StringTableBuilder,
+    ) -> Option<u16> {
+        // Convert query-level identifiers to bytecode-level identifiers
+        let string_id = strings.get(field_name)?;
+        let type_id = self.mapping.get(&field_type)?;
+        self.member_cache.get(&(string_id, *type_id)).copied()
+    }
+
+    /// Emit type definitions, members, and names as bytes.
+    ///
+    /// Returns (type_defs_bytes, type_members_bytes, type_names_bytes).
+    pub fn emit(&self) -> (Vec<u8>, Vec<u8>, Vec<u8>) {
+        let mut defs_bytes = Vec::with_capacity(self.type_defs.len() * 4);
+        for def in &self.type_defs {
+            defs_bytes.extend_from_slice(&def.data.to_le_bytes());
+            defs_bytes.push(def.count);
+            defs_bytes.push(def.kind);
+        }
+
+        let mut members_bytes = Vec::with_capacity(self.type_members.len() * 4);
+        for member in &self.type_members {
+            members_bytes.extend_from_slice(&member.name.get().to_le_bytes());
+            members_bytes.extend_from_slice(&member.type_id.0.to_le_bytes());
+        }
+
+        let mut names_bytes = Vec::with_capacity(self.type_names.len() * 4);
+        for type_name in &self.type_names {
+            names_bytes.extend_from_slice(&type_name.name.get().to_le_bytes());
+            names_bytes.extend_from_slice(&type_name.type_id.0.to_le_bytes());
+        }
+
+        (defs_bytes, members_bytes, names_bytes)
+    }
+
+    /// Number of type definitions.
+    pub fn type_defs_count(&self) -> usize {
+        self.type_defs.len()
+    }
+
+    /// Number of type members.
+    pub fn type_members_count(&self) -> usize {
+        self.type_members.len()
+    }
+
+    /// Number of type names.
+    pub fn type_names_count(&self) -> usize {
+        self.type_names.len()
+    }
+}
+
+impl Default for TypeTableBuilder {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+/// Collect types depth-first starting from a root type.
+fn collect_types_dfs(
+    type_id: TypeId,
+    type_ctx: &TypeContext,
+    out: &mut Vec<TypeId>,
+    seen: &mut HashSet<TypeId>,
+) {
+    // Skip builtins and already-seen types
+    if type_id.is_builtin() || seen.contains(&type_id) {
+        return;
+    }
+
+    let Some(type_shape) = type_ctx.get_type(type_id) else {
+        return;
+    };
+
+    // Resolve Ref types to their target
+    if let TypeShape::Ref(def_id) = type_shape {
+        if let Some(target_id) = type_ctx.get_def_type(*def_id) {
+            collect_types_dfs(target_id, type_ctx, out, seen);
+        }
+        return;
+    }
+
+    seen.insert(type_id);
+
+    // Collect children first (depth-first), then add self
+    match type_shape {
+        TypeShape::Struct(fields) => {
+            for field_info in fields.values() {
+                collect_types_dfs(field_info.type_id, type_ctx, out, seen);
+            }
+            out.push(type_id);
+        }
+        TypeShape::Enum(variants) => {
+            for &variant_type_id in variants.values() {
+                collect_types_dfs(variant_type_id, type_ctx, out, seen);
+            }
+            out.push(type_id);
+        }
+        TypeShape::Array { element, .. } => {
+            // Collect element type first, then add the Array itself
+            collect_types_dfs(*element, type_ctx, out, seen);
+            out.push(type_id);
+        }
+        TypeShape::Optional(inner) => {
+            // Collect inner type first, then add the Optional itself
+            collect_types_dfs(*inner, type_ctx, out, seen);
+            out.push(type_id);
+        }
+        TypeShape::Custom(_) => {
+            // Custom types alias Node, no children to collect
+            out.push(type_id);
+        }
+        _ => {}
+    }
+}
+
+/// Collect which builtin types are referenced by a type.
+fn collect_builtin_refs(
+    type_id: TypeId,
+    type_ctx: &TypeContext,
+    used: &mut [bool; 3],
+    seen: &mut HashSet<TypeId>,
+) {
+    if !seen.insert(type_id) {
+        return;
+    }
+
+    let Some(type_shape) = type_ctx.get_type(type_id) else {
+        return;
+    };
+
+    match type_shape {
+        TypeShape::Void => used[0] = true,
+        TypeShape::Node => used[1] = true,
+        TypeShape::String => used[2] = true,
+        TypeShape::Custom(_) => used[1] = true, // Custom types alias Node
+        TypeShape::Struct(fields) => {
+            for field_info in fields.values() {
+                collect_builtin_refs(field_info.type_id, type_ctx, used, seen);
+            }
+        }
+        TypeShape::Enum(variants) => {
+            for &variant_type_id in variants.values() {
+                collect_builtin_refs(variant_type_id, type_ctx, used, seen);
+            }
+        }
+        TypeShape::Array { element, .. } => {
+            collect_builtin_refs(*element, type_ctx, used, seen);
+        }
+        TypeShape::Optional(inner) => {
+            collect_builtin_refs(*inner, type_ctx, used, seen);
+        }
+        TypeShape::Ref(def_id) => {
+            if let Some(target_id) = type_ctx.get_def_type(*def_id) {
+                collect_builtin_refs(target_id, type_ctx, used, seen);
+            }
+        }
+    }
+}
diff --git a/crates/plotnik-lib/src/emit/type_table_tests.rs b/crates/plotnik-lib/src/emit/type_table_tests.rs
new file mode 100644
index 00000000..59982f4c
--- /dev/null
+++ b/crates/plotnik-lib/src/emit/type_table_tests.rs
@@ -0,0 +1,30 @@
+//! Unit tests for TypeTableBuilder.
+
+use super::type_table::TypeTableBuilder;
+
+#[test]
+fn new_builder_is_empty() {
+    let builder = TypeTableBuilder::new();
+
+    assert_eq!(builder.type_defs_count(), 0);
+    assert_eq!(builder.type_members_count(), 0);
+    assert_eq!(builder.type_names_count(), 0);
+}
+
+#[test]
+fn validate_passes_for_empty_builder() {
+    let builder = TypeTableBuilder::new();
+
+    assert!(builder.validate().is_ok());
+}
+
+#[test]
+fn emit_empty_builder_produces_empty_sections() {
+    let builder = TypeTableBuilder::new();
+
+    let (defs, members, names) = builder.emit();
+
+    assert!(defs.is_empty());
+    assert!(members.is_empty());
+    assert!(names.is_empty());
+}
diff --git a/crates/plotnik-lib/src/engine/engine_tests.rs b/crates/plotnik-lib/src/engine/engine_tests.rs
index 3c76373b..1fbfede7 100644
--- a/crates/plotnik-lib/src/engine/engine_tests.rs
+++ b/crates/plotnik-lib/src/engine/engine_tests.rs
@@ -103,9 +103,7 @@ macro_rules! snap {
     }};
 }
 
-// ============================================================================
-// 1. SIMPLE CAPTURES
-// ============================================================================
+// Simple captures
 
 #[test]
 fn capture_single() {
@@ -131,9 +129,7 @@ fn capture_string_annotation() {
     );
 }
 
-// ============================================================================
-// 2. QUANTIFIERS
-// ============================================================================
+// Quantifiers
 
 #[test]
 fn quantifier_star() {
@@ -203,9 +199,7 @@ fn quantifier_plus_with_string_annotation() {
     );
 }
 
-// ============================================================================
-// 3. ALTERNATIONS
-// ============================================================================
+// Alternations
 
 #[test]
 fn alternation_tagged_num() {
@@ -264,9 +258,7 @@ fn alternation_merge_ident() {
     );
 }
 
-// ============================================================================
-// 4. RECURSION
-// ============================================================================
+// Recursion
 
 #[test]
 fn recursion_member_chain() {
@@ -292,9 +284,7 @@ fn recursion_nested_calls() {
     );
 }
 
-// ============================================================================
-// 5. ANCHORS
-// ============================================================================
+// Anchors
 
 #[test]
 fn anchor_first_child() {
@@ -350,9 +340,7 @@ fn anchor_last_child_multi_item() {
     );
 }
 
-// ============================================================================
-// 6. FIELDS
-// ============================================================================
+// Fields
 
 #[test]
 fn field_negated_absent() {
@@ -362,9 +350,7 @@ fn field_negated_absent() {
     );
 }
 
-// ============================================================================
-// 7. SEARCH BEHAVIOR
-// ============================================================================
+// Search behavior
 
 #[test]
 fn search_skip_siblings() {
@@ -374,9 +360,7 @@ fn search_skip_siblings() {
     );
 }
 
-// ============================================================================
-// 8. REGRESSION TESTS
-// ============================================================================
+// Regression tests
 
 /// BUG #1: Scalar node arrays produced null values.
 /// The issue was that `(identifier)* @args` captured an array of nulls instead
@@ -477,9 +461,7 @@ fn regression_enum_tag_with_definition_refs() {
     );
 }
 
-// ============================================================================
-// 10. SUPPRESSIVE CAPTURES
-// ============================================================================
+// Suppressive captures
 
 /// Suppressive capture (@_) matches structurally but doesn't produce output.
 #[test]
diff --git a/docs/binary-format/07-dump-format.md b/docs/binary-format/07-dump-format.md
index 0123a20a..8a3c9e8e 100644
--- a/docs/binary-format/07-dump-format.md
+++ b/docs/binary-format/07-dump-format.md
@@ -170,14 +170,14 @@ Examples:
 - `!▽ ` — down, skip trivia
 - `!!▷ ` — next, exact
 
-| Instruction      | Format                                           |
-| ---------------- | ------------------------------------------------ |
-| Match (terminal) | `step nav    [pre] (type) [post]      ◼`         |
-| Match            | `step nav    [pre] field: (type) [post] succ`    |
-| Match (branch)   | `step nav    [pre] (type) [post]      s1, s2`    |
-| Epsilon          | `step  ε     [effects]                succ`      |
-| Call             | `step nav    field: (Name)        target : ret`  |
-| Return           | `step                                 ▶`         |
+| Instruction      | Format                                          |
+| ---------------- | ----------------------------------------------- |
+| Match (terminal) | `step nav    [pre] (type) [post]      ◼`        |
+| Match            | `step nav    [pre] field: (type) [post] succ`   |
+| Match (branch)   | `step nav    [pre] (type) [post]      s1, s2`   |
+| Epsilon          | `step  ε     [effects]                succ`     |
+| Call             | `step nav    field: (Name)        target : ret` |
+| Return           | `step                                 ▶`        |
 
 Successors aligned in right column. Omit empty `[pre]`, `[post]`, `(type)`, `field:`.
 
diff --git a/docs/binary-format/08-trace-format.md b/docs/binary-format/08-trace-format.md
index 6bfe8e6f..dee6badb 100644
--- a/docs/binary-format/08-trace-format.md
+++ b/docs/binary-format/08-trace-format.md
@@ -84,6 +84,7 @@ The `◀` symbol appears in the symbol column with the definition name in parent
 ### Definition Labels
 
 Definition labels (`Name:`) appear at:
+
 - Entry to a definition (initial or via call)
 - After returning from a call (showing the caller's name)