Merge remote-tracking branch 'upstream'

Author: aickin

lib/index.js

@@ -41,6 +41,10 @@ function optimizeJs (jsString, opts) {
         return false
       }
 
+      function isNumeric (str) {
+        return /^[0-9]+$/.test(str)
+      }
+
       function isCallExpression (node) {
         return node && node.type === 'CallExpression'
       }
@@ -49,37 +53,62 @@ function optimizeJs (jsString, opts) {
         return node && node.type === 'ArrayExpression'
       }
 
+      function isElementOfArray (node) {
+        return isArrayExpression(node.parent()) &&
+          node.parent().elements.indexOf(node) !== -1
+      }
+
       // returns true iff node is an argument to a function call expression.
       function isArgumentToFunctionCall (node) {
         return isCallExpression(node.parent()) &&
           node.parent().arguments.length &&
           node.parent().arguments.indexOf(node) !== -1
       }
 
-      // returns true iff node is an element of an array literal which is in turn
-      // an argument to a function call expression.
-      function isElementOfArrayArgumentToFunctionCall (node) {
-        return isArrayExpression(node.parent()) &&
-          node.parent().elements.indexOf(node) !== -1 &&
-          isArgumentToFunctionCall(node.parent())
+      function isValueOfObjectLiteralWithNumericName (node) {
+        return node &&
+          node.parent() &&
+          node.parent().type === 'Property' &&
+          node.parent().key &&
+          node.parent().key.type === 'Literal' &&
+          node.parent().key.raw &&
+          isNumeric(node.parent().key.raw) &&
+          node.parent().value === node &&
+          node.parent().parent() &&
+          node.parent().parent().type === 'ObjectExpression'
       }
 
       // returns true iff node is an IIFE.
       function isIIFE (node) {
-        return isCallExpression(node.parent()) &&
+        return node &&
+          node.type === 'FunctionExpression' &&
+          isCallExpression(node.parent()) &&
           node.parent().callee === node
       }
 
+      // returns true iff this is an IIFE call expression
+      function isIIFECall (node) {
+        return node &&
+          isCallExpression(node) &&
+          node.callee &&
+          node.callee.type === 'FunctionExpression'
+      }
+
       // tries to divine if this function is a webpack module wrapper.
       // returns true iff node is an element of an array literal which is in turn
       // an argument to a function call expression, and that function call
       // expression is an IIFE.
       function isProbablyWebpackModule (node) {
-        return isElementOfArrayArgumentToFunctionCall(node) &&
-          node.parent() && // array literal
-          node.parent().parent() && // CallExpression
-          node.parent().parent().callee && // function that is being called
-          node.parent().parent().callee.type === 'FunctionExpression'
+        return isElementOfArray(node) &&
+          isArgumentToFunctionCall(node.parent()) &&
+          isIIFECall(node.parent().parent())
+      }
+
+      function isProbablyBrowserifyModule (node) {
+        return isElementOfArray(node) &&
+          isValueOfObjectLiteralWithNumericName(node.parent()) &&
+          isArgumentToFunctionCall(node.parent().parent().parent()) &&
+          isIIFECall(node.parent().parent().parent().parent())
       }
 
       if (node.type === 'FunctionExpression') {
@@ -88,7 +117,9 @@ function optimizeJs (jsString, opts) {
         var postChar = jsString.charAt(node.end)
         var postPostChar = jsString.charAt(node.end + 1)
 
-        if (isArgumentToFunctionCall(node) || isProbablyWebpackModule(node)) {
+        if (isArgumentToFunctionCall(node) ||
+          isProbablyWebpackModule(node) ||
+          isProbablyBrowserifyModule(node)) {
           // function passed in to another function, either as an argument, or as an element
           // of an array argument. these are almost _always_ executed, e.g. webpack bundles,
           // UMD bundles, Browserify bundles, Node-style errbacks, Promise then()s and catch()s, etc.

package.json

@@ -4,7 +4,7 @@
   "description": "Optimize initial JavaScript execution/parsing by wrapping eager functions",
   "main": "lib/index.js",
   "scripts": {
-    "test": "standard && mocha test/test.js",
+    "test": "standard && mocha --timeout 60000 test/test.js",
     "benchmark": "npm run build-benchmark && hs -p 9090 benchmarks",
     "build-benchmark": "sh bin/build-benchmark.sh",
     "publish-benchmark": "sh bin/publish-benchmark.sh",

test/cases/browserify-basic-with-bundle-collapser/input.js

@@ -0,0 +1,8 @@
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+var mod = require(2)
+console.log('hello browserify')
+
+},{"2":2}],2:[function(require,module,exports){
+console.log('hello browserify module')
+
+},{}]},{},[1]);

test/cases/browserify-basic-with-bundle-collapser/output.js

@@ -0,0 +1,8 @@
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,(function(e){var n=t[o][1][e];return s(n?n:e)}),l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[(function(require,module,exports){
+var mod = require(2)
+console.log('hello browserify')
+
+}),{"2":2}],2:[(function(require,module,exports){
+console.log('hello browserify module')
+
+}),{}]},{},[1]);

