@calcit/procs 0.8.2 → 0.8.4

package/lib/calcit-data.mjs

@@ -402,6 +402,14 @@ export let to_js_data = (x, addColon = false) => {
         }
         return Symbol(x.value);
     }
+    if (x instanceof CalcitTuple) {
+        var result = [to_js_data(x.tag)];
+        for (let i = 0; i < x.extra.length; i++) {
+            let item = x.extra[i];
+            result.push(to_js_data(item));
+        }
+        return result;
+    }
     if (x instanceof CalcitList || x instanceof CalcitSliceList) {
         var result = [];
         for (let item of x.items()) {

package/lib/calcit.procs.mjs

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.8.2";
+export const calcit_version = "0.8.4";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 import { CalcitSymbol, CalcitTag, CalcitRef, CalcitRecur, newTag, refsRegistry, toString, getStringName, _$n__$e_, hashFunction, } from "./calcit-data.mjs";
@@ -129,7 +129,7 @@ export let atom = (x) => {
 export let peekDefatom = (path) => {
     return refsRegistry.get(path);
 };
-export let deref = (x) => {
+export let _$n_atom_$o_deref = (x) => {
     return x.value;
 };
 export let _$n__ADD_ = (x, y) => {
@@ -1208,10 +1208,9 @@ export function invoke_method_closure(p) {
         return invoke_method(p, obj, ...args);
     };
 }
-export function invoke_method(p, obj, ...args) {
+function lookup_class(obj) {
     let klass;
     let tag;
-    let value = obj;
     if (obj == null) {
         tag = "&core-nil-class";
         klass = calcit_builtin_classes.nil;
@@ -1259,19 +1258,18 @@ export function invoke_method(p, obj, ...args) {
         klass = calcit_builtin_classes.map;
     }
     else {
-        if (obj[p] == null) {
-            throw new Error(`Missing method \`${p}\` on object`);
-        }
-        return obj[p](...args); // trying to call native JavaScript method
-    }
-    if (klass == null)
         throw new Error("Cannot find class for this object for invoking");
-    if (!klass.contains(p)) {
-        throw new Error(`Missing method '.${p}' for '${tag}' object '${obj}'.\navailable fields are: ${klass.fields.map((fd) => fd.value).join(" ")}`);
     }
-    let method = klass.get(p);
+    return [klass, tag];
+}
+export function invoke_method(p, obj, ...args) {
+    let [klass, tag] = lookup_class(obj);
+    let method = klass.getOrNil(p);
+    if (method == null) {
+        throw new Error(`No method '.${p}' for '${tag}' object '${obj}'.\navailable fields are: ${klass.fields.map((fd) => fd.value).join(" ")}`);
+    }
     if (typeof method === "function") {
-        return method(value, ...args);
+        return method(obj, ...args);
     }
     else {
         throw new Error("Method for invoking is not a function");

package/lib/js-record.mjs

@@ -27,6 +27,16 @@ export class CalcitRecord {
             throw new Error(`Cannot find :${field} among (${this.fields.join(",")})`);
         }
     }
+    getOrNil(k) {
+        let field = castTag(k);
+        let idx = findInFields(this.fields, field);
+        if (idx >= 0) {
+            return this.values[idx];
+        }
+        else {
+            return undefined;
+        }
+    }
     assoc(k, v) {
         let values = new Array(this.fields.length);
         let k_id = castTag(k);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.8.2",
+  "version": "0.8.4",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^20.6.2",
@@ -12,7 +12,7 @@
     "cp-mac": "cargo build --release && rm -rfv builds/* && node scripts/cp-version.js && scp builds/* rsync-user@calcit-lang.org:/web-assets/repo/calcit-lang/binaries/macos/",
     "eval": "cargo run --bin cr -- -e",
     "try-rs": "cargo run --bin cr -- calcit/test.cirru -1",
-    "try-js-brk": "cargo run --bin cr -- calcit/test.cirru --emit-js -1 && node js-out/main.mjs",
+    "try-js-brk": "cargo run --bin cr -- calcit/test.cirru --emit-js -1 && node --inspect-brk js-out/main.mjs",
     "try-js": "cargo run --bin cr -- calcit/test.cirru --emit-js -1 && node js-out/main.mjs"
   },
   "repository": {

package/ts-src/calcit-data.mts

@@ -437,6 +437,14 @@ export let to_js_data = (x: CalcitValue, addColon: boolean = false): any => {
     }
     return Symbol(x.value);
   }
+  if (x instanceof CalcitTuple) {
+    var result: any[] = [to_js_data(x.tag)];
+    for (let i = 0; i < x.extra.length; i++) {
+      let item = x.extra[i];
+      result.push(to_js_data(item));
+    }
+    return result;
+  }
   if (x instanceof CalcitList || x instanceof CalcitSliceList) {
     var result: any[] = [];
     for (let item of x.items()) {

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.8.2";
+export const calcit_version = "0.8.4";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
@@ -158,7 +158,7 @@ export let peekDefatom = (path: string): CalcitRef => {
   return refsRegistry.get(path);
 };
 
-export let deref = (x: CalcitRef): CalcitValue => {
+export let _$n_atom_$o_deref = (x: CalcitRef): CalcitValue => {
   return x.value;
 };
 
@@ -1309,10 +1309,9 @@ export function invoke_method_closure(p: string) {
   };
 }
 
-export function invoke_method(p: string, obj: CalcitValue, ...args: CalcitValue[]) {
+function lookup_class(obj: CalcitValue): [CalcitRecord, string] {
   let klass: CalcitRecord;
   let tag: string;
-  let value = obj;
   if (obj == null) {
     tag = "&core-nil-class";
     klass = calcit_builtin_classes.nil;
@@ -1349,20 +1348,19 @@ export function invoke_method(p: string, obj: CalcitValue, ...args: CalcitValue[
     tag = "&core-map-class";
     klass = calcit_builtin_classes.map;
   } else {
-    if ((obj as any)[p] == null) {
-      throw new Error(`Missing method \`${p}\` on object`);
-    }
-    return (obj as any)[p](...args); // trying to call native JavaScript method
+    throw new Error("Cannot find class for this object for invoking");
   }
-  if (klass == null) throw new Error("Cannot find class for this object for invoking");
+  return [klass, tag];
+}
 
-  if (!klass.contains(p)) {
-    throw new Error(`Missing method '.${p}' for '${tag}' object '${obj}'.\navailable fields are: ${klass.fields.map((fd: CalcitTag) => fd.value).join(" ")}`);
+export function invoke_method(p: string, obj: CalcitValue, ...args: CalcitValue[]) {
+  let [klass, tag] = lookup_class(obj);
+  let method = klass.getOrNil(p);
+  if (method == null) {
+    throw new Error(`No method '.${p}' for '${tag}' object '${obj}'.\navailable fields are: ${klass.fields.map((fd: CalcitTag) => fd.value).join(" ")}`);
   }
-
-  let method = klass.get(p);
   if (typeof method === "function") {
-    return method(value, ...args);
+    return method(obj, ...args);
   } else {
     throw new Error("Method for invoking is not a function");
   }

package/ts-src/js-record.mts

@@ -34,6 +34,15 @@ export class CalcitRecord {
       throw new Error(`Cannot find :${field} among (${this.fields.join(",")})`);
     }
   }
+  getOrNil(k: CalcitValue) {
+    let field = castTag(k);
+    let idx = findInFields(this.fields, field);
+    if (idx >= 0) {
+      return this.values[idx];
+    } else {
+      return undefined;
+    }
+  }
   assoc(k: CalcitValue, v: CalcitValue): CalcitRecord {
     let values: Array<CalcitValue> = new Array(this.fields.length);
     let k_id = castTag(k);