@calcit/procs 0.6.10 → 0.6.11

package/.vscode/launch.json

@@ -0,0 +1,101 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug unit tests in library 'calcit'",
+      "cargo": {
+        "args": [
+          "test",
+          "--no-run",
+          "--lib",
+          "--package=calcit"
+        ],
+        "filter": {
+          "name": "calcit",
+          "kind": "lib"
+        }
+      },
+      "args": [],
+      "cwd": "${workspaceFolder}"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug executable 'cr'",
+      "cargo": {
+        "args": [
+          "build",
+          "--bin=cr",
+          "--package=calcit"
+        ],
+        "filter": {
+          "name": "cr",
+          "kind": "bin"
+        }
+      },
+      "args": [],
+      "cwd": "${workspaceFolder}"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug unit tests in executable 'cr'",
+      "cargo": {
+        "args": [
+          "test",
+          "--no-run",
+          "--bin=cr",
+          "--package=calcit"
+        ],
+        "filter": {
+          "name": "cr",
+          "kind": "bin"
+        }
+      },
+      "args": [],
+      "cwd": "${workspaceFolder}"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug executable 'bundle_calcit'",
+      "cargo": {
+        "args": [
+          "build",
+          "--bin=bundle_calcit",
+          "--package=calcit"
+        ],
+        "filter": {
+          "name": "bundle_calcit",
+          "kind": "bin"
+        }
+      },
+      "args": [],
+      "cwd": "${workspaceFolder}"
+    },
+    {
+      "type": "lldb",
+      "request": "launch",
+      "name": "Debug unit tests in executable 'bundle_calcit'",
+      "cargo": {
+        "args": [
+          "test",
+          "--no-run",
+          "--bin=bundle_calcit",
+          "--package=calcit"
+        ],
+        "filter": {
+          "name": "bundle_calcit",
+          "kind": "bin"
+        }
+      },
+      "args": [],
+      "cwd": "${workspaceFolder}"
+    }
+  ]
+}

package/.vscode/settings.json

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

package/lib/calcit-data.mjs

