1 files changed, 87 insertions, 20 deletions

diff --git a/mingling_macros/src/func/gen_program.rs b/mingling_macros/src/func/gen_program.rs
index c5358bc..d50041e 100644
--- a/mingling_macros/src/func/gen_program.rs
+++ b/mingling_macros/src/func/gen_program.rs
@@ -15,33 +15,100 @@ pub(crate) fn gen_program_impl(_input: TokenStream) -> TokenStream {
     #[cfg(not(feature = "comp"))]
     let comp_gen = quote! {};
 
+    // When pathf is enabled, load the type_using.rs generated by the build script
+    // and emit its use statements so types from submodules are in scope.
+    #[cfg(feature = "pathf")]
+    let pathf_uses: Vec<proc_macro2::TokenStream> = {
+        let uses = load_pathf_uses();
+        if uses.is_empty() {
+            // The file might not exist yet — emit a clear hint
+            let hint: proc_macro2::TokenStream = syn::parse_quote! {
+                compile_error!(
+                    "pathf: `{}` not found or empty.\n\
+                     Make sure `build.rs` calls `mingling::build::analyze_and_build_type_mapping().unwrap();`\n\
+                     with features [\"build\", \"pathf\"] enabled."
+                );
+            };
+            vec![hint]
+        } else {
+            uses
+        }
+    };
+    #[cfg(not(feature = "pathf"))]
+    let pathf_uses: Vec<proc_macro2::TokenStream> = Vec::new();
+
+    #[cfg(feature = "pathf")]
+    let super_use = quote! {};
+
+    #[cfg(not(feature = "pathf"))]
+    let super_use = quote! {
+      use super::*;
+    };
+
     TokenStream::from(quote! {
-        /// Alias for the current program type `crate::ThisProgram`
-        pub type Next = ::mingling::ChainProcess<crate::ThisProgram>;
-
-        impl ::mingling::Routable<crate::ThisProgram> for ::mingling::ChainProcess<crate::ThisProgram>
-        {
-            fn to_chain(self) -> ::mingling::ChainProcess<crate::ThisProgram> {
-                match self {
-                    ::mingling::ChainProcess::Ok((any, _)) => {
-                        ::mingling::ChainProcess::Ok((any, mingling::NextProcess::Chain))
+        pub use __this_program_impl::*;
+
+        #[doc(hidden)]
+        pub mod __this_program_impl {
+            #super_use
+            #(#pathf_uses)*
+
+            /// Alias for the current program type `ThisProgram`
+            pub type Next = ::mingling::ChainProcess<ThisProgram>;
+
+            ::mingling::macros::pack!(Entry = Vec<String>);
+
+            impl ::mingling::Routable<ThisProgram> for ::mingling::ChainProcess<ThisProgram>
+            {
+                fn to_chain(self) -> ::mingling::ChainProcess<ThisProgram> {
+                    match self {
+                        ::mingling::ChainProcess::Ok((any, _)) => {
+                            ::mingling::ChainProcess::Ok((any, mingling::NextProcess::Chain))
+                        }
+                        other => other,
                     }
-                    other => other,
                 }
-            }
 
-            fn to_render(self) -> ::mingling::ChainProcess<crate::ThisProgram> {
-                match self {
-                    ::mingling::ChainProcess::Ok((any, _)) => {
-                        ::mingling::ChainProcess::Ok((any, mingling::NextProcess::Renderer))
+                fn to_render(self) -> ::mingling::ChainProcess<ThisProgram> {
+                    match self {
+                        ::mingling::ChainProcess::Ok((any, _)) => {
+                            ::mingling::ChainProcess::Ok((any, mingling::NextProcess::Renderer))
+                        }
+                        other => other,
                     }
-                    other => other,
                 }
             }
-        }
 
-        #comp_gen
-        ::mingling::macros::program_fallback_gen!();
-        ::mingling::macros::program_final_gen!();
+            #comp_gen
+            ::mingling::macros::program_fallback_gen!();
+            ::mingling::macros::program_final_gen!();
+        }
     })
 }
+
+/// Loads `type_using.rs` generated by the pathf build script and returns each
+/// `use ...;` line as a token stream, ready to be emitted in the generated output.
+#[cfg(feature = "pathf")]
+fn load_pathf_uses() -> Vec<proc_macro2::TokenStream> {
+    let out_dir = match std::env::var("OUT_DIR") {
+        Ok(d) => d,
+        Err(_) => return Vec::new(),
+    };
+    let crate_name = match std::env::var("CARGO_PKG_NAME") {
+        Ok(n) => n,
+        Err(_) => return Vec::new(),
+    };
+    let path = std::path::Path::new(&out_dir)
+        .join(&crate_name)
+        .join("type_using.rs");
+    let content = match std::fs::read_to_string(&path) {
+        Ok(c) => c,
+        Err(_) => return Vec::new(),
+    };
+    content
+        .lines()
+        .map(|line| line.trim().to_string())
+        .filter(|line| !line.is_empty())
+        .filter_map(|line| line.parse::<proc_macro2::TokenStream>().ok())
+        .collect()
+}