add strip-prefix, select-keys... bump 0.3.11

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "calcit_runner"
-version = "0.3.10"
+version = "0.3.11"
 authors = ["jiyinyiyong <[email protected]>"]
 edition = "2018"
 license = "MIT"

calcit/snapshots/test-map.cirru

@@ -156,6 +156,23 @@
                   let[] (k v) pair
                     &+ acc v
 
+        |test-select $ quote
+          fn ()
+            log-title "|Testing select"
+            assert=
+              select-keys ({} (:a 1) (:b 2) (:c 3)) ([] :a :b)
+              {} (:a 1) (:b 2)
+            assert=
+              select-keys ({} (:a 1) (:b 2) (:c 3)) ([] :d)
+              {} (:d nil)
+
+            assert=
+              unselect-keys ({} (:a 1) (:b 2) (:c 3)) ([] :a :b)
+              {} (:c 3)
+            assert=
+              unselect-keys ({} (:a 1) (:b 2) (:c 3)) ([] :c :d)
+              {} (:a 1) (:b 2)
+
         |main! $ quote
           defn main! ()
 
@@ -174,6 +191,8 @@
 
             test-get
 
+            test-select
+
             do true
 
       :proc $ quote ()

calcit/snapshots/test-string.cirru

@@ -62,6 +62,12 @@
             assert= true $ ends-with? |01234 |4
             assert= false $ ends-with? |01234 |23
 
+            assert= |abc $ strip-prefix |ababc |ab
+            assert= |0abc $ strip-prefix |0abc |ab
+
+            assert= |aba $ strip-suffix |ababc |bc
+            assert= |abc0 $ strip-suffix |abc0 |bc
+
         |test-parse $ quote
           fn ()
             assert= 0 $ parse-float |0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "main": "./lib/calcit.procs.js",
   "devDependencies": {
     "@types/node": "^15.0.1",

src/builtins/lists.rs

@@ -154,7 +154,7 @@ pub fn rest(xs: &CalcitItems) -> Result<Calcit, String> {
         }
         buffer.push(c)
       }
-      Ok(Calcit::Str(s.to_owned()))
+      Ok(Calcit::Str(buffer.to_owned()))
     }
     Some(a) => Err(format!("rest expected a list, got: {}", a)),
     None => Err(String::from("rest expected 1 argument")),

src/cirru/calcit-core.cirru

@@ -1075,6 +1075,30 @@
         |;nil $ quote
           defmacro ;nil (& _body) nil
 
+        |strip-prefix $ quote
+          defn strip-prefix (s piece)
+            if (starts-with? s piece)
+              substr s (count piece)
+              , s
+
+        |strip-suffix $ quote
+          defn strip-suffix (s piece)
+            if (ends-with? s piece)
+              substr s 0 (&- (count s) (count piece))
+              , s
+
+        |select-keys $ quote
+          defn select-keys (m keys)
+            assert "|expectd map for selecting" $ map? m
+            foldl keys (&{}) $ fn (acc k)
+              assoc acc k (&get m k)
+
+        |unselect-keys $ quote
+          defn unselect-keys (m keys)
+            assert "|expectd map for unselecting" $ map? m
+            foldl keys m $ fn (acc k)
+              dissoc acc k
+
         |conj $ quote
           defn conj (xs a)
             append xs a