Single component templates with multi component upgrade

Cargo.toml

@@ -24,9 +24,7 @@ members = [
 
 exclude = [
     "cli/desktop-app/src-tauri",
-    "test-components/host-api-tests",
-    "test-components/http-tests",
-    "test-components/oplog-processor",
+    "test-components",
     "sdks/golem-rust"
 ]
 
@@ -210,7 +208,7 @@ reqwest-middleware = { version = "0.5.1", features = ["json", "multipart", "quer
 reqwest-tracing = { version = "0.7", features = ["opentelemetry_0_30"] }
 ringbuf = "0.4.7"
 rlimit = "0.10.2"
-rmcp = {version = "0.16.0", features = ["server", "transport-streamable-http-server"] }
+rmcp = { version = "0.16.0", features = ["server", "transport-streamable-http-server"] }
 rsa = "0.9.7"
 
 rustc-hash = "2.1.1"
@@ -271,6 +269,11 @@ tracing-opentelemetry = "0.31.0"
 tracing-serde = "0.2.0"
 tracing-subscriber = { version = "0.3.20", features = ["env-filter", "fmt", "std", "json", ] }
 tracing-test = "0.2.5"
+tree-sitter = "0.26.5"
+tree-sitter-json = "0.24.8"
+tree-sitter-rust = "0.24.0"
+tree-sitter-typescript = "0.23.2"
+tree-sitter-yaml = "0.7.2"
 tower = "0.5.2"
 try_match = "0.4.2"
 tryhard = "0.5.1"

cli/golem-cli/Cargo.toml

@@ -100,6 +100,11 @@ toml_edit = { workspace = true }
 tracing = { workspace = true }
 tracing-log = "0.2.0"
 tracing-subscriber = { workspace = true }
+tree-sitter = { workspace = true }
+tree-sitter-json = { workspace = true }
+tree-sitter-rust = { workspace = true }
+tree-sitter-typescript = { workspace = true }
+tree-sitter-yaml = { workspace = true }
 unicode-segmentation = { workspace = true }
 url = { workspace = true }
 uuid = { workspace = true }

cli/golem-cli/src/app/build/clean.rs

@@ -24,6 +24,8 @@ pub fn clean_app(ctx: &BuildContext<'_>, mode: CleanMode) -> anyhow::Result<()>
         log_action("Cleaning", "components");
         let _indent = LogIndent::new();
 
+        let app_root_dir = ctx.application().app_root_dir();
+
         let paths = {
             let mut paths = BTreeSet::<(&'static str, PathBuf)>::new();
 
@@ -39,9 +41,8 @@ pub fn clean_app(ctx: &BuildContext<'_>, mode: CleanMode) -> anyhow::Result<()>
 
             for component_name in &component_names {
                 let component = ctx.application().component(component_name);
-                let component_source_dir = component.source_dir();
+                let component_source_dir = component.component_dir();
 
-                paths.insert(("generated wit", component.generated_wit()));
                 paths.insert(("component wasm", component.wasm()));
                 paths.insert(("output wasm", component.final_wasm()));
 
@@ -52,9 +53,13 @@ pub fn clean_app(ctx: &BuildContext<'_>, mode: CleanMode) -> anyhow::Result<()>
                         .unwrap_or_else(|| component_source_dir.to_path_buf());
 
                     paths.extend(
-                        fs::compile_and_collect_globs(&build_dir, &build_step.targets())?
-                            .into_iter()
-                            .map(|path| ("build output", path)),
+                        fs::compile_and_collect_globs(
+                            app_root_dir,
+                            &build_dir,
+                            &build_step.targets(),
+                        )?
+                        .into_iter()
+                        .map(|path| ("build output", path)),
                     );
                 }
 

cli/golem-cli/src/app/build/command.rs

@@ -41,7 +41,7 @@ pub async fn execute_build_command(
     let base_build_dir = ctx
         .application()
         .component(component_name)
-        .source_dir()
+        .component_dir()
         .to_path_buf();
     match command {
         app_raw::BuildCommand::External(external_command) => {
@@ -172,7 +172,7 @@ pub async fn execute_custom_command(
 
             for step in custom_command {
                 if let Err(error) =
-                    execute_external_command(ctx, component.source_dir(), step).await
+                    execute_external_command(ctx, component.component_dir(), step).await
                 {
                     return Err(CustomCommandError::CommandError { error });
                 }
@@ -287,6 +287,8 @@ pub async fn execute_external_command(
     base_command_dir: &Path,
     command: &app_raw::ExternalCommand,
 ) -> anyhow::Result<()> {
+    let app_root_dir = ctx.application().app_root_dir();
+
     let build_dir = command
         .dir
         .as_ref()
@@ -296,8 +298,13 @@ pub async fn execute_external_command(
     let (sources, targets) = {
         if !command.sources.is_empty() && !command.targets.is_empty() {
             (
-                fs::compile_and_collect_globs(&build_dir, &command.sources)?,
-                fs::compile_and_collect_globs(&build_dir, &command.targets)?,
+                fs::compile_and_collect_globs_with_expanders(
+                    app_root_dir,
+                    &build_dir,
+                    &command.sources,
+                    &[fs::GlobExpander::TsConfigInclude],
+                )?,
+                fs::compile_and_collect_globs(app_root_dir, &build_dir, &command.targets)?,
             )
         } else {
             (vec![], vec![])
@@ -365,9 +372,10 @@ pub async fn execute_external_command(
                 )
                 .await?;
 
-                Command::new(command_tokens[0].clone())
-                    .args(command_tokens.iter().skip(1))
+                let mut cmd = Command::new(command_tokens[0].clone());
+                cmd.args(command_tokens.iter().skip(1))
                     .current_dir(&build_dir)
+                    .envs(&command.env)
                     .stream_and_run(&command_tokens[0])
                     .await
             },