@@ -255,7 +255,8 @@ export let hashFunction = (x) => {
         let base = defaultHash_map;
         let pairs = x.pairs();
         pairs.sort((a, b) => _$n_compare(a[0], b[0]));
-        for (let [k, v] of pairs) {
+        for (let idx = 0; idx < pairs.length; idx++) {
+            let [k, v] = pairs[idx];
             base = mergeValueHash(base, hashFunction(k));
             base = mergeValueHash(base, hashFunction(v));
         }
@@ -266,7 +267,8 @@ export let hashFunction = (x) => {
         let base = defaultHash_map;
         let pairs = x.pairs();
         pairs.sort((a, b) => _$n_compare(a[0], b[0]));
-        for (let [k, v] of pairs) {
+        for (let idx = 0; idx < pairs.length; idx++) {
+            let [k, v] = pairs[idx];
             base = mergeValueHash(base, hashFunction(k));
             base = mergeValueHash(base, hashFunction(v));
         }
@@ -407,7 +409,9 @@ export let to_js_data = (x, addColon = false) => {
     }
     if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
         let result = {};
-        for (let [k, v] of x.pairs()) {
+        let pairs = x.pairs();
+        for (let idx = 0; idx < pairs.length; idx++) {
+            let [k, v] = pairs[idx];
             var key = to_js_data(k, addColon);
             result[key] = to_js_data(v, addColon);
         }
@@ -511,7 +515,9 @@ export let _$n__$e_ = (x, y) => {
             if (x.len() !== y.len()) {
                 return false;
             }
-            for (let [k, v] of x.pairs()) {
+            let pairs = x.pairs();
+            for (let idx = 0; idx < pairs.length; idx++) {
+                let [k, v] = pairs[idx];
                 if (!y.contains(k)) {
                     return false;
                 }

package/lib/calcit.procs.mjs

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.6.10";
+export const calcit_version = "0.6.11";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 import "./js-primes.mjs";
@@ -201,7 +201,9 @@ export let _$n_list_$o_includes_$q_ = (xs, x) => {
 };
 export let _$n_map_$o_includes_$q_ = (xs, x) => {
     if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
-        for (let [k, v] of xs.pairs()) {
+        let pairs = xs.pairs();
+        for (let idx = 0; idx < pairs.length; idx = idx + 1) {
+            let v = pairs[idx][1];
             if (_$n__$e_(v, x)) {
                 return true;
             }
@@ -566,7 +568,8 @@ export let _$n_list_$o_slice = (xs, from, to) => {
 };
 export let _$n_list_$o_concat = (...lists) => {
     let result = new CalcitSliceList([]);
-    for (let item of lists) {
+    for (let idx = 0; idx < lists.length; idx++) {
+        let item = lists[idx];
         if (item == null) {
             continue;
         }
@@ -653,10 +656,12 @@ export let _$n_merge = (a, b) => {
     if (a instanceof CalcitRecord) {
         if (b instanceof CalcitMap || b instanceof CalcitSliceMap) {
             let values = [];
-            for (let item of a.values) {
-                values.push(item);
+            for (let idx = 0; idx < a.values.length; idx++) {
+                values.push(a.values[idx]);
             }
-            for (let [k, v] of b.pairs()) {
+            let pairs = b.pairs();
+            for (let idx = 0; idx < pairs.length; idx++) {
+                let [k, v] = pairs[idx];
                 let field;
                 if (k instanceof CalcitKeyword) {
                     field = k;
@@ -664,9 +669,9 @@ export let _$n_merge = (a, b) => {
                 else {
                     field = kwd(getStringName(k));
                 }
-                let idx = a.findIndex(field);
-                if (idx >= 0) {
-                    values[idx] = v;
+                let position = a.findIndex(field);
+                if (position >= 0) {
+                    values[position] = v;
                 }
                 else {
                     throw new Error(`Cannot find field ${field} among (${a.fields.join(", ")})`);
@@ -695,8 +700,9 @@ export let _$n_merge_non_nil = (a, b) => {
 export let to_pairs = (xs) => {
     if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
         let result = [];
-        for (let [k, v] of xs.pairs()) {
-            result.push(new CalcitSliceList([k, v]));
+        let pairs = xs.pairs();
+        for (let idx = 0; idx < pairs.length; idx++) {
+            result.push(new CalcitSliceList(pairs[idx]));
         }
         return new CalcitSet(result);
     }
@@ -1166,65 +1172,71 @@ let calcit_builtin_classes = {
 export let register_calcit_builtin_classes = (options) => {
     Object.assign(calcit_builtin_classes, options);
 };
-export function invoke_method(p) {
+/** method used as closure */
+export function invoke_method_closure(p) {
     return (obj, ...args) => {
-        let klass;
-        let value = obj;
-        if (obj == null) {
-            klass = calcit_builtin_classes.nil;
-        }
-        else if (obj instanceof CalcitTuple) {
-            if (obj.fst instanceof CalcitRecord) {
-                klass = obj.fst;
-            }
-            else {
-                throw new Error("Method invoking expected a record as class");
-            }
-        }
-        else if (typeof obj === "number") {
-            klass = calcit_builtin_classes.number;
-        }
-        else if (typeof obj === "string") {
-            klass = calcit_builtin_classes.string;
-        }
-        else if (typeof obj === "function") {
-            klass = calcit_builtin_classes.fn;
-        }
-        else if (obj instanceof CalcitSet) {
-            klass = calcit_builtin_classes.set;
-        }
-        else if (obj instanceof CalcitList || obj instanceof CalcitSliceList) {
-            klass = calcit_builtin_classes.list;
-        }
-        else if (obj instanceof CalcitRecord) {
-            klass = calcit_builtin_classes.record;
-        }
-        else if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
-            klass = calcit_builtin_classes.map;
+        return invoke_method(p, obj, ...args);
+    };
+}
+export function invoke_method(p, obj, ...args) {
+    let klass;
+    let value = obj;
+    if (obj == null) {
+        klass = calcit_builtin_classes.nil;
+    }
+    else if (obj instanceof CalcitTuple) {
+        if (obj.fst instanceof CalcitRecord) {
+            klass = obj.fst;
         }
         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 object: ${obj}`);
-        let method = klass.get(p);
-        if (typeof method === "function") {
-            return method(value, ...args);
+            throw new Error("Method invoking expected a record as class");
         }
-        else {
-            throw new Error("Method for invoking is not a function");
+    }
+    else if (typeof obj === "number") {
+        klass = calcit_builtin_classes.number;
+    }
+    else if (typeof obj === "string") {
+        klass = calcit_builtin_classes.string;
+    }
+    else if (typeof obj === "function") {
+        klass = calcit_builtin_classes.fn;
+    }
+    else if (obj instanceof CalcitSet) {
+        klass = calcit_builtin_classes.set;
+    }
+    else if (obj instanceof CalcitList || obj instanceof CalcitSliceList) {
+        klass = calcit_builtin_classes.list;
+    }
+    else if (obj instanceof CalcitRecord) {
+        klass = calcit_builtin_classes.record;
+    }
+    else if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
+        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 object: ${obj}`);
+    let method = klass.get(p);
+    if (typeof method === "function") {
+        return method(value, ...args);
+    }
+    else {
+        throw new Error("Method for invoking is not a function");
+    }
 }
 export let _$n_map_$o_to_list = (m) => {
     if (m instanceof CalcitMap || m instanceof CalcitSliceMap) {
         let ys = [];
-        for (let pair of m.pairs()) {
+        let pairs = m.pairs();
+        for (let idx = 0; idx < pairs.length; idx++) {
+            let pair = pairs[idx];
             ys.push(new CalcitSliceList(pair));
         }
         return new CalcitSliceList(ys);

package/lib/custom-formatter.mjs

@@ -118,7 +118,8 @@ export let load_console_formatter_$x_ = () => {
                     if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
                         let ret = ["div", { style: "color: hsl(280, 80%, 60%)" }];
                         let pairs = obj.pairs();
-                        for (let [k, v] of pairs) {
+                        for (let idx = 0; idx < pairs.length; idx++) {
+                            let [k, v] = pairs[idx];
                             ret.push([
                                 "div",
                                 { style: "margin-left: 8px; display: flex;" },

package/lib/js-cirru.mjs

@@ -30,7 +30,8 @@ export let format_cirru = (data, useInline) => {
     if (!Array.isArray(chunk)) {
         throw new Error("Expected data of list");
     }
-    for (let item of chunk) {
+    for (let idx = 0; idx < chunk.length; idx++) {
+        let item = chunk[idx];
         if (!Array.isArray(item)) {
             throw new Error("Expected data in a list of lists");
         }
@@ -66,11 +67,12 @@ export let to_cirru_edn = (x) => {
     }
     if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
         let buffer = ["{}"];
-        let pairs = [];
-        for (let pair of x.pairs()) {
-            pairs.push(pair);
+        let pairs_buffer = [];
+        let pairs = x.pairs();
+        for (let idx = 0; idx < pairs.length; idx++) {
+            pairs_buffer.push(pairs[idx]);
         }
-        pairs.sort((a, b) => {
+        pairs_buffer.sort((a, b) => {
             let a0_literal = is_literal(a[0]);
             let a1_literal = is_literal(a[1]);
             let b0_literal = is_literal(b[0]);
@@ -96,7 +98,8 @@ export let to_cirru_edn = (x) => {
                 return _$n_compare(a[0], b[0]);
             }
         });
-        for (let [k, v] of pairs) {
+        for (let idx = 0; idx < pairs_buffer.length; idx++) {
+            let [k, v] = pairs_buffer[idx];
             buffer.push([to_cirru_edn(k), to_cirru_edn(v)]);
         }
         return buffer;

package/lib/js-list.mjs

@@ -323,7 +323,9 @@ export let foldl_shortcut = function (xs, acc, v0, f) {
     }
     if (xs instanceof CalcitSet) {
         let state = acc;
-        for (let item of xs.values()) {
+        let values = xs.values();
+        for (let idx = 0; idx < values.length; idx++) {
+            let item = values[idx];
             let pair = f(state, item);
             if (pair instanceof CalcitTuple) {
                 if (typeof pair.fst === "boolean") {
@@ -366,7 +368,9 @@ export let foldl_shortcut = function (xs, acc, v0, f) {
     }
     if (xs instanceof CalcitMap) {
         let state = acc;
-        for (let item of xs.pairs()) {
+        let pairs = xs.pairs();
+        for (let idx = 0; idx < pairs.length; idx++) {
+            let item = pairs[idx];
             let pair = f(state, new CalcitSliceList(item));
             if (pair instanceof CalcitTuple) {
                 if (typeof pair.fst === "boolean") {

package/lib/js-map.mjs

@@ -48,7 +48,9 @@ export class CalcitMap {
     }
     toString(shorter = false, disableJsDataWarning = false) {
         let itemsCode = "";
-        for (let [k, v] of this.pairs()) {
+        let pairs = this.pairs();
+        for (let idx = 0; idx < pairs.length; idx++) {
+            let [k, v] = pairs[idx];
             if (shorter) {
                 let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
                 let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
@@ -235,7 +237,9 @@ export class CalcitSliceMap {
     }
     toString(shorter = false, disableJsDataWarning = false) {
         let itemsCode = "";
-        for (let [k, v] of this.pairs()) {
+        let pairs = this.pairs();
+        for (let idx = 0; idx < pairs.length; idx++) {
+            let [k, v] = pairs[idx];
             if (shorter) {
                 let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
                 let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);

package/lib/js-record.mjs

@@ -136,7 +136,8 @@ export let _$n_record_$o_from_map = (proto, data) => {
         }
         else {
             let values = [];
-            for (let field of proto.fields) {
+            for (let i = 0; i < proto.fields.length; i++) {
+                let field = proto.fields[i];
                 let idx = findInFields(data.fields, field);
                 if (idx < 0) {
                     throw new Error(`Cannot find field ${field} among ${data.fields}`);
@@ -147,22 +148,25 @@ export let _$n_record_$o_from_map = (proto, data) => {
         }
     }
     else if (data instanceof CalcitMap || data instanceof CalcitSliceMap) {
-        let pairs = [];
-        for (let [k, v] of data.pairs()) {
-            pairs.push([castKwd(k), v]);
+        let pairs_buffer = [];
+        let pairs = data.pairs();
+        for (let i = 0; i < pairs.length; i++) {
+            let [k, v] = pairs[i];
+            pairs_buffer.push([castKwd(k), v]);
         }
         // mutable sort
-        pairs.sort((pair1, pair2) => pair1[0].cmp(pair2[0]));
+        pairs_buffer.sort((pair1, pair2) => pair1[0].cmp(pair2[0]));
         let values = [];
-        outerLoop: for (let field of proto.fields) {
-            for (let idx = 0; idx < pairs.length; idx++) {
-                let pair = pairs[idx];
+        outerLoop: for (let i = 0; i < proto.fields.length; i++) {
+            let field = proto.fields[i];
+            for (let idx = 0; idx < pairs_buffer.length; idx++) {
+                let pair = pairs_buffer[idx];
                 if (pair[0] === field) {
                     values.push(pair[1]);
                     continue outerLoop; // dirty code for performance
                 }
             }
-            throw new Error(`Cannot find field ${field} among ${pairs}`);
+            throw new Error(`Cannot find field ${field} among ${pairs_buffer}`);
         }
         return new CalcitRecord(proto.name, proto.fields, values);
     }

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@calcit/procs",
-  "version": "0.6.10",
+  "version": "0.6.11",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^18.11.3",
+    "@types/node": "^18.11.9",
     "typescript": "^4.8.4"
   },
   "scripts": {

package/ts-src/calcit-data.mts

@@ -286,7 +286,8 @@ export let hashFunction = (x: CalcitValue): Hash => {
     let base = defaultHash_map;
     let pairs = x.pairs();
     pairs.sort((a, b) => _$n_compare(a[0], b[0]));
-    for (let [k, v] of pairs) {
+    for (let idx = 0; idx < pairs.length; idx++) {
+      let [k, v] = pairs[idx];
       base = mergeValueHash(base, hashFunction(k));
       base = mergeValueHash(base, hashFunction(v));
     }
@@ -298,7 +299,8 @@ export let hashFunction = (x: CalcitValue): Hash => {
 
     let pairs = x.pairs();
     pairs.sort((a, b) => _$n_compare(a[0], b[0]));
-    for (let [k, v] of pairs) {
+    for (let idx = 0; idx < pairs.length; idx++) {
+      let [k, v] = pairs[idx];
       base = mergeValueHash(base, hashFunction(k));
       base = mergeValueHash(base, hashFunction(v));
     }
@@ -441,7 +443,9 @@ export let to_js_data = (x: CalcitValue, addColon: boolean = false): any => {
   }
   if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
     let result: Record<string, CalcitValue> = {};
-    for (let [k, v] of x.pairs()) {
+    let pairs = x.pairs();
+    for (let idx = 0; idx < pairs.length; idx++) {
+      let [k, v] = pairs[idx];
       var key = to_js_data(k, addColon);
       result[key] = to_js_data(v, addColon);
     }
@@ -552,7 +556,9 @@ export let _$n__$e_ = (x: CalcitValue, y: CalcitValue): boolean => {
       if (x.len() !== y.len()) {
         return false;
       }
-      for (let [k, v] of x.pairs()) {
+      let pairs = x.pairs();
+      for (let idx = 0; idx < pairs.length; idx++) {
+        let [k, v] = pairs[idx];
         if (!y.contains(k)) {
           return false;
         }

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.6.10";
+export const calcit_version = "0.6.11";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
@@ -243,7 +243,9 @@ export let _$n_list_$o_includes_$q_ = (xs: CalcitValue, x: CalcitValue): boolean
 
 export let _$n_map_$o_includes_$q_ = (xs: CalcitValue, x: CalcitValue): boolean => {
   if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
-    for (let [k, v] of xs.pairs()) {
+    let pairs = xs.pairs();
+    for (let idx = 0; idx < pairs.length; idx = idx + 1) {
+      let v = pairs[idx][1];
       if (_$n__$e_(v, x)) {
         return true;
       }
@@ -637,7 +639,8 @@ export let _$n_list_$o_slice = (xs: CalcitList, from: number, to: number): Calci
 
 export let _$n_list_$o_concat = (...lists: (CalcitList | CalcitSliceList)[]): CalcitList | CalcitSliceList => {
   let result: CalcitSliceList | CalcitList = new CalcitSliceList([]);
-  for (let item of lists) {
+  for (let idx = 0; idx < lists.length; idx++) {
+    let item = lists[idx];
     if (item == null) {
       continue;
     }
@@ -726,19 +729,21 @@ export let _$n_merge = (a: CalcitValue, b: CalcitMap | CalcitSliceMap): CalcitVa
   if (a instanceof CalcitRecord) {
     if (b instanceof CalcitMap || b instanceof CalcitSliceMap) {
       let values = [];
-      for (let item of a.values) {
-        values.push(item);
+      for (let idx = 0; idx < a.values.length; idx++) {
+        values.push(a.values[idx]);
       }
-      for (let [k, v] of b.pairs()) {
+      let pairs = b.pairs();
+      for (let idx = 0; idx < pairs.length; idx++) {
+        let [k, v] = pairs[idx];
         let field: CalcitKeyword;
         if (k instanceof CalcitKeyword) {
           field = k;
         } else {
           field = kwd(getStringName(k));
         }
-        let idx = a.findIndex(field);
-        if (idx >= 0) {
-          values[idx] = v;
+        let position = a.findIndex(field);
+        if (position >= 0) {
+          values[position] = v;
         } else {
           throw new Error(`Cannot find field ${field} among (${a.fields.join(", ")})`);
         }
@@ -769,8 +774,9 @@ export let _$n_merge_non_nil = (a: CalcitMap | CalcitSliceMap, b: CalcitMap | Ca
 export let to_pairs = (xs: CalcitValue): CalcitValue | CalcitSliceList => {
   if (xs instanceof CalcitMap || xs instanceof CalcitSliceMap) {
     let result: Array<CalcitSliceList> = [];
-    for (let [k, v] of xs.pairs()) {
-      result.push(new CalcitSliceList([k, v]));
+    let pairs = xs.pairs();
+    for (let idx = 0; idx < pairs.length; idx++) {
+      result.push(new CalcitSliceList(pairs[idx]));
     }
     return new CalcitSet(result);
   } else if (xs instanceof CalcitRecord) {
@@ -1267,55 +1273,62 @@ export let register_calcit_builtin_classes = (options: typeof calcit_builtin_cla
   Object.assign(calcit_builtin_classes, options);
 };
 
-export function invoke_method(p: string) {
+/** method used as closure */
+export function invoke_method_closure(p: string) {
   return (obj: CalcitValue, ...args: CalcitValue[]) => {
-    let klass: CalcitRecord;
-    let value = obj;
-    if (obj == null) {
-      klass = calcit_builtin_classes.nil;
-    } else if (obj instanceof CalcitTuple) {
-      if (obj.fst instanceof CalcitRecord) {
-        klass = obj.fst;
-      } else {
-        throw new Error("Method invoking expected a record as class");
-      }
-    } else if (typeof obj === "number") {
-      klass = calcit_builtin_classes.number;
-    } else if (typeof obj === "string") {
-      klass = calcit_builtin_classes.string;
-    } else if (typeof obj === "function") {
-      klass = calcit_builtin_classes.fn;
-    } else if (obj instanceof CalcitSet) {
-      klass = calcit_builtin_classes.set;
-    } else if (obj instanceof CalcitList || obj instanceof CalcitSliceList) {
-      klass = calcit_builtin_classes.list;
-    } else if (obj instanceof CalcitRecord) {
-      klass = calcit_builtin_classes.record;
-    } else if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
-      klass = calcit_builtin_classes.map;
+    return invoke_method(p, obj, ...args);
+  };
+}
+
+export function invoke_method(p: string, obj: CalcitValue, ...args: CalcitValue[]) {
+  let klass: CalcitRecord;
+  let value = obj;
+  if (obj == null) {
+    klass = calcit_builtin_classes.nil;
+  } else if (obj instanceof CalcitTuple) {
+    if (obj.fst instanceof CalcitRecord) {
+      klass = obj.fst;
     } 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("Method invoking expected a record as class");
+    }
+  } else if (typeof obj === "number") {
+    klass = calcit_builtin_classes.number;
+  } else if (typeof obj === "string") {
+    klass = calcit_builtin_classes.string;
+  } else if (typeof obj === "function") {
+    klass = calcit_builtin_classes.fn;
+  } else if (obj instanceof CalcitSet) {
+    klass = calcit_builtin_classes.set;
+  } else if (obj instanceof CalcitList || obj instanceof CalcitSliceList) {
+    klass = calcit_builtin_classes.list;
+  } else if (obj instanceof CalcitRecord) {
+    klass = calcit_builtin_classes.record;
+  } else if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
+    klass = calcit_builtin_classes.map;
+  } else {
+    if ((obj as any)[p] == null) {
+      throw new Error(`Missing method \`${p}\` on object`);
     }
-    if (klass == null) throw new Error("Cannot find class for this object for invoking");
+    return (obj as any)[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 object: ${obj}`);
+  if (!klass.contains(p)) throw new Error(`Missing method '${p}' for object: ${obj}`);
 
-    let method = klass.get(p);
-    if (typeof method === "function") {
-      return method(value, ...args);
-    } else {
-      throw new Error("Method for invoking is not a function");
-    }
-  };
+  let method = klass.get(p);
+  if (typeof method === "function") {
+    return method(value, ...args);
+  } else {
+    throw new Error("Method for invoking is not a function");
+  }
 }
 
 export let _$n_map_$o_to_list = (m: CalcitValue): CalcitSliceList => {
   if (m instanceof CalcitMap || m instanceof CalcitSliceMap) {
     let ys = [];
-    for (let pair of m.pairs()) {
+    let pairs = m.pairs();
+    for (let idx = 0; idx < pairs.length; idx++) {
+      let pair = pairs[idx];
       ys.push(new CalcitSliceList(pair));
     }
     return new CalcitSliceList(ys);

package/ts-src/custom-formatter.mts

@@ -133,7 +133,8 @@ export let load_console_formatter_$x_ = () => {
           if (obj instanceof CalcitMap || obj instanceof CalcitSliceMap) {
             let ret: any[] = ["div", { style: "color: hsl(280, 80%, 60%)" }];
             let pairs = obj.pairs();
-            for (let [k, v] of pairs) {
+            for (let idx = 0; idx < pairs.length; idx++) {
+              let [k, v] = pairs[idx];
               ret.push([
                 "div",
                 { style: "margin-left: 8px; display: flex;" },

package/ts-src/js-cirru.mts

@@ -36,7 +36,8 @@ export let format_cirru = (data: CalcitCirruQuote | CalcitList, useInline: boole
   if (!Array.isArray(chunk)) {
     throw new Error("Expected data of list");
   }
-  for (let item of chunk) {
+  for (let idx = 0; idx < chunk.length; idx++) {
+    let item = chunk[idx];
     if (!Array.isArray(item)) {
       throw new Error("Expected data in a list of lists");
     }
@@ -73,11 +74,12 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
   }
   if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
     let buffer: CirruEdnFormat = ["{}"];
-    let pairs: [CalcitValue, CalcitValue][] = [];
-    for (let pair of x.pairs()) {
-      pairs.push(pair);
+    let pairs_buffer: [CalcitValue, CalcitValue][] = [];
+    let pairs = x.pairs();
+    for (let idx = 0; idx < pairs.length; idx++) {
+      pairs_buffer.push(pairs[idx]);
     }
-    pairs.sort((a, b) => {
+    pairs_buffer.sort((a, b) => {
       let a0_literal = is_literal(a[0]);
       let a1_literal = is_literal(a[1]);
       let b0_literal = is_literal(b[0]);
@@ -98,7 +100,8 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
         return _$n_compare(a[0], b[0]);
       }
     });
-    for (let [k, v] of pairs) {
+    for (let idx = 0; idx < pairs_buffer.length; idx++) {
+      let [k, v] = pairs_buffer[idx];
       buffer.push([to_cirru_edn(k), to_cirru_edn(v)]);
     }
     return buffer;

package/ts-src/js-list.mts

@@ -340,7 +340,9 @@ export let foldl_shortcut = function (xs: CalcitValue, acc: CalcitValue, v0: Cal
   }
   if (xs instanceof CalcitSet) {
     let state = acc;
-    for (let item of xs.values()) {
+    let values = xs.values();
+    for (let idx = 0; idx < values.length; idx++) {
+      let item = values[idx];
       let pair = f(state, item);
       if (pair instanceof CalcitTuple) {
         if (typeof pair.fst === "boolean") {
@@ -379,7 +381,9 @@ export let foldl_shortcut = function (xs: CalcitValue, acc: CalcitValue, v0: Cal
   }
   if (xs instanceof CalcitMap) {
     let state = acc;
-    for (let item of xs.pairs()) {
+    let pairs = xs.pairs();
+    for (let idx = 0; idx < pairs.length; idx++) {
+      let item = pairs[idx];
       let pair = f(state, new CalcitSliceList(item));
       if (pair instanceof CalcitTuple) {
         if (typeof pair.fst === "boolean") {

package/ts-src/js-map.mts

@@ -68,7 +68,9 @@ export class CalcitMap {
   }
   toString(shorter = false, disableJsDataWarning = false) {
     let itemsCode = "";
-    for (let [k, v] of this.pairs()) {
+    let pairs = this.pairs();
+    for (let idx = 0; idx < pairs.length; idx++) {
+      let [k, v] = pairs[idx];
       if (shorter) {
         let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
         let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);
@@ -254,7 +256,9 @@ export class CalcitSliceMap {
   }
   toString(shorter = false, disableJsDataWarning = false) {
     let itemsCode = "";
-    for (let [k, v] of this.pairs()) {
+    let pairs = this.pairs();
+    for (let idx = 0; idx < pairs.length; idx++) {
+      let [k, v] = pairs[idx];
       if (shorter) {
         let keyPart = isNestedCalcitData(k) ? tipNestedCalcitData(k) : toString(k, true, disableJsDataWarning);
         let valuePart = isNestedCalcitData(v) ? tipNestedCalcitData(v) : toString(v, true, disableJsDataWarning);

package/ts-src/js-record.mts

@@ -143,7 +143,8 @@ export let _$n_record_$o_from_map = (proto: CalcitValue, data: CalcitValue): Cal
       return new CalcitRecord(proto.name, proto.fields, data.values);
     } else {
       let values: Array<CalcitValue> = [];
-      for (let field of proto.fields) {
+      for (let i = 0; i < proto.fields.length; i++) {
+        let field = proto.fields[i];
         let idx = findInFields(data.fields, field);
         if (idx < 0) {
           throw new Error(`Cannot find field ${field} among ${data.fields}`);
@@ -153,23 +154,26 @@ export let _$n_record_$o_from_map = (proto: CalcitValue, data: CalcitValue): Cal
       return new CalcitRecord(proto.name, proto.fields, values);
     }
   } else if (data instanceof CalcitMap || data instanceof CalcitSliceMap) {
-    let pairs: Array<[CalcitKeyword, CalcitValue]> = [];
-    for (let [k, v] of data.pairs()) {
-      pairs.push([castKwd(k), v]);
+    let pairs_buffer: Array<[CalcitKeyword, CalcitValue]> = [];
+    let pairs = data.pairs();
+    for (let i = 0; i < pairs.length; i++) {
+      let [k, v] = pairs[i];
+      pairs_buffer.push([castKwd(k), v]);
     }
     // mutable sort
-    pairs.sort((pair1, pair2) => pair1[0].cmp(pair2[0]));
+    pairs_buffer.sort((pair1, pair2) => pair1[0].cmp(pair2[0]));
 
     let values: Array<CalcitValue> = [];
-    outerLoop: for (let field of proto.fields) {
-      for (let idx = 0; idx < pairs.length; idx++) {
-        let pair = pairs[idx];
+    outerLoop: for (let i = 0; i < proto.fields.length; i++) {
+      let field = proto.fields[i];
+      for (let idx = 0; idx < pairs_buffer.length; idx++) {
+        let pair = pairs_buffer[idx];
         if (pair[0] === field) {
           values.push(pair[1]);
           continue outerLoop; // dirty code for performance
         }
       }
-      throw new Error(`Cannot find field ${field} among ${pairs}`);
+      throw new Error(`Cannot find field ${field} among ${pairs_buffer}`);
     }
     return new CalcitRecord(proto.name, proto.fields, values);
   } else {