From fd77e1ed45a85e1fa2f9055a65a5f75dc1049b33 Mon Sep 17 00:00:00 2001
From: Scott Richmond <kredati@users.noreply.github.com>
Date: Sat, 25 Nov 2023 14:26:00 -0500
Subject: [PATCH] Fix clj (extern call) for js

---
 src/ludus/draw.cljs    |  2 ++
 src/ludus/prelude.cljc | 35 ++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 src/ludus/draw.cljs

diff --git a/src/ludus/draw.cljs b/src/ludus/draw.cljs
new file mode 100644
index 0000000..e2d0620
--- /dev/null
+++ b/src/ludus/draw.cljs
@@ -0,0 +1,2 @@
+(ns ludus.draw)
+
diff --git a/src/ludus/prelude.cljc b/src/ludus/prelude.cljc
index 9755e39..248dc06 100644
--- a/src/ludus/prelude.cljc
+++ b/src/ludus/prelude.cljc
@@ -4,6 +4,7 @@
     [ludus.show :as show]
     ;[ludus.draw :as d]
     #?(:cljs [cljs.reader])
+    #?(:cljs [goog.object :as o])
     ))
 
 ;; TODO: make eq, and, or special forms that short-circuit
@@ -145,50 +146,50 @@
             #?(
                :clj clojure.lang.Keyword
                :cljs cljs.core/Keyword
-            )
+               )
 
             :long
             #?(
                :clj java.lang.Long
                :cljs js/Number
-            )
+               )
 
             :double
             #?(
                :clj java.lang.Double
                :cljs js/Number
-            )
+               )
 
             :string
             #?(
                :clj java.lang.String
                :cljs js/String
-            )
+               )
 
             :boolean
             #?(
                :clj java.lang.Boolean
                :cljs js/Boolean
-            )
+               )
 
             :set
             #?(
                :clj clojure.lang.PersistentHashSet
                :cljs cljs.core/PersistentHashSet
-            )
+               )
 
             :vector
             #?(
                :clj clojure.lang.PersistentVector
                :cljs cljs.core/PersistentVector
-            )
+               )
 
             :map
             #?(
                :clj clojure.lang.PersistentArrayMap
                :cljs cljs.core/PersistentArrayMap
-            )
-})
+               )
+            })
 
 (defn get-type [value]
   (let [t (type value)]
@@ -232,17 +233,25 @@
   #?(
      :clj read-string
      :cljs cljs.reader/read-string
-  ))
+     ))
+
+(defn- resolve-str [str]
+  #?(
+     :clj (eval str)
+     :cljs (.bind (o/get js/window str) js/window)
+     ))
 
 (def clj {:name "clj"
           ::data/type ::data/clj
           :body (fn [& args]
                   (println "Args passed: " args)
-                  (let [called (-> args first strpart readstr eval)
+                  (let [called (-> args first strpart readstr resolve-str)
                         fn-args (rest args)]
                     (println "Fn: " called)
-                    (println "Args: " fn-args)
-                    (apply called fn-args)))})
+                    (println "Args: " (clj->js fn-args))
+                    #?(
+                       :clj(apply called fn-args)
+                       :cljs (.apply called js/window (clj->js fn-args)))))})
 
 (def count- {:name "count"
              ::data/type ::data/clj