@calcit/procs 0.6.10 → 0.6.11-a1

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-a1";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 import "./js-primes.mjs";
@@ -1166,60 +1166,64 @@ 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.6.10",
+  "version": "0.6.11-a1",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^18.11.3",

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-a1";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
@@ -1267,49 +1267,54 @@ 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 => {