release(statum): prepare 0.8.3

Author: eboody

README.md

@@ -34,7 +34,7 @@ Statum targets stable Rust and currently supports Rust `1.93+`.
 
 ```toml
 [dependencies]
-statum = "0.8.2"
+statum = "0.8.3"
 ```
 
 ## 60-Second Example

statum-core/Cargo.toml

@@ -20,7 +20,7 @@ name = "statum-core"
 readme = "README.md"
 repository = "https://github.com/eboody/statum"
 rust-version = "1.93"
-version = "0.8.2"
+version = "0.8.3"
 
 [package.metadata.modum]
 weak_modules = [

statum-examples/Cargo.toml

@@ -21,7 +21,7 @@ version = "0.8"
 
 [dependencies.statum]
 path = "../statum"
-version = "0.8.2"
+version = "0.8.3"
 
 [dependencies.tokio]
 features = ["full"]
@@ -37,7 +37,7 @@ license = "MIT"
 name = "statum-examples"
 publish = false
 rust-version = "1.93"
-version = "0.8.2"
+version = "0.8.3"
 
 [package.metadata.modum]
 weak_modules = [

statum-macros/Cargo.toml

@@ -22,7 +22,7 @@ trybuild = "1.0"
 
 [dev-dependencies.statum-core]
 path = "../statum-core"
-version = "0.8.2"
+version = "0.8.3"
 
 [features]
 default = []
@@ -48,4 +48,4 @@ name = "statum-macros"
 readme = "README.md"
 repository = "https://github.com/eboody/statum"
 rust-version = "1.93"
-version = "0.8.2"
+version = "0.8.3"

statum-macros/src/analysis.rs

@@ -18,6 +18,13 @@ pub struct StructEntry {
     pub attrs: Vec<String>,
 }
 
+/// Type alias entry extracted from a parsed source file.
+#[derive(Clone)]
+pub struct TypeAliasEntry {
+    pub item: syn::ItemType,
+    pub line_number: usize,
+}
+
 /// Impl entry extracted from a parsed source file.
 #[allow(dead_code)]
 #[derive(Clone)]
@@ -32,13 +39,15 @@ pub struct ImplEntry {
 pub struct FileAnalysis {
     pub enums: Vec<EnumEntry>,
     pub structs: Vec<StructEntry>,
+    pub type_aliases: Vec<TypeAliasEntry>,
     pub impls: Vec<ImplEntry>,
 }
 
 #[derive(Default)]
 struct DeclarationLines {
     enums: VecDeque<usize>,
     structs: VecDeque<usize>,
+    type_aliases: VecDeque<usize>,
     impls: VecDeque<usize>,
 }
 
@@ -96,6 +105,12 @@ fn collect_items(
                     item: item_struct,
                 });
             }
+            syn::Item::Type(item_type) => {
+                analysis.type_aliases.push(TypeAliasEntry {
+                    line_number: lines.type_aliases.pop_front()?,
+                    item: item_type,
+                });
+            }
             syn::Item::Impl(item_impl) => {
                 analysis.impls.push(ImplEntry {
                     attrs: attribute_names(&item_impl.attrs),
@@ -131,6 +146,7 @@ fn scan_declaration_lines(content: &str) -> DeclarationLines {
                 match keyword.as_str() {
                     "enum" => lines.enums.push_back(token.line),
                     "struct" => lines.structs.push_back(token.line),
+                    "type" => lines.type_aliases.push_back(token.line),
                     "impl" => lines.impls.push_back(token.line),
                     "mod" => {
                         if matches!(

statum-macros/src/lib.rs

@@ -129,7 +129,8 @@ pub fn machine(_attr: TokenStream, item: TokenStream) -> TokenStream {
 ///
 /// Apply `#[transition]` to an `impl Machine<CurrentState>` block. Each method
 /// must consume `self` and return a legal `Machine<NextState>` shape or a
-/// supported wrapper around it, such as `Result<Machine<NextState>, E>`,
+/// source-declared type alias that expands to that shape, or a supported
+/// wrapper around it, such as `Result<Machine<NextState>, E>`,
 /// `Option<Machine<NextState>>`, or
 /// `statum::Branch<Machine<Left>, Machine<Right>>`.
 #[proc_macro_attribute]

statum-macros/src/pathing.rs

@@ -84,8 +84,7 @@ pub fn module_path_from_file_with_root(file_path: &str, module_root: &Path) -> S
 }
 
 /// Maps a module path (e.g. `crate::foo::bar`) to a source file.
-#[cfg(test)]
-pub fn module_path_to_file(
+pub(crate) fn module_path_to_file(
     module_path: &str,
     current_file: &str,
     module_root: &Path,

statum-macros/src/query.rs

@@ -16,6 +16,14 @@ pub struct ItemCandidate {
     pub module_path: String,
 }
 
+/// A type alias discovered in source with its resolved module path.
+#[derive(Clone)]
+pub struct TypeAliasCandidate {
+    pub item: syn::ItemType,
+    pub line_number: usize,
+    pub module_path: String,
+}
+
 /// Returns candidates of `kind` in `module_path`, optionally requiring `required_attr`.
 pub fn candidates_in_module(
     file_path: &str,
@@ -84,6 +92,45 @@ pub fn plain_item_line_in_module(
     }
 }
 
+/// Returns type aliases of `alias_name` declared in `module_path`.
+pub fn type_aliases_in_module(
+    file_path: &str,
+    module_path: &str,
+    alias_name: &str,
+) -> Vec<TypeAliasCandidate> {
+    let Some(analysis) = get_file_analysis(file_path) else {
+        return Vec::new();
+    };
+
+    let mut candidates = analysis
+        .type_aliases
+        .iter()
+        .filter(|entry| entry.item.ident == alias_name)
+        .filter_map(|entry| {
+            let resolved_module = module_path_for_line(file_path, entry.line_number)?;
+            (resolved_module == module_path).then(|| TypeAliasCandidate {
+                item: entry.item.clone(),
+                line_number: entry.line_number,
+                module_path: resolved_module,
+            })
+        })
+        .collect::<Vec<_>>();
+    candidates.sort_by(|left, right| {
+        left.item
+            .ident
+            .to_string()
+            .cmp(&right.item.ident.to_string())
+            .then(left.module_path.cmp(&right.module_path))
+            .then(left.line_number.cmp(&right.line_number))
+    });
+    candidates.dedup_by(|left, right| {
+        left.item.ident == right.item.ident
+            && left.module_path == right.module_path
+            && left.line_number == right.line_number
+    });
+    candidates
+}
+
 /// Formats candidates for user-facing diagnostics.
 pub fn format_candidates(candidates: &[ItemCandidate]) -> String {
     candidates