Handle bundles with multiple outputs, 2.0.4

Author: doesdev

README.md

@@ -159,6 +159,12 @@ dependents:      1
           - **unusedExports** *(Array)* - list of unused named exports
 
 
+## Other considerations
+
+Rollup allows you to output to multiple files. If you are outputting to multiple
+files you will get a distinct analysis for each output file. Each analysis
+will contain data on the files imported by the respective target.
+
 ## License
 
 MIT © [Andrew Carpenter](https://github.com/doesdev)

index.js

@@ -114,28 +114,23 @@ const formatted = (bndl, opts) => analyze(bndl, opts, true);
 const plugin = (opts = {}) => {
   let cb = opts.writeTo || (opts.stdout ? console.log : console.error);
   if (opts.onAnalysis) cb = opts.onAnalysis;
-  let written;
-  let modules;
+  let depMap = {};
 
   let runAnalysis = (out, bundle, isWrite) => new Promise((resolve, reject) => {
     resolve();
-    if (written) return
-    written = true;
     if (out.bundle) bundle = out.bundle;
+    let modules = bundle.modules;
 
-    if (!Array.isArray(bundle.modules)) {
-      modules.forEach((m) => {
-        let bm = bundle.modules[m.id];
-        bm.id = bm.id || m.id;
-        bm.usedExports = bm.renderedExports || m.renderedExports;
-        bm.unusedExports = bm.removedExports || m.removedExports;
-        bm.dependencies = m.dependencies || [];
-      });
-      modules = Object.keys(bundle.modules).map((k) => bundle.modules[k]);
-    } else {
-      modules = bundle.modules;
+    if (Array.isArray(modules)) {
+      return analyze({modules}, opts, !opts.onAnalysis).then(cb)
     }
 
+    modules = Object.keys(modules).map((k) => {
+      let module = Object.assign(modules[k], depMap[k] || {});
+      module.usedExports = module.renderedExports;
+      module.unusedExports = module.removedExports;
+      return module
+    });
     return analyze({modules}, opts, !opts.onAnalysis).then(cb)
   });
 
@@ -144,8 +139,8 @@ const plugin = (opts = {}) => {
     transformChunk: (_a, _b, chunk) => new Promise((resolve, reject) => {
       resolve(null);
       if (!chunk || !chunk.orderedModules) return
-      modules = chunk.orderedModules.map((m) => {
-        return {id: m.id, dependencies: m.dependencies.map((d) => d.id)}
+      chunk.orderedModules.forEach(({id, dependencies}) => {
+        depMap[id] = {id, dependencies: dependencies.map((d) => d.id)};
       });
     }),
     generateBundle: runAnalysis,

module.js

@@ -112,28 +112,23 @@ export const formatted = (bndl, opts) => analyze(bndl, opts, true)
 export const plugin = (opts = {}) => {
   let cb = opts.writeTo || (opts.stdout ? console.log : console.error)
   if (opts.onAnalysis) cb = opts.onAnalysis
-  let written
-  let modules
+  let depMap = {}
 
   let runAnalysis = (out, bundle, isWrite) => new Promise((resolve, reject) => {
     resolve()
-    if (written) return
-    written = true
     if (out.bundle) bundle = out.bundle
+    let modules = bundle.modules
 
-    if (!Array.isArray(bundle.modules)) {
-      modules.forEach((m) => {
-        let bm = bundle.modules[m.id]
-        bm.id = bm.id || m.id
-        bm.usedExports = bm.renderedExports || m.renderedExports
-        bm.unusedExports = bm.removedExports || m.removedExports
-        bm.dependencies = m.dependencies || []
-      })
-      modules = Object.keys(bundle.modules).map((k) => bundle.modules[k])
-    } else {
-      modules = bundle.modules
+    if (Array.isArray(modules)) {
+      return analyze({modules}, opts, !opts.onAnalysis).then(cb)
     }
 
+    modules = Object.keys(modules).map((k) => {
+      let module = Object.assign(modules[k], depMap[k] || {})
+      module.usedExports = module.renderedExports
+      module.unusedExports = module.removedExports
+      return module
+    })
     return analyze({modules}, opts, !opts.onAnalysis).then(cb)
   })
 
@@ -142,8 +137,8 @@ export const plugin = (opts = {}) => {
     transformChunk: (_a, _b, chunk) => new Promise((resolve, reject) => {
       resolve(null)
       if (!chunk || !chunk.orderedModules) return
-      modules = chunk.orderedModules.map((m) => {
-        return {id: m.id, dependencies: m.dependencies.map((d) => d.id)}
+      chunk.orderedModules.forEach(({id, dependencies}) => {
+        depMap[id] = {id, dependencies: dependencies.map((d) => d.id)}
       })
     }),
     generateBundle: runAnalysis,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup-plugin-analyzer",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "Mad metrics for your rollup bundles, know all the things",
   "main": "index.js",
   "module": "module.js",

test/test.js

@@ -158,7 +158,7 @@ rollers.forEach(({rollup, version, opts, noTreeshake}) => {
 
   if (version === '0.60.x') {
     let split1 = `${version}: writes expected heading with experimentalCodeSplitting`
-    test.skip(split1, async (assert) => {
+    test(split1, async (assert) => {
       let results
       let writeTo = (r) => { results = r }
       let rollOpts = Object.assign({plugins: [plugin({writeTo})]}, multiInputOpts)
@@ -169,16 +169,21 @@ rollers.forEach(({rollup, version, opts, noTreeshake}) => {
     })
 
     let split2 = `${version}: data as expected with experimentalCodeSplitting`
-    test.skip(split2, async (assert) => {
-      let results
-      let onAnalysis = (r) => { results = r.modules }
+    test(split2, async (assert) => {
+      let results = []
+      let onAnalysis = (r) => { results.push(r.modules) }
       let plugins = [plugin({onAnalysis})]
       let rollOpts = Object.assign({}, multiInputOpts, {plugins})
       rollOpts.experimentalCodeSplitting = true
       let bundle = await rollup(rollOpts)
       await bundle.write(rollOpts.output)
-      let imported = results.find((r) => r.id.indexOf('import-a') !== -1)
-      assert.is(imported.size, 27)
+
+      let imports = [{id: 'import-a', size: 8238}, {id: 'import-b', size: 33}]
+      imports.forEach((imp, i) => {
+        let result = results[i]
+        let imported = result.find((r) => r.id.indexOf(imp.id) !== -1)
+        assert.is(imported.size, imp.size)
+      })
     })
   }
 })