npm - @calcit/procs - Versions diffs - 0.8.0 → 0.8.2 - Mend

@calcit/procs 0.8.0 → 0.8.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/lib/calcit.procs.mjs CHANGED Viewed

@@ -1,6 +1,6 @@
 var _a;
 // CALCIT VERSION
-export const calcit_version = "0.8.0";
+export const calcit_version = "0.8.2";
 import { parse } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
 import { CalcitSymbol, CalcitTag, CalcitRef, CalcitRecur, newTag, refsRegistry, toString, getStringName, _$n__$e_, hashFunction, } from "./calcit-data.mjs";
@@ -1097,7 +1097,13 @@ export let parse_cirru_list = (code) => {
     return to_calcit_data(parse(code), true);
 };
 export let parse_cirru_edn = (code, options) => {
-    return extract_cirru_edn(parse(code)[0], options);
+    let nodes = parse(code);
+    if (nodes.length === 1) {
+        return extract_cirru_edn(nodes[0], options);
+    }
+    else {
+        throw new Error(`Expected EDN in a single node, got ${nodes.length}`);
+    }
 };
 export let format_to_lisp = (x) => {
     if (x == null) {

package/lib/js-cirru.mjs CHANGED Viewed

@@ -19,7 +19,12 @@ export class CalcitCirruQuote {
     }
     /** provide a simple text representation in Console or std out, with indentations */
     textForm() {
-        return writeCirruCode(this.value);
+        if (Array.isArray(this.value) && this.value.every((x) => Array.isArray(x))) {
+            return writeCirruCode(this.value);
+        }
+        else {
+            return this.toString();
+        }
     }
 }
 export let format_cirru = (data, useInline) => {
@@ -204,11 +209,18 @@ export let extract_cirru_edn = (x, options) => {
                 if (idx === 0) {
                     return; // skip first `{}` symbol
                 }
-                if (pair instanceof Array && pair.length === 2) {
-                    result.push(extract_cirru_edn(pair[0], options), extract_cirru_edn(pair[1], options));
+                if (pair instanceof Array) {
+                    if (pair[0] === ";")
+                        return;
+                    if (pair.length === 2) {
+                        result.push(extract_cirru_edn(pair[0], options), extract_cirru_edn(pair[1], options));
+                    }
+                    else {
+                        throw new Error(`Expected a pair, got size ${pair.length}`);
+                    }
                 }
                 else {
-                    throw new Error("Expected pairs for map");
+                    throw new Error(`Expected pairs for map, got ${pair}`);
                 }
             });
             return new CalcitSliceMap(result);
@@ -224,16 +236,23 @@ export let extract_cirru_edn = (x, options) => {
                 if (idx <= 1) {
                     return; // skip %{} name
                 }
-                if (pair instanceof Array && pair.length === 2) {
-                    if (typeof pair[0] === "string") {
-                        entries.push([extractFieldTag(pair[0]), extract_cirru_edn(pair[1], options)]);
+                if (pair instanceof Array) {
+                    if (pair[0] === ";")
+                        return;
+                    if (pair.length === 2) {
+                        if (typeof pair[0] === "string") {
+                            entries.push([extractFieldTag(pair[0]), extract_cirru_edn(pair[1], options)]);
+                        }
+                        else {
+                            throw new Error("Expected string as field");
+                        }
                     }
                     else {
-                        throw new Error("Expected string as field");
+                        throw new Error("Expected pair of size 2");
                     }
                 }
                 else {
-                    throw new Error("Expected pairs for map");
+                    throw new Error("Expected pairs for reocrd");
                 }
             });
             entries.sort((a, b) => {
@@ -256,11 +275,23 @@ export let extract_cirru_edn = (x, options) => {
             }
             return new CalcitRecord(extractFieldTag(name), fields, values);
         }
+        let notComment = (x) => {
+            if (x instanceof Array && x[0] === ";") {
+                return false;
+            }
+            return true;
+        };
         if (x[0] === "[]") {
-            return new CalcitSliceList(x.slice(1).map((x) => extract_cirru_edn(x, options)));
+            return new CalcitSliceList(x
+                .slice(1)
+                .filter(notComment)
+                .map((x) => extract_cirru_edn(x, options)));
         }
         if (x[0] === "#{}") {
-            return new CalcitSet(x.slice(1).map((x) => extract_cirru_edn(x, options)));
+            return new CalcitSet(x
+                .slice(1)
+                .filter(notComment)
+                .map((x) => extract_cirru_edn(x, options)));
         }
         if (x[0] === "do" && x.length === 2) {
             return extract_cirru_edn(x[1], options);
@@ -276,7 +307,10 @@ export let extract_cirru_edn = (x, options) => {
                 throw new Error("tuple expects at least 1 value1");
             }
             let baseClass = new CalcitRecord(newTag("base-class"), [], []);
-            return new CalcitTuple(extract_cirru_edn(x[1], options), x.slice(2).map((x) => extract_cirru_edn(x, options)), baseClass);
+            return new CalcitTuple(extract_cirru_edn(x[1], options), x
+                .slice(2)
+                .filter(notComment)
+                .map((x) => extract_cirru_edn(x, options)), baseClass);
         }
     }
     console.error(x);

package/package.json CHANGED Viewed

@@ -1,15 +1,16 @@
 {
   "name": "@calcit/procs",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "main": "./lib/calcit.procs.mjs",
   "devDependencies": {
-    "@types/node": "^20.4.8",
-    "typescript": "^5.1.6"
+    "@types/node": "^20.6.2",
+    "typescript": "^5.2.2"
   },
   "scripts": {
     "compile": "rm -rfv lib/* && tsc",
     "procs-link": "ln -s ../../ node_modules/@calcit/procs",
     "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/",
+    "eval": "cargo run --bin cr -- -e",
     "try-rs": "cargo run --bin cr -- calcit/test.cirru -1",
     "try-js-brk": "cargo run --bin cr -- calcit/test.cirru --emit-js -1 && node js-out/main.mjs",
     "try-js": "cargo run --bin cr -- calcit/test.cirru --emit-js -1 && node js-out/main.mjs"

package/ts-src/calcit.procs.mts CHANGED Viewed

@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.8.0";
+export const calcit_version = "0.8.2";
 import { parse, ICirruNode } from "@cirru/parser.ts";
 import { writeCirruCode } from "@cirru/writer.ts";
@@ -1198,7 +1198,12 @@ export let parse_cirru_list = (code: string): CalcitList => {
 };
 export let parse_cirru_edn = (code: string, options: CalcitValue) => {
-  return extract_cirru_edn(parse(code)[0], options);
+  let nodes = parse(code);
+  if (nodes.length === 1) {
+    return extract_cirru_edn(nodes[0], options);
+  } else {
+    throw new Error(`Expected EDN in a single node, got ${nodes.length}`);
+  }
 };
 export let format_to_lisp = (x: CalcitValue): string => {

package/ts-src/js-cirru.mts CHANGED Viewed

@@ -25,7 +25,11 @@ export class CalcitCirruQuote {
   }
   /** provide a simple text representation in Console or std out, with indentations */
   textForm(): string {
-    return writeCirruCode(this.value);
+    if (Array.isArray(this.value) && this.value.every((x) => Array.isArray(x))) {
+      return writeCirruCode(this.value);
+    } else {
+      return this.toString();
+    }
   }
 }
@@ -203,10 +207,15 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
         if (idx === 0) {
           return; // skip first `{}` symbol
         }
-        if (pair instanceof Array && pair.length === 2) {
-          result.push(extract_cirru_edn(pair[0], options), extract_cirru_edn(pair[1], options));
+        if (pair instanceof Array) {
+          if (pair[0] === ";") return;
+          if (pair.length === 2) {
+            result.push(extract_cirru_edn(pair[0], options), extract_cirru_edn(pair[1], options));
+          } else {
+            throw new Error(`Expected a pair, got size ${pair.length}`);
+          }
         } else {
-          throw new Error("Expected pairs for map");
+          throw new Error(`Expected pairs for map, got ${pair}`);
         }
       });
       return new CalcitSliceMap(result);
@@ -222,15 +231,19 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
         if (idx <= 1) {
           return; // skip %{} name
         }
-        if (pair instanceof Array && pair.length === 2) {
-          if (typeof pair[0] === "string") {
-            entries.push([extractFieldTag(pair[0]), extract_cirru_edn(pair[1], options)]);
+        if (pair instanceof Array) {
+          if (pair[0] === ";") return;
+          if (pair.length === 2) {
+            if (typeof pair[0] === "string") {
+              entries.push([extractFieldTag(pair[0]), extract_cirru_edn(pair[1], options)]);
+            } else {
+              throw new Error("Expected string as field");
+            }
           } else {
-            throw new Error("Expected string as field");
+            throw new Error("Expected pair of size 2");
           }
         } else {
-          throw new Error("Expected pairs for map");
+          throw new Error("Expected pairs for reocrd");
         }
       });
       entries.sort((a, b) => {
@@ -256,11 +269,27 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
       return new CalcitRecord(extractFieldTag(name), fields, values);
     }
+    let notComment = (x: any) => {
+      if (x instanceof Array && x[0] === ";") {
+        return false;
+      }
+      return true;
+    };
     if (x[0] === "[]") {
-      return new CalcitSliceList(x.slice(1).map((x) => extract_cirru_edn(x, options)));
+      return new CalcitSliceList(
+        x
+          .slice(1)
+          .filter(notComment)
+          .map((x) => extract_cirru_edn(x, options))
+      );
     }
     if (x[0] === "#{}") {
-      return new CalcitSet(x.slice(1).map((x) => extract_cirru_edn(x, options)));
+      return new CalcitSet(
+        x
+          .slice(1)
+          .filter(notComment)
+          .map((x) => extract_cirru_edn(x, options))
+      );
     }
     if (x[0] === "do" && x.length === 2) {
       return extract_cirru_edn(x[1], options);
@@ -278,7 +307,10 @@ export let extract_cirru_edn = (x: CirruEdnFormat, options: CalcitValue): Calcit
       let baseClass = new CalcitRecord(newTag("base-class"), [], []);
       return new CalcitTuple(
         extract_cirru_edn(x[1], options),
-        x.slice(2).map((x) => extract_cirru_edn(x, options)),
+        x
+          .slice(2)
+          .filter(notComment)
+          .map((x) => extract_cirru_edn(x, options)),
         baseClass
       );
     }