rollup 0.58.1 → 0.58.2

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # rollup changelog
 
+## 0.58.2
+*2018-04-23*
+* Fix rendering of certain statically resolvable if statements ([#2146](https://github.com/rollup/rollup/pull/2146))
+
 ## 0.58.1
 *2018-04-18*
 * Fix comment detection ([#2129](https://github.com/rollup/rollup/pull/2129))

package/bin/rollup

@@ -252,7 +252,7 @@ function isNumber (x) {
 
 var help = "rollup version __VERSION__\n=====================================\n\nUsage: rollup [options] <entry file>\n\nBasic options:\n\n-v, --version               Show version number\n-h, --help                  Show this help message\n-c, --config                Use this config file (if argument is used but value\n                              is unspecified, defaults to rollup.config.js)\n-w, --watch                 Watch files in bundle and rebuild on changes\n-i, --input                 Input (alternative to <entry file>)\n-o, --file <output>         Output (if absent, prints to stdout)\n-f, --format [es]           Type of output (amd, cjs, es, iife, umd)\n-e, --external              Comma-separate list of module IDs to exclude\n-g, --globals               Comma-separate list of `module ID:Global` pairs\n                              Any module IDs defined here are added to external\n-n, --name                  Name for UMD export\n-m, --sourcemap             Generate sourcemap (`-m inline` for inline map)\n-l, --legacy                Support IE8\n--amd.id                    ID for AMD module (default is anonymous)\n--amd.define                Function to use in place of `define`\n--no-strict                 Don't emit a `\"use strict\";` in the generated modules.\n--no-indent                 Don't indent result\n--environment <values>      Settings passed to config file (see example)\n--no-conflict               Generate a noConflict method for UMD globals\n--no-treeshake              Disable tree-shaking\n--silent                    Don't print warnings\n--intro                     Content to insert at top of bundle (inside wrapper)\n--outro                     Content to insert at end of bundle (inside wrapper)\n--banner                    Content to insert at top of bundle (outside wrapper)\n--footer                    Content to insert at end of bundle (outside wrapper)\n--no-interop                Do not include interop block\n\nExamples:\n\n# use settings in config file\nrollup -c\n\n# in config file, process.env.INCLUDE_DEPS === 'true'\n# and process.env.BUILD === 'production'\nrollup -c --environment INCLUDE_DEPS,BUILD:production\n\n# create CommonJS bundle.js from src/main.js\nrollup --format=cjs --file=bundle.js -- src/main.js\n\n# create self-executing IIFE using `window.jQuery`\n# and `window._` as external globals\nrollup -f iife --globals jquery:jQuery,lodash:_ \\\n  -i src/app.js -o build/app.js -m build/app.js.map\n\nNotes:\n\n* When piping to stdout, only inline sourcemaps are permitted\n\nFor more information visit https://rollupjs.org\n";
 
-var version = "0.58.1";
+var version = "0.58.2";
 
 var modules = {};
 
@@ -1777,10 +1777,6 @@ function supportsColor(stream) {
 	}
 
 	if (stream && !stream.isTTY && forceColor !== true) {
-		// VS code debugger doesn't have isTTY set
-		if (env.VSCODE_PID) {
-			return 1;
-		}
 		return 0;
 	}
 

package/dist/rollup.browser.js

@@ -1,6 +1,6 @@
 /*
-	Rollup.js v0.58.1
-	Wed, 18 Apr 2018 18:21:56 GMT - commit ce3801d3fe33c957c607ebd75e3d8ef3f39af13b
+	Rollup.js v0.58.2
+	Mon, 23 Apr 2018 15:25:53 GMT - commit d21b9359fe1b8845abb5801dbce27a16f3a67aed
 
 
 	https://github.com/rollup/rollup
@@ -14863,49 +14863,62 @@
             return _super !== null && _super.apply(this, arguments) || this;
         }
         ConditionalExpression.prototype.forEachReturnExpressionWhenCalledAtPath = function (path, callOptions, callback, options) {
-            if (this.hasUnknownTestValue) {
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+            if (testValue === UNKNOWN_VALUE || testValue) {
                 this.consequent.forEachReturnExpressionWhenCalledAtPath(path, callOptions, callback, options);
-                this.alternate.forEachReturnExpressionWhenCalledAtPath(path, callOptions, callback, options);
             }
-            else {
-                this.forEachRelevantBranch(function (node) {
-                    return node.forEachReturnExpressionWhenCalledAtPath(path, callOptions, callback, options);
-                });
+            if (testValue === UNKNOWN_VALUE || !testValue) {
+                this.alternate.forEachReturnExpressionWhenCalledAtPath(path, callOptions, callback, options);
             }
         };
         ConditionalExpression.prototype.getValue = function () {
-            var testValue = this.test.getValue();
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
             if (testValue === UNKNOWN_VALUE)
                 return UNKNOWN_VALUE;
             return testValue ? this.consequent.getValue() : this.alternate.getValue();
         };
         ConditionalExpression.prototype.hasEffects = function (options) {
-            return (this.test.hasEffects(options) ||
-                (this.hasUnknownTestValue
-                    ? this.consequent.hasEffects(options) || this.alternate.hasEffects(options)
-                    : this.someRelevantBranch(function (node) { return node.hasEffects(options); })));
+            if (this.test.hasEffects(options))
+                return true;
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+            if (testValue === UNKNOWN_VALUE) {
+                return this.consequent.hasEffects(options) || this.alternate.hasEffects(options);
+            }
+            return testValue ? this.consequent.hasEffects(options) : this.alternate.hasEffects(options);
         };
         ConditionalExpression.prototype.hasEffectsWhenAccessedAtPath = function (path, options) {
-            return (path.length > 0 &&
-                (this.hasUnknownTestValue
-                    ? this.consequent.hasEffectsWhenAccessedAtPath(path, options) ||
-                        this.alternate.hasEffectsWhenAccessedAtPath(path, options)
-                    : this.someRelevantBranch(function (node) { return node.hasEffectsWhenAccessedAtPath(path, options); })));
+            if (path.length === 0)
+                return false;
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+            if (testValue === UNKNOWN_VALUE) {
+                return (this.consequent.hasEffectsWhenAccessedAtPath(path, options) ||
+                    this.alternate.hasEffectsWhenAccessedAtPath(path, options));
+            }
+            return testValue
+                ? this.consequent.hasEffectsWhenAccessedAtPath(path, options)
+                : this.alternate.hasEffectsWhenAccessedAtPath(path, options);
         };
         ConditionalExpression.prototype.hasEffectsWhenAssignedAtPath = function (path, options) {
-            return (path.length === 0 ||
-                (this.hasUnknownTestValue
-                    ? this.consequent.hasEffectsWhenAssignedAtPath(path, options) ||
-                        this.alternate.hasEffectsWhenAssignedAtPath(path, options)
-                    : this.someRelevantBranch(function (node) { return node.hasEffectsWhenAssignedAtPath(path, options); })));
+            if (path.length === 0)
+                return true;
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+            if (testValue === UNKNOWN_VALUE) {
+                return (this.consequent.hasEffectsWhenAssignedAtPath(path, options) ||
+                    this.alternate.hasEffectsWhenAssignedAtPath(path, options));
+            }
+            return testValue
+                ? this.consequent.hasEffectsWhenAssignedAtPath(path, options)
+                : this.alternate.hasEffectsWhenAssignedAtPath(path, options);
         };
         ConditionalExpression.prototype.hasEffectsWhenCalledAtPath = function (path, callOptions, options) {
-            return this.hasUnknownTestValue
-                ? this.consequent.hasEffectsWhenCalledAtPath(path, callOptions, options) ||
-                    this.alternate.hasEffectsWhenCalledAtPath(path, callOptions, options)
-                : this.someRelevantBranch(function (node) {
-                    return node.hasEffectsWhenCalledAtPath(path, callOptions, options);
-                });
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+            if (testValue === UNKNOWN_VALUE) {
+                return (this.consequent.hasEffectsWhenCalledAtPath(path, callOptions, options) ||
+                    this.alternate.hasEffectsWhenCalledAtPath(path, callOptions, options));
+            }
+            return testValue
+                ? this.consequent.hasEffectsWhenCalledAtPath(path, callOptions, options)
+                : this.alternate.hasEffectsWhenCalledAtPath(path, callOptions, options);
         };
         ConditionalExpression.prototype.initialise = function () {
             this.included = false;
@@ -14913,7 +14926,7 @@
         };
         ConditionalExpression.prototype.include = function () {
             this.included = true;
-            var testValue = this.test.getValue();
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
             if (testValue === UNKNOWN_VALUE || this.test.shouldBeIncluded()) {
                 this.test.include();
                 this.consequent.include();
@@ -14928,61 +14941,50 @@
         };
         ConditionalExpression.prototype.reassignPath = function (path, options) {
             if (path.length > 0) {
-                if (this.hasUnknownTestValue) {
+                var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+                if (testValue === UNKNOWN_VALUE || testValue) {
                     this.consequent.reassignPath(path, options);
-                    this.alternate.reassignPath(path, options);
                 }
-                else {
-                    this.forEachRelevantBranch(function (node) { return node.reassignPath(path, options); });
+                if (testValue === UNKNOWN_VALUE || !testValue) {
+                    this.alternate.reassignPath(path, options);
                 }
             }
         };
         ConditionalExpression.prototype.render = function (code, options, _a) {
             var _b = _a === void 0 ? BLANK : _a, renderedParentType = _b.renderedParentType, isCalleeOfRenderedParent = _b.isCalleeOfRenderedParent;
-            if (!this.context.treeshake || this.test.included) {
-                _super.prototype.render.call(this, code, options);
-            }
-            else {
-                var branchToRetain = this.consequent.included ? this.consequent : this.alternate;
-                code.remove(this.start, branchToRetain.start);
-                code.remove(branchToRetain.end, this.end);
-                branchToRetain.render(code, options, {
+            if (!this.test.included) {
+                var singleRetainedBranch = this.consequent.included ? this.consequent : this.alternate;
+                code.remove(this.start, singleRetainedBranch.start);
+                code.remove(singleRetainedBranch.end, this.end);
+                singleRetainedBranch.render(code, options, {
                     renderedParentType: renderedParentType || this.parent.type,
                     isCalleeOfRenderedParent: renderedParentType
                         ? isCalleeOfRenderedParent
                         : this.parent.callee === this
                 });
             }
+            else {
+                _super.prototype.render.call(this, code, options);
+            }
         };
         ConditionalExpression.prototype.someReturnExpressionWhenCalledAtPath = function (path, callOptions, predicateFunction, options) {
-            return this.hasUnknownTestValue
-                ? this.consequent.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options) ||
-                    this.alternate.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options)
-                : this.someRelevantBranch(function (node) {
-                    return node.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options);
-                });
-        };
-        ConditionalExpression.prototype.forEachRelevantBranch = function (callback) {
-            var testValue = this.test.getValue();
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
             if (testValue === UNKNOWN_VALUE) {
-                this.hasUnknownTestValue = true;
-                callback(this.consequent);
-                callback(this.alternate);
-            }
-            else if (testValue) {
-                callback(this.consequent);
-            }
-            else {
-                callback(this.alternate);
+                return (this.consequent.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options) ||
+                    this.alternate.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options));
             }
+            return testValue
+                ? this.consequent.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options)
+                : this.alternate.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options);
         };
-        ConditionalExpression.prototype.someRelevantBranch = function (predicateFunction) {
-            var testValue = this.test.getValue();
-            if (testValue === UNKNOWN_VALUE) {
+        ConditionalExpression.prototype.getTestValue = function () {
+            if (this.hasUnknownTestValue)
+                return UNKNOWN_VALUE;
+            var value = this.test.getValue();
+            if (value === UNKNOWN_VALUE) {
                 this.hasUnknownTestValue = true;
-                return predicateFunction(this.consequent) || predicateFunction(this.alternate);
             }
-            return testValue ? predicateFunction(this.consequent) : predicateFunction(this.alternate);
+            return value;
         };
         return ConditionalExpression;
     }(NodeBase));
@@ -15190,27 +15192,28 @@
             return _super !== null && _super.apply(this, arguments) || this;
         }
         IfStatement.prototype.hasEffects = function (options) {
-            return (this.test.hasEffects(options) ||
-                (this.hasUnknownTestValue
-                    ? this.consequent.hasEffects(options) ||
-                        (this.alternate !== null && this.alternate.hasEffects(options))
-                    : this.someRelevantBranch(function (node) { return node.hasEffects(options); })));
+            if (this.test.hasEffects(options))
+                return true;
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+            if (testValue === UNKNOWN_VALUE) {
+                return (this.consequent.hasEffects(options) ||
+                    (this.alternate !== null && this.alternate.hasEffects(options)));
+            }
+            return testValue
+                ? this.consequent.hasEffects(options)
+                : this.alternate !== null && this.alternate.hasEffects(options);
         };
         IfStatement.prototype.include = function () {
             this.included = true;
-            var testValue = this.test.getValue();
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
             if (testValue === UNKNOWN_VALUE || this.test.shouldBeIncluded()) {
                 this.test.include();
             }
-            if (testValue === UNKNOWN_VALUE) {
+            if ((testValue === UNKNOWN_VALUE || testValue) && this.consequent.shouldBeIncluded()) {
                 this.consequent.include();
-                if (this.alternate !== null)
-                    this.alternate.include();
             }
-            else if (testValue) {
-                this.consequent.include();
-            }
-            else if (this.alternate !== null) {
+            if (this.alternate !== null &&
+                ((testValue === UNKNOWN_VALUE || !testValue) && this.alternate.shouldBeIncluded())) {
                 this.alternate.include();
             }
         };
@@ -15219,30 +15222,46 @@
             this.hasUnknownTestValue = false;
         };
         IfStatement.prototype.render = function (code, options) {
-            var testValue = this.test.getValue();
-            if (!this.context.treeshake ||
-                this.test.included ||
-                (testValue ? this.alternate !== null && this.alternate.included : this.consequent.included)) {
-                _super.prototype.render.call(this, code, options);
+            // Note that unknown test values are always included
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.test.getValue();
+            if (!this.test.included &&
+                (testValue ? this.alternate === null || !this.alternate.included : !this.consequent.included)) {
+                var singleRetainedBranch = testValue ? this.consequent : this.alternate;
+                code.remove(this.start, singleRetainedBranch.start);
+                code.remove(singleRetainedBranch.end, this.end);
+                singleRetainedBranch.render(code, options);
             }
             else {
-                // if test is not included, it is impossible that alternate===null even though it is the retained branch
-                var branchToRetain = testValue ? this.consequent : this.alternate;
-                code.remove(this.start, branchToRetain.start);
-                code.remove(branchToRetain.end, this.end);
-                branchToRetain.render(code, options);
+                if (this.test.included) {
+                    this.test.render(code, options);
+                }
+                else {
+                    code.overwrite(this.test.start, this.test.end, testValue ? 'true' : 'false');
+                }
+                if (this.consequent.included) {
+                    this.consequent.render(code, options);
+                }
+                else {
+                    code.overwrite(this.consequent.start, this.consequent.end, ';');
+                }
+                if (this.alternate !== null) {
+                    if (this.alternate.included) {
+                        this.alternate.render(code, options);
+                    }
+                    else {
+                        code.remove(this.consequent.end, this.alternate.end);
+                    }
+                }
             }
         };
-        IfStatement.prototype.someRelevantBranch = function (predicateFunction) {
-            var testValue = this.test.getValue();
-            if (testValue === UNKNOWN_VALUE) {
+        IfStatement.prototype.getTestValue = function () {
+            if (this.hasUnknownTestValue)
+                return UNKNOWN_VALUE;
+            var value = this.test.getValue();
+            if (value === UNKNOWN_VALUE) {
                 this.hasUnknownTestValue = true;
-                return (predicateFunction(this.consequent) ||
-                    (this.alternate !== null && predicateFunction(this.alternate)));
             }
-            return testValue
-                ? predicateFunction(this.consequent)
-                : this.alternate !== null && predicateFunction(this.alternate);
+            return value;
         };
         return IfStatement;
     }(NodeBase));
@@ -15366,125 +15385,133 @@
             return _super !== null && _super.apply(this, arguments) || this;
         }
         LogicalExpression.prototype.forEachReturnExpressionWhenCalledAtPath = function (path, callOptions, callback, options) {
-            if (this.hasUnknownLeftValue) {
+            var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
+            if (leftValue === UNKNOWN_VALUE) {
                 this.left.forEachReturnExpressionWhenCalledAtPath(path, callOptions, callback, options);
                 this.right.forEachReturnExpressionWhenCalledAtPath(path, callOptions, callback, options);
             }
+            else if (leftValue === (this.operator === '||')) {
+                this.left.forEachReturnExpressionWhenCalledAtPath(path, callOptions, callback, options);
+            }
             else {
-                this.forEachRelevantBranch(function (node) {
-                    return node.forEachReturnExpressionWhenCalledAtPath(path, callOptions, callback, options);
-                });
+                this.right.forEachReturnExpressionWhenCalledAtPath(path, callOptions, callback, options);
             }
         };
         LogicalExpression.prototype.getValue = function () {
-            var leftValue = this.left.getValue();
+            var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
             if (leftValue === UNKNOWN_VALUE)
                 return UNKNOWN_VALUE;
-            if (!leftValue === (this.operator === '&&'))
+            if (leftValue === (this.operator === '||'))
                 return leftValue;
             return this.right.getValue();
         };
         LogicalExpression.prototype.hasEffects = function (options) {
             if (this.left.hasEffects(options))
                 return true;
-            var leftValue = this.left.getValue();
-            return ((leftValue === UNKNOWN_VALUE || !leftValue === (this.operator === '||')) &&
+            var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
+            return ((leftValue === UNKNOWN_VALUE || leftValue === (this.operator === '&&')) &&
                 this.right.hasEffects(options));
         };
         LogicalExpression.prototype.hasEffectsWhenAccessedAtPath = function (path, options) {
-            return (path.length > 0 &&
-                (this.hasUnknownLeftValue
-                    ? this.left.hasEffectsWhenAccessedAtPath(path, options) ||
-                        this.right.hasEffectsWhenAccessedAtPath(path, options)
-                    : this.someRelevantBranch(function (node) { return node.hasEffectsWhenAccessedAtPath(path, options); })));
+            if (path.length === 0)
+                return false;
+            var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
+            if (leftValue === UNKNOWN_VALUE) {
+                return (this.left.hasEffectsWhenAccessedAtPath(path, options) ||
+                    this.right.hasEffectsWhenAccessedAtPath(path, options));
+            }
+            return leftValue === (this.operator === '||')
+                ? this.left.hasEffectsWhenAccessedAtPath(path, options)
+                : this.right.hasEffectsWhenAccessedAtPath(path, options);
         };
         LogicalExpression.prototype.hasEffectsWhenAssignedAtPath = function (path, options) {
-            return (path.length === 0 ||
-                (this.hasUnknownLeftValue
-                    ? this.left.hasEffectsWhenAssignedAtPath(path, options) ||
-                        this.right.hasEffectsWhenAssignedAtPath(path, options)
-                    : this.someRelevantBranch(function (node) { return node.hasEffectsWhenAssignedAtPath(path, options); })));
+            if (path.length === 0)
+                return true;
+            var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
+            if (leftValue === UNKNOWN_VALUE) {
+                return (this.left.hasEffectsWhenAssignedAtPath(path, options) ||
+                    this.right.hasEffectsWhenAssignedAtPath(path, options));
+            }
+            return leftValue === (this.operator === '||')
+                ? this.left.hasEffectsWhenAssignedAtPath(path, options)
+                : this.right.hasEffectsWhenAssignedAtPath(path, options);
         };
         LogicalExpression.prototype.hasEffectsWhenCalledAtPath = function (path, callOptions, options) {
-            return this.hasUnknownLeftValue
-                ? this.left.hasEffectsWhenCalledAtPath(path, callOptions, options) ||
-                    this.right.hasEffectsWhenCalledAtPath(path, callOptions, options)
-                : this.someRelevantBranch(function (node) {
-                    return node.hasEffectsWhenCalledAtPath(path, callOptions, options);
-                });
+            var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
+            if (leftValue === UNKNOWN_VALUE) {
+                return (this.left.hasEffectsWhenCalledAtPath(path, callOptions, options) ||
+                    this.right.hasEffectsWhenCalledAtPath(path, callOptions, options));
+            }
+            return leftValue === (this.operator === '||')
+                ? this.left.hasEffectsWhenCalledAtPath(path, callOptions, options)
+                : this.right.hasEffectsWhenCalledAtPath(path, callOptions, options);
         };
         LogicalExpression.prototype.include = function () {
             this.included = true;
-            var leftValue = this.left.getValue();
+            var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
             if (leftValue === UNKNOWN_VALUE ||
-                !leftValue === (this.operator === '&&') ||
-                this.left.shouldBeIncluded())
+                leftValue === (this.operator === '||') ||
+                this.left.shouldBeIncluded()) {
                 this.left.include();
-            if (leftValue === UNKNOWN_VALUE || !leftValue === (this.operator === '||'))
+            }
+            if (leftValue === UNKNOWN_VALUE || leftValue === (this.operator === '&&')) {
                 this.right.include();
+            }
         };
         LogicalExpression.prototype.initialise = function () {
+            this.included = false;
             this.hasUnknownLeftValue = false;
         };
         LogicalExpression.prototype.reassignPath = function (path, options) {
             if (path.length > 0) {
-                if (this.hasUnknownLeftValue) {
+                var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
+                if (leftValue === UNKNOWN_VALUE) {
                     this.left.reassignPath(path, options);
                     this.right.reassignPath(path, options);
                 }
+                else if (leftValue === (this.operator === '||')) {
+                    this.left.reassignPath(path, options);
+                }
                 else {
-                    this.forEachRelevantBranch(function (node) { return node.reassignPath(path, options); });
+                    this.right.reassignPath(path, options);
                 }
             }
         };
         LogicalExpression.prototype.render = function (code, options, _a) {
             var _b = _a === void 0 ? BLANK : _a, renderedParentType = _b.renderedParentType, isCalleeOfRenderedParent = _b.isCalleeOfRenderedParent;
-            if (!this.context.treeshake || (this.left.included && this.right.included)) {
-                _super.prototype.render.call(this, code, options);
-            }
-            else {
-                var branchToRetain = this.left.included ? this.left : this.right;
-                code.remove(this.start, branchToRetain.start);
-                code.remove(branchToRetain.end, this.end);
-                branchToRetain.render(code, options, {
+            if (!this.left.included || !this.right.included) {
+                var singleRetainedBranch = this.left.included ? this.left : this.right;
+                code.remove(this.start, singleRetainedBranch.start);
+                code.remove(singleRetainedBranch.end, this.end);
+                singleRetainedBranch.render(code, options, {
                     renderedParentType: renderedParentType || this.parent.type,
                     isCalleeOfRenderedParent: renderedParentType
                         ? isCalleeOfRenderedParent
                         : this.parent.callee === this
                 });
             }
+            else {
+                _super.prototype.render.call(this, code, options);
+            }
         };
         LogicalExpression.prototype.someReturnExpressionWhenCalledAtPath = function (path, callOptions, predicateFunction, options) {
-            return this.hasUnknownLeftValue
-                ? this.left.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options) ||
-                    this.right.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options)
-                : this.someRelevantBranch(function (node) {
-                    return node.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options);
-                });
-        };
-        LogicalExpression.prototype.forEachRelevantBranch = function (callback) {
-            var leftValue = this.left.getValue();
+            var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
             if (leftValue === UNKNOWN_VALUE) {
-                this.hasUnknownLeftValue = true;
-                callback(this.left);
-                callback(this.right);
-            }
-            else if (!leftValue === (this.operator === '&&')) {
-                callback(this.left);
-            }
-            else {
-                callback(this.right);
+                return (this.left.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options) ||
+                    this.right.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options));
             }
+            return leftValue === (this.operator === '||')
+                ? this.left.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options)
+                : this.right.someReturnExpressionWhenCalledAtPath(path, callOptions, predicateFunction, options);
         };
-        LogicalExpression.prototype.someRelevantBranch = function (predicateFunction) {
-            var leftValue = this.left.getValue();
-            if (leftValue === UNKNOWN_VALUE) {
+        LogicalExpression.prototype.getLeftValue = function () {
+            if (this.hasUnknownLeftValue)
+                return UNKNOWN_VALUE;
+            var value = this.left.getValue();
+            if (value === UNKNOWN_VALUE) {
                 this.hasUnknownLeftValue = true;
-                return predicateFunction(this.left) || predicateFunction(this.right);
             }
-            return !leftValue === (this.operator === '&&')
-                ? predicateFunction(this.left)
-                : predicateFunction(this.right);
+            return value;
         };
         return LogicalExpression;
     }(NodeBase));
@@ -16053,38 +16080,33 @@
         };
         SequenceExpression.prototype.render = function (code, options, _a) {
             var _b = _a === void 0 ? BLANK : _a, renderedParentType = _b.renderedParentType, isCalleeOfRenderedParent = _b.isCalleeOfRenderedParent;
-            if (!this.context.treeshake) {
-                _super.prototype.render.call(this, code, options);
-            }
-            else {
-                var firstStart = 0, lastEnd = void 0, includedNodes = 0;
-                for (var _i = 0, _c = getCommaSeparatedNodesWithBoundaries(this.expressions, code, this.start, this.end); _i < _c.length; _i++) {
-                    var _d = _c[_i], node = _d.node, start = _d.start, end = _d.end;
-                    if (!node.included) {
-                        code.remove(start, end);
-                        continue;
-                    }
-                    includedNodes++;
-                    if (firstStart === 0)
-                        firstStart = start;
-                    lastEnd = end;
-                    if (node === this.expressions[this.expressions.length - 1] && includedNodes === 1) {
-                        node.render(code, options, {
-                            renderedParentType: renderedParentType || this.parent.type,
-                            isCalleeOfRenderedParent: renderedParentType
-                                ? isCalleeOfRenderedParent
-                                : this.parent.callee === this
-                        });
-                    }
-                    else {
-                        node.render(code, options);
-                    }
+            var firstStart = 0, lastEnd, includedNodes = 0;
+            for (var _i = 0, _c = getCommaSeparatedNodesWithBoundaries(this.expressions, code, this.start, this.end); _i < _c.length; _i++) {
+                var _d = _c[_i], node = _d.node, start = _d.start, end = _d.end;
+                if (!node.included) {
+                    code.remove(start, end);
+                    continue;
                 }
-                // Round brackets are part of the actual parent and should be re-added in case the parent changed
-                if (includedNodes > 1 && renderedParentType) {
-                    code.prependRight(firstStart, '(');
-                    code.appendLeft(lastEnd, ')');
+                includedNodes++;
+                if (firstStart === 0)
+                    firstStart = start;
+                lastEnd = end;
+                if (node === this.expressions[this.expressions.length - 1] && includedNodes === 1) {
+                    node.render(code, options, {
+                        renderedParentType: renderedParentType || this.parent.type,
+                        isCalleeOfRenderedParent: renderedParentType
+                            ? isCalleeOfRenderedParent
+                            : this.parent.callee === this
+                    });
                 }
+                else {
+                    node.render(code, options);
+                }
+            }
+            // Round brackets are part of the actual parent and should be re-added in case the parent changed
+            if (includedNodes > 1 && renderedParentType) {
+                code.prependRight(firstStart, '(');
+                code.appendLeft(lastEnd, ')');
             }
         };
         return SequenceExpression;
@@ -21241,7 +21263,7 @@
         return outputOptions;
     }
 
-    var version$1 = "0.58.1";
+    var version$1 = "0.58.2";
 
     exports.rollup = rollup;
     exports.VERSION = version$1;