CLJS-1802: Generated namespaces should be of the form cljs.user.fileXXXX

Author: anmonteiro

src/main/clojure/cljs/analyzer.cljc

@@ -36,8 +36,6 @@
                    [java.util.regex Pattern]
                    [java.net URL]
                    [java.lang Throwable]
-                   [java.security MessageDigest]
-                   [javax.xml.bind DatatypeConverter]
                    [clojure.lang Namespace Var LazySeq ArityException]
                    [cljs.tagged_literals JSValue])))
 
@@ -3144,17 +3142,14 @@
 
 #?(:clj
    (defn gen-user-ns [src]
-     (let [name (str src)
-           name (.substring name (inc (.lastIndexOf name "/")) (.lastIndexOf name "."))
-           digest (MessageDigest/getInstance "SHA-1")]
-       (.reset digest)
-       (.update digest (.getBytes ^String name "utf8"))
+     (let [full-name (str src)
+           name (.substring full-name
+                  (inc (.lastIndexOf full-name "/"))
+                  (.lastIndexOf full-name "."))]
        (symbol
-         (str
-           "cljs.user$$gen_ns$$_" name
-           (->> (DatatypeConverter/printHexBinary (.digest digest))
-             (take 7)
-             (apply str)))))))
+         (apply str
+           "cljs.user." name
+           (take 7 (util/content-sha full-name)))))))
 
 #?(:clj
    (defn parse-ns
@@ -3198,9 +3193,7 @@
                                    (forms-seq* rdr (source-path src))
                                    src)
                            ret (merge
-                                 {:ns           (gen-user-ns src)
-                                  :provides     [(gen-user-ns src)]
-                                  :file         dest
+                                 {:file         dest
                                   :source-file  (when rdr src)
                                   :source-forms (when-not rdr src)
                                   :macros-ns    (:macros-ns opts)
@@ -3242,7 +3235,12 @@
                             (= :ns* (:op ast))
                             (let [deps (merge (:uses ast) (:requires ast))]
                               (recur (rest forms)
-                                (update-in ret [:requires] into (set (vals deps)))))
+                                (cond-> (update-in ret [:requires] into (set (vals deps)))
+                                  ;; we need to defer generating the user namespace
+                                  ;; until we actually need or it will break when
+                                  ;; `src` is a sequence of forms - António Monteiro
+                                  (not (:ns ret))
+                                  (assoc :ns (gen-user-ns src) :provides [(gen-user-ns src)]))))
 
                             :else ret))
                         ret))

src/main/clojure/cljs/closure.clj

@@ -60,8 +60,6 @@
               ES6ModuleLoader AbstractCompiler TransformAMDToCJSModule
               ProcessEs6Modules CompilerInput]
            [com.google.javascript.rhino Node]
-           [java.security MessageDigest]
-           [javax.xml.bind DatatypeConverter]
            [java.nio.file Path Paths Files StandardWatchEventKinds WatchKey
                           WatchEvent FileVisitor FileVisitResult]
            [java.nio.charset Charset StandardCharsets]
@@ -1506,14 +1504,11 @@
          :else (path-from-jarfile url))
 
        (string? js)
-       (let [digest (MessageDigest/getInstance "SHA-1")]
-         (.reset digest)
-         (.update digest (.getBytes ^String js "utf8"))
-         (str
-           (->> (DatatypeConverter/printHexBinary (.digest digest))
-             (take 7)
-             (apply str))
-           ".js"))
+       (str
+         (->> (util/content-sha js)
+           (take 7)
+           (apply str))
+         ".js")
 
        :else (str (random-string 5) ".js")))))
 

src/main/clojure/cljs/util.cljc

@@ -13,7 +13,9 @@
             [clojure.set :as set]
             [clojure.edn :as edn])
   (:import [java.io File]
-           [java.net URL]))
+           [java.net URL]
+           [java.security MessageDigest]
+           [javax.xml.bind DatatypeConverter]))
 
 ;; next line is auto-generated by the build-script - Do not edit!
 (def ^:dynamic *clojurescript-version*)
@@ -261,3 +263,9 @@
                            (cons x (step (rest s) (conj seen v)))))))
                     xs seen)))]
      (step coll #{}))))
+
+(defn content-sha [^String s]
+  (let [digest (MessageDigest/getInstance "SHA-1")]
+    (.reset digest)
+    (.update digest (.getBytes s "utf8"))
+    (DatatypeConverter/printHexBinary (.digest digest))))

src/test/clojure/cljs/analyzer_tests.clj

@@ -3,7 +3,8 @@
             [cljs.analyzer :as a]
             [cljs.env :as e]
             [cljs.env :as env]
-            [cljs.analyzer.api :as ana-api])
+            [cljs.analyzer.api :as ana-api]
+            [cljs.util :as util])
   (:use clojure.test))
 
 (defn collecting-warning-handler [state]
@@ -567,3 +568,18 @@
                    (:require [clojure.set :as set])) [1 2]))
         (a/analyze test-env
           '(map #(require '[clojure.set :as set]) [1 2]))))))
+
+(deftest test-gen-user-ns
+  ;; note: can't use `with-redefs` because direct-linking is enabled
+  (let [s   "src/cljs/foo.cljs"
+        sha (util/content-sha s)]
+    (is (= (a/gen-user-ns s) (symbol (str "cljs.user.foo" (apply str (take 7 sha)))))))
+  (let [a   "src/cljs/foo.cljs"
+        b   "src/cljs/foo.cljc"]
+    ;; namespaces should have different names because the filename hash will be different
+    (is (not= (a/gen-user-ns a) (a/gen-user-ns b)))
+    ;; specifically, only the hashes should differ
+    (let [nsa (str (a/gen-user-ns a))
+          nsb (str (a/gen-user-ns b))]
+      (is (not= (.substring nsa (- (count nsa) 7)) (.substring nsb (- (count nsb) 7))))
+      (is (= (.substring nsa 0 (- (count nsa) 7)) (.substring nsb 0 (- (count nsb) 7)))))))