From 0678972f39f9232e8e5f01417c97612d7beb94d4 Mon Sep 17 00:00:00 2001
From: Sergei Zharinov <zharinov@users.noreply.github.com>
Date: Tue, 6 Jan 2026 13:27:20 -0300
Subject: [PATCH] refactor: reorganize `src/parser` imports

---
 crates/plotnik-lib/src/analyze/dependencies.rs       | 3 +--
 crates/plotnik-lib/src/analyze/link.rs               | 3 +--
 crates/plotnik-lib/src/analyze/type_check/context.rs | 2 +-
 crates/plotnik-lib/src/analyze/type_check/infer.rs   | 5 ++---
 crates/plotnik-lib/src/analyze/type_check/mod.rs     | 2 +-
 crates/plotnik-lib/src/analyze/validation/anchors.rs | 2 +-
 crates/plotnik-lib/src/analyze/visitor.rs            | 2 +-
 crates/plotnik-lib/src/compile/compiler.rs           | 2 +-
 crates/plotnik-lib/src/compile/navigation.rs         | 8 ++++----
 crates/plotnik-lib/src/compile/quantifier.rs         | 2 +-
 crates/plotnik-lib/src/compile/scope.rs              | 2 +-
 crates/plotnik-lib/src/parser/cst_tests.rs           | 2 +-
 crates/plotnik-lib/src/parser/grammar/structures.rs  | 3 ++-
 crates/plotnik-lib/src/parser/grammar/validation.rs  | 3 ++-
 crates/plotnik-lib/src/parser/invariants.rs          | 3 +--
 crates/plotnik-lib/src/parser/mod.rs                 | 6 ++++--
 crates/plotnik-lib/src/query/printer.rs              | 2 +-
 crates/plotnik-lib/src/query/query.rs                | 2 +-
 18 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/crates/plotnik-lib/src/analyze/dependencies.rs b/crates/plotnik-lib/src/analyze/dependencies.rs
index 22a5146d..c548aa66 100644
--- a/crates/plotnik-lib/src/analyze/dependencies.rs
+++ b/crates/plotnik-lib/src/analyze/dependencies.rs
@@ -12,8 +12,7 @@ use plotnik_core::{Interner, Symbol};
 
 use super::symbol_table::SymbolTable;
 use super::type_check::DefId;
-use crate::parser::Ref;
-use crate::parser::ast::Expr;
+use crate::parser::{Expr, Ref};
 
 /// Result of dependency analysis.
 #[derive(Clone, Debug, Default)]
diff --git a/crates/plotnik-lib/src/analyze/link.rs b/crates/plotnik-lib/src/analyze/link.rs
index 820c2eab..f188e8cd 100644
--- a/crates/plotnik-lib/src/analyze/link.rs
+++ b/crates/plotnik-lib/src/analyze/link.rs
@@ -25,8 +25,7 @@ use super::utils::find_similar;
 use super::visitor::{Visitor, walk};
 use crate::diagnostics::{DiagnosticKind, Diagnostics};
 use crate::parser::ast::{self, Expr, NamedNode};
-use crate::parser::cst::{SyntaxKind, SyntaxToken};
-use crate::parser::token_src;
+use crate::parser::{SyntaxKind, SyntaxToken, token_src};
 use crate::query::query::AstMap;
 use crate::query::source_map::{SourceId, SourceMap};
 
diff --git a/crates/plotnik-lib/src/analyze/type_check/context.rs b/crates/plotnik-lib/src/analyze/type_check/context.rs
index 630a9584..285eb8be 100644
--- a/crates/plotnik-lib/src/analyze/type_check/context.rs
+++ b/crates/plotnik-lib/src/analyze/type_check/context.rs
@@ -6,7 +6,7 @@
 
 use std::collections::{BTreeMap, HashMap, HashSet};
 
