handle ckj displaying; tag 0.8.59

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "calcit"
-version = "0.8.58"
+version = "0.8.59"
 authors = ["jiyinyiyong <[email protected]>"]
 edition = "2021"
 license = "MIT"
@@ -20,7 +20,7 @@ exclude = [
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-cirru_edn = "0.6.10"
+cirru_edn = "0.6.11"
 # cirru_edn = { path = "/Users/chenyong/repo/cirru/edn.rs" }
 cirru_parser = "0.1.31"
 # cirru_parser = { path = "/Users/chenyong/repo/cirru/parser.rs" }

calcit/test-string.cirru

@@ -166,6 +166,8 @@
               assert= (str-spaced nil nil |c 12) "|c 12"
               assert= (str-spaced |a nil |c 12 nil) "|a c 12"
               assert= (str 1 2 3) |123
+              assert= "|(:: :a |世界 \"|海 洋\")"
+                str $ :: :a |世界 "|海 洋"
               assert=
                 type-of $ &str 1
                 , :string

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.8.58",
+  "version": "0.8.59",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^20.11.28",

src/calcit.rs

@@ -121,7 +121,16 @@ impl fmt::Display for Calcit {
         if is_simple_str(s) {
           write!(f, "|{s}")
         } else {
-          write!(f, "\"|{}\"", s.escape_default())
+          // write!(f, "\"|{}\"", s.escape_default())
+          write!(f, "\"|")?;
+          for c in s.chars() {
+            if cirru_edn::is_simple_char(c) {
+              write!(f, "{}", c)?;
+            } else {
+              write!(f, "{}", c.escape_default())?;
+            }
+          }
+          write!(f, "\"")
         }
       } // TODO, escaping choices
       Calcit::Thunk(thunk) => match thunk {
@@ -281,7 +290,7 @@ impl fmt::Display for Calcit {
 
 fn is_simple_str(tok: &str) -> bool {
   for c in tok.chars() {
-    if !matches!(c, 'a'..='z' | 'A'..='Z' | '0'..='9' | '-' | '?' | '!' | '|') {
+    if !cirru_edn::is_simple_char(c) {
       return false;
     }
   }

ts-src/js-tuple.mts

@@ -59,7 +59,7 @@ export class CalcitTuple {
       if (i > 0) {
         content += " ";
       }
-      content += toString(args[i], false, disableJsDataWarning);
+      content += toString(args[i], true, disableJsDataWarning);
     }
     if (this.klass instanceof CalcitRecord) {
       return `(%:: ${content} (:class ${this.klass.name.value}))`;