caps Download; thread-first aliases

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "calcit"
-version = "0.9.7"
+version = "0.9.8"
 authors = ["jiyinyiyong <jiyinyiyong@gmail.com>"]
 edition = "2021"
 license = "MIT"
@@ -20,9 +20,9 @@ cirru_edn = "0.6.13"
 cirru_parser = "0.1.31"
 # cirru_parser = { path = "/Users/chenyong/repo/cirru/parser.rs" }
 argh = "0.1.13"
-dirs = "5.0.1"
-notify = "7.0.0"
-notify-debouncer-mini = "0.5.0"
+dirs = "6.0.0"
+notify = "8.0.0"
+notify-debouncer-mini = "0.6.0"
 walkdir = "2.5.0"
 hex = "0.4.3"
 rpds = "1.1.0"

calcit/test-macro.cirru

@@ -241,6 +241,10 @@
                   macroexpand $ quote
                     -> a (b c) (d e f)
                   quote $ d (b a c) e f
+                assert=
+                  macroexpand $ quote
+                    thread-first a (b c) (d e f)
+                  quote $ -> a (b c) (d e f)
                 assert=
                   macroexpand-all $ quote
                     <- (b c) (d e f) a
@@ -260,6 +264,10 @@
                   macroexpand $ quote
                     ->> a (b c) (d e f)
                   quote $ d e f (b c a)
+                assert=
+                  macroexpand $ quote
+                    thread-last a (b c) (d e f)
+                  quote $ ->> a (b c) (d e f)
                 assert=
                   macroexpand $ quote (->% a)
                   quote a
@@ -270,6 +278,10 @@
                       % a
                       % $ + % 1
                     * % 2
+                assert=
+                  macroexpand $ quote
+                    thread-as a (+ % 1) (* % 2)
+                  quote $ ->% a (+ % 1) (* % 2)
               assert= 35 $ ->% 3 (+ % 4) (* % 5)
               assert= 36 $ ->% 3 (+ % %) (* % %)
               assert= 18 $ %<- (+ % %) (* % %) 3

package.json

@@ -1,10 +1,10 @@
 {
   "name": "@calcit/procs",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^22.10.5",
-    "typescript": "^5.7.2"
+    "@types/node": "^22.10.7",
+    "typescript": "^5.7.3"
   },
   "scripts": {
     "compile": "rm -rfv lib/* && tsc",

src/bin/calcit_deps.rs

@@ -58,6 +58,22 @@ pub fn main() -> Result<(), String> {
   // parse deps.cirru
 
   let cli_args: TopLevelCaps = argh::from_env();
+  if let Some(SubCommand::Download(dep_names)) = &cli_args.subcommand {
+    if dep_names.packages.is_empty() {
+      eprintln!("Error: no packages to download!");
+      std::process::exit(1);
+    }
+    let dict: HashMap<Arc<str>, Arc<str>> = dep_names
+      .packages
+      .iter()
+      .map(|s| {
+        let (org_and_folder, version) = s.split_once('@').ok_or("invalid name")?;
+        Ok((org_and_folder.to_owned().into(), version.to_owned().into()))
+      })
+      .collect::<Result<_, String>>()?;
+    download_deps(dict, cli_args)?;
+    return Ok(());
+  }
 
   // if file exists
 
@@ -75,10 +91,16 @@ pub fn main() -> Result<(), String> {
       }
     }
 
-    if cli_args.subcommand.is_some() {
-      outdated_tags(deps.dependencies)?;
-    } else {
-      download_deps(deps.dependencies, cli_args)?;
+    match &cli_args.subcommand {
+      Some(SubCommand::Outdated(_)) => {
+        outdated_tags(deps.dependencies)?;
+      }
+      Some(SubCommand::Download(dep_names)) => {
+        unreachable!("already handled: {:?}", dep_names);
+      }
+      None => {
+        download_deps(deps.dependencies, cli_args)?;
+      }
     }
 
     Ok(())
@@ -259,13 +281,23 @@ struct TopLevelCaps {
 enum SubCommand {
   /// show outdated versions
   Outdated(OutdatedCaps),
+  Download(DownloadCaps),
 }
 
 #[derive(FromArgs, PartialEq, Debug, Clone)]
 /// show outdated versions
 #[argh(subcommand, name = "outdated")]
 struct OutdatedCaps {}
 
+#[derive(FromArgs, PartialEq, Debug, Clone)]
+/// download named packages with org/repo@branch
+#[argh(subcommand, name = "download")]
+struct DownloadCaps {
+  /// packages to download, in format of `org/repo@branch`
+  #[argh(positional)]
+  packages: Vec<String>,
+}
+
 fn dim_println(msg: String) {
   if msg.chars().nth(1) == Some(' ') {
     println!("{}", msg.truecolor(128, 128, 128));