Merge pull request #490 from moonbitlang/install_bin

feat: support moon install --bin

crates/moon/src/cli.rs

@@ -51,6 +51,9 @@ pub use fmt::*;
 pub use generate_test_driver::*;
 pub use info::*;
 use moonbuild::upgrade::UpgradeSubcommand;
+use mooncake::pkg::{
+    add::AddSubcommand, install::InstallSubcommand, remove::RemoveSubcommand, tree::TreeSubcommand,
+};
 pub use new::*;
 pub use query::*;
 pub use run::*;

crates/moon/src/cli/build.rs

@@ -22,6 +22,7 @@ use moonbuild::entry;
 use moonbuild::watch::watching;
 use mooncake::pkg::sync::auto_sync;
 use moonutil::common::lower_surface_targets;
+use moonutil::common::BuildOpt;
 use moonutil::common::FileLock;
 use moonutil::common::MoonbuildOpt;
 use moonutil::common::RunMode;
@@ -31,6 +32,7 @@ use moonutil::mooncakes::sync::AutoSyncFlags;
 use moonutil::mooncakes::RegistryConfig;
 use n2::trace;
 use std::path::Path;
+use std::path::PathBuf;
 use std::sync::Arc;
 use std::thread;
 
@@ -50,8 +52,19 @@ pub struct BuildSubcommand {
     #[clap(long, short)]
     pub watch: bool,
 
+    #[clap(long, hide = true)]
+    pub install_path: Option<PathBuf>,
+
     #[clap(long, hide = true)]
     pub show_artifacts: bool,
+
+    // package name (username/hello/lib)
+    #[clap(long, hide = true)]
+    pub package: Option<String>,
+
+    // when package is specified, specify the alias of the binary package artifact to install
+    #[clap(long, hide = true, requires("package"))]
+    pub bin_alias: Option<String>,
 }
 
 pub fn run_build(cli: &UniversalFlags, cmd: &BuildSubcommand) -> anyhow::Result<i32> {
@@ -138,6 +151,10 @@ fn run_build_internal(
         build_graph: cli.build_graph,
         test_opt: None,
         check_opt: None,
+        build_opt: Some(BuildOpt {
+            install_path: cmd.install_path.clone(),
+            filter_package: cmd.package.clone(),
+        }),
         fmt_opt: None,
         args: vec![],
         output_json: false,
@@ -152,6 +169,19 @@ fn run_build_internal(
         &dir_sync_result,
     )?;
 
+    if let Some(bin_alias) = cmd.bin_alias.clone() {
+        let pkg = module.get_package_by_name_mut_safe(cmd.package.as_ref().unwrap());
+        match pkg {
+            Some(pkg) => {
+                pkg.bin_name = Some(bin_alias);
+            }
+            _ => anyhow::bail!(format!(
+                "package `{}` not found",
+                cmd.package.as_ref().unwrap()
+            )),
+        }
+    }
+
     moonutil::common::set_native_backend_link_flags(
         run_mode,
         cmd.build_flags.release,

crates/moon/src/cli/bundle.rs

@@ -142,6 +142,7 @@ fn run_bundle_internal(
         run_mode,
         test_opt: None,
         check_opt: None,
+        build_opt: None,
         fmt_opt: None,
         args: vec![],
         verbose: cli.verbose,

crates/moon/src/cli/check.rs

@@ -169,6 +169,7 @@ fn run_check_internal(
             no_mi: cmd.no_mi,
         }),
         test_opt: None,
+        build_opt: None,
         fmt_opt: None,
         args: vec![],
         no_parallelize: false,

crates/moon/src/cli/deps.rs

@@ -17,42 +17,29 @@
 // For inquiries, you can contact us via e-mail at [email protected].
 
 use anyhow::bail;
+use mooncake::pkg::{
+    add::AddSubcommand, install::InstallSubcommand, remove::RemoveSubcommand, tree::TreeSubcommand,
+};
 use moonutil::{
     dirs::PackageDirs,
     mooncakes::{ModuleName, RegistryConfig},
 };
 
 use super::UniversalFlags;
 
-/// Install dependencies
-#[derive(Debug, clap::Parser)]
-pub struct InstallSubcommand {}
-
-/// Remove a dependency
-#[derive(Debug, clap::Parser)]
-pub struct RemoveSubcommand {
-    /// The package path to remove
-    pub package_path: String,
-}
-
-/// Add a dependency
-#[derive(Debug, clap::Parser)]
-pub struct AddSubcommand {
-    /// The package path to add
-    pub package_path: String,
-}
-
-/// Display the dependency tree
-#[derive(Debug, clap::Parser)]
-pub struct TreeSubcommand {}
-
 pub fn install_cli(cli: UniversalFlags, _cmd: InstallSubcommand) -> anyhow::Result<i32> {
     let PackageDirs {
         source_dir,
         target_dir,
     } = cli.source_tgt_dir.try_into_package_dirs()?;
     let registry_config = RegistryConfig::load();
-    mooncake::pkg::install::install(&source_dir, &target_dir, &registry_config, false)
+    mooncake::pkg::install::install(
+        &source_dir,
+        &target_dir,
+        &registry_config,
+        cli.quiet,
+        cli.verbose,
+    )
 }
 
 pub fn remove_cli(cli: UniversalFlags, cmd: RemoveSubcommand) -> anyhow::Result<i32> {
@@ -100,9 +87,16 @@ pub fn add_cli(cli: UniversalFlags, cmd: AddSubcommand) -> anyhow::Result<i32> {
     if parts.len() == 2 {
         let version: &str = parts[1];
         let version = version.parse()?;
-        mooncake::pkg::add::add(&source_dir, &target_dir, &pkg_name, &version, false)
+        mooncake::pkg::add::add(
+            &source_dir,
+            &target_dir,
+            &pkg_name,
+            cmd.bin,
+            &version,
+            false,
+        )
     } else {
-        mooncake::pkg::add::add_latest(&source_dir, &target_dir, &pkg_name, false)
+        mooncake::pkg::add::add_latest(&source_dir, &target_dir, &pkg_name, cmd.bin, false)
     }
 }
 

crates/moon/src/cli/doc.rs

@@ -93,6 +93,7 @@ pub fn run_doc(cli: UniversalFlags, cmd: DocSubcommand) -> anyhow::Result<i32> {
         run_mode,
         test_opt: None,
         check_opt: None,
+        build_opt: None,
         fmt_opt: None,
         args: vec![],
         verbose: cli.verbose,

crates/moon/src/cli/fmt.rs

@@ -77,6 +77,7 @@ pub fn run_fmt(cli: &UniversalFlags, cmd: FmtSubcommand) -> anyhow::Result<i32>
         build_graph: cli.build_graph,
         test_opt: None,
         check_opt: None,
+        build_opt: None,
         args: vec![],
         verbose: cli.verbose,
         quiet: cli.quiet,

crates/moon/src/cli/generate_test_driver.rs

@@ -175,6 +175,7 @@ pub fn generate_test_driver(
             patch_file: cmd.patch_file.clone(),
         }),
         check_opt: None,
+        build_opt: None,
         fmt_opt: None,
         sort_input,
         run_mode,

crates/moon/src/cli/info.rs

@@ -93,6 +93,7 @@ pub fn run_info(cli: UniversalFlags, cmd: InfoSubcommand) -> anyhow::Result<i32>
         run_mode: RunMode::Check,
         test_opt: None,
         check_opt: None,
+        build_opt: None,
         fmt_opt: None,
         args: vec![],
         verbose: cli.verbose,

crates/moon/src/cli/run.rs

@@ -279,6 +279,7 @@ pub fn run_run_internal(cli: &UniversalFlags, cmd: RunSubcommand) -> anyhow::Res
         build_graph: cli.build_graph,
         test_opt: None,
         check_opt: None,
+        build_opt: None,
         fmt_opt: None,
         output_json: false,
         no_parallelize: false,

crates/moon/src/cli/test.rs

@@ -202,6 +202,7 @@ fn run_test_internal(
             patch_file,
         }),
         check_opt: None,
+        build_opt: None,
         sort_input,
         run_mode,
         quiet: true,

crates/moon/tests/test_cases/mod.rs

@@ -8020,3 +8020,50 @@ fn test_moon_query() {
 
     get_stdout(&dir, ["query", "moonbitlang/x"]);
 }
+
+#[test]
+fn test_moon_install_bin() {
+    let dir = TestDir::new("moon_install_bin.in");
+    let dir = dir.join("user.in");
+
+    let mooncakes_path = dir.join(moonutil::common::DEP_PATH);
+    if mooncakes_path.exists() {
+        std::fs::remove_dir_all(&mooncakes_path).unwrap();
+    }
+
+    let bin_dir = mooncakes_path.join(moonutil::common::MOON_BIN_DIR);
+
+    // moon check should auto install bin deps
+    get_stdout(&dir, ["check"]);
+    assert!(bin_dir.exists());
+    assert!(bin_dir.join("author2-native.exe").exists());
+    assert!(bin_dir.join("author2-js.js").exists());
+    assert!(bin_dir.join("author2-wasm.wasm").exists());
+    assert!(bin_dir.join("m-wasm.wasm").exists());
+    assert!(bin_dir.join("main-js.js").exists());
+
+    std::fs::remove_dir_all(&mooncakes_path).unwrap();
+
+    assert!(!bin_dir.exists());
+
+    // moon install should install bin deps
+    get_stdout(&dir, ["install"]);
+
+    assert!(bin_dir.exists());
+    assert!(bin_dir.join("author2-native.exe").exists());
+    assert!(bin_dir.join("author2-js.js").exists());
+    assert!(bin_dir.join("author2-wasm.wasm").exists());
+    assert!(bin_dir.join("m-wasm.wasm").exists());
+    assert!(bin_dir.join("main-js.js").exists());
+
+    check(
+        get_stderr(&dir, ["build"]),
+        expect![[r#"
+        main-js
+        lib Hello, world!
+        ()
+        Executed 1 pre-build task, now up to date
+        Finished. moon: ran 17 tasks, now up to date
+    "#]],
+    );
+}

crates/moon/tests/test_cases/moon_install_bin.in/author1.in/.gitignore

@@ -0,0 +1,2 @@
+target/
+.mooncakes/

crates/moon/tests/test_cases/moon_install_bin.in/author1.in/README.md

@@ -0,0 +1 @@
+# username/hello

crates/moon/tests/test_cases/moon_install_bin.in/author1.in/lib/hello.mbt

@@ -0,0 +1,3 @@
+pub fn hello() -> Unit {
+  println("lib Hello, world!")
+}

crates/moon/tests/test_cases/moon_install_bin.in/author1.in/lib/moon.pkg.json

@@ -0,0 +1,3 @@
+{
+
+}

crates/moon/tests/test_cases/moon_install_bin.in/author1.in/main-js/main.mbt

@@ -0,0 +1,4 @@
+fn main {
+  println("main-js")
+  println(@lib.hello())
+}

crates/moon/tests/test_cases/moon_install_bin.in/author1.in/main-js/moon.pkg.json

@@ -0,0 +1,7 @@
+{
+  "is_main": true,
+  "import": [
+    "username/flash/lib"
+  ],
+  "bin-target": "js"
+}

crates/moon/tests/test_cases/moon_install_bin.in/author1.in/main-native/main.mbt

@@ -0,0 +1,4 @@
+fn main {
+  println("main-native")
+  println(@lib.hello())
+}

crates/moon/tests/test_cases/moon_install_bin.in/author1.in/main-native/moon.pkg.json

@@ -0,0 +1,8 @@
+{
+  "is_main": true,
+  "import": [
+    "username/flash/lib"
+  ],
+  "bin-target": "native",
+  "bin-name": "this-is-native"
+}

crates/moon/tests/test_cases/moon_install_bin.in/author1.in/main-wasm/main.mbt

@@ -0,0 +1,4 @@
+fn main {
+  println("main-wasm")
+  println(@lib.hello())
+}

crates/moon/tests/test_cases/moon_install_bin.in/author1.in/main-wasm/moon.pkg.json

@@ -0,0 +1,8 @@
+{
+  "is_main": true,
+  "import": [
+    "username/flash/lib"
+  ],
+  "bin-target": "wasm",
+  "bin-name": "this-is-wasm"
+}

crates/moon/tests/test_cases/moon_install_bin.in/author1.in/moon.mod.json

@@ -0,0 +1,9 @@
+{
+  "name": "username/flash",
+  "version": "0.1.0",
+  "readme": "README.md",
+  "repository": "",
+  "license": "Apache-2.0",
+  "keywords": [],
+  "description": ""
+}

crates/moon/tests/test_cases/moon_install_bin.in/author2.in/.gitignore

@@ -0,0 +1,2 @@
+target/
+.mooncakes/

crates/moon/tests/test_cases/moon_install_bin.in/author2.in/README.md

@@ -0,0 +1 @@
+# username/hello

crates/moon/tests/test_cases/moon_install_bin.in/author2.in/lib/hello.mbt

@@ -0,0 +1,3 @@
+pub fn hello() -> Unit {
+  println("lib Hello, world!")
+}

crates/moon/tests/test_cases/moon_install_bin.in/author2.in/lib/moon.pkg.json

@@ -0,0 +1,3 @@
+{
+
+}

crates/moon/tests/test_cases/moon_install_bin.in/author2.in/main-js/main.mbt

@@ -0,0 +1,4 @@
+fn main {
+  println("main-js")
+  println(@lib.hello())
+}

crates/moon/tests/test_cases/moon_install_bin.in/author2.in/main-js/moon.pkg.json

@@ -0,0 +1,8 @@
+{
+  "is_main": true,
+  "import": [
+    "author2/flash/lib"
+  ],
+  "bin-target": "js",
+  "bin-name": "author2-js"
+}

crates/moon/tests/test_cases/moon_install_bin.in/author2.in/main-native/main.mbt

@@ -0,0 +1,4 @@
+fn main {
+  println("main-native")
+  println(@lib.hello())
+}

crates/moon/tests/test_cases/moon_install_bin.in/author2.in/main-native/moon.pkg.json

@@ -0,0 +1,8 @@
+{
+  "is_main": true,
+  "import": [
+    "author2/flash/lib"
+  ],
+  "bin-target": "native",
+  "bin-name": "author2-native"
+}

crates/moon/tests/test_cases/moon_install_bin.in/author2.in/main-wasm/main.mbt

@@ -0,0 +1,4 @@
+fn main {
+  println("main-wasm")
+  println(@lib.hello())
+}

crates/moon/tests/test_cases/moon_install_bin.in/author2.in/main-wasm/moon.pkg.json

@@ -0,0 +1,8 @@
+{
+  "is_main": true,
+  "import": [
+    "author2/flash/lib"
+  ],
+  "bin-target": "wasm",
+  "bin-name": "author2-wasm"
+}

crates/moon/tests/test_cases/moon_install_bin.in/author2.in/moon.mod.json

@@ -0,0 +1,9 @@
+{
+  "name": "author2/flash",
+  "version": "0.1.0",
+  "readme": "README.md",
+  "repository": "",
+  "license": "Apache-2.0",
+  "keywords": [],
+  "description": ""
+}