rollup 3.20.1 → 3.20.3-0

package/dist/bin/rollup

@@ -2,8 +2,8 @@
 
 /*
   @license
-	Rollup.js v3.20.1
-	Thu, 23 Mar 2023 08:52:57 GMT - commit 75c5113e24f5857abf845776423f55f70b8d1c13
+	Rollup.js v3.20.3-0
+	Fri, 14 Apr 2023 05:11:57 GMT - commit 80c2fcb882e8a5ec2be167784d8ab14654f69379
 
 	https://github.com/rollup/rollup
 

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.1
-	Thu, 23 Mar 2023 08:52:57 GMT - commit 75c5113e24f5857abf845776423f55f70b8d1c13
+	Rollup.js v3.20.3-0
+	Fri, 14 Apr 2023 05:11:57 GMT - commit 80c2fcb882e8a5ec2be167784d8ab14654f69379
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/node-entry.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.1
-	Thu, 23 Mar 2023 08:52:57 GMT - commit 75c5113e24f5857abf845776423f55f70b8d1c13
+	Rollup.js v3.20.3-0
+	Fri, 14 Apr 2023 05:11:57 GMT - commit 80c2fcb882e8a5ec2be167784d8ab14654f69379
 
 	https://github.com/rollup/rollup
 
@@ -16,7 +16,7 @@ import { lstat, realpath, readdir, readFile, mkdir, writeFile } from 'node:fs/pr
 import { EventEmitter } from 'node:events';
 import * as tty from 'tty';
 
-var version$1 = "3.20.1";
+var version$1 = "3.20.3-0";
 
 const comma = ','.charCodeAt(0);
 const semicolon = ';'.charCodeAt(0);
@@ -1860,11 +1860,8 @@ const UNKNOWN_RETURN_EXPRESSION = [
     false
 ];
 const deoptimizeInteraction = (interaction) => {
-    interaction.thisArg?.deoptimizePath(UNKNOWN_PATH);
-    if (interaction.args) {
-        for (const argument of interaction.args) {
-            argument.deoptimizePath(UNKNOWN_PATH);
-        }
+    for (const argument of interaction.args) {
+        argument?.deoptimizePath(UNKNOWN_PATH);
     }
 };
 
@@ -1872,23 +1869,18 @@ const INTERACTION_ACCESSED = 0;
 const INTERACTION_ASSIGNED = 1;
 const INTERACTION_CALLED = 2;
 const NODE_INTERACTION_UNKNOWN_ACCESS = {
-    args: null,
-    thisArg: null,
+    args: [null],
     type: INTERACTION_ACCESSED
 };
-const UNKNOWN_ARG = [UNKNOWN_EXPRESSION];
 const NODE_INTERACTION_UNKNOWN_ASSIGNMENT = {
-    args: UNKNOWN_ARG,
-    thisArg: null,
+    args: [null, UNKNOWN_EXPRESSION],
     type: INTERACTION_ASSIGNED
 };
-const NO_ARGS = [];
 // While this is technically a call without arguments, we can compare against
-// this reference in places where precise values or thisArg would make a
+// this reference in places where precise values or this argument would make a
 // difference
 const NODE_INTERACTION_UNKNOWN_CALL = {
-    args: NO_ARGS,
-    thisArg: null,
+    args: [null],
     type: INTERACTION_CALLED,
     withNew: false
 };
@@ -1974,6 +1966,11 @@ class ExternalVariable extends Variable {
 const BLANK = Object.freeze(Object.create(null));
 const EMPTY_OBJECT = Object.freeze({});
 const EMPTY_ARRAY = Object.freeze([]);
+const EMPTY_SET = Object.freeze(new (class extends Set {
+    add() {
+        throw new Error('Cannot add to empty set');
+    }
+})());
 
 function getLocator(source, options) {
     if (options === void 0) { options = {}; }
@@ -2030,6 +2027,9 @@ const MIN_CHARACTERS_SHOWN_AFTER_LOCATION = 10;
 const ELLIPSIS = '...';
 function getCodeFrame(source, line, column) {
     let lines = source.split('\n');
+    // Needed if a plugin did not generate correct sourcemaps
+    if (line > lines.length)
+        return '';
     const maxLineLength = Math.max(tabsToSpaces(lines[line - 1].slice(0, column)).length +
         MIN_CHARACTERS_SHOWN_AFTER_LOCATION +
         ELLIPSIS.length, LINE_TRUNCATE_LENGTH);
@@ -5154,8 +5154,8 @@ const returnsString = {
 const stringReplace = {
     value: {
         hasEffectsWhenCalled({ args }, context) {
-            const argument1 = args[1];
-            return (args.length < 2 ||
+            const argument1 = args[2];
+            return (args.length < 3 ||
                 (typeof argument1.getLiteralValueAtPath(EMPTY_PATH, SHARED_RECURSION_TRACKER, {
                     deoptimizeCache() { }
                 }) === 'symbol' &&
@@ -5853,7 +5853,7 @@ class NodeBase extends ExpressionEntity {
         }
     }
     setAssignedValue(value) {
-        this.assignmentInteraction = { args: [value], thisArg: null, type: INTERACTION_ASSIGNED };
+        this.assignmentInteraction = { args: [null, value], type: INTERACTION_ASSIGNED };
     }
     shouldBeIncluded(context) {
         return this.included || (!context.brokenFlow && this.hasEffects(createHasEffectsContext()));
@@ -5912,19 +5912,19 @@ class Method extends ExpressionEntity {
         super();
         this.description = description;
     }
-    deoptimizeArgumentsOnInteractionAtPath({ type, thisArg }, path) {
+    deoptimizeArgumentsOnInteractionAtPath({ args, type }, path) {
         if (type === INTERACTION_CALLED && path.length === 0 && this.description.mutatesSelfAsArray) {
-            thisArg?.deoptimizePath(UNKNOWN_INTEGER_PATH);
+            args[0]?.deoptimizePath(UNKNOWN_INTEGER_PATH);
         }
     }
-    getReturnExpressionWhenCalledAtPath(path, { thisArg }) {
+    getReturnExpressionWhenCalledAtPath(path, { args }) {
         if (path.length > 0) {
             return UNKNOWN_RETURN_EXPRESSION;
         }
         return [
             this.description.returnsPrimitive ||
                 (this.description.returns === 'self'
-                    ? thisArg || UNKNOWN_EXPRESSION
+                    ? args[0] || UNKNOWN_EXPRESSION
                     : this.description.returns()),
             false
         ];
@@ -5935,14 +5935,14 @@ class Method extends ExpressionEntity {
             return true;
         }
         if (type === INTERACTION_CALLED) {
-            const { args, thisArg } = interaction;
+            const { args } = interaction;
             if (this.description.mutatesSelfAsArray === true &&
-                thisArg?.hasEffectsOnInteractionAtPath(UNKNOWN_INTEGER_PATH, NODE_INTERACTION_UNKNOWN_ASSIGNMENT, context)) {
+                args[0]?.hasEffectsOnInteractionAtPath(UNKNOWN_INTEGER_PATH, NODE_INTERACTION_UNKNOWN_ASSIGNMENT, context)) {
                 return true;
             }
             if (this.description.callsArgs) {
                 for (const argumentIndex of this.description.callsArgs) {
-                    if (args[argumentIndex]?.hasEffectsOnInteractionAtPath(EMPTY_PATH, NODE_INTERACTION_UNKNOWN_CALL, context)) {
+                    if (args[argumentIndex + 1]?.hasEffectsOnInteractionAtPath(EMPTY_PATH, NODE_INTERACTION_UNKNOWN_CALL, context)) {
                         return true;
                     }
                 }
@@ -6042,18 +6042,13 @@ class ObjectEntity extends ExpressionEntity {
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         const [key, ...subPath] = path;
-        const { args, thisArg, type } = interaction;
+        const { args, type } = interaction;
         if (this.hasLostTrack ||
             // single paths that are deoptimized will not become getters or setters
             ((type === INTERACTION_CALLED || path.length > 1) &&
                 (this.hasUnknownDeoptimizedProperty ||
                     (typeof key === 'string' && this.deoptimizedPaths[key])))) {
-            thisArg?.deoptimizePath(UNKNOWN_PATH);
-            if (args) {
-                for (const argument of args) {
-                    argument.deoptimizePath(UNKNOWN_PATH);
-                }
-            }
+            deoptimizeInteraction(interaction);
             return;
         }
         const [propertiesForExactMatchByKey, relevantPropertiesByKey, relevantUnmatchableProperties] = type === INTERACTION_CALLED || path.length > 1
@@ -6074,11 +6069,8 @@ class ObjectEntity extends ExpressionEntity {
                     }
                 }
                 if (!this.immutable) {
-                    if (thisArg) {
-                        this.additionalExpressionsToBeDeoptimized.add(thisArg);
-                    }
-                    if (args) {
-                        for (const argument of args) {
+                    for (const argument of args) {
+                        if (argument) {
                             this.additionalExpressionsToBeDeoptimized.add(argument);
                         }
                     }
@@ -6108,11 +6100,8 @@ class ObjectEntity extends ExpressionEntity {
             }
         }
         if (!this.immutable) {
-            if (thisArg) {
-                this.additionalExpressionsToBeDeoptimized.add(thisArg);
-            }
-            if (args) {
-                for (const argument of args) {
+            for (const argument of args) {
+                if (argument) {
                     this.additionalExpressionsToBeDeoptimized.add(argument);
                 }
             }
@@ -6646,7 +6635,7 @@ class LocalVariable extends Variable {
             if (!this.isReassigned) {
                 this.isReassigned = true;
                 const expressionsToBeDeoptimized = this.expressionsToBeDeoptimized;
-                this.expressionsToBeDeoptimized = [];
+                this.expressionsToBeDeoptimized = EMPTY_ARRAY;
                 for (const expression of expressionsToBeDeoptimized) {
                     expression.deoptimizeCache();
                 }
@@ -6758,43 +6747,68 @@ class LocalVariable extends Variable {
     }
 }
 
+const MAX_TRACKED_INTERACTIONS = 20;
+const NO_INTERACTIONS = EMPTY_ARRAY;
+const UNKNOWN_DEOPTIMIZED_FIELD = new Set([UnknownKey]);
+const EMPTY_PATH_TRACKER = new PathTracker();
+const UNKNOWN_DEOPTIMIZED_ENTITY = new Set([UNKNOWN_EXPRESSION]);
 class ParameterVariable extends LocalVariable {
     constructor(name, declarator, context) {
         super(name, declarator, UNKNOWN_EXPRESSION, context);
         this.deoptimizationInteractions = [];
-        this.deoptimizations = new DiscriminatedPathTracker();
+        this.deoptimizations = new PathTracker();
         this.deoptimizedFields = new Set();
         this.entitiesToBeDeoptimized = new Set();
     }
     addEntityToBeDeoptimized(entity) {
-        if (this.deoptimizedFields.has(UnknownKey)) {
+        if (entity === UNKNOWN_EXPRESSION) {
+            // As unknown expressions fully deoptimize all interactions, we can clear
+            // the interaction cache at this point provided we keep this optimization
+            // in mind when adding new interactions
+            if (!this.entitiesToBeDeoptimized.has(UNKNOWN_EXPRESSION)) {
+                this.entitiesToBeDeoptimized.add(UNKNOWN_EXPRESSION);
+                for (const { interaction } of this.deoptimizationInteractions) {
+                    deoptimizeInteraction(interaction);
+                }
+                this.deoptimizationInteractions = NO_INTERACTIONS;
+            }
+        }
+        else if (this.deoptimizedFields.has(UnknownKey)) {
+            // This means that we already deoptimized all interactions and no longer
+            // track them
             entity.deoptimizePath(UNKNOWN_PATH);
         }
-        else {
+        else if (!this.entitiesToBeDeoptimized.has(entity)) {
+            this.entitiesToBeDeoptimized.add(entity);
             for (const field of this.deoptimizedFields) {
                 entity.deoptimizePath([field]);
             }
+            for (const { interaction, path } of this.deoptimizationInteractions) {
+                entity.deoptimizeArgumentsOnInteractionAtPath(interaction, path, SHARED_RECURSION_TRACKER);
+            }
         }
-        for (const { interaction, path } of this.deoptimizationInteractions) {
-            entity.deoptimizeArgumentsOnInteractionAtPath(interaction, path, SHARED_RECURSION_TRACKER);
-        }
-        this.entitiesToBeDeoptimized.add(entity);
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path) {
         // For performance reasons, we fully deoptimize all deeper interactions
-        if (path.length >= 2) {
+        if (path.length >= 2 ||
+            this.entitiesToBeDeoptimized.has(UNKNOWN_EXPRESSION) ||
+            this.deoptimizationInteractions.length >= MAX_TRACKED_INTERACTIONS ||
+            (path.length === 1 &&
+                (this.deoptimizedFields.has(UnknownKey) ||
+                    (interaction.type === INTERACTION_CALLED && this.deoptimizedFields.has(path[0]))))) {
             deoptimizeInteraction(interaction);
             return;
         }
-        if (interaction.thisArg &&
-            !this.deoptimizations.trackEntityAtPathAndGetIfTracked(path, interaction.args, interaction.thisArg)) {
+        if (!this.deoptimizations.trackEntityAtPathAndGetIfTracked(path, interaction.args)) {
             for (const entity of this.entitiesToBeDeoptimized) {
                 entity.deoptimizeArgumentsOnInteractionAtPath(interaction, path, SHARED_RECURSION_TRACKER);
             }
-            this.deoptimizationInteractions.push({
-                interaction,
-                path
-            });
+            if (!this.entitiesToBeDeoptimized.has(UNKNOWN_EXPRESSION)) {
+                this.deoptimizationInteractions.push({
+                    interaction,
+                    path
+                });
+            }
         }
     }
     deoptimizePath(path) {
@@ -6807,8 +6821,17 @@ class ParameterVariable extends LocalVariable {
         }
         this.deoptimizedFields.add(key);
         for (const entity of this.entitiesToBeDeoptimized) {
+            // We do not need a recursion tracker here as we already track whether
+            // this field is deoptimized
             entity.deoptimizePath(path);
         }
+        if (key === UnknownKey) {
+            // save some memory
+            this.deoptimizationInteractions = NO_INTERACTIONS;
+            this.deoptimizations = EMPTY_PATH_TRACKER;
+            this.deoptimizedFields = UNKNOWN_DEOPTIMIZED_FIELD;
+            this.entitiesToBeDeoptimized = UNKNOWN_DEOPTIMIZED_ENTITY;
+        }
     }
     getReturnExpressionWhenCalledAtPath(path) {
         // We deoptimize everything that is called as that will trivially deoptimize
@@ -6818,7 +6841,7 @@ class ParameterVariable extends LocalVariable {
             this.deoptimizePath(UNKNOWN_PATH);
         }
         else if (!this.deoptimizedFields.has(path[0])) {
-            this.deoptimizePath(path.slice(0, 1));
+            this.deoptimizePath([path[0]]);
         }
         return UNKNOWN_RETURN_EXPRESSION;
     }
@@ -7149,13 +7172,13 @@ const PF = {
 const MUTATES_ARG_WITHOUT_ACCESSOR = {
     __proto__: null,
     [ValueProperties]: {
-        deoptimizeArgumentsOnCall({ args: [firstArgument] }) {
+        deoptimizeArgumentsOnCall({ args: [, firstArgument] }) {
             firstArgument?.deoptimizePath(UNKNOWN_PATH);
         },
         getLiteralValue: getTruthyLiteralValue,
         hasEffectsWhenCalled({ args }, context) {
-            return (args.length === 0 ||
-                args[0].hasEffectsOnInteractionAtPath(UNKNOWN_NON_ACCESSOR_PATH, NODE_INTERACTION_UNKNOWN_ASSIGNMENT, context));
+            return (args.length <= 1 ||
+                args[1].hasEffectsOnInteractionAtPath(UNKNOWN_NON_ACCESSOR_PATH, NODE_INTERACTION_UNKNOWN_ASSIGNMENT, context));
         }
     }
 };
@@ -8578,18 +8601,19 @@ class FunctionBase extends NodeBase {
             const { parameters } = this.scope;
             const { args } = interaction;
             let hasRest = false;
-            for (let position = 0; position < args.length; position++) {
+            for (let position = 0; position < args.length - 1; position++) {
                 const parameter = this.params[position];
+                // Only the "this" argument arg[0] can be null
+                const argument = args[position + 1];
                 if (hasRest || parameter instanceof RestElement) {
                     hasRest = true;
-                    args[position].deoptimizePath(UNKNOWN_PATH);
+                    argument.deoptimizePath(UNKNOWN_PATH);
                 }
                 else if (parameter instanceof Identifier) {
-                    // args[position].deoptimizePath(UNKNOWN_PATH);
-                    parameters[position][0].addEntityToBeDeoptimized(args[position]);
+                    parameters[position][0].addEntityToBeDeoptimized(argument);
                 }
                 else if (parameter) {
-                    args[position].deoptimizePath(UNKNOWN_PATH);
+                    argument.deoptimizePath(UNKNOWN_PATH);
                 }
             }
         }
@@ -8971,8 +8995,9 @@ class FunctionNode extends FunctionBase {
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         super.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
-        if (interaction.type === INTERACTION_CALLED && path.length === 0 && interaction.thisArg) {
-            this.scope.thisVariable.addEntityToBeDeoptimized(interaction.thisArg);
+        if (interaction.type === INTERACTION_CALLED && path.length === 0 && interaction.args[0]) {
+            // args[0] is the "this" argument
+            this.scope.thisVariable.addEntityToBeDeoptimized(interaction.args[0]);
         }
     }
     hasEffects(context) {
@@ -9302,10 +9327,10 @@ class MemberExpression extends NodeBase {
         }
     }
     deoptimizeCache() {
-        const expressionsToBeDeoptimized = this.expressionsToBeDeoptimized;
-        this.expressionsToBeDeoptimized = [];
+        const { expressionsToBeDeoptimized, object } = this;
+        this.expressionsToBeDeoptimized = EMPTY_ARRAY;
         this.propertyKey = UnknownKey;
-        this.object.deoptimizePath(UNKNOWN_PATH);
+        object.deoptimizePath(UNKNOWN_PATH);
         for (const expression of expressionsToBeDeoptimized) {
             expression.deoptimizeCache();
         }
@@ -9331,8 +9356,8 @@ class MemberExpression extends NodeBase {
         if (this.isUndefined) {
             return undefined;
         }
-        this.expressionsToBeDeoptimized.push(origin);
-        if (path.length < MAX_PATH_DEPTH) {
+        if (this.propertyKey !== UnknownKey && path.length < MAX_PATH_DEPTH) {
+            this.expressionsToBeDeoptimized.push(origin);
             return this.object.getLiteralValueAtPath([this.getPropertyKey(), ...path], recursionTracker, origin);
         }
         return UnknownValue;
@@ -9344,8 +9369,8 @@ class MemberExpression extends NodeBase {
         if (this.isUndefined) {
             return [UNDEFINED_EXPRESSION, false];
         }
-        this.expressionsToBeDeoptimized.push(origin);
-        if (path.length < MAX_PATH_DEPTH) {
+        if (this.propertyKey !== UnknownKey && path.length < MAX_PATH_DEPTH) {
+            this.expressionsToBeDeoptimized.push(origin);
             return this.object.getReturnExpressionWhenCalledAtPath([this.getPropertyKey(), ...path], interaction, recursionTracker, origin);
         }
         return UNKNOWN_RETURN_EXPRESSION;
@@ -9404,7 +9429,7 @@ class MemberExpression extends NodeBase {
     }
     initialise() {
         this.propertyKey = getResolvablePropertyKey(this);
-        this.accessInteraction = { args: null, thisArg: this.object, type: INTERACTION_ACCESSED };
+        this.accessInteraction = { args: [this.object], type: INTERACTION_ACCESSED };
     }
     isSkippedAsOptional(origin) {
         return (!this.variable &&
@@ -9434,8 +9459,7 @@ class MemberExpression extends NodeBase {
     }
     setAssignedValue(value) {
         this.assignmentInteraction = {
-            args: [value],
-            thisArg: this.object,
+            args: [this.object, value],
             type: INTERACTION_ASSIGNED
         };
     }
@@ -9535,27 +9559,22 @@ class CallExpressionBase extends NodeBase {
         this.expressionsToBeDeoptimized = new Set();
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
-        const { args, thisArg } = interaction;
+        const { args } = interaction;
         const [returnExpression, isPure] = this.getReturnExpression(recursionTracker);
         if (isPure)
             return;
+        const deoptimizedExpressions = args.filter(expression => !!expression && expression !== UNKNOWN_EXPRESSION);
+        if (deoptimizedExpressions.length === 0)
+            return;
         if (returnExpression === UNKNOWN_EXPRESSION) {
-            thisArg?.deoptimizePath(UNKNOWN_PATH);
-            if (args) {
-                for (const argument of args) {
-                    argument.deoptimizePath(UNKNOWN_PATH);
-                }
+            for (const expression of deoptimizedExpressions) {
+                expression.deoptimizePath(UNKNOWN_PATH);
             }
         }
         else {
             recursionTracker.withTrackedEntityAtPath(path, returnExpression, () => {
-                if (thisArg) {
-                    this.expressionsToBeDeoptimized.add(thisArg);
-                }
-                if (args) {
-                    for (const argument of args) {
-                        this.expressionsToBeDeoptimized.add(argument);
-                    }
+                for (const expression of deoptimizedExpressions) {
+                    this.expressionsToBeDeoptimized.add(expression);
                 }
                 returnExpression.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
             }, null);
@@ -9564,10 +9583,13 @@ class CallExpressionBase extends NodeBase {
     deoptimizeCache() {
         if (this.returnExpression?.[0] !== UNKNOWN_EXPRESSION) {
             this.returnExpression = UNKNOWN_RETURN_EXPRESSION;
-            for (const expression of this.deoptimizableDependentExpressions) {
+            const { deoptimizableDependentExpressions, expressionsToBeDeoptimized } = this;
+            this.expressionsToBeDeoptimized = EMPTY_SET;
+            this.deoptimizableDependentExpressions = EMPTY_ARRAY;
+            for (const expression of deoptimizableDependentExpressions) {
                 expression.deoptimizeCache();
             }
-            for (const expression of this.expressionsToBeDeoptimized) {
+            for (const expression of expressionsToBeDeoptimized) {
                 expression.deoptimizePath(UNKNOWN_PATH);
             }
         }
@@ -9635,10 +9657,12 @@ class CallExpression extends CallExpressionBase {
             }
         }
         this.interaction = {
-            args: this.arguments,
-            thisArg: this.callee instanceof MemberExpression && !this.callee.variable
-                ? this.callee.object
-                : null,
+            args: [
+                this.callee instanceof MemberExpression && !this.callee.variable
+                    ? this.callee.object
+                    : null,
+                ...this.arguments
+            ],
             type: INTERACTION_CALLED,
             withNew: false
         };
@@ -9791,8 +9815,7 @@ class MethodBase extends NodeBase {
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
         if (interaction.type === INTERACTION_ACCESSED && this.kind === 'get' && path.length === 0) {
             return this.value.deoptimizeArgumentsOnInteractionAtPath({
-                args: NO_ARGS,
-                thisArg: interaction.thisArg,
+                args: interaction.args,
                 type: INTERACTION_CALLED,
                 withNew: false
             }, EMPTY_PATH, recursionTracker);
@@ -9800,7 +9823,6 @@ class MethodBase extends NodeBase {
         if (interaction.type === INTERACTION_ASSIGNED && this.kind === 'set' && path.length === 0) {
             return this.value.deoptimizeArgumentsOnInteractionAtPath({
                 args: interaction.args,
-                thisArg: interaction.thisArg,
                 type: INTERACTION_CALLED,
                 withNew: false
             }, EMPTY_PATH, recursionTracker);
@@ -9825,8 +9847,7 @@ class MethodBase extends NodeBase {
     hasEffectsOnInteractionAtPath(path, interaction, context) {
         if (this.kind === 'get' && interaction.type === INTERACTION_ACCESSED && path.length === 0) {
             return this.value.hasEffectsOnInteractionAtPath(EMPTY_PATH, {
-                args: NO_ARGS,
-                thisArg: interaction.thisArg,
+                args: interaction.args,
                 type: INTERACTION_CALLED,
                 withNew: false
             }, context);
@@ -9835,7 +9856,6 @@ class MethodBase extends NodeBase {
         if (this.kind === 'set' && interaction.type === INTERACTION_ASSIGNED) {
             return this.value.hasEffectsOnInteractionAtPath(EMPTY_PATH, {
                 args: interaction.args,
-                thisArg: interaction.thisArg,
                 type: INTERACTION_CALLED,
                 withNew: false
             }, context);
@@ -10096,7 +10116,9 @@ class ConditionalExpression extends NodeBase {
             const unusedBranch = this.usedBranch === this.consequent ? this.alternate : this.consequent;
             this.usedBranch = null;
             unusedBranch.deoptimizePath(UNKNOWN_PATH);
-            for (const expression of this.expressionsToBeDeoptimized) {
+            const { expressionsToBeDeoptimized } = this;
+            this.expressionsToBeDeoptimized = EMPTY_ARRAY;
+            for (const expression of expressionsToBeDeoptimized) {
                 expression.deoptimizeCache();
             }
         }
@@ -11228,12 +11250,14 @@ class LogicalExpression extends NodeBase {
             const unusedBranch = this.usedBranch === this.left ? this.right : this.left;
             this.usedBranch = null;
             unusedBranch.deoptimizePath(UNKNOWN_PATH);
-            for (const expression of this.expressionsToBeDeoptimized) {
+            const { context, expressionsToBeDeoptimized } = this;
+            this.expressionsToBeDeoptimized = EMPTY_ARRAY;
+            for (const expression of expressionsToBeDeoptimized) {
                 expression.deoptimizeCache();
             }
             // Request another pass because we need to ensure "include" runs again if
             // it is rendered
-            this.context.requestTreeshakingPass();
+            context.requestTreeshakingPass();
         }
     }
     deoptimizePath(path) {
@@ -11503,8 +11527,7 @@ class NewExpression extends NodeBase {
     }
     initialise() {
         this.interaction = {
-            args: this.arguments,
-            thisArg: null,
+            args: [null, ...this.arguments],
             type: INTERACTION_CALLED,
             withNew: true
         };
@@ -11626,6 +11649,9 @@ class Program extends NodeBase {
         this.hasLoggedEffect = false;
     }
     hasCachedEffects() {
+        if (!this.included) {
+            return false;
+        }
         return this.hasCachedEffect === null
             ? (this.hasCachedEffect = this.hasEffects(createHasEffectsContext()))
             : this.hasCachedEffect;
@@ -12020,16 +12046,19 @@ class TaggedTemplateExpression extends CallExpressionBase {
             this.tag.include(context, includeChildrenRecursively);
             this.quasi.include(context, includeChildrenRecursively);
         }
-        this.tag.includeCallArguments(context, this.interaction.args);
+        this.tag.includeCallArguments(context, this.args);
         const [returnExpression] = this.getReturnExpression();
         if (!returnExpression.included) {
             returnExpression.include(context, false);
         }
     }
     initialise() {
+        this.args = [UNKNOWN_EXPRESSION, ...this.quasi.expressions];
         this.interaction = {
-            args: [UNKNOWN_EXPRESSION, ...this.quasi.expressions],
-            thisArg: this.tag instanceof MemberExpression && !this.tag.variable ? this.tag.object : null,
+            args: [
+                this.tag instanceof MemberExpression && !this.tag.variable ? this.tag.object : null,
+                ...this.args
+            ],
             type: INTERACTION_CALLED,
             withNew: false
         };
@@ -12214,8 +12243,7 @@ class ThisExpression extends NodeBase {
         this.variable = this.scope.findVariable('this');
     }
     deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker) {
-        // We rewrite the parameter so that a ThisVariable can detect self-mutations
-        this.variable.deoptimizeArgumentsOnInteractionAtPath(interaction.thisArg === this ? { ...interaction, thisArg: this.variable } : interaction, path, recursionTracker);
+        this.variable.deoptimizeArgumentsOnInteractionAtPath(interaction, path, recursionTracker);
     }
     deoptimizePath(path) {
         this.variable.deoptimizePath(path);

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.1
-	Thu, 23 Mar 2023 08:52:57 GMT - commit 75c5113e24f5857abf845776423f55f70b8d1c13
+	Rollup.js v3.20.3-0
+	Fri, 14 Apr 2023 05:11:57 GMT - commit 80c2fcb882e8a5ec2be167784d8ab14654f69379
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.1
-	Thu, 23 Mar 2023 08:52:57 GMT - commit 75c5113e24f5857abf845776423f55f70b8d1c13
+	Rollup.js v3.20.3-0
+	Fri, 14 Apr 2023 05:11:57 GMT - commit 80c2fcb882e8a5ec2be167784d8ab14654f69379
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.d.ts

@@ -254,7 +254,7 @@ export type ShouldTransformCachedModuleHook = (
 		resolvedSources: ResolvedIdMap;
 		syntheticNamedExports: boolean | string;
 	}
-) => boolean;
+) => boolean | NullValue;
 
 export type IsExternal = (
 	source: string,

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.20.1
-	Thu, 23 Mar 2023 08:52:57 GMT - commit 75c5113e24f5857abf845776423f55f70b8d1c13
+	Rollup.js v3.20.3-0
+	Fri, 14 Apr 2023 05:11:57 GMT - commit 80c2fcb882e8a5ec2be167784d8ab14654f69379
 
 	https://github.com/rollup/rollup