Merge branch 'side-effects' of github.com:browserify/common-shakeify …

…into side-effect

.gitignore

@@ -1,3 +1,4 @@
-node_modules/
+/node_modules
+!test/*/node_modules
 actual.js
 package-lock.json

index.js

@@ -1,6 +1,7 @@
 'use strict'
-const relative = require('path').relative
+const path = require('path')
 const Analyzer = require('@goto-bus-stop/common-shake').Analyzer
+const evaluateConst = require('@goto-bus-stop/common-shake').evaluateConst
 const transformAst = require('transform-ast')
 const wrapComment = require('wrap-comment')
 const through = require('through2')
@@ -15,9 +16,9 @@ module.exports = function commonShake (b, opts) {
   const seen = {}
   opts = Object.assign({
     verbose: false,
-    onExportDelete (path, name) {
+    onExportDelete (source, name) {
       if (opts.verbose || opts.v) {
-        console.warn('common-shake: removed', `\`${name}\``, 'in', relative(basedir, path))
+        console.warn('common-shake: removed', `\`${name}\``, 'in', path.relative(basedir, source))
       }
     },
     onModuleBailout (resource, reasons) {
@@ -27,15 +28,15 @@ module.exports = function commonShake (b, opts) {
           seen[resource.resource + reason.reason] = true
           const loc = reason.loc.start
           const source = reason.source || resource.resource
-          console.warn('common-shake: bailed out: ', reason.reason, 'in', `${relative(basedir, source)}:${loc.line}:${loc.column}`)
+          console.warn('common-shake: bailed out: ', reason.reason, 'in', `${path.relative(basedir, source)}:${loc.line}:${loc.column}`)
         })
       }
     },
     onGlobalBailout (reasons) {
       if (opts.verbose || opts.v) {
         reasons.forEach((reason) => {
           const loc = reason.loc.start
-          console.warn('common-shake: GLOBAL BAILOUT:', reason.reason, 'in', `${relative(basedir, reason.source)}:${loc.line}:${loc.column}`)
+          console.warn('common-shake: GLOBAL BAILOUT:', reason.reason, 'in', `${path.relative(basedir, reason.source)}:${loc.line}:${loc.column}`)
         })
       }
     }
@@ -47,11 +48,29 @@ module.exports = function commonShake (b, opts) {
   addHooks()
   b.on('reset', addHooks)
   function addHooks () {
-    b.pipeline.get('label').unshift(createStream(opts))
+    const packages = new Map()
+    const aliases = new Map()
+    b._mdeps.on('package', (pkg) => {
+      packages.set(pkg.__dirname, pkg)
+    })
+    b._mdeps.on('file', (file, id) => {
+      aliases.set(id, file)
+    })
+    b.pipeline.get('label').unshift(createStream(opts, {
+      getSideEffects(name) {
+        const file = aliases.get(name) || name
+        let pkg
+        let dir = file
+        while (!pkg && (dir = path.dirname(dir))) {
+          pkg = packages.get(dir)
+        }
+        return pkg && pkg.sideEffects === false ? false : true
+      }
+    }))
   }
 }
 
-function createStream (opts) {
+function createStream (opts, api) {
   const analyzer = new Analyzer()
 
   const rows = new Map()
@@ -87,7 +106,9 @@ function createStream (opts) {
     }, (node) => {
       if (node.type === 'Program') ast = node
     })
-    analyzer.run(ast, index)
+    analyzer.run(ast, index, {
+      sideEffects: api.getSideEffects(row.file)
+    })
 
     const deps = opts.fullPaths ? row.deps : row.indexDeps
     Object.keys(deps).forEach((name) => {
@@ -125,13 +146,15 @@ function createStream (opts) {
       // If this module was a duplicate of another module,
       // the original module will have been rewritten already.
       if (row.dedupe) {
-        this.push(row)
         return
       }
 
       if (module.bailouts) {
         opts.onModuleBailout(module, module.bailouts)
-        this.push(row)
+        return
+      }
+
+      if (module.getInfo().removeImport) {
         return
       }
 
@@ -143,15 +166,6 @@ function createStream (opts) {
         }
       })
 
-      const transformed = string.toString()
-      if (opts.sourceMap) {
-        row.source = transformed + '\n' + convertSourceMap.fromObject(string.map).toComment()
-      } else {
-        row.source = transformed
-      }
-
-      this.push(row)
-
       // Check if a name was used in this module, or
       // in any of this module's deduped versions.
       function isUsed (name) {
@@ -168,6 +182,44 @@ function createStream (opts) {
       }
     })
 
+    rows.forEach((row, index) => {
+      const module = analyzer.getModule(index)
+      if (module && module.getInfo().removeImport) {
+        return
+      }
+
+      if (row.dedupe || module.bailouts) {
+        this.push(row)
+        return
+      }
+
+      const string = strings.get(index)
+
+      Object.keys(row.indexDeps).forEach((depName) => {
+        const depModule = analyzer.getModule(row.indexDeps[depName])
+        if (depModule && depModule.getInfo().removeImport) {
+          delete row.indexDeps[depName]
+          delete row.deps[depName]
+          const imports = module.requireNodes.get(depName) || []
+          imports.forEach((node) => {
+            // We can replace this with `undefined` because this will not be a .property.
+            // If it was a require('mod').property, the .property would be marked as used,
+            // and the module's import would not be removable
+            node.edit.update(`void 0 ${wrapComment(node.getSource())}`)
+          })
+        }
+      })
+
+      const transformed = string.toString()
+      if (opts.sourceMap) {
+        row.source = transformed + '\n' + convertSourceMap.fromObject(string.map).toComment()
+      } else {
+        row.source = transformed
+      }
+
+      this.push(row)
+    })
+
     next()
   }
 

package.json

@@ -27,7 +27,7 @@
   },
   "homepage": "https://github.com/browserify/common-shakeify#readme",
   "dependencies": {
-    "@goto-bus-stop/common-shake": "^2.2.0",
+    "@goto-bus-stop/common-shake": "^2.3.0",
     "convert-source-map": "^1.5.1",
     "through2": "^2.0.3",
     "transform-ast": "^2.4.3",

test/side-effects/app.js

@@ -0,0 +1,3 @@
+var dep = require('./dep')
+
+console.log(dep.three())

test/side-effects/dep.js

@@ -0,0 +1,4 @@
+var _ = require('functional')
+
+exports.two = function () { return _.addOne(1) }
+exports.three = function () { return 3 }

test/side-effects/expected.js

@@ -0,0 +1,12 @@
+(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
+var dep = require('./dep')
+
+console.log(dep.three())
+
+},{"./dep":2}],2:[function(require,module,exports){
+var _ = void 0 /* require('functional') */
+
+/* common-shake removed: exports.two = */ void function () { return _.addOne(1) }
+exports.three = function () { return 3 }
+
+},{}]},{},[1]);

test/test.js

@@ -69,6 +69,9 @@ test('exclude', function (t) {
 test('paren-exports', function (t) {
   runTest(t, 'paren-exports')
 })
+test('side-effects', function (t) {
+  runTest(t, 'side-effects')
+})
 
 test('external', function (t) {
   var b = browserify({