@calcit/procs 0.5.27 → 0.5.28

package/.vscode/settings.json

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

package/README.md

@@ -73,10 +73,10 @@ cr compact.cirru --emit-js # compile to js
 cr compact.cirru --emit-js --emit-path=out/ # compile to js and save in `out/`
 ```
 
-By default, js code is generated to `js-out/`. You will need Vite or Esbuild to run it, from an entry file:
+By default, js code is generated to `js-out/`. You will need Vite or Node to run it, from an entry file:
 
 ```js
-import { main_$x_, reload_$x_ } from "./js-out/app.main.js";
+import { main_$x_, reload_$x_ } from "./js-out/app.main.mjs";
 main_$x_();
 ```
 

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.27";
+export const calcit_version = "0.5.28";
 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") {

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)) {

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,26 +1,24 @@
 {
   "name": "@calcit/procs",
-  "version": "0.5.27",
-  "main": "./lib/calcit.procs.js",
+  "version": "0.5.28",
+  "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^17.0.21",
-    "esbuild": "^0.14.25",
+    "@types/node": "^17.0.23",
     "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",
     "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"
+    "try-js": "cargo run --bin cr -- calcit/test.cirru --emit-js -1 && node js-out/main.mjs"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/calcit-lang/calcit"
   },
   "dependencies": {
-    "@calcit/ternary-tree": "0.0.18",
+    "@calcit/ternary-tree": "0.0.19",
     "@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.27";
+export const calcit_version = "0.5.28";
 
 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";
 

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[];
 

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";