CLJS-2255: Clean up :npm-deps

Author: anmonteiro

src/main/clojure/cljs/build/api.clj

@@ -215,12 +215,33 @@
    (binding [ana/*cljs-warning-handlers* (:warning-handlers opts ana/*cljs-warning-handlers*)]
      (closure/watch source opts compiler-env stop))))
 
-(defn node-module-deps
-  "EXPERIMENTAL: return the foreign libs entries as computed by running
-   the module-deps package on the supplied JavaScript entry point. Assumes
-   that the module-deps NPM package is either locally or globally installed."
-  [entry]
-  (closure/node-module-deps entry))
+;; =============================================================================
+;; Node.js / NPM dependencies
+
+(defn install-node-deps!
+  "EXPERIMENTAL: Install the supplied dependencies via NPM. dependencies must be
+   a map of name to version."
+  ([dependencies]
+   (install-node-deps! dependencies
+     (when-not (nil? env/*compiler*)
+       (:options @env/*compiler*))))
+  ([dependencies opts]
+   {:pre [(map? dependencies)]}
+   (closure/maybe-install-node-deps! (merge opts {:npm-deps dependencies}))))
+
+(defn get-node-deps
+  "EXPERIMENTAL: Get the Node.js dependency graph of the supplied dependencies.
+   Dependencies must be a sequence of strings or symbols naming packages or paths
+   within packages (e.g. [react \"react-dom/server\"]. Assumes dependencies have
+   been been previously installed, either by `cljs.build.api/install-node-deps!`
+   or by an NPM client, and reside in the `node_modules` directory."
+  ([dependencies]
+   (get-node-deps dependencies
+     (when-not (nil? env/*compiler*)
+       (:options @env/*compiler*))))
+  ([dependencies opts]
+   {:pre [(sequential? dependencies)]}
+   (closure/index-node-modules dependencies opts)))
 
 (comment
   (node-module-deps

src/test/clojure/cljs/build_api_tests.clj

@@ -415,3 +415,33 @@
   (.delete (io/file "package.json"))
   (.delete (io/file "package-lock.json"))
   (test/delete-node-modules))
+
+(deftest test-deps-api-cljs-2255
+  (test/delete-node-modules)
+  (spit (io/file "package.json") "{}")
+  (build/install-node-deps! {:left-pad "1.1.3"})
+  (is (.exists (io/file "node_modules/left-pad/package.json")))
+  (test/delete-node-modules)
+  (spit (io/file "package.json") "{}")
+  (build/install-node-deps! {:react "15.6.1"
+                             :react-dom "15.6.1"})
+  (let [modules (build/get-node-deps '[react "react-dom/server"])]
+    (is (true? (some (fn [module]
+                       (= module {:module-type :commonjs
+                                  :file (.getAbsolutePath (io/file "node_modules/react/react.js"))
+                                  :provides ["react"
+                                             "react/react.js"
+                                             "react/react"]}))
+                 modules)))
+    (is (true? (some (fn [module]
+                       (= module {:module-type :commonjs
+                                  :file (.getAbsolutePath (io/file "node_modules/react/lib/React.js"))
+                                  :provides ["react/lib/React.js" "react/lib/React"]}))
+                 modules)))
+    (is (true? (some (fn [module]
+                       (= module {:module-type :commonjs
+                                  :file (.getAbsolutePath (io/file "node_modules/react-dom/server.js"))
+                                  :provides ["react-dom/server.js" "react-dom/server"]}))
+                 modules))))
+  (test/delete-node-modules)
+  (.delete (io/file "package.json")))