@calcit/procs 0.7.0-a1 → 0.7.0-a2

package/lib/calcit-data.mjs

@@ -128,7 +128,7 @@ export function findInFields(xs, y) {
     return -1;
 }
 var tagRegistery = {};
-export let tag = (content) => {
+export let newTag = (content) => {
     let item = tagRegistery[content];
     if (item != null) {
         return item;
@@ -144,10 +144,10 @@ export let castTag = (x) => {
         return x;
     }
     if (typeof x === "string") {
-        return tag(x);
+        return newTag(x);
     }
     if (x instanceof CalcitSymbol) {
-        return tag(x.value);
+        return newTag(x.value);
     }
     throw new Error(`Cannot cast this to tag: ${x}`);
 };

package/lib/calcit.procs.mjs

@@ -1,9 +1,9 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.7.0-a1";
+export const calcit_version = "0.7.0-a2";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
-import { CalcitSymbol, CalcitTag, CalcitRef, CalcitRecur, tag, refsRegistry, toString, getStringName, _$n__$e_, hashFunction, } from "./calcit-data.mjs";
+import { CalcitSymbol, CalcitTag, CalcitRef, CalcitRecur, newTag, refsRegistry, toString, getStringName, _$n__$e_, hashFunction, } from "./calcit-data.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 export * from "./calcit-data.mjs";
 export * from "./js-record.mjs";
@@ -23,53 +23,53 @@ import { to_calcit_data, extract_cirru_edn, CalcitCirruQuote } from "./js-cirru.
 let inNodeJs = typeof process !== "undefined" && ((_a = process === null || process === void 0 ? void 0 : process.release) === null || _a === void 0 ? void 0 : _a.name) === "node";
 export let type_of = (x) => {
     if (typeof x === "string") {
-        return tag("string");
+        return newTag("string");
     }
     if (typeof x === "number") {
-        return tag("number");
+        return newTag("number");
     }
     if (x instanceof CalcitTag) {
-        return tag("tag");
+        return newTag("tag");
     }
     if (x instanceof CalcitList || x instanceof CalcitSliceList) {
-        return tag("list");
+        return newTag("list");
     }
     if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
-        return tag("map");
+        return newTag("map");
     }
     if (x == null) {
-        return tag("nil");
+        return newTag("nil");
     }
     if (x instanceof CalcitRef) {
-        return tag("ref");
+        return newTag("ref");
     }
     if (x instanceof CalcitTuple) {
-        return tag("tuple");
+        return newTag("tuple");
     }
     if (x instanceof CalcitSymbol) {
-        return tag("symbol");
+        return newTag("symbol");
     }
     if (x instanceof CalcitSet) {
-        return tag("set");
+        return newTag("set");
     }
     if (x instanceof CalcitRecord) {
-        return tag("record");
+        return newTag("record");
     }
     if (x instanceof CalcitCirruQuote) {
-        return tag("cirru-quote");
+        return newTag("cirru-quote");
     }
     if (x === true || x === false) {
-        return tag("bool");
+        return newTag("bool");
     }
     if (typeof x === "function") {
         if (x.isMacro) {
             // this is faked...
-            return tag("macro");
+            return newTag("macro");
         }
-        return tag("fn");
+        return newTag("fn");
     }
     if (typeof x === "object") {
-        return tag("js-object");
+        return newTag("js-object");
     }
     throw new Error(`Unknown data ${x}`);
 };
@@ -492,7 +492,7 @@ export let recur = (...xs) => {
     return new CalcitRecur(xs);
 };
 export let _$n_get_calcit_backend = () => {
-    return tag("js");
+    return newTag("js");
 };
 export let not = (x) => {
     return !x;
@@ -674,7 +674,7 @@ export let _$n_merge = (a, b) => {
                     field = k;
                 }
                 else {
-                    field = tag(getStringName(k));
+                    field = newTag(getStringName(k));
                 }
                 let position = a.findIndex(field);
                 if (position >= 0) {
@@ -894,13 +894,13 @@ export let get_env = (name, v0) => {
 };
 export let turn_tag = (x) => {
     if (typeof x === "string") {
-        return tag(x);
+        return newTag(x);
     }
     if (x instanceof CalcitTag) {
         return x;
     }
     if (x instanceof CalcitSymbol) {
-        return tag(x.value);
+        return newTag(x.value);
     }
     console.error(x);
     throw new Error("Unexpected data for tag");
@@ -1161,8 +1161,12 @@ export let _$n_js_object = (...xs) => {
     }
     return ret;
 };
-export let _$o__$o_ = (tag, ...extra) => {
-    return new CalcitTuple(tag, extra);
+export let _$o__$o_ = (tagName, ...extra) => {
+    let klass = new CalcitRecord(newTag("base-class"), [], []);
+    return new CalcitTuple(tagName, extra, klass);
+};
+export let _PCT__$o__$o_ = (klass, tag, ...extra) => {
+    return new CalcitTuple(tag, extra, klass);
 };
 // mutable place for core to register
 let calcit_builtin_classes = {
@@ -1192,8 +1196,8 @@ export function invoke_method(p, obj, ...args) {
         klass = calcit_builtin_classes.nil;
     }
     else if (obj instanceof CalcitTuple) {
-        if (obj.tag instanceof CalcitRecord) {
-            klass = obj.tag;
+        if (obj.klass instanceof CalcitRecord) {
+            klass = obj.klass;
         }
         else {
             throw new Error("Method invoking expected a record as class");
@@ -1322,7 +1326,7 @@ export let _$n_str_$o_pad_right = (s, size, pattern) => {
     return s.padEnd(size, pattern);
 };
 export let _$n_get_os = () => {
-    return tag("js-engine");
+    return newTag("js-engine");
 };
 export let _$n_buffer = (...xs) => {
     let buf = new Uint8Array(xs.length);

package/lib/js-cirru.mjs

@@ -4,7 +4,7 @@ import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { CalcitSet } from "./js-set.mjs";
-import { CalcitTag, CalcitSymbol, CalcitRecur, CalcitRef, tag } from "./calcit-data.mjs";
+import { CalcitTag, CalcitSymbol, CalcitRecur, CalcitRef, newTag } from "./calcit-data.mjs";
 import { CalcitTuple } from "./js-tuple.mjs";
 export class CalcitCirruQuote {
     constructor(value) {
@@ -140,10 +140,10 @@ export let to_cirru_edn = (x) => {
 /** makes sure we got string */
 let extractFieldTag = (x) => {
     if (x[0] === ":") {
-        return tag(x.slice(1));
+        return newTag(x.slice(1));
     }
     else {
-        return tag(x);
+        return newTag(x);
     }
 };
 export let extract_cirru_edn = (x) => {
@@ -164,7 +164,7 @@ export let extract_cirru_edn = (x) => {
             return x.slice(1);
         }
         if (x[0] === ":") {
-            return tag(x.slice(1));
+            return newTag(x.slice(1));
         }
         if (x[0] === "'") {
             return new CalcitSymbol(x.slice(1));
@@ -248,7 +248,8 @@ export let extract_cirru_edn = (x) => {
             if (x.length < 3) {
                 throw new Error("tuple expects at least 2 values");
             }
-            return new CalcitTuple(extract_cirru_edn(x[1]), x.slice(2).map(extract_cirru_edn));
+            let baseClass = new CalcitRecord(newTag("base-class"), [], []);
+            return new CalcitTuple(extract_cirru_edn(x[1]), x.slice(2).map(extract_cirru_edn), baseClass);
         }
     }
     console.error(x);
@@ -282,7 +283,7 @@ export let to_calcit_data = (x, noKeyword = false) => {
         return x;
     if (typeof x === "string") {
         if (!noKeyword && x[0] === ":" && x.slice(1).match(/^[\w\d_\?\!\-]+$/)) {
-            return tag(x.slice(1));
+            return newTag(x.slice(1));
         }
         return x;
     }

package/lib/js-tuple.mjs

@@ -1,8 +1,9 @@
 import { toString } from "./calcit-data.mjs";
 export class CalcitTuple {
-    constructor(tag, extra) {
-        this.tag = tag;
+    constructor(tagName, extra, klass) {
+        this.tag = tagName;
         this.extra = extra;
+        this.klass = klass;
         this.cachedHash = null;
     }
     get(n) {
@@ -18,12 +19,12 @@ export class CalcitTuple {
     }
     assoc(n, v) {
         if (n === 0) {
-            return new CalcitTuple(v, this.extra);
+            return new CalcitTuple(v, this.extra, this.klass);
         }
         else if (n - 1 < this.extra.length) {
             let next_extra = this.extra.slice();
             next_extra[n - 1] = v;
-            return new CalcitTuple(this.tag, next_extra);
+            return new CalcitTuple(this.tag, next_extra, this.klass);
         }
         else {
             throw new Error(`Tuple only have ${this.extra.length} elements`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.7.0-a1",
+  "version": "0.7.0-a2",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
     "@types/node": "^20.2.3",

package/ts-src/calcit-data.mts

@@ -154,7 +154,7 @@ export function findInFields(xs: Array<CalcitTag>, y: CalcitTag): number {
 
 var tagRegistery: Record<string, CalcitTag> = {};
 
-export let tag = (content: string) => {
+export let newTag = (content: string) => {
   let item = tagRegistery[content];
   if (item != null) {
     return item;
@@ -170,10 +170,10 @@ export let castTag = (x: CalcitValue): CalcitTag => {
     return x;
   }
   if (typeof x === "string") {
-    return tag(x);
+    return newTag(x);
   }
   if (x instanceof CalcitSymbol) {
-    return tag(x.value);
+    return newTag(x.value);
   }
   throw new Error(`Cannot cast this to tag: ${x}`);
 };

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.7.0-a1";
+export const calcit_version = "0.7.0-a2";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
@@ -11,7 +11,7 @@ import {
   CalcitRef,
   CalcitFn,
   CalcitRecur,
-  tag,
+  newTag,
   refsRegistry,
   toString,
   getStringName,
@@ -43,53 +43,53 @@ let inNodeJs = typeof process !== "undefined" && process?.release?.name === "nod
 
 export let type_of = (x: any): CalcitTag => {
   if (typeof x === "string") {
-    return tag("string");
+    return newTag("string");
   }
   if (typeof x === "number") {
-    return tag("number");
+    return newTag("number");
   }
   if (x instanceof CalcitTag) {
-    return tag("tag");
+    return newTag("tag");
   }
   if (x instanceof CalcitList || x instanceof CalcitSliceList) {
-    return tag("list");
+    return newTag("list");
   }
   if (x instanceof CalcitMap || x instanceof CalcitSliceMap) {
-    return tag("map");
+    return newTag("map");
   }
   if (x == null) {
-    return tag("nil");
+    return newTag("nil");
   }
   if (x instanceof CalcitRef) {
-    return tag("ref");
+    return newTag("ref");
   }
   if (x instanceof CalcitTuple) {
-    return tag("tuple");
+    return newTag("tuple");
   }
   if (x instanceof CalcitSymbol) {
-    return tag("symbol");
+    return newTag("symbol");
   }
   if (x instanceof CalcitSet) {
-    return tag("set");
+    return newTag("set");
   }
   if (x instanceof CalcitRecord) {
-    return tag("record");
+    return newTag("record");
   }
   if (x instanceof CalcitCirruQuote) {
-    return tag("cirru-quote");
+    return newTag("cirru-quote");
   }
   if (x === true || x === false) {
-    return tag("bool");
+    return newTag("bool");
   }
   if (typeof x === "function") {
     if (x.isMacro) {
       // this is faked...
-      return tag("macro");
+      return newTag("macro");
     }
-    return tag("fn");
+    return newTag("fn");
   }
   if (typeof x === "object") {
-    return tag("js-object");
+    return newTag("js-object");
   }
   throw new Error(`Unknown data ${x}`);
 };
@@ -554,7 +554,7 @@ export let recur = (...xs: CalcitValue[]): CalcitRecur => {
 };
 
 export let _$n_get_calcit_backend = () => {
-  return tag("js");
+  return newTag("js");
 };
 
 export let not = (x: boolean): boolean => {
@@ -747,7 +747,7 @@ export let _$n_merge = (a: CalcitValue, b: CalcitMap | CalcitSliceMap): CalcitVa
         if (k instanceof CalcitTag) {
           field = k;
         } else {
-          field = tag(getStringName(k));
+          field = newTag(getStringName(k));
         }
         let position = a.findIndex(field);
         if (position >= 0) {
@@ -985,13 +985,13 @@ export let get_env = (name: string, v0: string): string => {
 
 export let turn_tag = (x: CalcitValue): CalcitTag => {
   if (typeof x === "string") {
-    return tag(x);
+    return newTag(x);
   }
   if (x instanceof CalcitTag) {
     return x;
   }
   if (x instanceof CalcitSymbol) {
-    return tag(x.value);
+    return newTag(x.value);
   }
   console.error(x);
   throw new Error("Unexpected data for tag");
@@ -1260,8 +1260,13 @@ export let _$n_js_object = (...xs: CalcitValue[]): Record<string, CalcitValue> =
   return ret;
 };
 
-export let _$o__$o_ = (tag: CalcitValue, ...extra: CalcitValue[]): CalcitTuple => {
-  return new CalcitTuple(tag, extra);
+export let _$o__$o_ = (tagName: CalcitValue, ...extra: CalcitValue[]): CalcitTuple => {
+  let klass = new CalcitRecord(newTag("base-class"), [], []);
+  return new CalcitTuple(tagName, extra, klass);
+};
+
+export let _PCT__$o__$o_ = (klass: CalcitRecord, tag: CalcitValue, ...extra: CalcitValue[]): CalcitTuple => {
+  return new CalcitTuple(tag, extra, klass);
 };
 
 // mutable place for core to register
@@ -1294,8 +1299,8 @@ export function invoke_method(p: string, obj: CalcitValue, ...args: CalcitValue[
   if (obj == null) {
     klass = calcit_builtin_classes.nil;
   } else if (obj instanceof CalcitTuple) {
-    if (obj.tag instanceof CalcitRecord) {
-      klass = obj.tag;
+    if (obj.klass instanceof CalcitRecord) {
+      klass = obj.klass;
     } else {
       throw new Error("Method invoking expected a record as class");
     }
@@ -1420,7 +1425,7 @@ export let _$n_str_$o_pad_right = (s: string, size: number, pattern: string): st
 };
 
 export let _$n_get_os = (): CalcitTag => {
-  return tag("js-engine");
+  return newTag("js-engine");
 };
 
 export let _$n_buffer = (...xs: CalcitValue[]): Uint8Array => {

package/ts-src/js-cirru.mts

@@ -6,7 +6,7 @@ import { CalcitList, CalcitSliceList } from "./js-list.mjs";
 import { CalcitRecord } from "./js-record.mjs";
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 import { CalcitSet } from "./js-set.mjs";
-import { CalcitTag, CalcitSymbol, CalcitRecur, CalcitRef, tag } from "./calcit-data.mjs";
+import { CalcitTag, CalcitSymbol, CalcitRecur, CalcitRef, newTag } from "./calcit-data.mjs";
 import { CalcitTuple } from "./js-tuple.mjs";
 
 type CirruEdnFormat = string | CirruEdnFormat[];
@@ -142,9 +142,9 @@ export let to_cirru_edn = (x: CalcitValue): CirruEdnFormat => {
 /** makes sure we got string */
 let extractFieldTag = (x: string) => {
   if (x[0] === ":") {
-    return tag(x.slice(1));
+    return newTag(x.slice(1));
   } else {
-    return tag(x);
+    return newTag(x);
   }
 };
 
@@ -166,7 +166,7 @@ export let extract_cirru_edn = (x: CirruEdnFormat): CalcitValue => {
       return x.slice(1);
     }
     if (x[0] === ":") {
-      return tag(x.slice(1));
+      return newTag(x.slice(1));
     }
     if (x[0] === "'") {
       return new CalcitSymbol(x.slice(1));
@@ -249,7 +249,8 @@ export let extract_cirru_edn = (x: CirruEdnFormat): CalcitValue => {
       if (x.length < 3) {
         throw new Error("tuple expects at least 2 values");
       }
-      return new CalcitTuple(extract_cirru_edn(x[1]), x.slice(2).map(extract_cirru_edn));
+      let baseClass = new CalcitRecord(newTag("base-class"), [], []);
+      return new CalcitTuple(extract_cirru_edn(x[1]), x.slice(2).map(extract_cirru_edn), baseClass);
     }
   }
   console.error(x);
@@ -285,7 +286,7 @@ export let to_calcit_data = (x: any, noKeyword: boolean = false): CalcitValue =>
 
   if (typeof x === "string") {
     if (!noKeyword && x[0] === ":" && x.slice(1).match(/^[\w\d_\?\!\-]+$/)) {
-      return tag(x.slice(1));
+      return newTag(x.slice(1));
     }
     return x;
   }

package/ts-src/js-record.mts

@@ -1,6 +1,6 @@
 import { initTernaryTreeMap, Hash, insert } from "@calcit/ternary-tree";
 import { CalcitValue } from "./js-primes.mjs";
-import { tag, castTag, toString, CalcitTag, getStringName, findInFields } from "./calcit-data.mjs";
+import { newTag, castTag, toString, CalcitTag, getStringName, findInFields } from "./calcit-data.mjs";
 
 import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 

package/ts-src/js-tuple.mts

@@ -1,15 +1,18 @@
 import { Hash } from "@calcit/ternary-tree";
 
 import { CalcitValue } from "./js-primes.mjs";
-import { toString } from "./calcit-data.mjs";
+import { newTag, toString } from "./calcit-data.mjs";
+import { CalcitRecord } from "./js-record.mjs";
 
 export class CalcitTuple {
   tag: CalcitValue;
   extra: CalcitValue[];
+  klass: CalcitRecord;
   cachedHash: Hash;
-  constructor(tag: CalcitValue, extra: CalcitValue[]) {
-    this.tag = tag;
+  constructor(tagName: CalcitValue, extra: CalcitValue[], klass: CalcitRecord) {
+    this.tag = tagName;
     this.extra = extra;
+    this.klass = klass;
     this.cachedHash = null;
   }
   get(n: number) {
@@ -23,11 +26,11 @@ export class CalcitTuple {
   }
   assoc(n: number, v: CalcitValue) {
     if (n === 0) {
-      return new CalcitTuple(v, this.extra);
+      return new CalcitTuple(v, this.extra, this.klass);
     } else if (n - 1 < this.extra.length) {
       let next_extra = this.extra.slice();
       next_extra[n - 1] = v;
-      return new CalcitTuple(this.tag, next_extra);
+      return new CalcitTuple(this.tag, next_extra, this.klass);
     } else {
       throw new Error(`Tuple only have ${this.extra.length} elements`);
     }