AOT core wip

`cljs.analyzer/cache-file` now searches in the correct location for
core analysis cache

`cljs.analyzer/requires-analysis?` now returns true if cache is a URL
that matches the expect core analysis cache location

`cljs.closure/aot-cache-core` no longer sets :cache-analysis true
as this will write the cache file to a default filename, instead write
out the cache ourselves

drop File type hint from `cljs.util/compiled-by-version`, could be
URL or File

Author: swannodette

src/clj/cljs/analyzer.clj

@@ -1893,7 +1893,7 @@ argument, which the reader will use in any emitted errors."
    (if-let [core-cache
             (and (util/url? src)
                  (.endsWith (.getPath ^URL src) (str "cljs" File/separator "core.cljs"))
-                 (io/resource "aot_cljs/cljs/core.cljs.cache.edn"))]
+                 (io/resource "cljs/core.cljs.cache.aot.edn"))]
      core-cache
      (let [ns-info (parse-ns src)]
        (io/file (str (util/to-target-file output-dir ns-info "cljs") ".cache.edn"))))))
@@ -1911,9 +1911,17 @@ argument, which the reader will use in any emitted errors."
   ([src output-dir]
     (let [cache (cache-file src output-dir)]
       (requires-analysis? src cache output-dir)))
-  ([src ^File cache output-dir]
-    (if (not (.exists cache))
+  ([src cache output-dir]
+    (cond
+      (and (util/url? cache)
+           (.endsWith (.getPath ^URL cache) "cljs/core.cljs.cache.aot.edn"))
+      false
+
+      (and (util/file? cache)
+           (not (.exists ^File cache)))
       true
+
+      :else
       (let [out-src (util/to-target-file output-dir (parse-ns src))]
         (if (not (.exists out-src))
           true
@@ -1951,11 +1959,12 @@ argument, which the reader will use in any emitted errors."
          (let [path (if (instance? File res)
                       (.getPath ^File res)
                       (.getPath ^URL res))
-               cache (when (and (:cache-analysis opts) output-dir)
+               cache (when (or (= f "cljs/core.cljs")
+                               (and (:cache-analysis opts) output-dir))
                        (cache-file res output-dir))]
            (when-not (get-in @env/*compiler* [::analyzed-cljs path])
-             (if (or (not (:cache-analysis opts))
-                     (not output-dir)
+             (if (or (not= f "cljs/core.cljs")
+                     (not cache)
                      (requires-analysis? res output-dir))
                (binding [*cljs-ns* 'cljs.user
                          *cljs-file* path
@@ -1972,7 +1981,7 @@ argument, which the reader will use in any emitted errors."
                                   (recur (:name ast) (next forms))
                                   (recur ns (next forms))))
                               ns))]
-                   (when cache
+                   (when (and cache (true? (:cache-analysis opts)))
                      (write-analysis-cache ns cache))
                    (swap! env/*compiler* assoc-in [::analyzed-cljs path] true)))
                ;; we want want to keep dependency analysis information

src/clj/cljs/closure.clj

@@ -1553,16 +1553,23 @@ should contain the source for the given namespace name."
           (str goog-ns))))))
 
 (defn aot-cache-core []
-  (let [src (io/file "src" "cljs" "cljs" "core.cljs")
-        dest (io/file "src" "aot_cljs" "cljs" "core.js")]
+  (let [base-path (io/file "src" "cljs" "cljs")
+        src (io/file base-path "core.cljs")
+        dest (io/file base-path "core.aot.js")
+        cache (io/file base-path "core.cljs.cache.aot.edn")]
     (util/mkdirs dest)
     (env/with-compiler-env (env/default-compiler-env)
       (comp/compile-file src dest
         {:source-map true
-         :cache-analysis true
-         :output-dir (str "src" File/separator "aot_cljs")}))))
+         :output-dir (str "src" File/separator "cljs")})
+      (ana/write-analysis-cache 'cljs.core cache))))
 
 (comment
+  (time
+    (do (aot-cache-core) nil))
+
+  (time
+    (do (ana/analyze-file "cljs/core.cljs") nil))
 
   (println (build '[(ns hello.core)
                     (defn ^{:export greet} greet [n] (str "Hola " n))

src/clj/cljs/util.clj

@@ -33,7 +33,7 @@
        "-SNAPSHOT"))
     "0.0-0000"))
 
-(defn ^String compiled-by-version [^File f]
+(defn ^String compiled-by-version [f]
   (with-open [reader (io/reader f)]
     (let [match (->> reader line-seq first
                      (re-matches #".*ClojureScript (\d+\.\d+-\d+).*$"))]