test/cases/browserify-basic/input.js

@@ -0,0 +1,8 @@
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+var mod = require('./module')
+console.log('hello browserify')
+
+},{"./module":2}],2:[function(require,module,exports){
+console.log('hello browserify module')
+
+},{}]},{},[1]);

test/cases/browserify-basic/output.js

@@ -0,0 +1,8 @@
+(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,(function(e){var n=t[o][1][e];return s(n?n:e)}),l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[(function(require,module,exports){
+var mod = require('./module')
+console.log('hello browserify')
+
+}),{"./module":2}],2:[(function(require,module,exports){
+console.log('hello browserify module')
+
+}),{}]},{},[1]);

test/cases/browserify-object-literal-in-global-scope/input.js

@@ -0,0 +1,9 @@
+// a browserify-style object literal that isn't a parameter shouldn't be optimized.
+var a = {
+  1:[
+    function(o,r,t){
+      console.log("browserify style!");
+    },
+    {}
+  ]
+};

test/cases/browserify-object-literal-in-global-scope/output.js

@@ -0,0 +1,9 @@
+// a browserify-style object literal that isn't a parameter shouldn't be optimized.
+var a = {
+  1:[
+    function(o,r,t){
+      console.log("browserify style!");
+    },
+    {}
+  ]
+};

test/cases/browserify-style-multi-element/input.js

@@ -0,0 +1,24 @@
+!function(o){
+  return o[0]();
+}(
+  {
+    1:[
+      function(o,r,t){
+        console.log("browserify style!");
+      },
+      {}
+    ],
+    2:[
+      function(o,r,t){
+        console.log("browserify style!");
+      },
+      {}
+    ],
+    3:[
+      function(o,r,t){
+        console.log("browserify style!");
+      },
+      {}
+    ]
+  }
+);

test/cases/browserify-style-multi-element/output.js

@@ -0,0 +1,24 @@
+!(function(o){
+  return o[0]();
+})(
+  {
+    1:[
+      (function(o,r,t){
+        console.log("browserify style!");
+      }),
+      {}
+    ],
+    2:[
+      (function(o,r,t){
+        console.log("browserify style!");
+      }),
+      {}
+    ],
+    3:[
+      (function(o,r,t){
+        console.log("browserify style!");
+      }),
+      {}
+    ]
+  }
+);

test/cases/browserify-style-non-iife/input.js

@@ -0,0 +1,10 @@
+foo(
+  {
+    1:[
+      function(o,r,t){
+        console.log("browserify style!");
+      },
+      {}
+    ]
+  }
+);

test/cases/browserify-style-non-iife/output.js

@@ -0,0 +1,10 @@
+foo(
+  {
+    1:[
+      function(o,r,t){
+        console.log("browserify style!");
+      },
+      {}
+    ]
+  }
+);

test/cases/browserify-style-one-element/input.js

@@ -0,0 +1,12 @@
+!function(o){
+  return o[0]();
+}(
+  {
+    1:[
+      function(o,r,t){
+        console.log("browserify style!");
+      },
+      {}
+    ]
+  }
+);

test/cases/browserify-style-one-element/output.js

@@ -0,0 +1,12 @@
+!(function(o){
+  return o[0]();
+})(
+  {
+    1:[
+      (function(o,r,t){
+        console.log("browserify style!");
+      }),
+      {}
+    ]
+  }
+);

test/cases/browserify-style-with-non-numeric-propname/input.js

@@ -0,0 +1,14 @@
+// a browserify-style function call that has non-numeric object indices shouldn't
+// be optimized.
+!function(o){
+  return o[0]();
+}(
+  {
+    a:[
+      function(o,r,t){
+        console.log("browserify style!");
+      },
+      {}
+    ]
+  }
+);

test/cases/browserify-style-with-non-numeric-propname/output.js

@@ -0,0 +1,14 @@
+// a browserify-style function call that has non-numeric object indices shouldn't
+// be optimized.
+!(function(o){
+  return o[0]();
+})(
+  {
+    a:[
+      function(o,r,t){
+        console.log("browserify style!");
+      },
+      {}
+    ]
+  }
+);