allow cljc files to supplied anywhere cljs files are (wip)

Author: dnolen

src/clj/cljs/analyzer.clj

@@ -108,10 +108,10 @@
   (str "Use of undeclared Var " (:prefix info) "/" (:suffix info)))
 
 (defmethod error-message :undeclared-ns
-  [warning-type {:keys [ns-sym path] :as info}]
+  [warning-type {:keys [ns-sym] :as info}]
   (str "No such namespace: " ns-sym
-    (when path
-      (str ", could not locate " path))))
+       ", could not locate " (util/ns->relpath ns-sym :cljc)
+       " or " (util/ns->relpath ns-sym :cljs)))
 
 (defmethod error-message :dynamic
   [warning-type info]
@@ -433,8 +433,8 @@
              (nil? (get-in @env/*compiler* [::namespaces ns-sym]))
              ;; macros may refer to namespaces never explicitly required
              ;; confirm that the library at least exists
-             (nil? (io/resource (util/ns->relpath ns-sym))))
-    (warning :undeclared-ns env {:ns-sym ns-sym :path (util/ns->relpath ns-sym)})))
+             (nil? (util/ns->source ns-sym)))
+    (warning :undeclared-ns env {:ns-sym ns-sym})))
 
 (declare get-expander)
 
@@ -1211,13 +1211,19 @@
 
 (declare analyze-file)
 
-(defn locate-src [relpath]
-  (or (io/resource relpath)
-      (let [root (:root @env/*compiler*)
-            root-path (when root (.getPath ^File root))
-            f (io/file root-path relpath)]
-        (when (and (.exists f) (.isFile f))
-          f))))
+(defn locate-src
+  "Given a namespace return the corresponding ClojureScript (.cljc or .cljs)
+  resource on the classpath or file from the root of the build."
+  [ns]
+  (or (util/ns->source ns)
+      (let [rootp (when-let [root (:root @env/*compiler*)]
+                    (.getPath ^File root))
+            cljcf (io/file rootp (util/ns->relpath ns :cljc))
+            cljsf (io/file rootp (util/ns->relpath ns :cljs))]
+        (if (and (.exists cljcf) (.isFile cljcf))
+          cljcf
+          (if (and (.exists cljsf) (.isFile cljsf))
+            cljsf)))))
 
 (defn foreign-dep? [dep]
   {:pre [(symbol? dep)]}
@@ -1237,13 +1243,11 @@
          (when-not (or (not-empty (get-in compiler [::namespaces dep :defs]))
                        (contains? (:js-dependency-index compiler) (name dep))
                        (deps/find-classpath-lib dep))
-           (let [relpath (util/ns->relpath dep)
-                 src (locate-src relpath)]
-             (if src
-               (analyze-file src opts)
-               (throw
-                 (error env
-                   (error-message :undeclared-ns {:ns-sym dep :path relpath})))))))))))
+           (if-let [src (locate-src dep)]
+             (analyze-file src opts)
+             (throw
+               (error env
+                 (error-message :undeclared-ns {:ns-sym dep}))))))))))
 
 (defn check-uses [uses env]
   (doseq [[sym lib] uses]
@@ -1373,8 +1377,8 @@
     (let [ns (if (sequential? form) (first form) form)
          {:keys [use-macros require-macros]}
          (or (get-in @env/*compiler* [::namespaces ns])
-           (when-let [res (io/resource (util/ns->relpath ns))]
-             (:ast (parse-ns res))))]
+             (when-let [res (util/ns->source ns)]
+               (:ast (parse-ns res))))]
       (or (some #{ns} (vals use-macros))
           (some #{ns} (vals require-macros))))))
 
@@ -2023,7 +2027,7 @@
   ([src dest opts]
     (env/ensure
       (let [src (if (symbol? src)
-                  (io/resource (util/ns->relpath src))
+                  (util/ns->source src)
                   src)
             compiler-env @env/*compiler*
             [ijs compiler-env']
@@ -2085,7 +2089,9 @@
                  (= (:ns ns-info) 'cljs.core)
                  (io/resource "cljs/core.cljs.cache.aot.edn"))]
      core-cache
-     (io/file (str (util/to-target-file output-dir ns-info "cljs") ".cache.edn")))))
+     (let [target-file (util/to-target-file output-dir ns-info
+                         (util/ext (:source-file ns-info)))]
+       (io/file (str target-file ".cache.edn"))))))
 
 (defn requires-analysis?
   ([src] (requires-analysis? src "out"))

src/clj/cljs/closure.clj

@@ -479,26 +479,35 @@
     (-compile uri (merge opts {:output-file js-file}))))
 
 (defn cljs-source-for-namespace
-  "Returns a map containing :relative-path, :uri referring to the resource that
-should contain the source for the given namespace name."
+  "Given a namespace return the corresponding source with either a .cljc or
+  .cljs extension."
   [ns]
-  (as-> (munge ns) %
-    (string/replace % \. \/)
-    (str % ".cljs")
-    {:relative-path % :uri (io/resource %)}))
+  (let [path (-> (munge ns) (string/replace \. \/))
+        relpath (str path ".cljc")]
+    (if-let [res (io/resource relpath)]
+      {:relative-path relpath :uri res}
+      (let [relpath (str path ".cljs")]
+        (if-let [res (io/resource relpath)]
+          {:relative-path relpath :uri res})))))
 
 (defn source-for-namespace
+  "Given a namespace and compilation environment return the relative path and
+  uri of the corresponding source regardless of the source language extension:
+  .cljc, .cljs, .js"
   [ns compiler-env]
   (let [ns-str  (str (comp/munge ns {}))
         path    (string/replace ns-str \. \/)
-        relpath (str path ".cljs")]
-    (if-let [cljs-res (io/resource relpath)]
-      {:relative-path relpath :uri cljs-res}
-      (let [relpath (:file (get-in @compiler-env [:js-dependency-index ns-str]))]
-        (if-let [js-res (and relpath (io/resource relpath))]
-          {:relative-path relpath :uri js-res}
-          (throw
-            (IllegalArgumentException. (str "Namespace " ns " does not exist"))))))))
+        relpath (str path ".cljc")]
+    (if-let [cljc-res (io/resource relpath)]
+      {:relative-path relpath :uri cljc-res}
+      (let [relpath (str path ".cljs")]
+        (if-let [cljs-res (io/resource relpath)]
+          {:relative-path relpath :uri cljs-res}
+          (let [relpath (:file (get-in @compiler-env [:js-dependency-index ns-str]))]
+            (if-let [js-res (and relpath (io/resource relpath))]
+              {:relative-path relpath :uri js-res}
+              (throw
+                (IllegalArgumentException. (str "Namespace " ns " does not exist"))))))))))
 
 (defn cljs-dependencies
   "Given a list of all required namespaces, return a list of
@@ -814,7 +823,7 @@ should contain the source for the given namespace name."
               (if (and provides source-url)
                 (assoc relpaths
                   (.getPath ^URL source-url)
-                  (util/ns->relpath (first provides)))
+                  (util/ns->relpath (first provides) (util/ext source-url)))
                 relpaths))
             (if-let [url (:url source)]
               (let [path (.getPath ^URL url)]
@@ -1156,9 +1165,9 @@ should contain the source for the given namespace name."
     (write-javascript opts js)
     ;; always copy original ClojureScript sources to the output directory
     ;; when source maps enabled
-    (let [out-file (if-let [ns (and (:source-map opts) (first (:provides js)))]
+    (let [out-file (when-let [ns (and (:source-map opts) (first (:provides js)))]
                      (io/file (io/file (util/output-directory opts))
-                       (util/ns->relpath ns)))
+                       (util/ns->relpath ns (util/ext (:source-url js)))))
           source-url (:source-url js)]
       (when (and out-file source-url
                  (or (not (.exists ^File out-file))
@@ -1551,7 +1560,8 @@ should contain the source for the given namespace name."
                          (some
                            (fn [^WatchEvent e]
                              (let [fstr (.. e context toString)]
-                               (and (or (. fstr (endsWith "cljs"))
+                               (and (or (. fstr (endsWith "cljc"))
+                                        (. fstr (endsWith "cljs"))
                                         (. fstr (endsWith "js")))
                                     (not (. fstr (startsWith ".#"))))))
                            (seq (.pollEvents key))))
@@ -1596,9 +1606,9 @@ should contain the source for the given namespace name."
   ([src {:keys [wrap all-provides] :as options}]
     (let [goog-ns
           (case (util/ext src)
-            "cljs" (comp/munge (:ns (ana/parse-ns src)))
-            "js"   (cond-> (:provides (parse-js-ns src))
-                     (not all-provides) first)
+            ("cljc" "cljs") (comp/munge (:ns (ana/parse-ns src)))
+            "js" (cond-> (:provides (parse-js-ns src))
+                   (not all-provides) first)
             (throw
               (IllegalArgumentException.
                 (str "Can't create goog.require expression for " src))))]

src/clj/cljs/compiler.clj

@@ -933,11 +933,22 @@
                (emits (interleave (concat segs (repeat nil))
                                   (concat args [nil]))))))
 
+;; TODO: unify renaming helpers - this one was hard to find - David
+
 (defn rename-to-js
   "Change the file extension from .cljs to .js. Takes a File or a
   String. Always returns a String."
-  [file-str]
-  (clojure.string/replace file-str #"\.cljs$" ".js"))
+  [^String file-str]
+  (cond
+    (.endsWith file-str ".cljc")
+    (clojure.string/replace file-str #"\.cljc$" ".js")
+
+    (.endsWith file-str ".cljs")
+    (clojure.string/replace file-str #"\.cljs$" ".js")
+
+    :else
+    (throw (IllegalArgumentException.
+             (str "Invalid source file extension " file-str)))))
 
 (defn with-core-cljs
   "Ensure that core.cljs has been loaded."
@@ -1125,13 +1136,15 @@
           (throw (java.io.FileNotFoundException. (str "The file " src " does not exist."))))))))
 
 (defn cljs-files-in
-  "Return a sequence of all .cljs files in the given directory."
+  "Return a sequence of all .cljc and .cljs files in the given directory."
   [dir]
-  (filter #(let [name (.getName ^File %)]
-             (and (.endsWith name ".cljs")
-                  (not= \. (first name))
-                  (not (contains? cljs-reserved-file-names name))))
-          (file-seq dir)))
+  (filter
+    #(let [name (.getName ^File %)]
+      (and (or (.endsWith name ".cljc")
+               (.endsWith name ".cljs"))
+           (not= \. (first name))
+           (not (contains? cljs-reserved-file-names name))))
+    (file-seq dir)))
 
 (defn compile-root
   "Looks recursively in src-dir for .cljs files and compiles them to

src/clj/cljs/repl.clj

@@ -202,12 +202,17 @@
 
 (defn ^File js-src->cljs-src
   "Map a JavaScript output file back to the original ClojureScript source
-   file."
+   file (.cljc or .cljs)."
   [f]
   (let [f (io/file f)
         dir (.getParentFile f)
-        name (.getName f)]
-    (io/file dir (string/replace name ".js" ".cljs"))))
+        base-name (string/replace (.getName f) ".js" "")
+        cljcf (io/file dir (str base-name ".cljc"))]
+    (if (.exists cljcf)
+      cljcf
+      (let [cljsf (io/file dir (str base-name ".cljs"))]
+        (if (.exists cljsf)
+          cljsf)))))
 
 (defn read-source-map
   "Return the source map for the JavaScript source file."
@@ -298,8 +303,8 @@
                                  source-file
                                  (io/file rfile)))
                              (str (System/getProperty "user.dir") File/separator) ""))
-                   url (or (and ns-info (io/resource (util/ns->relpath ns)))
-                         (and file (io/resource file)))]
+                   url (or (and ns-info (util/ns->source ns))
+                           (and file (io/resource file)))]
                (merge
                  {:function name'
                   :call call
@@ -494,7 +499,7 @@
         (when-let [ns (and (:source-map opts) (first (:provides compiled)))]
           (spit
             (io/file (io/file (util/output-directory opts))
-              (util/ns->relpath ns))
+              (util/ns->relpath ns (util/ext (:source-url compiled))))
             (slurp src)))
         ;; need to load dependencies first
         (load-dependencies repl-env (:requires compiled) opts)

src/clj/cljs/repl/browser.clj

@@ -90,6 +90,7 @@
             ".html" "text/html"
             ".jpg" "image/jpeg"
             ".js" "text/javascript"
+            ".cljc" "text/x-clojure"
             ".cljs" "text/x-clojure"
             ".map" "application/json"
             ".png" "image/png"
@@ -107,6 +108,7 @@
     (or
       (= path "/")
       (.endsWith path ".js")
+      (.endsWith path ".cljc")
       (.endsWith path ".cljs")
       (.endsWith path ".map")
       (.endsWith path ".html")

src/clj/cljs/repl/nashorn.clj

@@ -25,13 +25,6 @@
 ;;
 ;; Nashorn's load() function docs:
 ;; http://docs.oracle.com/javase/8/docs/technotes/guides/scripting/nashorn/shell.html
-;;
-;; Some functions are copied from: https://github.com/bodil/cljs-nashorn and the node.js repl code
-
-;;
-;; ** Usage from Leiningen:
-;;
-;; Create a file init_repl_test.clj containing (adjust :output-dir to your cljsbuild settings):
 
 (comment
   (ns init-repl-test
@@ -43,25 +36,6 @@
     :cache-analysis true)
   )
 
-;;
-;; Invoke it with:
-;; lein trampoline run -m clojure.main src-clj/init_repl_test.clj
-
-;;
-;; ** Usage from nrepl / piggieback, execute the following at the nrepl prompt:
-;;    (adjust :output-dir to your cljsbuild settings)
-
-(comment
-  (ns init-repl-piggieback
-    (:require [cljs.repl.nashorn]
-              [cemerick.piggieback]))
-
-  (cemerick.piggieback/cljs-repl
-    :repl-env (cljs.repl.nashorn/repl-env)
-    :output-dir "resources/public/compiled"
-    :cache-analysis true)
-  )
-
 ;; Implementation
 
 (defn create-engine

src/clj/cljs/util.clj

@@ -48,8 +48,18 @@
 (defn munge-path [ss]
   (clojure.lang.Compiler/munge (str ss)))
 
-(defn ns->relpath [s]
-  (str (string/replace (munge-path s) \. \/) ".cljs"))
+(defn ns->relpath
+  "Given a namespace as a symbol return the relative path. May optionally
+  provide the file extension, defaults to :cljs."
+  ([ns] (ns->relpath ns :cljs))
+  ([ns ext]
+   (str (string/replace (munge-path ns) \. \/) "." (name ext))))
+
+(defn ns->source
+  "Given a namespace as a symbol return the corresponding resource if it exists."
+  [ns]
+  (or (io/resource (ns->relpath ns :cljc))
+      (io/resource (ns->relpath ns :cljs))))
 
 (defn path-seq
   [file-str]