extract current namespace to load code into

Author: bobbicodes

deps.edn

@@ -1,4 +1,5 @@
 {:deps {thheller/shadow-cljs {:mvn/version "2.23.8"}
         org.babashka/sci {:mvn/version "0.8.40"}
-        applied-science/js-interop {:mvn/version "0.4.2"}}
+        applied-science/js-interop {:mvn/version "0.4.2"}
+        rewrite-clj/rewrite-clj {:mvn/version "1.1.47"}}
  :paths ["src/"]}

src/eval-region.js

@@ -72,7 +72,15 @@ export function tryEval(s) {
       }
 }
 
+export const clearEval = (view) => {
+    if (evalResult.length != 0) {
+        evalResult = ""
+        updateEditor(view, codeBeforeEval, posBeforeEval)
+    }
+}
+
 export const evalAtCursor = (view) => {
+    clearEval(view)
     const doc = view.state.doc.toString()
     codeBeforeEval = doc
     posBeforeEval = view.state.selection.main.head
@@ -85,14 +93,8 @@ export const evalAtCursor = (view) => {
     return true
 }
 
-export const clearEval = (view) => {
-    if (evalResult.length != 0) {
-        evalResult = ""
-        updateEditor(view, codeBeforeEval, posBeforeEval)
-    }
-}
-
 export const evalTopLevel = (view) => {
+    clearEval(view)
     posAtFormEnd = topLevelNode(view.state).to
     const doc = view.state.doc.toString()
     posBeforeEval = view.state.selection.main.head
@@ -106,6 +108,7 @@ export const evalTopLevel = (view) => {
 }
 
 export const evalCell = (view) => {
+    clearEval(view)
     const doc = view.state.doc.toString()
     posBeforeEval = view.state.selection.main.head
     evalResult = tryEval(view.state.doc.text.join(" "))

src/lang_clojure_eval/main.cljs

@@ -6,6 +6,7 @@
             [goog.string]
             [goog.string.format]
             [clojure.pprint :as pprint]
+            [rewrite-clj.zip :as z]
             [sci.impl.evaluator]))
 
 (defonce context
@@ -25,14 +26,19 @@
                           'lang-clojure-eval.integer
                           {'parseInt int/parse-int}}}))
 
+(defn current-ns [source]
+  (z/sexpr (z/next (z/find-next-value (z/of-string source) z/next 'ns))))
+
 (defn eval-string [source]
-  (let [reqs "(require '[lang-clojure-eval.character :as Character]
-                       '[lang-clojure-eval.integer :as Integer])
+  (let [reqs (str "(ns " (or (current-ns source) "lang-clojure-eval")
+                  "(:require [lang-clojure-eval.character :as Character]
+                       [lang-clojure-eval.integer :as Integer]))
               (defn int [x]
                 (if (.isInteger js/Number (js/parseInt x))
                     (js/parseInt x)
-                    (.charCodeAt x 0)))"]
+                    (.charCodeAt x 0)))")]
     (try (binding [*print-length* 100]
            (with-out-str (pprint/pprint (sci/eval-string* context (str reqs source)))))
          (catch :default e
            (with-out-str (error-handler source e))))))
+