rollup 0.58.1 → 0.58.2

package/dist/rollup.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
@@ -14836,49 +14836,62 @@ var ConditionalExpression = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     ConditionalExpression.prototype.forEachReturnExpressionWhenCalledAtPath = function (path$$1, callOptions, callback, options) {
-        if (this.hasUnknownTestValue) {
+        var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+        if (testValue === UNKNOWN_VALUE || testValue) {
             this.consequent.forEachReturnExpressionWhenCalledAtPath(path$$1, callOptions, callback, options);
-            this.alternate.forEachReturnExpressionWhenCalledAtPath(path$$1, callOptions, callback, options);
         }
-        else {
-            this.forEachRelevantBranch(function (node) {
-                return node.forEachReturnExpressionWhenCalledAtPath(path$$1, callOptions, callback, options);
-            });
+        if (testValue === UNKNOWN_VALUE || !testValue) {
+            this.alternate.forEachReturnExpressionWhenCalledAtPath(path$$1, 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$$1, options) {
-        return (path$$1.length > 0 &&
-            (this.hasUnknownTestValue
-                ? this.consequent.hasEffectsWhenAccessedAtPath(path$$1, options) ||
-                    this.alternate.hasEffectsWhenAccessedAtPath(path$$1, options)
-                : this.someRelevantBranch(function (node) { return node.hasEffectsWhenAccessedAtPath(path$$1, options); })));
+        if (path$$1.length === 0)
+            return false;
+        var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+        if (testValue === UNKNOWN_VALUE) {
+            return (this.consequent.hasEffectsWhenAccessedAtPath(path$$1, options) ||
+                this.alternate.hasEffectsWhenAccessedAtPath(path$$1, options));
+        }
+        return testValue
+            ? this.consequent.hasEffectsWhenAccessedAtPath(path$$1, options)
+            : this.alternate.hasEffectsWhenAccessedAtPath(path$$1, options);
     };
     ConditionalExpression.prototype.hasEffectsWhenAssignedAtPath = function (path$$1, options) {
-        return (path$$1.length === 0 ||
-            (this.hasUnknownTestValue
-                ? this.consequent.hasEffectsWhenAssignedAtPath(path$$1, options) ||
-                    this.alternate.hasEffectsWhenAssignedAtPath(path$$1, options)
-                : this.someRelevantBranch(function (node) { return node.hasEffectsWhenAssignedAtPath(path$$1, options); })));
+        if (path$$1.length === 0)
+            return true;
+        var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+        if (testValue === UNKNOWN_VALUE) {
+            return (this.consequent.hasEffectsWhenAssignedAtPath(path$$1, options) ||
+                this.alternate.hasEffectsWhenAssignedAtPath(path$$1, options));
+        }
+        return testValue
+            ? this.consequent.hasEffectsWhenAssignedAtPath(path$$1, options)
+            : this.alternate.hasEffectsWhenAssignedAtPath(path$$1, options);
     };
     ConditionalExpression.prototype.hasEffectsWhenCalledAtPath = function (path$$1, callOptions, options) {
-        return this.hasUnknownTestValue
-            ? this.consequent.hasEffectsWhenCalledAtPath(path$$1, callOptions, options) ||
-                this.alternate.hasEffectsWhenCalledAtPath(path$$1, callOptions, options)
-            : this.someRelevantBranch(function (node) {
-                return node.hasEffectsWhenCalledAtPath(path$$1, callOptions, options);
-            });
+        var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+        if (testValue === UNKNOWN_VALUE) {
+            return (this.consequent.hasEffectsWhenCalledAtPath(path$$1, callOptions, options) ||
+                this.alternate.hasEffectsWhenCalledAtPath(path$$1, callOptions, options));
+        }
+        return testValue
+            ? this.consequent.hasEffectsWhenCalledAtPath(path$$1, callOptions, options)
+            : this.alternate.hasEffectsWhenCalledAtPath(path$$1, callOptions, options);
     };
     ConditionalExpression.prototype.initialise = function () {
         this.included = false;
@@ -14886,7 +14899,7 @@ var ConditionalExpression = /** @class */ (function (_super) {
     };
     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();
@@ -14901,61 +14914,50 @@ var ConditionalExpression = /** @class */ (function (_super) {
     };
     ConditionalExpression.prototype.reassignPath = function (path$$1, options) {
         if (path$$1.length > 0) {
-            if (this.hasUnknownTestValue) {
+            var testValue = this.hasUnknownTestValue ? UNKNOWN_VALUE : this.getTestValue();
+            if (testValue === UNKNOWN_VALUE || testValue) {
                 this.consequent.reassignPath(path$$1, options);
-                this.alternate.reassignPath(path$$1, options);
             }
-            else {
-                this.forEachRelevantBranch(function (node) { return node.reassignPath(path$$1, options); });
+            if (testValue === UNKNOWN_VALUE || !testValue) {
+                this.alternate.reassignPath(path$$1, 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$$1, callOptions, predicateFunction, options) {
-        return this.hasUnknownTestValue
-            ? this.consequent.someReturnExpressionWhenCalledAtPath(path$$1, callOptions, predicateFunction, options) ||
-                this.alternate.someReturnExpressionWhenCalledAtPath(path$$1, callOptions, predicateFunction, options)
-            : this.someRelevantBranch(function (node) {
-                return node.someReturnExpressionWhenCalledAtPath(path$$1, 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$$1, callOptions, predicateFunction, options) ||
+                this.alternate.someReturnExpressionWhenCalledAtPath(path$$1, callOptions, predicateFunction, options));
         }
+        return testValue
+            ? this.consequent.someReturnExpressionWhenCalledAtPath(path$$1, callOptions, predicateFunction, options)
+            : this.alternate.someReturnExpressionWhenCalledAtPath(path$$1, 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));
@@ -15163,27 +15165,28 @@ var IfStatement = /** @class */ (function (_super) {
         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();
         }
     };
@@ -15192,30 +15195,46 @@ var IfStatement = /** @class */ (function (_super) {
         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));
@@ -15339,125 +15358,133 @@ var LogicalExpression = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     LogicalExpression.prototype.forEachReturnExpressionWhenCalledAtPath = function (path$$1, callOptions, callback, options) {
-        if (this.hasUnknownLeftValue) {
+        var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
+        if (leftValue === UNKNOWN_VALUE) {
             this.left.forEachReturnExpressionWhenCalledAtPath(path$$1, callOptions, callback, options);
             this.right.forEachReturnExpressionWhenCalledAtPath(path$$1, callOptions, callback, options);
         }
+        else if (leftValue === (this.operator === '||')) {
+            this.left.forEachReturnExpressionWhenCalledAtPath(path$$1, callOptions, callback, options);
+        }
         else {
-            this.forEachRelevantBranch(function (node) {
-                return node.forEachReturnExpressionWhenCalledAtPath(path$$1, callOptions, callback, options);
-            });
+            this.right.forEachReturnExpressionWhenCalledAtPath(path$$1, 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$$1, options) {
-        return (path$$1.length > 0 &&
-            (this.hasUnknownLeftValue
-                ? this.left.hasEffectsWhenAccessedAtPath(path$$1, options) ||
-                    this.right.hasEffectsWhenAccessedAtPath(path$$1, options)
-                : this.someRelevantBranch(function (node) { return node.hasEffectsWhenAccessedAtPath(path$$1, options); })));
+        if (path$$1.length === 0)
+            return false;
+        var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
+        if (leftValue === UNKNOWN_VALUE) {
+            return (this.left.hasEffectsWhenAccessedAtPath(path$$1, options) ||
+                this.right.hasEffectsWhenAccessedAtPath(path$$1, options));
+        }
+        return leftValue === (this.operator === '||')
+            ? this.left.hasEffectsWhenAccessedAtPath(path$$1, options)
+            : this.right.hasEffectsWhenAccessedAtPath(path$$1, options);
     };
     LogicalExpression.prototype.hasEffectsWhenAssignedAtPath = function (path$$1, options) {
-        return (path$$1.length === 0 ||
-            (this.hasUnknownLeftValue
-                ? this.left.hasEffectsWhenAssignedAtPath(path$$1, options) ||
-                    this.right.hasEffectsWhenAssignedAtPath(path$$1, options)
-                : this.someRelevantBranch(function (node) { return node.hasEffectsWhenAssignedAtPath(path$$1, options); })));
+        if (path$$1.length === 0)
+            return true;
+        var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
+        if (leftValue === UNKNOWN_VALUE) {
+            return (this.left.hasEffectsWhenAssignedAtPath(path$$1, options) ||
+                this.right.hasEffectsWhenAssignedAtPath(path$$1, options));
+        }
+        return leftValue === (this.operator === '||')
+            ? this.left.hasEffectsWhenAssignedAtPath(path$$1, options)
+            : this.right.hasEffectsWhenAssignedAtPath(path$$1, options);
     };
     LogicalExpression.prototype.hasEffectsWhenCalledAtPath = function (path$$1, callOptions, options) {
-        return this.hasUnknownLeftValue
-            ? this.left.hasEffectsWhenCalledAtPath(path$$1, callOptions, options) ||
-                this.right.hasEffectsWhenCalledAtPath(path$$1, callOptions, options)
-            : this.someRelevantBranch(function (node) {
-                return node.hasEffectsWhenCalledAtPath(path$$1, callOptions, options);
-            });
+        var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
+        if (leftValue === UNKNOWN_VALUE) {
+            return (this.left.hasEffectsWhenCalledAtPath(path$$1, callOptions, options) ||
+                this.right.hasEffectsWhenCalledAtPath(path$$1, callOptions, options));
+        }
+        return leftValue === (this.operator === '||')
+            ? this.left.hasEffectsWhenCalledAtPath(path$$1, callOptions, options)
+            : this.right.hasEffectsWhenCalledAtPath(path$$1, 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$$1, options) {
         if (path$$1.length > 0) {
-            if (this.hasUnknownLeftValue) {
+            var leftValue = this.hasUnknownLeftValue ? UNKNOWN_VALUE : this.getLeftValue();
+            if (leftValue === UNKNOWN_VALUE) {
                 this.left.reassignPath(path$$1, options);
                 this.right.reassignPath(path$$1, options);
             }
+            else if (leftValue === (this.operator === '||')) {
+                this.left.reassignPath(path$$1, options);
+            }
             else {
-                this.forEachRelevantBranch(function (node) { return node.reassignPath(path$$1, options); });
+                this.right.reassignPath(path$$1, 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$$1, callOptions, predicateFunction, options) {
-        return this.hasUnknownLeftValue
-            ? this.left.someReturnExpressionWhenCalledAtPath(path$$1, callOptions, predicateFunction, options) ||
-                this.right.someReturnExpressionWhenCalledAtPath(path$$1, callOptions, predicateFunction, options)
-            : this.someRelevantBranch(function (node) {
-                return node.someReturnExpressionWhenCalledAtPath(path$$1, 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$$1, callOptions, predicateFunction, options) ||
+                this.right.someReturnExpressionWhenCalledAtPath(path$$1, callOptions, predicateFunction, options));
         }
+        return leftValue === (this.operator === '||')
+            ? this.left.someReturnExpressionWhenCalledAtPath(path$$1, callOptions, predicateFunction, options)
+            : this.right.someReturnExpressionWhenCalledAtPath(path$$1, 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));
@@ -16026,38 +16053,33 @@ var SequenceExpression = /** @class */ (function (_super) {
     };
     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;
@@ -25299,7 +25321,7 @@ function watch(configs) {
     return new Watcher(configs);
 }
 
-var version$1 = "0.58.1";
+var version$1 = "0.58.2";
 
 /// <reference path="../typings/package.json.d.ts" />
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "0.58.1",
+  "version": "0.58.2",
   "description": "Next-generation ES6 module bundler",
   "main": "dist/rollup.js",
   "module": "dist/rollup.es.js",