@calcit/procs 0.6.6 → 0.6.8

package/lib/calcit.procs.mjs

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.6.6";
+export const calcit_version = "0.6.8";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 import "./js-primes.mjs";
@@ -359,23 +359,20 @@ export let remove_watch = (a, k) => {
     a.listeners.delete(k);
     return null;
 };
-export let range = (n, m, m2) => {
+export let range = (n, m, step = 1) => {
     var result = new CalcitSliceList([]);
-    if (m2 != null) {
-        console.warn("TODO range with 3 arguments"); // TODO
-    }
     if (m != null) {
         var idx = n;
         while (idx < m) {
             result = result.append(idx);
-            idx = idx + 1;
+            idx = idx + step;
         }
     }
     else {
         var idx = 0;
         while (idx < n) {
             result = result.append(idx);
-            idx = idx + 1;
+            idx = idx + step;
         }
     }
     return result;

package/lib/custom-formatter.mjs

@@ -5,6 +5,7 @@ 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";
+import { CalcitCirruQuote } from "./js-cirru.mjs";
 let embedObject = (x) => {
     if (x == null) {
         return null;
@@ -68,6 +69,18 @@ export let load_console_formatter_$x_ = () => {
                             ["div", { style: "color: hsl(280, 80%, 60%)" }, ["div", { style: "margin-left: 8px;" }, embedObject(obj.value)]],
                         ];
                     }
+                    if (obj instanceof CalcitCirruQuote) {
+                        return [
+                            "div",
+                            { style: "color: hsl(240, 80%, 60%); display: flex;" },
+                            `CirruQuote`,
+                            [
+                                "div",
+                                { style: "color: hsl(280, 80%, 60%); padding: 4px 4px; margin: 0 4px 2px; border: 1px solid hsl(0,70%,90%); border-radius: 4px;" },
+                                obj.textForm().trim(),
+                            ],
+                        ];
+                    }
                     return null;
                 },
                 hasBody: (obj) => {

package/lib/js-cirru.mjs

@@ -12,11 +12,15 @@ export class CalcitCirruQuote {
         this.value = value;
     }
     toString() {
-        return `(cirru-quote ${JSON.stringify(this.value)})`;
+        return `(&cirru-quote ${JSON.stringify(this.value)})`;
     }
     toList() {
         return to_calcit_data(this.value, true);
     }
+    /** provide a simple text representation in Console or std out, with indentations */
+    textForm() {
+        return writeCirruCode(this.value);
+    }
 }
 export let format_cirru = (data, useInline) => {
     if (data instanceof CalcitCirruQuote) {

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@calcit/procs",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^18.7.18",
-    "typescript": "^4.8.3"
+    "@types/node": "^18.7.23",
+    "typescript": "^4.8.4"
   },
   "scripts": {
     "compile": "rm -rfv lib/* && tsc",

package/ts-src/calcit.procs.mts

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.6.6";
+export const calcit_version = "0.6.8";
 
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
@@ -418,22 +418,19 @@ export let remove_watch = (a: CalcitRef, k: CalcitKeyword): null => {
   return null;
 };
 
-export let range = (n: number, m: number, m2: number): CalcitSliceList | CalcitList => {
+export let range = (n: number, m: number, step: number = 1): CalcitSliceList | CalcitList => {
   var result: CalcitList | CalcitSliceList = new CalcitSliceList([]);
-  if (m2 != null) {
-    console.warn("TODO range with 3 arguments"); // TODO
-  }
   if (m != null) {
     var idx = n;
     while (idx < m) {
       result = result.append(idx);
-      idx = idx + 1;
+      idx = idx + step;
     }
   } else {
     var idx = 0;
     while (idx < n) {
       result = result.append(idx);
-      idx = idx + 1;
+      idx = idx + step;
     }
   }
   return result;

package/ts-src/custom-formatter.mts

@@ -6,6 +6,7 @@ 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";
+import { CalcitCirruQuote } from "./js-cirru.mjs";
 
 declare global {
   interface Window {
@@ -81,6 +82,18 @@ export let load_console_formatter_$x_ = () => {
               ["div", { style: "color: hsl(280, 80%, 60%)" }, ["div", { style: "margin-left: 8px;" }, embedObject(obj.value)]],
             ];
           }
+          if (obj instanceof CalcitCirruQuote) {
+            return [
+              "div",
+              { style: "color: hsl(240, 80%, 60%); display: flex;" },
+              `CirruQuote`,
+              [
+                "div",
+                { style: "color: hsl(280, 80%, 60%); padding: 4px 4px; margin: 0 4px 2px; border: 1px solid hsl(0,70%,90%); border-radius: 4px;" },
+                obj.textForm().trim(),
+              ],
+            ];
+          }
           return null;
         },
         hasBody: (obj) => {

package/ts-src/js-cirru.mts

@@ -17,11 +17,15 @@ export class CalcitCirruQuote {
     this.value = value;
   }
   toString(): string {
-    return `(cirru-quote ${JSON.stringify(this.value)})`;
+    return `(&cirru-quote ${JSON.stringify(this.value)})`;
   }
   toList(): CalcitValue {
     return to_calcit_data(this.value, true);
   }
+  /** provide a simple text representation in Console or std out, with indentations */
+  textForm(): string {
+    return writeCirruCode(this.value);
+  }
 }
 
 export let format_cirru = (data: CalcitCirruQuote | CalcitList, useInline: boolean): string => {