Merge pull request #102 from calcit-lang/fix-formatter

fix record field displaying in custom formatter
calcit-lang · Oct 11, 2021 · 57767ce · 57767ce
2 parents 7ae9f2a + acd4c22
commit 57767ce
Show file tree

Hide file tree

Showing 8 changed files with 1,385 additions and 759 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "calcit_runner"
-version = "0.5.0-a3"
+version = "0.5.0-a4"
 authors = ["jiyinyiyong <jiyinyiyong@gmail.com>"]
 edition = "2018"
 license = "MIT"
@@ -28,6 +28,8 @@ im = "15.0.0"
 lazy_static = "1.4.0"
 notify = "4.0.17"
 walkdir = "2"
+
+[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 libloading = "0.7"
 
 [lib]

diff --git a/calcit/calcit.cirru b/calcit/calcit.cirru
diff --git a/calcit/compact.cirru b/calcit/compact.cirru
@@ -4,6 +4,26 @@
     :modules $ []
     :version |0.0.1
   :files $ {}
+    |app.lib $ {}
+      :ns $ quote (ns app.lib)
+      :defs $ {}
+        |f2 $ quote
+          defn f2 () $ echo "\"f2 in lib"
+        |f3 $ quote
+          defn f3 (x) (echo "\"f3 in lib") (echo "\"v:" x)
+    |app.macro $ {}
+      :ns $ quote (ns app.macro)
+      :defs $ {}
+        |add-by-1 $ quote
+          defmacro add-by-1 (x)
+            quasiquote $ &+ ~x 1
+        |add-by-2 $ quote
+          defmacro add-by-2 (x)
+            quasiquote $ &+ 2 (add-by-1 ~x)
+        |add-num $ quote
+          defmacro add-num (a b)
+            quasiquote $ &let nil
+              &+ (~ a) (~ b)
     |app.main $ {}
       :ns $ quote
         ns app.main $ :require (app.lib :as lib)
@@ -14,10 +34,29 @@
           defmacro call-macro (x0 & xs)
             quasiquote $ &{} :a (~ x0) :b
               [] $ ~@ xs
-        |call-3 $ quote
-          defn call-3 (a b c) (echo "\"a is:" a) (echo "\"b is:" b) (echo "\"c is:" c)
-        |main! $ quote
-          defn main! () (demos) (; fib 10) (try-method)
+        |show-data $ quote
+          defn show-data () (load-console-formatter!)
+            js/console.log $ defrecord! :Demo (:a 1)
+              :b $ {} (:a 1)
+        |fib $ quote
+          defn fib (n)
+            if (< n 2) 1 $ +
+              fib $ - n 1
+              fib $ - n 2
+        |add-more $ quote
+          defmacro add-more (acc x times)
+            if (&< times 1) acc $ recur
+              quasiquote $ &+ (~ x) (~ acc)
+              , x (&- times 1)
+        |test-args $ quote
+          defn test-args ()
+            call-3 & $ [] 1 2 3
+            call-many 1
+            call-many 1 2
+            call-many 1 2 3
+            echo $ macroexpand (call-macro 11 12 13)
+        |call-many $ quote
+          defn call-many (x0 & xs) (echo "\"many...") (echo "\"x0" x0) (echo "\"xs" xs)
         |demos $ quote
           defn demos () (echo "\"demo")
             echo $ &+ 2 2
@@ -55,60 +94,19 @@
             echo "\"call and call" $ add-by-2 10
             ; echo $ macroexpand (assert= 1 2)
             test-args
-        |call-many $ quote
-          defn call-many (x0 & xs) (echo "\"many...") (echo "\"x0" x0) (echo "\"xs" xs)
+        |main! $ quote
+          defn main! () (demos) (; fib 10) (try-method) (; show-data)
+        |f1 $ quote
+          defn f1 () $ echo "\"calling f1"
         |try-method $ quote
           defn try-method () $ println
             .count $ range 11
+        |call-3 $ quote
+          defn call-3 (a b c) (echo "\"a is:" a) (echo "\"b is:" b) (echo "\"c is:" c)
         |rec-sum $ quote
           defn rec-sum (acc xs)
             if (empty? xs) acc $ recur
               &+ acc $ nth xs 0
               rest xs
-        |test-args $ quote
-          defn test-args ()
-            call-3 & $ [] 1 2 3
-            call-many 1
-            call-many 1 2
-            call-many 1 2 3
-            echo $ macroexpand (call-macro 11 12 13)
-        |fib $ quote
-          defn fib (n)
-            if (< n 2) 1 $ +
-              fib $ - n 1
-              fib $ - n 2
-        |f1 $ quote
-          defn f1 () $ echo "\"calling f1"
         |reload! $ quote
           defn reload! () (println "\"reloaded 2") (; fib 40) (try-method)
-        |add-more $ quote
-          defmacro add-more (acc x times)
-            if (&< times 1) acc $ recur
-              quasiquote $ &+ (~ x) (~ acc)
-              , x (&- times 1)
-      :proc $ quote ()
-      :configs $ {}
-    |app.lib $ {}
-      :ns $ quote (ns app.lib)
-      :defs $ {}
-        |f2 $ quote
-          defn f2 () $ echo "\"f2 in lib"
-        |f3 $ quote
-          defn f3 (x) (echo "\"f3 in lib") (echo "\"v:" x)
-      :proc $ quote ()
-      :configs $ {}
-    |app.macro $ {}
-      :ns $ quote (ns app.macro)
-      :defs $ {}
-        |add-num $ quote
-          defmacro add-num (a b)
-            quasiquote $ &let nil
-              &+ (~ a) (~ b)
-        |add-by-1 $ quote
-          defmacro add-by-1 (x)
-            quasiquote $ &+ ~x 1
-        |add-by-2 $ quote
-          defmacro add-by-2 (x)
-            quasiquote $ &+ 2 (add-by-1 ~x)
-      :proc $ quote ()
-      :configs $ {}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@calcit/procs",
-  "version": "0.5.0-a3",
+  "version": "0.5.0-a4",
   "main": "./lib/calcit.procs.js",
   "devDependencies": {
     "@types/node": "^16.9.6",

diff --git a/src/bin/cr.rs b/src/bin/cr.rs
@@ -5,6 +5,7 @@ use std::sync::mpsc::channel;
 use std::time::Duration;
 use std::time::Instant;
 
+#[cfg(not(target_arch = "wasm32"))]
 mod injection;
 
 use notify::{RecommendedWatcher, RecursiveMode, Watcher};
@@ -25,6 +26,7 @@ fn main() -> Result<(), String> {
   builtins::effects::init_effects_states();
 
   // get dirty functions injected
+  #[cfg(not(target_arch = "wasm32"))]
   builtins::register_import_proc("&call-dylib-edn", injection::call_dylib_edn);
 
   let cli_matches = cli_args::parse_cli();

diff --git a/ts-src/calcit.procs.ts b/ts-src/calcit.procs.ts
@@ -1,5 +1,5 @@
 // CALCIT VERSION
-export const calcit_version = "0.5.0-a3";
+export const calcit_version = "0.5.0-a4";
 
 import { overwriteComparator, initTernaryTreeMap } from "@calcit/ternary-tree";
 import { parse, ICirruNode } from "@cirru/parser.ts";

diff --git a/ts-src/custom-formatter.ts b/ts-src/custom-formatter.ts
@@ -61,7 +61,7 @@ export let load_console_formatter_$x_ = () => {
               ret.push([
                 "div",
                 { style: "margin-left: 8px;" },
-                ["div", { style: "margin-left: 8px; display: inline-block;" }, obj.fields[idx]],
+                ["div", { style: "margin-left: 8px; display: inline-block;" }, embedObject(obj.fields[idx])],
                 ["div", { style: "margin-left: 8px; display: inline-block;" }, embedObject(obj.values[idx])],
               ]);
             }