@calcit/procs 0.5.28 → 0.5.29

package/README.md

@@ -1,6 +1,6 @@
 ### Calcit Scripting Language
 
-> Spiritually dialect of ClojureScript. Built with Rust. Also compiles to JavaScript ES Modules.
+> Semantically a dialect of ClojureScript. Built with Rust. Compiles to JavaScript ES Modules.
 
 - Home http://calcit-lang.org/
 - API Doc http://apis.calcit-lang.org/

package/lib/calcit-data.mjs

@@ -286,7 +286,7 @@ let hashFunction = (x) => {
 };
 // Dirty code to change ternary-tree behavior
 overwriteHashGenerator(hashFunction);
-export let toString = (x, escaped) => {
+export let toString = (x, escaped, disableJsDataWarning = false) => {
     if (x == null) {
         return "nil";
     }
@@ -320,25 +320,27 @@ export let toString = (x, escaped) => {
         return x.toString();
     }
     if (x instanceof CalcitList || x instanceof CalcitSliceList) {
-        return x.toString();
+        return x.toString(false, disableJsDataWarning);
     }
     if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
-        return x.toString();
+        return x.toString(false, disableJsDataWarning);
     }
     if (x instanceof CalcitSet) {
-        return x.toString();
+        return x.toString(disableJsDataWarning);
     }
     if (x instanceof CalcitRecord) {
-        return x.toString();
+        return x.toString(disableJsDataWarning);
     }
     if (x instanceof CalcitRef) {
         return x.toString();
     }
     if (x instanceof CalcitTuple) {
-        return x.toString();
+        return x.toString(disableJsDataWarning);
+    }
+    if (!disableJsDataWarning) {
+        console.warn("Unknown structure to string, better use `console.log`", x);
     }
-    console.warn("Unknown structure to string, better use `console.log`", x);
-    return `${x}`;
+    return `(#js ${JSON.stringify(x)})`;
 };
 export let to_js_data = (x, addColon = false) => {
     if (x == null) {

package/lib/calcit.procs.mjs

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.5.28";
+export const calcit_version = "0.5.29";
 import "@calcit/ternary-tree";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";

package/lib/custom-formatter.mjs

@@ -31,15 +31,15 @@ export let load_console_formatter_$x_ = () => {
                         return [
                             "div",
                             { style: "color: hsl(280, 80%, 60%, 0.4)" },
-                            obj.toString(true),
+                            obj.toString(true, true),
                             ["span", { style: "font-size: 80%; vertical-align: 0.7em; color: hsl(280, 80%, 60%, 0.8)" }, `${obj.len()}`],
                         ];
                     }
                     if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
-                        return ["div", { style: "color: hsl(280, 80%, 60%, 0.4)" }, obj.toString(true)];
+                        return ["div", { style: "color: hsl(280, 80%, 60%, 0.4)" }, obj.toString(true, true)];
                     }
                     if (obj instanceof CalcitSet) {
-                        return ["div", { style: "color: hsl(280, 80%, 60%, 0.4)" }, obj.toString()];
+                        return ["div", { style: "color: hsl(280, 80%, 60%, 0.4)" }, obj.toString(true)];
                     }
                     if (obj instanceof CalcitRecord) {
                         let ret = ["div", { style: "color: hsl(280, 80%, 60%)" }, `%{} ${obj.name}`];

package/lib/js-list.mjs

@@ -40,14 +40,14 @@ export class CalcitList {
     slice(from, to) {
         return new CalcitList(ternaryTree.slice(this.value, from, to));
     }
-    toString(shorter = false) {
+    toString(shorter = false, disableJsDataWarning = false) {
         let result = "";
         for (let item of this.items()) {
             if (shorter && isNestedCalcitData(item)) {
                 result = `${result} ${tipNestedCalcitData(item)}`;
             }
             else {
-                result = `${result} ${toString(item, true)}`;
+                result = `${result} ${toString(item, true, disableJsDataWarning)}`;
             }
         }
         return `([]${result})`;
@@ -152,14 +152,14 @@ export class CalcitSliceList {
         result.end = this.start + to;
         return result;
     }
-    toString(shorter = false) {
+    toString(shorter = false, disableJsDataWarning = false) {
         let result = "";
         for (let item of this.items()) {
             if (shorter && isNestedCalcitData(item)) {
                 result = `${result} ${tipNestedCalcitData(item)}`;
             }
             else {
-                result = `${result} ${toString(item, true)}`;
+                result = `${result} ${toString(item, true, disableJsDataWarning)}`;
             }
         }
         return `([]${result})`;

package/lib/js-map.mjs

@@ -46,16 +46,16 @@ export class CalcitMap {
         }
         return new CalcitMap(ret);
     }
-    toString(shorter = false) {
+    toString(shorter = false, disableJsDataWarning = false) {
         let itemsCode = "";
         for (let [k, v] of this.pairs()) {
             if (shorter) {
-                let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true);
-                let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true);
+                let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
+                let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
                 itemsCode = `${itemsCode} (${keyPart} ${valuePart})`;
             }
             else {
-                itemsCode = `${itemsCode} (${toString(k, true)} ${toString(v, true)})`;
+                itemsCode = `${itemsCode} (${toString(k, true, disableJsDataWarning)} ${toString(v, true, disableJsDataWarning)})`;
             }
         }
         return `({}${itemsCode})`;
@@ -233,16 +233,16 @@ export class CalcitSliceMap {
             return this.turnMap().dissoc(...args);
         }
     }
-    toString(shorter = false) {
+    toString(shorter = false, disableJsDataWarning = false) {
         let itemsCode = "";
         for (let [k, v] of this.pairs()) {
             if (shorter) {
-                let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true);
-                let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true);
+                let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
+                let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
                 itemsCode = `${itemsCode} (${keyPart} ${valuePart})`;
             }
             else {
-                itemsCode = `${itemsCode} (${toString(k, true)} ${toString(v, true)})`;
+                itemsCode = `${itemsCode} (${toString(k, true, disableJsDataWarning)} ${toString(v, true, disableJsDataWarning)})`;
             }
         }
         return `({}${itemsCode})`;

package/lib/js-record.mjs

@@ -51,10 +51,10 @@ export class CalcitRecord {
         let idx = this.findIndex(k);
         return idx >= 0;
     }
-    toString() {
+    toString(disableJsDataWarning = false) {
         let ret = "(%{} " + this.name;
         for (let idx = 0; idx < this.fields.length; idx++) {
-            ret += " (" + this.fields[idx] + " " + toString(this.values[idx], true) + ")";
+            ret += " (" + this.fields[idx] + " " + toString(this.values[idx], true, disableJsDataWarning) + ")";
         }
         return ret + ")";
     }

package/lib/js-set.mjs

@@ -83,10 +83,10 @@ export class CalcitSet {
         let result = dissocMap(this.value, x0);
         return new CalcitSet(result);
     }
-    toString() {
+    toString(disableJsDataWarning = false) {
         let itemsCode = "";
         for (let k of ternaryTree.toKeys(this.value)) {
-            itemsCode = `${itemsCode} ${toString(k, true)}`;
+            itemsCode = `${itemsCode} ${toString(k, true, disableJsDataWarning)}`;
         }
         return `(#{}${itemsCode})`;
     }

package/lib/js-tuple.mjs

@@ -1,5 +1,6 @@
-import "./js-primes.mjs";
 import "@calcit/ternary-tree";
+import "./js-primes.mjs";
+import { toString } from "./calcit-data.mjs";
 export class CalcitTuple {
     constructor(a, b) {
         this.fst = a;
@@ -28,7 +29,7 @@ export class CalcitTuple {
             throw new Error("Tuple only have 2 elements");
         }
     }
-    toString() {
-        return `(&tuple ${this.fst.toString()} ${this.snd.toString()})`;
+    toString(disableJsDataWarning = false) {
+        return `(&tuple ${toString(this.fst, false, disableJsDataWarning)} ${toString(this.snd, false, disableJsDataWarning)})`;
     }
 }

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@calcit/procs",
-  "version": "0.5.28",
+  "version": "0.5.29",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^17.0.23",
-    "typescript": "^4.6.2"
+    "typescript": "^4.6.3"
   },
   "scripts": {
     "compile": "rm -rfv lib/* && tsc",

package/ts-src/calcit-data.mts

@@ -319,7 +319,7 @@ let hashFunction = (x: CalcitValue): Hash => {
 // Dirty code to change ternary-tree behavior
 overwriteHashGenerator(hashFunction);
 
-export let toString = (x: CalcitValue, escaped: boolean): string => {
+export let toString = (x: CalcitValue, escaped: boolean, disableJsDataWarning: boolean = false): string => {
   if (x == null) {
     return "nil";
   }
@@ -351,26 +351,28 @@ export let toString = (x: CalcitValue, escaped: boolean): string => {
     return x.toString();
   }
   if (x instanceof CalcitList || x instanceof CalcitSliceList) {
-    return x.toString();
+    return x.toString(false, disableJsDataWarning);
   }
   if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
-    return x.toString();
+    return x.toString(false, disableJsDataWarning);
   }
   if (x instanceof CalcitSet) {
-    return x.toString();
+    return x.toString(disableJsDataWarning);
   }
   if (x instanceof CalcitRecord) {
-    return x.toString();
+    return x.toString(disableJsDataWarning);
   }
   if (x instanceof CalcitRef) {
     return x.toString();
   }
   if (x instanceof CalcitTuple) {
-    return x.toString();
+    return x.toString(disableJsDataWarning);
   }
 
-  console.warn("Unknown structure to string, better use `console.log`", x);
-  return `${x}`;
+  if (!disableJsDataWarning) {
+    console.warn("Unknown structure to string, better use `console.log`", x);
+  }
+  return `(#js ${JSON.stringify(x)})`;
 };
 
 export let to_js_data = (x: CalcitValue, addColon: boolean = false): any => {

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.5.28";
+export const calcit_version = "0.5.29";
 
 import { overwriteComparator, initTernaryTreeMap } from "@calcit/ternary-tree";
 import { parse, ICirruNode } from "@cirru/parser.ts";

package/ts-src/custom-formatter.mts

@@ -44,15 +44,15 @@ export let load_console_formatter_$x_ = () => {
             return [
               "div",
               { style: "color: hsl(280, 80%, 60%, 0.4)" },
-              obj.toString(true),
+              obj.toString(true, true),
               ["span", { style: "font-size: 80%; vertical-align: 0.7em; color: hsl(280, 80%, 60%, 0.8)" }, `${obj.len()}`],
             ];
           }
           if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
-            return ["div", { style: "color: hsl(280, 80%, 60%, 0.4)" }, obj.toString(true)];
+            return ["div", { style: "color: hsl(280, 80%, 60%, 0.4)" }, obj.toString(true, true)];
           }
           if (obj instanceof CalcitSet) {
-            return ["div", { style: "color: hsl(280, 80%, 60%, 0.4)" }, obj.toString()];
+            return ["div", { style: "color: hsl(280, 80%, 60%, 0.4)" }, obj.toString(true)];
           }
           if (obj instanceof CalcitRecord) {
             let ret: any[] = ["div", { style: "color: hsl(280, 80%, 60%)" }, `%{} ${obj.name}`];

package/ts-src/js-list.mts

@@ -58,13 +58,13 @@ export class CalcitList {
   slice(from: number, to: number) {
     return new CalcitList(ternaryTree.slice(this.value, from, to));
   }
-  toString(shorter = false): string {
+  toString(shorter = false, disableJsDataWarning: boolean = false): string {
     let result = "";
     for (let item of this.items()) {
       if (shorter && isNestedCalcitData(item)) {
         result = `${result} ${tipNestedCalcitData(item)}`;
       } else {
-        result = `${result} ${toString(item, true)}`;
+        result = `${result} ${toString(item, true, disableJsDataWarning)}`;
       }
     }
     return `([]${result})`;
@@ -171,13 +171,13 @@ export class CalcitSliceList {
     result.end = this.start + to;
     return result;
   }
-  toString(shorter = false): string {
+  toString(shorter = false, disableJsDataWarning = false): string {
     let result = "";
     for (let item of this.items()) {
       if (shorter && isNestedCalcitData(item)) {
         result = `${result} ${tipNestedCalcitData(item)}`;
       } else {
-        result = `${result} ${toString(item, true)}`;
+        result = `${result} ${toString(item, true, disableJsDataWarning)}`;
       }
     }
     return `([]${result})`;

package/ts-src/js-map.mts

@@ -66,15 +66,15 @@ export class CalcitMap {
     }
     return new CalcitMap(ret);
   }
-  toString(shorter = false) {
+  toString(shorter = false, disableJsDataWarning = false) {
     let itemsCode = "";
     for (let [k, v] of this.pairs()) {
       if (shorter) {
-        let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true);
-        let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true);
+        let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
+        let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
         itemsCode = `${itemsCode} (${keyPart} ${valuePart})`;
       } else {
-        itemsCode = `${itemsCode} (${toString(k, true)} ${toString(v, true)})`;
+        itemsCode = `${itemsCode} (${toString(k, true, disableJsDataWarning)} ${toString(v, true, disableJsDataWarning)})`;
       }
     }
     return `({}${itemsCode})`;
@@ -252,15 +252,15 @@ export class CalcitSliceMap {
       return this.turnMap().dissoc(...args);
     }
   }
-  toString(shorter = false) {
+  toString(shorter = false, disableJsDataWarning = false) {
     let itemsCode = "";
     for (let [k, v] of this.pairs()) {
       if (shorter) {
-        let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true);
-        let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true);
+        let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
+        let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
         itemsCode = `${itemsCode} (${keyPart} ${valuePart})`;
       } else {
-        itemsCode = `${itemsCode} (${toString(k, true)} ${toString(v, true)})`;
+        itemsCode = `${itemsCode} (${toString(k, true, disableJsDataWarning)} ${toString(v, true, disableJsDataWarning)})`;
       }
     }
     return `({}${itemsCode})`;

package/ts-src/js-record.mts

@@ -54,10 +54,10 @@ export class CalcitRecord {
     let idx = this.findIndex(k);
     return idx >= 0;
   }
-  toString(): string {
+  toString(disableJsDataWarning: boolean = false): string {
     let ret = "(%{} " + this.name;
     for (let idx = 0; idx < this.fields.length; idx++) {
-      ret += " (" + this.fields[idx] + " " + toString(this.values[idx], true) + ")";
+      ret += " (" + this.fields[idx] + " " + toString(this.values[idx], true, disableJsDataWarning) + ")";
     }
     return ret + ")";
   }

package/ts-src/js-set.mts

@@ -105,10 +105,10 @@ export class CalcitSet {
     return new CalcitSet(result);
   }
 
-  toString() {
+  toString(disableJsDataWarning: boolean = false) {
     let itemsCode = "";
     for (let k of ternaryTree.toKeys(this.value)) {
-      itemsCode = `${itemsCode} ${toString(k, true)}`;
+      itemsCode = `${itemsCode} ${toString(k, true, disableJsDataWarning)}`;
     }
     return `(#{}${itemsCode})`;
   }

package/ts-src/js-tuple.mts

@@ -1,7 +1,8 @@
-import { CalcitValue } from "./js-primes.mjs";
-
 import { Hash } from "@calcit/ternary-tree";
 
+import { CalcitValue } from "./js-primes.mjs";
+import { toString } from "./calcit-data.mjs";
+
 export class CalcitTuple {
   fst: CalcitValue;
   snd: CalcitValue;
@@ -29,7 +30,7 @@ export class CalcitTuple {
       throw new Error("Tuple only have 2 elements");
     }
   }
-  toString(): string {
-    return `(&tuple ${this.fst.toString()} ${this.snd.toString()})`;
+  toString(disableJsDataWarning: boolean = false): string {
+    return `(&tuple ${toString(this.fst, false, disableJsDataWarning)} ${toString(this.snd, false, disableJsDataWarning)})`;
   }
 }

package/.vscode/settings.json

@@ -1,3 +0,0 @@
-{
-  "typescript.tsdk": "node_modules/typescript/lib"
-}