-use crate::parser::ast::Expr;
+use crate::parser::Expr;
 
 use super::symbol::{DefId, Interner, Symbol};
 use super::types::{
diff --git a/crates/plotnik-lib/src/analyze/type_check/infer.rs b/crates/plotnik-lib/src/analyze/type_check/infer.rs
index 65d9cd73..9ce7d4a8 100644
--- a/crates/plotnik-lib/src/analyze/type_check/infer.rs
+++ b/crates/plotnik-lib/src/analyze/type_check/infer.rs
@@ -22,11 +22,10 @@ use crate::analyze::dependencies::DependencyAnalysis;
 use crate::analyze::symbol_table::SymbolTable;
 use crate::analyze::visitor::{Visitor, walk_alt_expr, walk_def, walk_named_node, walk_seq_expr};
 use crate::diagnostics::{DiagnosticKind, Diagnostics};
-use crate::parser::ast::{
+use crate::parser::{
     AltExpr, AltKind, AnonymousNode, CapturedExpr, Def, Expr, FieldExpr, NamedNode, QuantifiedExpr,
-    Ref, Root, SeqExpr, is_truly_empty_scope,
+    Ref, Root, SeqExpr, SyntaxKind, is_truly_empty_scope,
 };
-use crate::parser::cst::SyntaxKind;
 use crate::query::source_map::SourceId;
 
 /// Type annotation kind from `@capture :: Type` syntax.
diff --git a/crates/plotnik-lib/src/analyze/type_check/mod.rs b/crates/plotnik-lib/src/analyze/type_check/mod.rs
index fda92fb2..2ad2b114 100644
--- a/crates/plotnik-lib/src/analyze/type_check/mod.rs
+++ b/crates/plotnik-lib/src/analyze/type_check/mod.rs
@@ -25,7 +25,7 @@ use indexmap::IndexMap;
 use crate::analyze::dependencies::DependencyAnalysis;
 use crate::analyze::symbol_table::{SymbolTable, UNNAMED_DEF};
 use crate::diagnostics::Diagnostics;
-use crate::parser::ast::Root;
+use crate::parser::Root;
 use crate::query::source_map::SourceId;
 
 /// Run type inference on all definitions.
diff --git a/crates/plotnik-lib/src/analyze/validation/anchors.rs b/crates/plotnik-lib/src/analyze/validation/anchors.rs
index 065ea063..e31a821d 100644
--- a/crates/plotnik-lib/src/analyze/validation/anchors.rs
+++ b/crates/plotnik-lib/src/analyze/validation/anchors.rs
@@ -9,7 +9,7 @@
 use crate::SourceId;
 use crate::analyze::visitor::{Visitor, walk_named_node, walk_seq_expr};
 use crate::diagnostics::{DiagnosticKind, Diagnostics};
-use crate::parser::ast::{NamedNode, Root, SeqExpr, SeqItem};
+use crate::parser::{NamedNode, Root, SeqExpr, SeqItem};
 
 pub fn validate_anchors(source_id: SourceId, ast: &Root, diag: &mut Diagnostics) {
     let mut visitor = AnchorValidator {
diff --git a/crates/plotnik-lib/src/analyze/visitor.rs b/crates/plotnik-lib/src/analyze/visitor.rs
index 7022ee62..d148a59e 100644
--- a/crates/plotnik-lib/src/analyze/visitor.rs
+++ b/crates/plotnik-lib/src/analyze/visitor.rs
@@ -15,7 +15,7 @@
 //! }
 //! ```
 
-use crate::parser::ast::{
+use crate::parser::{
     AltExpr, AnonymousNode, CapturedExpr, Def, Expr, FieldExpr, NamedNode, QuantifiedExpr, Ref,
     Root, SeqExpr,
 };
diff --git a/crates/plotnik-lib/src/compile/compiler.rs b/crates/plotnik-lib/src/compile/compiler.rs
index 649d6379..9a7f50bb 100644
--- a/crates/plotnik-lib/src/compile/compiler.rs
+++ b/crates/plotnik-lib/src/compile/compiler.rs
@@ -8,7 +8,7 @@ use crate::analyze::type_check::{DefId, TypeContext};
 use crate::bytecode::Nav;
 use crate::bytecode::{InstructionIR, Label, ReturnIR, TrampolineIR};
 use crate::emit::StringTableBuilder;
-use crate::parser::ast::Expr;
+use crate::parser::Expr;
 
 use super::capture::CaptureEffects;
 use super::error::{CompileError, CompileResult};
diff --git a/crates/plotnik-lib/src/compile/navigation.rs b/crates/plotnik-lib/src/compile/navigation.rs
index 30d2675c..864d1b67 100644
--- a/crates/plotnik-lib/src/compile/navigation.rs
+++ b/crates/plotnik-lib/src/compile/navigation.rs
@@ -4,7 +4,7 @@
 //! for quantifier repeat iterations.
 
 use crate::bytecode::Nav;
-use crate::parser::ast::{Expr, SeqItem};
+use crate::parser::{Expr, SeqItem};
 
 // Re-export from parser for compile module consumers
 pub use crate::parser::is_truly_empty_scope;
@@ -118,7 +118,7 @@ pub fn is_down_nav(nav: Option<Nav>) -> bool {
 
 /// Extract the operator kind from an expression if it's a quantifier.
 /// Unwraps CapturedExpr if present.
-fn quantifier_operator_kind(expr: &Expr) -> Option<crate::parser::cst::SyntaxKind> {
+fn quantifier_operator_kind(expr: &Expr) -> Option<crate::parser::SyntaxKind> {
     let expr = match expr {
         Expr::CapturedExpr(cap) => cap.inner()?,
         e => e.clone(),
@@ -132,7 +132,7 @@ fn quantifier_operator_kind(expr: &Expr) -> Option<crate::parser::cst::SyntaxKin
 
 /// Check if expression is optional (?) or star (*) - patterns that can match zero times.
 pub fn is_skippable_quantifier(expr: &Expr) -> bool {
-    use crate::parser::cst::SyntaxKind;
+    use crate::parser::SyntaxKind;
     quantifier_operator_kind(expr).is_some_and(|k| {
         matches!(
             k,
@@ -146,7 +146,7 @@ pub fn is_skippable_quantifier(expr: &Expr) -> bool {
 
 /// Syntactic check for star/plus quantifier (fallback when type info unavailable).
 pub fn is_star_or_plus_quantifier(expr: Option<&Expr>) -> bool {
-    use crate::parser::cst::SyntaxKind;
+    use crate::parser::SyntaxKind;
     expr.and_then(quantifier_operator_kind).is_some_and(|k| {
         matches!(
             k,
diff --git a/crates/plotnik-lib/src/compile/quantifier.rs b/crates/plotnik-lib/src/compile/quantifier.rs
index 7d73b553..6316afee 100644
--- a/crates/plotnik-lib/src/compile/quantifier.rs
+++ b/crates/plotnik-lib/src/compile/quantifier.rs
@@ -9,8 +9,8 @@
 use crate::analyze::type_check::TypeId;
 use crate::bytecode::Nav;
 use crate::bytecode::{EffectIR, Label};
+use crate::parser::SyntaxKind;
 use crate::parser::ast::{self, Expr};
-use crate::parser::cst::SyntaxKind;
 
 use super::Compiler;
 use super::capture::{CaptureEffects, check_needs_struct_wrapper, get_row_type_id};
diff --git a/crates/plotnik-lib/src/compile/scope.rs b/crates/plotnik-lib/src/compile/scope.rs
index 0bf8d796..6184eda5 100644
--- a/crates/plotnik-lib/src/compile/scope.rs
+++ b/crates/plotnik-lib/src/compile/scope.rs
@@ -7,7 +7,7 @@ use std::num::NonZeroU16;
 use crate::analyze::type_check::TypeId;
 use crate::bytecode::{CallIR, EffectIR, Label, MatchIR, MemberRef};
 use crate::bytecode::{EffectOpcode, Nav};
-use crate::parser::ast::Expr;
+use crate::parser::Expr;
 
 use super::Compiler;
 use super::capture::CaptureEffects;
diff --git a/crates/plotnik-lib/src/parser/cst_tests.rs b/crates/plotnik-lib/src/parser/cst_tests.rs
index 03e18e88..8815ef36 100644
--- a/crates/plotnik-lib/src/parser/cst_tests.rs
+++ b/crates/plotnik-lib/src/parser/cst_tests.rs
@@ -1,4 +1,4 @@
-use crate::parser::cst::{QLang, SyntaxKind::*, TokenSet};
+use super::cst::{QLang, SyntaxKind::*, TokenSet};
 use rowan::Language;
 
 #[test]
diff --git a/crates/plotnik-lib/src/parser/grammar/structures.rs b/crates/plotnik-lib/src/parser/grammar/structures.rs
index 040281d5..bc5ad505 100644
--- a/crates/plotnik-lib/src/parser/grammar/structures.rs
+++ b/crates/plotnik-lib/src/parser/grammar/structures.rs
@@ -1,6 +1,5 @@
 use rowan::{Checkpoint, TextRange};
 
-use super::utils::capitalize_first;
 use crate::diagnostics::DiagnosticKind;
 use crate::parser::Parser;
 use crate::parser::cst::token_sets::{
@@ -9,6 +8,8 @@ use crate::parser::cst::token_sets::{
 use crate::parser::cst::{SyntaxKind, TokenSet};
 use crate::parser::lexer::token_text;
 
+use super::utils::capitalize_first;
+
 impl Parser<'_, '_> {
     /// `(type ...)` | `(_ ...)` | `(ERROR)` | `(MISSING ...)` | `(RefName)` | `(expr/subtype)`
     /// PascalCase without children → Ref; with children → error but parses as Tree.
diff --git a/crates/plotnik-lib/src/parser/grammar/validation.rs b/crates/plotnik-lib/src/parser/grammar/validation.rs
index 600d3563..34a53d28 100644
--- a/crates/plotnik-lib/src/parser/grammar/validation.rs
+++ b/crates/plotnik-lib/src/parser/grammar/validation.rs
@@ -1,9 +1,10 @@
 use rowan::TextRange;
 
-use super::utils::{to_pascal_case, to_snake_case};
 use crate::diagnostics::DiagnosticKind;
 use crate::parser::Parser;
 
+use super::utils::{to_pascal_case, to_snake_case};
+
 impl Parser<'_, '_> {
     /// Validate capture name follows plotnik convention (snake_case).
     pub(crate) fn validate_capture_name(&mut self, name: &str, span: TextRange) {
diff --git a/crates/plotnik-lib/src/parser/invariants.rs b/crates/plotnik-lib/src/parser/invariants.rs
index 1ff2b86b..36a77560 100644
--- a/crates/plotnik-lib/src/parser/invariants.rs
+++ b/crates/plotnik-lib/src/parser/invariants.rs
@@ -2,9 +2,8 @@
 
 #![cfg_attr(coverage_nightly, coverage(off))]
 
-use crate::parser::SyntaxKind;
-
 use super::core::Parser;
+use super::cst::SyntaxKind;
 
 impl Parser<'_, '_> {
     #[inline]
diff --git a/crates/plotnik-lib/src/parser/mod.rs b/crates/plotnik-lib/src/parser/mod.rs
index da31c266..a19b3f8b 100644
--- a/crates/plotnik-lib/src/parser/mod.rs
+++ b/crates/plotnik-lib/src/parser/mod.rs
@@ -22,8 +22,8 @@
 //! However, fuel exhaustion (exec_fuel, recursion_fuel) returns an actual error immediately.
 
 pub mod ast;
-pub mod cst;
-pub mod lexer;
+mod cst;
+mod lexer;
 
 mod core;
 mod grammar;
@@ -47,3 +47,5 @@ pub use ast::{
 };
 
 pub use core::{ParseResult, Parser};
+
+pub use lexer::{Token, lex, token_text};
diff --git a/crates/plotnik-lib/src/query/printer.rs b/crates/plotnik-lib/src/query/printer.rs
index 572a640a..834b13ab 100644
--- a/crates/plotnik-lib/src/query/printer.rs
+++ b/crates/plotnik-lib/src/query/printer.rs
@@ -336,7 +336,7 @@ impl<'q> QueryPrinter<'q> {
         depth: usize,
         w: &mut impl Write,
     ) -> std::fmt::Result {
-        use crate::parser::cst::SyntaxKind;
+        use crate::parser::SyntaxKind;
         for child in node.children() {
             if child.kind() == SyntaxKind::Anchor {
                 self.mark_anchor(depth, w)?;
diff --git a/crates/plotnik-lib/src/query/query.rs b/crates/plotnik-lib/src/query/query.rs
index 4671b33a..568453a7 100644
--- a/crates/plotnik-lib/src/query/query.rs
+++ b/crates/plotnik-lib/src/query/query.rs
@@ -11,7 +11,7 @@ use crate::analyze::symbol_table::{SymbolTable, resolve_names};
 use crate::analyze::type_check::{self, Arity, TypeContext};
 use crate::analyze::validation::{validate_alt_kinds, validate_anchors};
 use crate::analyze::{dependencies, validate_recursion};
-use crate::parser::{Parser, Root, SyntaxNode, lexer::lex};
+use crate::parser::{Parser, Root, SyntaxNode, lex};
 use crate::query::source_map::{SourceId, SourceMap};
 
 const DEFAULT_QUERY_PARSE_FUEL: u32 = 1_000_000;