CLJS-1311: Improve error reporting when converting JavaScript modules

Show warnings and errors from Google Closure compiler when processing JS
modules. Pull :closure-warnings and :closure-extra-annotations into
set-options function so we can set those options and :pretty-print for
module processing.

Author: Maria Neise

src/main/clojure/cljs/closure.clj

@@ -125,6 +125,38 @@
 (defmethod js-source-file BufferedInputStream [^String name ^BufferedInputStream source]
   (SourceFile/fromInputStream name source))
 
+(def check-level
+  {:error CheckLevel/ERROR
+   :warning CheckLevel/WARNING
+   :off CheckLevel/OFF})
+
+(def warning-types
+  {:access-controls DiagnosticGroups/ACCESS_CONTROLS
+   :ambiguous-function-decl DiagnosticGroups/AMBIGUOUS_FUNCTION_DECL
+   :debugger-statement-present DiagnosticGroups/DEBUGGER_STATEMENT_PRESENT
+   :check-regexp DiagnosticGroups/CHECK_REGEXP
+   :check-types DiagnosticGroups/CHECK_TYPES
+   :check-useless-code DiagnosticGroups/CHECK_USELESS_CODE
+   :check-variables DiagnosticGroups/CHECK_VARIABLES
+   :const DiagnosticGroups/CONST
+   :constant-property DiagnosticGroups/CONSTANT_PROPERTY
+   :deprecated DiagnosticGroups/DEPRECATED
+   :duplicate-message DiagnosticGroups/DUPLICATE_MESSAGE
+   :es5-strict DiagnosticGroups/ES5_STRICT
+   :externs-validation DiagnosticGroups/EXTERNS_VALIDATION
+   :fileoverview-jsdoc DiagnosticGroups/FILEOVERVIEW_JSDOC
+   :global-this DiagnosticGroups/GLOBAL_THIS
+   :internet-explorer-checks DiagnosticGroups/INTERNET_EXPLORER_CHECKS
+   :invalid-casts DiagnosticGroups/INVALID_CASTS
+   :missing-properties DiagnosticGroups/MISSING_PROPERTIES
+   :non-standard-jsdoc DiagnosticGroups/NON_STANDARD_JSDOC
+   :strict-module-dep-check DiagnosticGroups/STRICT_MODULE_DEP_CHECK
+   :tweaks DiagnosticGroups/TWEAKS
+   :undefined-names DiagnosticGroups/UNDEFINED_NAMES
+   :undefined-variables DiagnosticGroups/UNDEFINED_VARIABLES
+   :unknown-defines DiagnosticGroups/UNKNOWN_DEFINES
+   :visiblity DiagnosticGroups/VISIBILITY})
+
 (defn set-options
   "TODO: Add any other options that we would like to support."
   [opts ^CompilerOptions compiler-options]
@@ -157,39 +189,18 @@
 
   (when (contains? opts :print-input-delimiter)
     (set! (.printInputDelimiter compiler-options)
-      (:print-input-delimiter opts))))
+      (:print-input-delimiter opts)))
 
-(def check-level
-  {:error CheckLevel/ERROR
-   :warning CheckLevel/WARNING
-   :off CheckLevel/OFF})
+  (when (contains? opts :closure-warnings)
+    (doseq [[type level] (:closure-warnings opts)]
+      (. compiler-options
+        (setWarningLevel (type warning-types) (level check-level)))))
 
