In principle this looks promising if you ignore the acres of scar tissue

Signed-off-by: itowlson <[email protected]>

Author: itowlson

src/commands/add.rs

@@ -0,0 +1,12 @@
+wit_bindgen::generate!({
+    inline: r#"
+    package imported:{!gen_name!};
+    world imports {
+{!imps!}
+    }
+    "#,
+    with: {
+{!gens!}
+    },
+    path: "{!dep_path!}",
+});

src/commands/gen.txt

@@ -1,6 +1,6 @@
-use anyhow::{bail, Result};
+use anyhow::Result;
 use spin_manifest::schema::v2::{AppManifest, ComponentDependencies, ComponentDependency};
-use std::path::PathBuf;
+use std::path::Path;
 use tokio::fs;
 use toml_edit::DocumentMut;
 
@@ -11,11 +11,11 @@ pub fn get_component_ids(manifest: &AppManifest) -> Vec<String> {
 // This is a helper function to edit the dependency table in the manifest file
 // while preserving the order of the manifest.
 pub async fn edit_component_deps_in_manifest(
+    manifest_file: &Path,
     component_id: &str,
     component_deps: &ComponentDependencies,
 ) -> Result<String> {
-    let manifest_path = get_spin_manifest_path()?;
-    let manifest = fs::read_to_string(manifest_path).await?;
+    let manifest = fs::read_to_string(manifest_file).await?;
     let mut doc = manifest.parse::<DocumentMut>()?;
 
     let mut dependencies_table = toml_edit::Table::new();
@@ -67,12 +67,3 @@ pub async fn edit_component_deps_in_manifest(
 
     Ok(doc.to_string())
 }
-
-// TODO: Eventually bring this function with the proposed Spin functionality of searching in parent Directories.
-pub fn get_spin_manifest_path() -> Result<PathBuf> {
-    let manifest_path = PathBuf::from("spin.toml");
-    if !manifest_path.exists() {
-        bail!("No spin.toml file found in the current directory");
-    }
-    Ok(manifest_path)
-}

src/common/manifest.rs

@@ -1,15 +1,7 @@
-use std::path::PathBuf;
-
 use anyhow::{Context, Result};
 use wit_component::WitPrinter;
 use wit_parser::{PackageId, Resolve};
 
-pub const DEFAULT_WIT: &str = r#"package spin-deps:[email protected];
-
-    world deps {
-    }
-"#;
-
 /// Converts a Resolve object to WIT content.
 pub fn resolve_to_wit(resolve: &Resolve, package_id: PackageId) -> Result<String> {
     let mut printer = WitPrinter::default();
@@ -56,23 +48,23 @@ pub fn get_exported_interfaces(
         .collect()
 }
 
-pub fn merge_dependecy_package(
-    base_resolve_file: Option<&PathBuf>,
-    dependency_resolve: &Resolve,
-    dependency_pkg_id: PackageId,
-) -> Result<(Resolve, PackageId)> {
-    let mut base_resolve = Resolve::default();
-    let base_resolve_pkg_id = match base_resolve_file {
-        Some(path) => base_resolve.push_file(path)?,
-        None => base_resolve.push_str("base_resolve.wit", DEFAULT_WIT)?,
-    };
-    let base_resolve_world_id = base_resolve.select_world(base_resolve_pkg_id, Some("deps"))?;
+// pub fn merge_dependecy_package(
+//     base_resolve_file: Option<&PathBuf>,
+//     dependency_resolve: &Resolve,
+//     dependency_pkg_id: PackageId,
+// ) -> Result<(Resolve, PackageId)> {
+//     let mut base_resolve = Resolve::default();
+//     let base_resolve_pkg_id = match base_resolve_file {
+//         Some(path) => base_resolve.push_file(path)?,
+//         None => base_resolve.push_str("base_resolve.wit", DEFAULT_WIT)?,
+//     };
+//     let base_resolve_world_id = base_resolve.select_world(base_resolve_pkg_id, Some("deps"))?;
 
-    let dependecy_main_world_id =
-        dependency_resolve.select_world(dependency_pkg_id, Some("dependency-world"))?;
-    let remap = base_resolve.merge(dependency_resolve.clone())?;
-    let dependecy_world_id = remap.map_world(dependecy_main_world_id, None)?;
-    base_resolve.merge_worlds(dependecy_world_id, base_resolve_world_id)?;
+//     let dependecy_main_world_id =
+//         dependency_resolve.select_world(dependency_pkg_id, Some("dependency-world"))?;
+//     let remap = base_resolve.merge(dependency_resolve.clone())?;
+//     let dependecy_world_id = remap.map_world(dependecy_main_world_id, None)?;
+//     base_resolve.merge_worlds(dependecy_world_id, base_resolve_world_id)?;
 
-    Ok((base_resolve, base_resolve_pkg_id))
-}
+//     Ok((base_resolve, base_resolve_pkg_id))
+// }

src/common/wit.rs

@@ -0,0 +1 @@
+pub mod rust;

src/language/mod.rs

@@ -0,0 +1,3 @@
+pub fn identifier_safe(package_name: &wit_parser::PackageName) -> String {
+    format!("{ns}_{name}", ns = package_name.namespace, name = package_name.name)
+}

src/language/rust.rs

@@ -3,6 +3,7 @@ use clap::{Parser, Subcommand};
 
 mod commands;
 mod common;
+mod language;
 use commands::{add::AddCommand, bindings::GenerateBindingsCommand, publish::PublishCommand};
 
 /// Main CLI structure for command-line argument parsing.