Fix extension and module name

Author: Raytwo

cli/src/commands.rs

@@ -263,7 +263,7 @@ pub fn list_disabled_methods(json: bool) -> Result<()> {
             Err(_) => continue,
         };
 
-        scan_methods_in_file(&raw, entry.path(), &bindings_src, &enabled, &mut entries);
+        scan_methods_in_file(&raw, entry.path(), &bindings_src, &enabled, &manifest.crate_ident(), &mut entries);
     }
 
     entries.sort_by(|a, b| a.method.cmp(&b.method).then_with(|| a.class.cmp(&b.class)));
@@ -331,6 +331,7 @@ fn scan_methods_in_file(
     file: &std::path::Path,
     bindings_src: &std::path::Path,
     enabled: &BTreeSet<String>,
+    crate_ident: &str,
     out: &mut Vec<MethodEntry>,
 ) {
     let namespace = derive_namespace(file, bindings_src);
@@ -388,7 +389,7 @@ fn scan_methods_in_file(
                 out.push(MethodEntry {
                     method,
                     class: class.clone(),
-                    path: format!("engage_il2cpp::{namespace}::{class}"),
+                    path: format!("{crate_ident}::{namespace}::{class}"),
                     feature: feat.clone(),
                     returns,
                     args,

cli/src/manifest.rs

@@ -9,16 +9,18 @@ pub struct Manifest {
     pub schema_version: u32,
     #[serde(rename = "crate")]
     pub crate_name: String,
+    #[serde(default)]
+    pub import: Option<String>,
     #[allow(dead_code)]
     pub version: String,
     pub paths: BTreeMap<String, String>,
     pub dependencies: BTreeMap<String, Vec<String>>,
     #[serde(skip)]
     pub ext_wrappers: BTreeMap<String, Vec<String>>,
     /// Short re-export path -> canonical path. Types live at
-    /// `engage_il2cpp::<ns>::<module>::<Type>` but the generated `<ns>` module
+    /// `engage::<ns>::<module>::<Type>` but the generated `<ns>` module
     /// re-exports them one level up (the `pub use <module>::{Type}` lines in
-    /// app.rs etc), so code usually imports the short `engage_il2cpp::<ns>::<Type>`.
+    /// app.rs etc), so code usually imports the short `engage::<ns>::<Type>`.
     /// This maps that short form back so the scanner recognizes it.
     #[serde(skip)]
     pub reexports: BTreeMap<String, String>,
@@ -50,16 +52,16 @@ impl Manifest {
     }
 
     pub fn crate_ident(&self) -> String {
-        self.crate_name.replace('-', "_")
+        self.import.as_ref().unwrap_or(&self.crate_name).replace('-', "_")
     }
 
     pub fn paths_with_leaf(&self, leaf: &str) -> Vec<(&String, &String)> {
         self.paths.iter().filter(|(path, _)| path.split("::").last() == Some(leaf)).collect()
     }
 
     /// Resolve a path as written in code to its (canonical path, gating feature).
-    /// Accepts the canonical path itself (engage_il2cpp::app::fade::Fade) or the
-    /// short re-export form code usually writes (engage_il2cpp::app::Fade), and
+    /// Accepts the canonical path itself (engage::app::fade::Fade) or the
+    /// short re-export form code usually writes (engage::app::Fade), and
     /// always hands back the canonical one so callers agree on a single key.
     /// Returns None if the path names no known engage type. This is the one place
     /// that knows about re-exports, so both the scanner and the prune import check
@@ -97,8 +99,8 @@ impl Manifest {
 }
 
 /// Invert the namespace-root re-exports: for each canonical
-/// `engage_il2cpp::<ns>::<module>::<Type>`, the `<ns>` module re-exports it as
-/// `engage_il2cpp::<ns>::<Type>`, so drop the module segment (second to last) to
+/// `engage::<ns>::<module>::<Type>`, the `<ns>` module re-exports it as
+/// `engage::<ns>::<Type>`, so drop the module segment (second to last) to
 /// get the short form code actually imports. A real `pub use` at one level can't
 /// name two types the same way, so if two canonicals ever collapse to the same
 /// short form we drop it rather than guess.

cli/src/scan.rs

@@ -111,7 +111,7 @@ impl<'a> PathVisitor<'a> {
             let candidate: String = segments[..n].join("::");
 
             // Matches either the canonical path or the short re-export form code
-            // usually writes (engage_il2cpp::app::Fade). Record the canonical so it
+            // usually writes (engage::app::Fade). Record the canonical so it
             // maps to a feature downstream.
             if let Some((canonical, _)) = self.manifest.resolve_path(&candidate) {
                 let canonical = canonical.to_string();