diff --git a/src/squint/compiler_common.cljc b/src/squint/compiler_common.cljc index 7c5e21f..75251b0 100644 --- a/src/squint/compiler_common.cljc +++ b/src/squint/compiler_common.cljc @@ -365,9 +365,10 @@ (defn process-require-clause [[libname & {:keys [refer as]}]] (let [libname (resolve-ns libname) - [libname suffix] (str/split libname #"\$" 2) + [libname suffix] (str/split (if (string? libname) libname (str libname)) #"\$" 2) [p & _props] (when suffix - (str/split suffix #"\."))] + (str/split suffix #"\.")) + as (when as (munge as))] (str (when-not *repl* (when (and as (= "default" p)) @@ -380,7 +381,7 @@ (when *repl* (if (str/ends-with? libname "$default") (statement (format "import %s from '%s'" as (str/replace libname "$default" ""))) - (statement (format "import * as %s from '%s'" as libname))))) + (statement (format "import * as %s from '%s'" as libname))))) (when refer (statement (format "import { %s } from '%s'" (str/join ", " refer) libname)))))) @@ -396,7 +397,7 @@ (let [full (resolve-ns full)] (case as (:as :as-alias) - (assoc aliases alias full) + (assoc aliases (munge alias) full) aliases))) {:current name}))) (str