@calcit/procs 0.4.33 → 0.4.37-a1

package/README.md

@@ -88,7 +88,7 @@ cr -e="range 100" # eval from CLI
 cr compact.cirru --emit-js # compile to js
 cr compact.cirru --emit-js --emit-path=out/ # compile to js and save in `out/`
 
-cr compact.cirru --emit-ir # compiles intermediate representation into program-ir.json
+cr compact.cirru --emit-ir # compiles intermediate representation into program-ir.cirru
 
 cr compact.cirru --emit-js --mjs # TODO compile to mjs
 ```

package/lib/calcit.procs.js

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.4.33";
+export const calcit_version = "0.4.37-a1";
 import { initTernaryTreeMap } from "@calcit/ternary-tree";
 import { parse } from "@cirru/parser.ts";
 import "./js-primes";

package/lib/js-cirru.js

@@ -72,6 +72,9 @@ export let to_cirru_edn = (x) => {
             // turn `x.snd` with CalcitList into raw Cirru nodes, which is in plain Array
             return ["quote", toWriterNode(x.snd)];
         }
+        else if (x.fst instanceof CalcitRecord) {
+            return ["::", "|" + x.fst.name, to_cirru_edn(x.snd)];
+        }
         else {
             throw new Error(`Unsupported tag for EDN: ${x.fst}`);
         }
@@ -169,6 +172,12 @@ export let extract_cirru_edn = (x) => {
             }
             return new CalcitTuple(new CalcitSymbol("quote"), to_calcit_data(x[1], true));
         }
+        if (x[0] === "::") {
+            if (x.length !== 3) {
+                throw new Error("tuple expects 2 values");
+            }
+            return new CalcitTuple(extract_cirru_edn(x[1]), extract_cirru_edn(x[2]));
+        }
     }
     console.error(x);
     throw new Error("Unexpected data from cirru-edn");

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@calcit/procs",
-  "version": "0.4.33",
+  "version": "0.4.37-a1",
   "main": "./lib/calcit.procs.js",
   "devDependencies": {
-    "@types/node": "^16.7.10",
-    "esbuild": "^0.12.26",
-    "typescript": "^4.4.2"
+    "@types/node": "^16.9.6",
+    "esbuild": "^0.13.2",
+    "typescript": "^4.4.3"
   },
   "scripts": {
     "compile": "rm -rfv lib/* && tsc",

package/ts-src/calcit.procs.ts

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

package/ts-src/js-cirru.ts

@@ -76,6 +76,8 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
     if (x.fst instanceof CalcitSymbol && x.fst.value === "quote") {
       // turn `x.snd` with CalcitList into raw Cirru nodes, which is in plain Array
       return ["quote", toWriterNode(x.snd as any)] as CirruEdnFormat;
+    } else if (x.fst instanceof CalcitRecord) {
+      return ["::", "|" + x.fst.name, to_cirru_edn(x.snd)];
     } else {
       throw new Error(`Unsupported tag for EDN: ${x.fst}`);
     }
@@ -172,6 +174,12 @@ export let extract_cirru_edn = (x: CirruEdnFormat): CalcitValue => {
       }
       return new CalcitTuple(new CalcitSymbol("quote"), to_calcit_data(x[1], true));
     }
+    if (x[0] === "::") {
+      if (x.length !== 3) {
+        throw new Error("tuple expects 2 values");
+      }
+      return new CalcitTuple(extract_cirru_edn(x[1]), extract_cirru_edn(x[2]));
+    }
   }
   console.error(x);
   throw new Error("Unexpected data from cirru-edn");