-(def warning-types
-  {:access-controls DiagnosticGroups/ACCESS_CONTROLS
-   :ambiguous-function-decl DiagnosticGroups/AMBIGUOUS_FUNCTION_DECL
-   :debugger-statement-present DiagnosticGroups/DEBUGGER_STATEMENT_PRESENT
-   :check-regexp DiagnosticGroups/CHECK_REGEXP
-   :check-types DiagnosticGroups/CHECK_TYPES
-   :check-useless-code DiagnosticGroups/CHECK_USELESS_CODE
-   :check-variables DiagnosticGroups/CHECK_VARIABLES
-   :const DiagnosticGroups/CONST
-   :constant-property DiagnosticGroups/CONSTANT_PROPERTY
-   :deprecated DiagnosticGroups/DEPRECATED
-   :duplicate-message DiagnosticGroups/DUPLICATE_MESSAGE
-   :es5-strict DiagnosticGroups/ES5_STRICT
-   :externs-validation DiagnosticGroups/EXTERNS_VALIDATION
-   :fileoverview-jsdoc DiagnosticGroups/FILEOVERVIEW_JSDOC
-   :global-this DiagnosticGroups/GLOBAL_THIS
-   :internet-explorer-checks DiagnosticGroups/INTERNET_EXPLORER_CHECKS
-   :invalid-casts DiagnosticGroups/INVALID_CASTS
-   :missing-properties DiagnosticGroups/MISSING_PROPERTIES
-   :non-standard-jsdoc DiagnosticGroups/NON_STANDARD_JSDOC
-   :strict-module-dep-check DiagnosticGroups/STRICT_MODULE_DEP_CHECK
-   :tweaks DiagnosticGroups/TWEAKS
-   :undefined-names DiagnosticGroups/UNDEFINED_NAMES
-   :undefined-variables DiagnosticGroups/UNDEFINED_VARIABLES
-   :unknown-defines DiagnosticGroups/UNKNOWN_DEFINES
-   :visiblity DiagnosticGroups/VISIBILITY})
+  (when (contains? opts :closure-extra-annotations)
+    (. compiler-options
+      (setExtraAnnotationNames (map name (:closure-extra-annotations opts)))))
+
+  compiler-options)
 
 (defn ^CompilerOptions make-options
   "Create a CompilerOptions object and set options from opts map."
@@ -209,9 +220,6 @@
           (or (true? val)
               (false? val)) (.setDefineToBooleanLiteral compiler-options key val)
           :else (println "value for" key "must be string, int, float, or bool"))))
-    (doseq [[type level] (:closure-warnings opts)]
-      (. compiler-options
-        (setWarningLevel (type warning-types) (level check-level))))
     (if-let [extra-annotations (:closure-extra-annotations opts)]
       (. compiler-options (setExtraAnnotationNames (map name extra-annotations))))
     (when (contains? opts :source-map)
@@ -1259,12 +1267,19 @@
       :commonjs
       module-type)))
 
+(defn make-convert-js-module-options [opts]
+  (-> opts
+      (select-keys [:closure-warnings
+                    :pretty-print
+                    :closure-extra-annotations])
+      (set-options (CompilerOptions.))))
+
 (util/compile-if can-convert-commonjs?
   (defmethod convert-js-module :commonjs [js opts]
     (let [{:keys [file module-type]} js
           ^List externs '()
           ^List source-files (get-source-files module-type opts)
-          ^CompilerOptions options (CompilerOptions.)
+          ^CompilerOptions options (make-convert-js-module-options opts)
           closure-compiler (doto (make-closure-compiler)
                              (.init externs source-files options))
           es6-loader (if is-new-es6-loader?
@@ -1276,14 +1291,15 @@
         (when (= (:module-type js) :amd)
           (.process (TransformAMDToCJSModule. closure-compiler) nil root)))
       (.process cjs nil root)
+      (report-failure (.getResult closure-compiler))
       (.toSource closure-compiler root))))
 
 (util/compile-if can-convert-es6?
   (defmethod convert-js-module :es6 [js opts]
     (let [{:keys [file module-type]} js
           ^List externs '()
           ^List source-files (get-source-files module-type opts)
-          ^CompilerOptions options (doto (CompilerOptions.)
+          ^CompilerOptions options (doto (make-convert-js-module-options opts)
                                      (.setLanguageIn CompilerOptions$LanguageMode/ECMASCRIPT6)
                                      (.setLanguageOut CompilerOptions$LanguageMode/ECMASCRIPT5))
           closure-compiler (doto (make-closure-compiler)
@@ -1294,6 +1310,7 @@
           cjs (ProcessEs6Modules. closure-compiler es6-loader true)
           ^Node root (get-root-node file closure-compiler)]
       (.processFile cjs root)
+      (report-failure (.getResult closure-compiler))
       (.toSource closure-compiler root))))
 
 (defmethod convert-js-module :default [js opts]