corkine/rum
1
0
Fork 0
mirror of https://github.com/tonsky/rum.git synced 2025-08-03 18:13:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

defer requiring cljs.analyzer, resolves #222

Browse Source
This commit is contained in:
roman01la
2021-03-06 01:26:43 +02:00
parent c44a9ec639
commit d4cd413fe5
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/daiquiri/compiler.clj
View File

@ -1,11 +1,15 @@
(ns daiquiri.compiler
(:require [daiquiri.normalize :as normalize]
[daiquiri.util :refer :all]
[clojure.set :as set]
[cljs.analyzer :as ana]))
[clojure.set :as set]))
(def warn-on-interpretation (atom false))
(defn- requiring-resolve [sym]
(or (resolve sym)
(do (require (-> sym namespace symbol))
(resolve sym))))
(defn maybe-warn-on-interpret
([env expr]
(maybe-warn-on-interpret env expr nil))
@ -14,7 +18,8 @@
(binding [*out* *err*]
(let [column (:column env)
line (:line env)]
(println (str "WARNING: interpreting by default at " ana/*cljs-file* ":" line ":" column))
(require 'cljs.analyzer)
(println (str "WARNING: interpreting by default at " (requiring-resolve 'cljs.analyzer/*cljs-file*) ":" line ":" column))
(prn expr)
(when tag
(println "Inferred tag was:" tag)))))))
@ -39,7 +44,9 @@
"Infer the tag of `form` using `env`."
[env form]
(when env
(let [e (ana/no-warn (ana/analyze env form))
(let [e (with-bindings* {(requiring-resolve 'cljs.analyzer/*cljs-warnings*) {}}
(fn []
((requiring-resolve 'cljs.analyzer/analyze) env form)))
;; Roman. Propagating Rum's component return tag
;; via :rum/tag meta field, because a component
;; is generated as a `def` instead of `defn`
@ -47,7 +54,7 @@
(-> e :fn :info :meta :rum/tag second))]
(if rum-tag
(normalize-tags rum-tag)
(when-let [tags (ana/infer-tag env e)]
(when-let [tags ((requiring-resolve 'cljs.analyzer/infer-tag) env e)]
(normalize-tags tags))))))
(declare to-js to-js-map)