Fix require bug

bobbicodes · Jul 4, 2023 · a4e582d · a4e582d
2 parents 81e1d1a + 267ade4
commit a4e582d
Show file tree

Hide file tree

Showing 5 changed files with 369 additions and 351 deletions.
diff --git a/dist/assets/index-13c5f3bf.js → dist/assets/index-a562dec2.js b/dist/assets/index-13c5f3bf.js → dist/assets/index-a562dec2.js
diff --git a/dist/index.html b/dist/index.html
@@ -5,7 +5,7 @@
     <link rel="icon" type="image/svg+xml" href="/lang-clojure-eval/assets/vite-4a748afd.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite App</title>
-    <script type="module" crossorigin src="/lang-clojure-eval/assets/index-13c5f3bf.js"></script>
+    <script type="module" crossorigin src="/lang-clojure-eval/assets/index-a562dec2.js"></script>
     <link rel="stylesheet" href="/lang-clojure-eval/assets/index-dcab846b.css">
   </head>
   <body>

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lang-clojure-eval",
-  "version": "0.0.21",
+  "version": "0.0.22",
   "author": "Bobbi Towers <[email protected]>",
   "description": "Lezer-based Clojure Codemirror 6 extension with live evaluation",
   "main": "dist/index.cjs",

diff --git a/src/lang_clojure_eval/main.cljs b/src/lang_clojure_eval/main.cljs
@@ -26,18 +26,33 @@
                           'lang-clojure-eval.integer
                           {'parseInt int/parse-int}}}))
 
+(defn reqs [req-form]
+  (let [first-req (z/down req-form)]
+    (loop [z first-req result []]
+      (if-not (z/right z)
+        result
+        (recur (z/right z) 
+               (conj result (z/sexpr (z/right z))))))))
+
 (defn current-ns [source]
   (z/sexpr (z/next (z/find-next-value (z/of-string source) z/next 'ns))))
 
+(def last-req (atom ""))
+
 (defn eval-string [source]
-  (let [reqs (str "(ns " (or (current-ns source) "lang-clojure-eval")
-                  "(:require [lang-clojure-eval.character :as Character]
-                       [lang-clojure-eval.integer :as Integer]))
+  (let [ns-name (z/next (z/find-next-value (z/of-string source) z/next 'ns))
+        req-form (z/right ns-name)
+        reqs (str "(ns " (or (current-ns source) "lang-clojure-eval")
+                  "\n  (:require [lang-clojure-eval.character :as Character]
+        [lang-clojure-eval.integer :as Integer] "
+               (apply str (interpose "\n" (reqs req-form))) "))
               (defn int [x]
                 (if (.isInteger js/Number (js/parseInt x))
                     (js/parseInt x)
                     (.charCodeAt x 0)))")]
+    (when (or req-form
+              (and ns-name (nil? req-form))) (reset! last-req reqs))
     (try (binding [*print-length* 100]
-           (with-out-str (pprint/pprint (sci/eval-string* context (str reqs source)))))
+           (with-out-str (pprint/pprint (sci/eval-string* context (str @last-req source)))))
          (catch :default e
            (with-out-str (error-handler source e))))))