Fix mranderson setup

vemv · bbatsov · commit 19d1af9c55b0 · 2021-10-01T08:30:00.000+03:00
diff --git a/src/main/suitable/complete_for_nrepl.clj b/src/main/suitable/complete_for_nrepl.clj
@@ -12,8 +12,14 @@
 ;; of course breaks when suitable.complete-for-nrepl is renamed(!).
 (def dummy-var)
 (def this-ns (:ns (meta #'dummy-var)))
-(def munged-js-introspection-ns (string/replace (name (clojure.core/ns-name this-ns)) #"complete-for-nrepl$" "js-introspection"))
-(def munged-js-introspection-js-name (symbol (string/replace munged-js-introspection-ns #"-" "_")))
+
+(defn munged-js-introspection-ns []
+  (suitable.js-completions/js-introspection-ns))
+
+(defn munged-js-introspection-js-name []
+  (-> (munged-js-introspection-ns)
+      (string/replace #"-" "_")
+      symbol))
 
 ;; -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
@@ -143,19 +149,19 @@
       (when (not= "true" (some-> (cljs-evaluate-fn
                                   renv "<suitable>" 1
                                   ;; see above, would be suitable.js_introspection
-                                  (format "!!goog.getObjectByName('%s')" munged-js-introspection-js-name)) :value))
+                                  (format "!!goog.getObjectByName('%s')" (munged-js-introspection-js-name))) :value))
         (try
           ;; see above, would be suitable.js-introspection
-          (cljs-load-namespace-fn renv (read-string munged-js-introspection-ns) opts)
+          (cljs-load-namespace-fn renv (read-string (munged-js-introspection-ns)) opts)
           (catch Exception e
             ;; when run with mranderson, cljs does not seem to handle the ns
             ;; annotation correctly and does not recognize the namespace even
             ;; though it loads correctly.
-            (when-not (and (string/includes? munged-js-introspection-ns "inlined-deps")
+            (when-not (and (string/includes? (munged-js-introspection-ns) "inlined-deps")
                            (string/includes? (string/lower-case (str e)) "does not provide a namespace"))
               (throw e))))
         (cljs-evaluate-fn renv "<suitable>" 1 (format "goog.require(\"%s\");%s"
-                                                      munged-js-introspection-js-name
+                                                      (munged-js-introspection-js-name)
                                                       (if debug? " console.log(\"suitable loaded\");" "")))
         ;; wait as depending on the implemention of goog.require provide by the
         ;; cljs repl might be async. See
diff --git a/src/main/suitable/js_completions.clj b/src/main/suitable/js_completions.clj
@@ -7,6 +7,10 @@
 
 (def debug? false)
 
+;; mranderson-friendly
+(defn js-introspection-ns []
+  (-> ::_ namespace (replace ".js-completions" ".js-introspection")))
+
 (defn js-properties-of-object
   "Returns the properties of the object we get by evaluating `obj-expr` filtered
   by all those that start with `prefix`."
@@ -19,9 +23,11 @@
      ;; to avoid
      ;; Compile Warning:  Use of undeclared Var
      ;;   suitable.js-introspection/property-names-and-types
-     (let [template "(suitable.js-introspection/property-names-and-types ~A ~S)"
+     (let [template (str "("
+                         (js-introspection-ns)
+                         "/property-names-and-types ~A ~S)")
            code (cl-format nil template obj-expr prefix)]
-       (cljs-eval-fn ns "(require 'suitable.js-introspection)")
+       (cljs-eval-fn ns (str "(require '" (js-introspection-ns) ")"))
        (cljs-eval-fn ns code))
      (catch Exception e {:error e}))))
 
