add thread-first thread-last thread-as aliases

Cargo.toml

@@ -20,7 +20,7 @@ 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"
+dirs = "6.0.0"
 notify = "7.0.0"
 notify-debouncer-mini = "0.5.0"
 walkdir = "2.5.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

@@ -3,8 +3,8 @@
   "version": "0.9.7",
   "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/cirru/calcit-core.cirru

@@ -491,6 +491,10 @@
                         &list:rest x0
                       , & $ &list:rest xs
                     recur ([] x0 base) & $ &list:rest xs
+        |thread-first $ %{} :CodeEntry (:doc "|a alias for `->`")
+          :code $ quote
+            defmacro thread-first (& xs)
+              quasiquote $ -> ~@xs
         |->% $ %{} :CodeEntry (:doc "|pass value as `%` into several expressions")
           :code $ quote
             defmacro ->% (base & xs)
@@ -501,6 +505,10 @@
                     map (butlast xs)
                       defn %->% (x) ([] '% x)
                 quasiquote $ let ~pairs ~tail
+        |thread-as $ %{} :CodeEntry (:doc "|a alias for `->%`")
+          :code $ quote
+            defmacro thread-as (& xs)
+              quasiquote $ ->% ~@xs
         |->> $ %{} :CodeEntry (:doc "|thread macro passing value at end of each expression")
           :code $ quote
             defmacro ->> (base & xs)
@@ -510,6 +518,10 @@
                   if (list? x0)
                     &call-spread recur (append x0 base) & $ &list:rest xs
                     &call-spread recur ([] x0 base) & $ &list:rest xs
+        |thread-last $ %{} :CodeEntry (:doc "|a alias for `->>`")
+          :code $ quote
+            defmacro thread-last (& xs)
+              quasiquote $ ->> ~@xs
         |/ $ %{} :CodeEntry (:doc |dividing)
           :code $ quote
             defn / (x & ys)