@calcit/procs 0.5.26 → 0.5.28-a2

package/README.md

@@ -1,14 +1,22 @@
 ### Calcit Scripting Language
 
-> Lisp compiling to JavaScript ES Modules. Runs in Rust(Similar to ClojureScript, but in very different syntax.).
+> Spiritually dialect of ClojureScript. Built with Rust. Also compiles to JavaScript ES Modules.
 
 - Home http://calcit-lang.org/
-- API Doc(heavily influenced by ClojureScript) http://apis.calcit-lang.org/
-- Dev Logs https://github.com/calcit-lang/calcit/discussions
-- 视频记录 https://space.bilibili.com/14227306/channel/seriesdetail?sid=281171
+- API Doc http://apis.calcit-lang.org/
+- Guidebook http://guide.calcit-lang.org/
 
 [Browse examples](https://github.com/calcit-lang/calcit/tree/main/calcit) or also [try WASM version online](https://github.com/calcit-lang/calcit-wasm-play).
 
+Core design:
+
+- Interpreter runs on Rust, extensible with Rust FFI
+- Persistent Data Structure
+- Structural Editor(with indentation-based syntax as a fallback)
+- Lisp macros, functional style
+- Compiles to JavaScript in ES Modules, JavaScript Interop
+- Hot code swapping friendly
+
 ### Install
 
 Build and install with Rust:
@@ -21,7 +29,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
 cargo install calcit
 ```
 
-For Ubuntu 20.04, try binaries from http://bin.calcit-lang.org/linux/ , which are provided for [CI usages](https://github.com/calcit-lang/respo-calcit-workflow/blob/main/.github/workflows/upload.yaml#L28-L37).
+For Ubuntu latest, try binaries from http://bin.calcit-lang.org/linux/ , which are provided for [CI usages](https://github.com/calcit-lang/respo-calcit-workflow/blob/main/.github/workflows/upload.yaml#L28-L37).
 
 ### Usage
 
@@ -46,7 +54,7 @@ println "|a demo"
 '
 ```
 
-Run with a [compact.cirru](https://github.com/calcit-lang/lilac/blob/master/compact.cirru):
+Run with a [compact.cirru](https://github.com/calcit-lang/lilac/blob/main/compact.cirru):
 
 ```bash
 cr compact.cirru -1 # run only once
@@ -56,13 +64,20 @@ cr compact.cirru # watch mode enabled by default
 cr compact.cirru --init-fn='app.main/main!' # specifying init-fn
 ```
 
-Emitting code:
+### JavaScript codegen
+
+It compiles to JavaScript and runs in consistet semantics. However it might require a lot of JavaScript interop.
 
 ```bash
 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.cirru
+By default, js code is generated to `js-out/`. You will need Vite or Esbuild to run it, from an entry file:
+
+```js
+import { main_$x_, reload_$x_ } from "./js-out/app.main.js";
+main_$x_();
 ```
 
 ### Calcit Editor & Bundler
@@ -92,33 +107,6 @@ Modules that ends with `/`s are automatically suffixed `compact.cirru` since it'
 
 To load modules in CI environments, make use of `git clone`.
 
-Web Frameworks:
-
-- [Respo](https://github.com/Respo/respo.calcit) - tiny Virtual DOM library
-- [Phlox](https://github.com/Phlox-GL/phlox) - wraps PIXI.js in Virtual DOM style
-- [Quamolit](https://github.com/Quamolit/quamolit.calcit/) - wraps Three.js in Virtual DOM style
-- [Quatrefoil](https://github.com/Quatrefoil-GL/quatrefoil) - Canvas API in virtual DOM style, with ticking rendering
-
-Mini libraries:
-
-- [Lilac](https://github.com/calcit-lang/lilac), data validation tool
-- [Memof](https://github.com/calcit-lang/memof), caching tool
-- [Recollect](https://github.com/calcit-lang/recollect), diffing tool
-- [Calcit Test](https://github.com/calcit-lang/calcit-test), testing tool
-- [Bisection Key](https://github.com/calcit-lang/bisection-key), ...
-- [Lilac Parser](https://github.com/calcit-lang/lilac-parser), string parsing tool
-
-### Extensions
-
-Rust supports extending with dynamic libraries, found an example in [dylib-workflow](https://github.com/calcit-lang/dylib-workflow). Currently there are some early extensions:
-
-- [Std](https://github.com/calcit-lang/calcit.std) - some collections of util functions
-- [WebSocket server binding](https://github.com/calcit-lang/calcit-wss)
-- [HTTP client binding](https://github.com/calcit-lang/calcit-fetch)
-- [HTTP server binding](https://github.com/calcit-lang/calcit-http)
-- [Wasmtime binding](https://github.com/calcit-lang/calcit_wasmtime)
-- [Canvas demo](https://github.com/calcit-lang/calcit-paint)
-
 ### Development
 
 I use these commands to run local examples:
@@ -132,6 +120,8 @@ cargo run --bin cr -- calcit/test.cirru --emit-js -1 && yarn try-js
 
 # run snippet
 cargo run --bin cr -- -e 'range 100'
+
+cr compact.cirru --emit-ir # compiles intermediate representation into program-ir.cirru
 ```
 
 - [Cirru Parser](https://github.com/Cirru/parser.rs) for indentation-based syntax parsing.
@@ -143,6 +133,11 @@ Other tools:
 - [Error Viewer](https://github.com/calcit-lang/calcit-error-viewer) for displaying `.calcit-error.cirru`
 - [IR Viewer](https://github.com/calcit-lang/calcit-ir-viewer) for rendering `program-ir.cirru`
 
+Some resources:
+
+- Dev Logs https://github.com/calcit-lang/calcit/discussions
+- 视频记录 https://space.bilibili.com/14227306/channel/seriesdetail?sid=281171
+
 ### License
 
 MIT

package/lib/{calcit-data.js → calcit-data.mjs}

@@ -1,12 +1,12 @@
 import { overwriteHashGenerator, valueHash, mergeValueHash } from "@calcit/ternary-tree";
 import { overwriteComparator } from "@calcit/ternary-tree";
-import { overwriteMapComparator } from "./js-map";
-import { CalcitRecord, fieldsEqual } from "./js-record";
-import { CalcitMap, CalcitSliceMap } from "./js-map";
-import "./js-primes";
-import { CalcitList, CalcitSliceList } from "./js-list";
-import { CalcitSet, overwriteSetComparator } from "./js-set";
-import { CalcitTuple } from "./js-tuple";
+import { overwriteMapComparator } from "./js-map.mjs";
+import { CalcitRecord, fieldsEqual } from "./js-record.mjs";
+import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
+import "./js-primes.mjs";
+import { CalcitList, CalcitSliceList } from "./js-list.mjs";
+import { CalcitSet, overwriteSetComparator } from "./js-set.mjs";
+import { CalcitTuple } from "./js-tuple.mjs";
 // we have to inject cache in a dirty way in some cases
 const calcit_dirty_hash_key = "_calcit_cached_hash";
 let keywordIdx = 0;

package/lib/{calcit.procs.js → calcit.procs.mjs}

@@ -1,26 +1,26 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.5.26";
+export const calcit_version = "0.5.28-a2";
 import "@calcit/ternary-tree";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
-import "./js-primes";
-import { CalcitSymbol, CalcitKeyword, CalcitRef, CalcitRecur, kwd, refsRegistry, toString, getStringName, _$n__$e_ } from "./calcit-data";
-import { CalcitRecord } from "./js-record";
-export * from "./calcit-data";
-export * from "./js-record";
-export * from "./js-map";
-export * from "./js-list";
-export * from "./js-set";
-export * from "./js-primes";
-export * from "./js-tuple";
-export * from "./custom-formatter";
-export * from "./js-cirru";
-import { CalcitList, CalcitSliceList, foldl } from "./js-list";
-import { CalcitMap, CalcitSliceMap } from "./js-map";
-import { CalcitSet } from "./js-set";
-import { CalcitTuple } from "./js-tuple";
-import { to_calcit_data, extract_cirru_edn } from "./js-cirru";
+import "./js-primes.mjs";
+import { CalcitSymbol, CalcitKeyword, CalcitRef, CalcitRecur, kwd, refsRegistry, toString, getStringName, _$n__$e_, } from "./calcit-data.mjs";
+import { CalcitRecord } from "./js-record.mjs";
+export * from "./calcit-data.mjs";
+export * from "./js-record.mjs";
+export * from "./js-map.mjs";
+export * from "./js-list.mjs";
+export * from "./js-set.mjs";
+export * from "./js-primes.mjs";
+export * from "./js-tuple.mjs";
+export * from "./custom-formatter.mjs";
+export * from "./js-cirru.mjs";
+import { CalcitList, CalcitSliceList, foldl } from "./js-list.mjs";
+import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
+import { CalcitSet } from "./js-set.mjs";
+import { CalcitTuple } from "./js-tuple.mjs";
+import { to_calcit_data, extract_cirru_edn } from "./js-cirru.mjs";
 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") {
@@ -455,7 +455,7 @@ export let _$n_list_$o_rest = (xs) => {
 };
 export let _$n_str_$o_rest = (xs) => {
     if (typeof xs === "string")
-        return xs.substr(1);
+        return xs.slice(1);
     console.error(xs);
     throw new Error("Expects a string");
 };
@@ -520,7 +520,7 @@ export let butlast = (xs) => {
         return xs.slice(0, xs.len() - 1);
     }
     if (typeof xs === "string") {
-        return xs.substr(0, xs.length - 1);
+        return xs.slice(0, -1);
     }
     console.error(xs);
     throw new Error("Data not ready for butlast");

package/lib/{custom-formatter.js → custom-formatter.mjs}

@@ -1,11 +1,10 @@
-import "./js-primes";
-import { CalcitRef, CalcitSymbol, CalcitKeyword } from "./calcit-data";
-import "@calcit/ternary-tree";
-import { CalcitRecord } from "./js-record";
-import { CalcitMap, CalcitSliceMap } from "./js-map";
-import { CalcitList, CalcitSliceList } from "./js-list";
-import { CalcitSet } from "./js-set";
-import { CalcitTuple } from "./js-tuple";
+import "./js-primes.mjs";
+import { CalcitRef, CalcitSymbol, CalcitKeyword } from "./calcit-data.mjs";
+import { CalcitRecord } from "./js-record.mjs";
+import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
+import { CalcitList, CalcitSliceList } from "./js-list.mjs";
+import { CalcitSet } from "./js-set.mjs";
+import { CalcitTuple } from "./js-tuple.mjs";
 let embedObject = (x) => {
     if (x == null) {
         return null;

package/lib/{js-cirru.js → js-cirru.mjs}

@@ -1,12 +1,12 @@
 import "@calcit/ternary-tree";
 import { writeCirruCode } from "@cirru/writer.ts";
-import "./js-primes";
-import { CalcitList, CalcitSliceList } from "./js-list";
-import { CalcitRecord } from "./js-record";
-import { CalcitMap, CalcitSliceMap } from "./js-map";
-import { CalcitSet } from "./js-set";
-import { CalcitKeyword, CalcitSymbol, CalcitRecur, CalcitRef, kwd } from "./calcit-data";
-import { CalcitTuple } from "./js-tuple";
+import "./js-primes.mjs";
+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 { CalcitKeyword, CalcitSymbol, CalcitRecur, CalcitRef, kwd } from "./calcit-data.mjs";
+import { CalcitTuple } from "./js-tuple.mjs";
 export let format_cirru = (data, useInline) => {
     let chunk = toWriterNode(data);
     if (!Array.isArray(chunk)) {
@@ -108,10 +108,10 @@ export let extract_cirru_edn = (x) => {
             return x.slice(1);
         }
         if (x[0] === ":") {
-            return kwd(x.substr(1));
+            return kwd(x.slice(1));
         }
         if (x[0] === "'") {
-            return new CalcitSymbol(x.substr(1));
+            return new CalcitSymbol(x.slice(1));
         }
         if (x.match(/^(-?)\d+(\.\d*$)?/)) {
             return parseFloat(x);

package/lib/{js-list.js → js-list.mjs}

@@ -1,10 +1,10 @@
 import * as ternaryTree from "@calcit/ternary-tree";
-import "./js-primes";
+import "./js-primes.mjs";
 import { initTernaryTreeList, initTernaryTreeListFromRange, listLen, listGet, assocList, listToItems, dissocList, assocBefore, assocAfter, } from "@calcit/ternary-tree";
-import { CalcitMap, CalcitSliceMap } from "./js-map";
-import { CalcitSet } from "./js-set";
-import { CalcitTuple } from "./js-tuple";
-import { isNestedCalcitData, tipNestedCalcitData, toString } from "./calcit-data";
+import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
+import { CalcitSet } from "./js-set.mjs";
+import { CalcitTuple } from "./js-tuple.mjs";
+import { isNestedCalcitData, tipNestedCalcitData, toString } from "./calcit-data.mjs";
 // two list implementations, should offer same interface
 export class CalcitList {
     constructor(value) {

package/lib/{js-map.js → js-map.mjs}

@@ -1,8 +1,8 @@
 import * as ternaryTree from "@calcit/ternary-tree";
-import "./js-primes";
-import { CalcitSet } from "./js-set";
+import "./js-primes.mjs";
+import { CalcitSet } from "./js-set.mjs";
 import { mapLen, assocMap, dissocMap, isMapEmpty, toPairsArray, mapGetDefault, initEmptyTernaryTreeMap, initTernaryTreeMapFromArray, } from "@calcit/ternary-tree";
-import { isNestedCalcitData, tipNestedCalcitData, toString } from "./calcit-data";
+import { isNestedCalcitData, tipNestedCalcitData, toString } from "./calcit-data.mjs";
 /** need to compare by Calcit */
 let DATA_EQUAL = (x, y) => {
     return x === y;

package/lib/js-primes.mjs

@@ -0,0 +1,6 @@
+import "./calcit-data.mjs";
+import "./js-list.mjs";
+import "./js-record.mjs";
+import "./js-map.mjs";
+import "./js-set.mjs";
+import "./js-tuple.mjs";

package/lib/{js-record.js → js-record.mjs}

@@ -1,7 +1,7 @@
 import "@calcit/ternary-tree";
-import "./js-primes";
-import { castKwd, toString, findInFields } from "./calcit-data";
-import { CalcitMap, CalcitSliceMap } from "./js-map";
+import "./js-primes.mjs";
+import { castKwd, toString, findInFields } from "./calcit-data.mjs";
+import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 export class CalcitRecord {
     constructor(name, fields, values) {
         this.name = name;

package/lib/{js-set.js → js-set.mjs}

@@ -1,5 +1,5 @@
-import "./js-primes";
-import { toString } from "./calcit-data";
+import "./js-primes.mjs";
+import { toString } from "./calcit-data.mjs";
 import { mapLen, assocMap, dissocMap, toPairsArray, contains, initTernaryTreeMapFromArray, initEmptyTernaryTreeMap, } from "@calcit/ternary-tree";
 import * as ternaryTree from "@calcit/ternary-tree";
 /** need to compare by Calcit */

package/lib/{js-tuple.js → js-tuple.mjs}

@@ -1,4 +1,4 @@
-import "./js-primes";
+import "./js-primes.mjs";
 import "@calcit/ternary-tree";
 export class CalcitTuple {
     constructor(a, b) {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@calcit/procs",
-  "version": "0.5.26",
-  "main": "./lib/calcit.procs.js",
+  "version": "0.5.28-a2",
+  "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^17.0.21",
-    "esbuild": "^0.14.25",
+    "@types/node": "^17.0.22",
+    "esbuild": "^0.14.27",
     "typescript": "^4.6.2"
   },
   "scripts": {
     "compile": "rm -rfv lib/* && tsc",
     "procs-link": "ln -s ../../ node_modules/@calcit/procs",
-    "bundle-main": "esbuild js-out/main.js --bundle --outfile=js-out/bundle.js --platform=node",
+    "bundle-main": "esbuild js-out/main.mjs --bundle --outfile=js-out/bundle.js --platform=node --resolve-extensions=.mjs,.js",
     "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/",
     "try-rs": "cargo run --bin cr -- calcit/test.cirru -1",
     "try-js": "cargo run --bin cr -- calcit/test.cirru --emit-js -1 && yarn bundle-main && node js-out/bundle.js"
@@ -20,7 +20,7 @@
     "url": "https://github.com/calcit-lang/calcit"
   },
   "dependencies": {
-    "@calcit/ternary-tree": "0.0.18",
+    "@calcit/ternary-tree": "0.0.19-a1",
     "@cirru/parser.ts": "^0.0.5",
     "@cirru/writer.ts": "^0.1.3"
   }

package/ts-src/{calcit-data.ts → calcit-data.mts}

@@ -1,14 +1,14 @@
 import { Hash, overwriteHashGenerator, valueHash, mergeValueHash } from "@calcit/ternary-tree";
 import { overwriteComparator, initTernaryTreeMap } from "@calcit/ternary-tree";
-import { overwriteMapComparator } from "./js-map";
+import { overwriteMapComparator } from "./js-map.mjs";
 
-import { CalcitRecord, fieldsEqual } from "./js-record";
-import { CalcitMap, CalcitSliceMap } from "./js-map";
+import { CalcitRecord, fieldsEqual } from "./js-record.mjs";
+import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 
-import { CalcitValue } from "./js-primes";
-import { CalcitList, CalcitSliceList } from "./js-list";
-import { CalcitSet, overwriteSetComparator } from "./js-set";
-import { CalcitTuple } from "./js-tuple";
+import { CalcitValue } from "./js-primes.mjs";
+import { CalcitList, CalcitSliceList } from "./js-list.mjs";
+import { CalcitSet, overwriteSetComparator } from "./js-set.mjs";
+import { CalcitTuple } from "./js-tuple.mjs";
 
 // we have to inject cache in a dirty way in some cases
 const calcit_dirty_hash_key = "_calcit_cached_hash";

package/ts-src/{calcit.procs.ts → calcit.procs.mts}

@@ -1,30 +1,42 @@
 // CALCIT VERSION
-export const calcit_version = "0.5.26";
+export const calcit_version = "0.5.28-a2";
 
 import { overwriteComparator, initTernaryTreeMap } from "@calcit/ternary-tree";
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 
-import { CalcitValue } from "./js-primes";
-import { CalcitSymbol, CalcitKeyword, CalcitRef, CalcitFn, CalcitRecur, kwd, refsRegistry, toString, getStringName, to_js_data, _$n__$e_ } from "./calcit-data";
-
-import { fieldsEqual, CalcitRecord } from "./js-record";
-
-export * from "./calcit-data";
-export * from "./js-record";
-export * from "./js-map";
-export * from "./js-list";
-export * from "./js-set";
-export * from "./js-primes";
-export * from "./js-tuple";
-export * from "./custom-formatter";
-export * from "./js-cirru";
-
-import { CalcitList, CalcitSliceList, foldl } from "./js-list";
-import { CalcitMap, CalcitSliceMap } from "./js-map";
-import { CalcitSet } from "./js-set";
-import { CalcitTuple } from "./js-tuple";
-import { to_calcit_data, extract_cirru_edn } from "./js-cirru";
+import { CalcitValue } from "./js-primes.mjs";
+import {
+  CalcitSymbol,
+  CalcitKeyword,
+  CalcitRef,
+  CalcitFn,
+  CalcitRecur,
+  kwd,
+  refsRegistry,
+  toString,
+  getStringName,
+  to_js_data,
+  _$n__$e_,
+} from "./calcit-data.mjs";
+
+import { fieldsEqual, CalcitRecord } from "./js-record.mjs";
+
+export * from "./calcit-data.mjs";
+export * from "./js-record.mjs";
+export * from "./js-map.mjs";
+export * from "./js-list.mjs";
+export * from "./js-set.mjs";
+export * from "./js-primes.mjs";
+export * from "./js-tuple.mjs";
+export * from "./custom-formatter.mjs";
+export * from "./js-cirru.mjs";
+
+import { CalcitList, CalcitSliceList, foldl } from "./js-list.mjs";
+import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
+import { CalcitSet } from "./js-set.mjs";
+import { CalcitTuple } from "./js-tuple.mjs";
+import { to_calcit_data, extract_cirru_edn } from "./js-cirru.mjs";
 
 let inNodeJs = typeof process !== "undefined" && process?.release?.name === "node";
 
@@ -499,7 +511,7 @@ export let _$n_list_$o_rest = (xs: CalcitValue): CalcitValue => {
 };
 
 export let _$n_str_$o_rest = (xs: CalcitValue): CalcitValue => {
-  if (typeof xs === "string") return xs.substr(1);
+  if (typeof xs === "string") return xs.slice(1);
 
   console.error(xs);
   throw new Error("Expects a string");
@@ -571,7 +583,7 @@ export let butlast = (xs: CalcitValue): CalcitValue => {
     return xs.slice(0, xs.len() - 1);
   }
   if (typeof xs === "string") {
-    return xs.substr(0, xs.length - 1);
+    return xs.slice(0, -1);
   }
   console.error(xs);
   throw new Error("Data not ready for butlast");

package/ts-src/{custom-formatter.ts → custom-formatter.mts}

@@ -1,12 +1,11 @@
-import { CalcitValue } from "./js-primes";
-import { CalcitRef, CalcitSymbol, CalcitKeyword } from "./calcit-data";
-import { toPairs } from "@calcit/ternary-tree";
+import { CalcitValue } from "./js-primes.mjs";
+import { CalcitRef, CalcitSymbol, CalcitKeyword } from "./calcit-data.mjs";
 
-import { CalcitRecord } from "./js-record";
-import { CalcitMap, CalcitSliceMap } from "./js-map";
-import { CalcitList, CalcitSliceList } from "./js-list";
-import { CalcitSet } from "./js-set";
-import { CalcitTuple } from "./js-tuple";
+import { CalcitRecord } from "./js-record.mjs";
+import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
+import { CalcitList, CalcitSliceList } from "./js-list.mjs";
+import { CalcitSet } from "./js-set.mjs";
+import { CalcitTuple } from "./js-tuple.mjs";
 
 declare global {
   interface Window {

package/ts-src/{js-cirru.ts → js-cirru.mts}

@@ -1,13 +1,13 @@
 import { overwriteComparator, initTernaryTreeMap } from "@calcit/ternary-tree";
 import { CirruWriterNode, writeCirruCode } from "@cirru/writer.ts";
 
-import { CalcitValue } from "./js-primes";
-import { CalcitList, CalcitSliceList } from "./js-list";
-import { CalcitRecord } from "./js-record";
-import { CalcitMap, CalcitSliceMap } from "./js-map";
-import { CalcitSet } from "./js-set";
-import { CalcitKeyword, CalcitSymbol, CalcitRecur, CalcitRef, kwd } from "./calcit-data";
-import { CalcitTuple } from "./js-tuple";
+import { CalcitValue } from "./js-primes.mjs";
+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 { CalcitKeyword, CalcitSymbol, CalcitRecur, CalcitRef, kwd } from "./calcit-data.mjs";
+import { CalcitTuple } from "./js-tuple.mjs";
 
 type CirruEdnFormat = string | CirruEdnFormat[];
 
@@ -112,10 +112,10 @@ export let extract_cirru_edn = (x: CirruEdnFormat): CalcitValue => {
       return x.slice(1);
     }
     if (x[0] === ":") {
-      return kwd(x.substr(1));
+      return kwd(x.slice(1));
     }
     if (x[0] === "'") {
-      return new CalcitSymbol(x.substr(1));
+      return new CalcitSymbol(x.slice(1));
     }
     if (x.match(/^(-?)\d+(\.\d*$)?/)) {
       return parseFloat(x);

package/ts-src/{js-list.ts → js-list.mts}

@@ -1,6 +1,6 @@
 import * as ternaryTree from "@calcit/ternary-tree";
 
-import { CalcitValue } from "./js-primes";
+import { CalcitValue } from "./js-primes.mjs";
 
 import {
   TernaryTreeList,
@@ -16,11 +16,11 @@ import {
   assocAfter,
 } from "@calcit/ternary-tree";
 
-import { CalcitMap, CalcitSliceMap } from "./js-map";
-import { CalcitSet } from "./js-set";
-import { CalcitTuple } from "./js-tuple";
+import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
+import { CalcitSet } from "./js-set.mjs";
+import { CalcitTuple } from "./js-tuple.mjs";
 
-import { isNestedCalcitData, tipNestedCalcitData, toString, CalcitFn } from "./calcit-data";
+import { isNestedCalcitData, tipNestedCalcitData, toString, CalcitFn } from "./calcit-data.mjs";
 
 // two list implementations, should offer same interface
 export class CalcitList {

package/ts-src/{js-map.ts → js-map.mts}

@@ -1,7 +1,7 @@
 import * as ternaryTree from "@calcit/ternary-tree";
 
-import { CalcitValue } from "./js-primes";
-import { CalcitSet } from "./js-set";
+import { CalcitValue } from "./js-primes.mjs";
+import { CalcitSet } from "./js-set.mjs";
 
 import {
   TernaryTreeMap,
@@ -17,7 +17,7 @@ import {
   initTernaryTreeMapFromArray,
 } from "@calcit/ternary-tree";
 
-import { isNestedCalcitData, tipNestedCalcitData, toString } from "./calcit-data";
+import { isNestedCalcitData, tipNestedCalcitData, toString } from "./calcit-data.mjs";
 
 /** need to compare by Calcit */
 let DATA_EQUAL = (x: CalcitValue, y: CalcitValue): boolean => {

package/ts-src/{js-primes.ts → js-primes.mts}

@@ -1,9 +1,9 @@
-import { CalcitKeyword, CalcitSymbol, CalcitRef, CalcitFn, CalcitRecur } from "./calcit-data";
-import { CalcitList, CalcitSliceList } from "./js-list";
-import { CalcitRecord } from "./js-record";
-import { CalcitMap, CalcitSliceMap } from "./js-map";
-import { CalcitSet as CalcitSet } from "./js-set";
-import { CalcitTuple } from "./js-tuple";
+import { CalcitKeyword, CalcitSymbol, CalcitRef, CalcitFn, CalcitRecur } from "./calcit-data.mjs";
+import { CalcitList, CalcitSliceList } from "./js-list.mjs";
+import { CalcitRecord } from "./js-record.mjs";
+import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
+import { CalcitSet as CalcitSet } from "./js-set.mjs";
+import { CalcitTuple } from "./js-tuple.mjs";
 
 export type CalcitValue =
   | string

package/ts-src/{js-record.ts → js-record.mts}

@@ -1,8 +1,8 @@
 import { initTernaryTreeMap, Hash, insert } from "@calcit/ternary-tree";
-import { CalcitValue } from "./js-primes";
-import { kwd, castKwd, toString, CalcitKeyword, getStringName, findInFields } from "./calcit-data";
+import { CalcitValue } from "./js-primes.mjs";
+import { kwd, castKwd, toString, CalcitKeyword, getStringName, findInFields } from "./calcit-data.mjs";
 
-import { CalcitMap, CalcitSliceMap } from "./js-map";
+import { CalcitMap, CalcitSliceMap } from "./js-map.mjs";
 
 export class CalcitRecord {
   name: CalcitKeyword;

package/ts-src/{js-set.ts → js-set.mts}

@@ -1,5 +1,5 @@
-import { CalcitValue } from "./js-primes";
-import { toString } from "./calcit-data";
+import { CalcitValue } from "./js-primes.mjs";
+import { toString } from "./calcit-data.mjs";
 import {
   TernaryTreeMap,
   initTernaryTreeMap,

package/ts-src/{js-tuple.ts → js-tuple.mts}

@@ -1,4 +1,4 @@
-import { CalcitValue } from "./js-primes";
+import { CalcitValue } from "./js-primes.mjs";
 
 import { Hash } from "@calcit/ternary-tree";
 

package/lib/js-primes.js

@@ -1,6 +0,0 @@
-import "./calcit-data";
-import "./js-list";
-import "./js-record";
-import "./js-map";
-import "./js-set";
-import "./js-tuple";