now clj-reload works but not sci tests, IDeref for example

Author: borkdude

src/sci/impl/evaluator.cljc

@@ -6,7 +6,7 @@
    [sci.impl.deftype]
    [sci.impl.interop :as interop]
    [sci.impl.macros :as macros]
-   [sci.impl.records]
+   [sci.impl.records :as records]
    [sci.impl.types :as types]
    [sci.impl.utils :as utils :refer [#?(:cljs kw-identical?)
                                      rethrow-with-location-of-node
@@ -203,7 +203,8 @@
                 (reduce (fn [_ class]
                           (let [fq-class-name (symbol (if package (str package "." class)
                                                           class))]
-                            (if-let [clazz (interop/resolve-class ctx fq-class-name)]
+                            (if-let [clazz (or (interop/resolve-class ctx fq-class-name)
+                                               (records/resolve-record-or-protocol-class ctx fq-class-name))]
                               (let [cnn (utils/current-ns-name)]
                                 (swap! env assoc-in [:namespaces cnn :imports class] fq-class-name)
                                 clazz)

src/sci/impl/records.cljc

@@ -349,16 +349,20 @@
    A protocol is represented by a map with :ns, :methods and optionally :class. This is also an implementation detail."
   ;; TODO: we should probably use munging here for namespaces with hyphens in them.
   ([ctx sym]
-   (or (some-> ctx :env deref :types (get sym))
-       (let [sym-str (str sym)
+   (let [env @(:env ctx)]
+     (or (some-> env :types (get sym))
+         (let [ns (utils/current-ns-name)
+               imports (get-in env [:namespaces ns :imports])]
+           (some-> env :types (get (get imports sym))))
+         (let [sym-str (str sym)
                last-dot (str/last-index-of sym-str ".")
                class-name (if last-dot
                             (subs sym-str (inc last-dot) (count sym-str))
                             sym-str)
                namespace (if last-dot
                            (symbol (subs sym-str 0 last-dot))
                            (utils/current-ns-name))]
-           (resolve-record-or-protocol-class ctx namespace (symbol class-name)))))
+           (resolve-record-or-protocol-class ctx namespace (symbol class-name))))))
   ([ctx package class]
    (let [namespace (-> package str (str/replace "_" "-") symbol)]
      (when-let [sci-var (let [ns (get-in @(:env ctx) [:namespaces namespace])]