rollup 3.7.3 → 3.7.5-0

package/dist/bin/rollup

@@ -2,8 +2,8 @@
 
 /*
   @license
-	Rollup.js v3.7.3
-	Sun, 11 Dec 2022 15:24:30 GMT - commit a0d4d69092484a0879377e16425b737ec541ae55
+	Rollup.js v3.7.5-0
+	Fri, 16 Dec 2022 10:54:15 GMT - commit 1ee5d10583f88926dc36b97e7b3870ee078327e2
 
 	https://github.com/rollup/rollup
 
@@ -1388,130 +1388,10 @@ function prettyMilliseconds(milliseconds, options = {}) {
 	return options.colonNotation ? result.join('') : result.join(' ');
 }
 
-const BYTE_UNITS = [
-	'B',
-	'kB',
-	'MB',
-	'GB',
-	'TB',
-	'PB',
-	'EB',
-	'ZB',
-	'YB',
-];
-
-const BIBYTE_UNITS = [
-	'B',
-	'kiB',
-	'MiB',
-	'GiB',
-	'TiB',
-	'PiB',
-	'EiB',
-	'ZiB',
-	'YiB',
-];
-
-const BIT_UNITS = [
-	'b',
-	'kbit',
-	'Mbit',
-	'Gbit',
-	'Tbit',
-	'Pbit',
-	'Ebit',
-	'Zbit',
-	'Ybit',
-];
-
-const BIBIT_UNITS = [
-	'b',
-	'kibit',
-	'Mibit',
-	'Gibit',
-	'Tibit',
-	'Pibit',
-	'Eibit',
-	'Zibit',
-	'Yibit',
-];
-
-/*
-Formats the given number using `Number#toLocaleString`.
-- If locale is a string, the value is expected to be a locale-key (for example: `de`).
-- If locale is true, the system default locale is used for translation.
-- If no value for locale is specified, the number is returned unmodified.
-*/
-const toLocaleString = (number, locale, options) => {
-	let result = number;
-	if (typeof locale === 'string' || Array.isArray(locale)) {
-		result = number.toLocaleString(locale, options);
-	} else if (locale === true || options !== undefined) {
-		result = number.toLocaleString(undefined, options);
-	}
-
-	return result;
-};
-
-function prettyBytes(number, options) {
-	if (!Number.isFinite(number)) {
-		throw new TypeError(`Expected a finite number, got ${typeof number}: ${number}`);
-	}
-
-	options = {
-		bits: false,
-		binary: false,
-		...options,
-	};
-
-	const UNITS = options.bits
-		? (options.binary ? BIBIT_UNITS : BIT_UNITS)
-		: (options.binary ? BIBYTE_UNITS : BYTE_UNITS);
-
-	if (options.signed && number === 0) {
-		return ` 0 ${UNITS[0]}`;
-	}
-
-	const isNegative = number < 0;
-	const prefix = isNegative ? '-' : (options.signed ? '+' : '');
-
-	if (isNegative) {
-		number = -number;
-	}
-
-	let localeOptions;
-
-	if (options.minimumFractionDigits !== undefined) {
-		localeOptions = {minimumFractionDigits: options.minimumFractionDigits};
-	}
-
-	if (options.maximumFractionDigits !== undefined) {
-		localeOptions = {maximumFractionDigits: options.maximumFractionDigits, ...localeOptions};
-	}
-
-	if (number < 1) {
-		const numberString = toLocaleString(number, options.locale, localeOptions);
-		return prefix + numberString + ' ' + UNITS[0];
-	}
-
-	const exponent = Math.min(Math.floor(options.binary ? Math.log(number) / Math.log(1024) : Math.log10(number) / 3), UNITS.length - 1);
-	number /= (options.binary ? 1024 : 1000) ** exponent;
-
-	if (!localeOptions) {
-		number = number.toPrecision(3);
-	}
-
-	const numberString = toLocaleString(Number(number), options.locale, localeOptions);
-
-	const unit = UNITS[exponent];
-
-	return prefix + numberString + ' ' + unit;
-}
-
 function printTimings(timings) {
     for (const [label, [time, memory, total]] of Object.entries(timings)) {
         const appliedColor = label[0] === '#' ? (label[1] !== '#' ? rollup.underline : rollup.bold) : (text) => text;
-        const row = `${label}: ${time.toFixed(0)}ms, ${prettyBytes(memory)} / ${prettyBytes(total)}`;
+        const row = `${label}: ${time.toFixed(0)}ms, ${rollup.prettyBytes(memory)} / ${rollup.prettyBytes(total)}`;
         console.info(appliedColor(row));
     }
 }

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.7.3
-	Sun, 11 Dec 2022 15:24:30 GMT - commit a0d4d69092484a0879377e16425b737ec541ae55
+	Rollup.js v3.7.5-0
+	Fri, 16 Dec 2022 10:54:15 GMT - commit 1ee5d10583f88926dc36b97e7b3870ee078327e2
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.7.3
-	Sun, 11 Dec 2022 15:24:30 GMT - commit a0d4d69092484a0879377e16425b737ec541ae55
+	Rollup.js v3.7.5-0
+	Fri, 16 Dec 2022 10:54:15 GMT - commit 1ee5d10583f88926dc36b97e7b3870ee078327e2
 
 	https://github.com/rollup/rollup
 
@@ -16,7 +16,7 @@ import { promises } from 'node:fs';
 import { EventEmitter } from 'node:events';
 import * as tty from 'tty';
 
-var version$1 = "3.7.3";
+var version$1 = "3.7.5-0";
 
 var charToInteger = {};
 var chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -5038,6 +5038,11 @@ const literalNumberMembers = assembleMemberDescriptions({
     toPrecision: returnsString,
     valueOf: returnsNumber
 }, objectMembers);
+/**
+ * RegExp are stateful when they have the global or sticky flags set.
+ * But if we actually don't use them, the side effect does not matter.
+ * the check logic in `hasEffectsOnInteractionAtPath`.
+ */
 const literalRegExpMembers = assembleMemberDescriptions({
     exec: returnsUnknown,
     test: returnsBoolean
@@ -8911,6 +8916,11 @@ class Literal extends NodeBase {
                 return true;
             }
             case INTERACTION_CALLED: {
+                if (this.included &&
+                    this.value instanceof RegExp &&
+                    (this.value.global || this.value.sticky)) {
+                    return true;
+                }
                 return (path.length !== 1 ||
                     hasMemberEffectWhenCalled(this.members, path[0], interaction, context));
             }
@@ -11269,7 +11279,12 @@ class PrivateIdentifier extends NodeBase {
 class Program extends NodeBase {
     constructor() {
         super(...arguments);
-        this.hasCachedEffect = false;
+        this.hasCachedEffect = null;
+    }
+    hasCachedEffects() {
+        return this.hasCachedEffect === null
+            ? (this.hasCachedEffect = this.hasEffects(createHasEffectsContext()))
+            : this.hasCachedEffect;
     }
     hasEffects(context) {
         // We are caching here to later more efficiently identify side-effect-free modules
@@ -13129,8 +13144,7 @@ class Module {
         return [null];
     }
     hasEffects() {
-        return (this.info.moduleSideEffects === 'no-treeshake' ||
-            (this.ast.included && this.ast.hasEffects(createHasEffectsContext())));
+        return this.info.moduleSideEffects === 'no-treeshake' || this.ast.hasCachedEffects();
     }
     include() {
         const context = createInclusionContext();
@@ -15729,12 +15743,132 @@ function getImportedBindingsPerDependency(renderedDependencies, resolveFileName)
 const QUERY_HASH_REGEX = /[#?]/;
 const resolveFileName = (dependency) => dependency.getFileName();
 
+const BYTE_UNITS = [
+	'B',
+	'kB',
+	'MB',
+	'GB',
+	'TB',
+	'PB',
+	'EB',
+	'ZB',
+	'YB',
+];
+
+const BIBYTE_UNITS = [
+	'B',
+	'kiB',
+	'MiB',
+	'GiB',
+	'TiB',
+	'PiB',
+	'EiB',
+	'ZiB',
+	'YiB',
+];
+
+const BIT_UNITS = [
+	'b',
+	'kbit',
+	'Mbit',
+	'Gbit',
+	'Tbit',
+	'Pbit',
+	'Ebit',
+	'Zbit',
+	'Ybit',
+];
+
+const BIBIT_UNITS = [
+	'b',
+	'kibit',
+	'Mibit',
+	'Gibit',
+	'Tibit',
+	'Pibit',
+	'Eibit',
+	'Zibit',
+	'Yibit',
+];
+
+/*
+Formats the given number using `Number#toLocaleString`.
+- If locale is a string, the value is expected to be a locale-key (for example: `de`).
+- If locale is true, the system default locale is used for translation.
+- If no value for locale is specified, the number is returned unmodified.
+*/
+const toLocaleString = (number, locale, options) => {
+	let result = number;
+	if (typeof locale === 'string' || Array.isArray(locale)) {
+		result = number.toLocaleString(locale, options);
+	} else if (locale === true || options !== undefined) {
+		result = number.toLocaleString(undefined, options);
+	}
+
+	return result;
+};
+
+function prettyBytes(number, options) {
+	if (!Number.isFinite(number)) {
+		throw new TypeError(`Expected a finite number, got ${typeof number}: ${number}`);
+	}
+
+	options = {
+		bits: false,
+		binary: false,
+		...options,
+	};
+
+	const UNITS = options.bits
+		? (options.binary ? BIBIT_UNITS : BIT_UNITS)
+		: (options.binary ? BIBYTE_UNITS : BYTE_UNITS);
+
+	if (options.signed && number === 0) {
+		return ` 0 ${UNITS[0]}`;
+	}
+
+	const isNegative = number < 0;
+	const prefix = isNegative ? '-' : (options.signed ? '+' : '');
+
+	if (isNegative) {
+		number = -number;
+	}
+
+	let localeOptions;
+
+	if (options.minimumFractionDigits !== undefined) {
+		localeOptions = {minimumFractionDigits: options.minimumFractionDigits};
+	}
+
+	if (options.maximumFractionDigits !== undefined) {
+		localeOptions = {maximumFractionDigits: options.maximumFractionDigits, ...localeOptions};
+	}
+
+	if (number < 1) {
+		const numberString = toLocaleString(number, options.locale, localeOptions);
+		return prefix + numberString + ' ' + UNITS[0];
+	}
+
+	const exponent = Math.min(Math.floor(options.binary ? Math.log(number) / Math.log(1024) : Math.log10(number) / 3), UNITS.length - 1);
+	number /= (options.binary ? 1024 : 1000) ** exponent;
+
+	if (!localeOptions) {
+		number = number.toPrecision(3);
+	}
+
+	const numberString = toLocaleString(Number(number), options.locale, localeOptions);
+
+	const unit = UNITS[exponent];
+
+	return prefix + numberString + ' ' + unit;
+}
+
 /**
  * Concatenate a number of iterables to a new iterable without fully evaluating
  * their iterators. Useful when e.g. working with large sets or lists and when
  * there is a chance that the iterators will not be fully exhausted.
  */
-function* concatLazy(...iterables) {
+function* concatLazy(iterables) {
     for (const iterable of iterables) {
         yield* iterable;
     }
@@ -15875,47 +16009,11 @@ function createChunks(allEntries, assignedEntriesByModule, minChunkSize) {
             alias: null,
             modules
         }))
-        : getOptimizedChunks(chunkModulesBySignature, minChunkSize);
-}
-function getOptimizedChunks(chunkModulesBySignature, minChunkSize) {
-    timeStart('optimize chunks', 3);
-    const { chunksToBeMerged, unmergeableChunks } = getMergeableChunks(chunkModulesBySignature, minChunkSize);
-    for (const sourceChunk of chunksToBeMerged) {
-        chunksToBeMerged.delete(sourceChunk);
-        let closestChunk = null;
-        let closestChunkDistance = Infinity;
-        const { signature, size, modules } = sourceChunk;
-        for (const targetChunk of concatLazy(chunksToBeMerged, unmergeableChunks)) {
-            const distance = getSignatureDistance(signature, targetChunk.signature, !chunksToBeMerged.has(targetChunk));
-            if (distance === 1) {
-                closestChunk = targetChunk;
-                break;
-            }
-            else if (distance < closestChunkDistance) {
-                closestChunk = targetChunk;
-                closestChunkDistance = distance;
-            }
-        }
-        if (closestChunk) {
-            closestChunk.modules.push(...modules);
-            if (chunksToBeMerged.has(closestChunk)) {
-                closestChunk.signature = mergeSignatures(signature, closestChunk.signature);
-                if ((closestChunk.size += size) > minChunkSize) {
-                    chunksToBeMerged.delete(closestChunk);
-                    unmergeableChunks.push(closestChunk);
-                }
-            }
-        }
-        else {
-            unmergeableChunks.push(sourceChunk);
-        }
-    }
-    timeEnd('optimize chunks', 3);
-    return unmergeableChunks;
+        : getOptimizedChunks(chunkModulesBySignature, minChunkSize).map(({ modules }) => ({
+            alias: null,
+            modules
+        }));
 }
-const CHAR_DEPENDENT = 'X';
-const CHAR_INDEPENDENT = '_';
-const CHAR_CODE_DEPENDENT = CHAR_DEPENDENT.charCodeAt(0);
 function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
     const chunkModules = Object.create(null);
     for (const [module, assignedEntries] of assignedEntriesByModule) {
@@ -15933,28 +16031,236 @@ function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
     }
     return chunkModules;
 }
-function getMergeableChunks(chunkModulesBySignature, minChunkSize) {
-    const chunksToBeMerged = new Set();
-    const unmergeableChunks = [];
-    const alias = null;
+/**
+ * This function tries to get rid of small chunks by merging them with other
+ * chunks. In order to merge chunks, one must obey the following rule:
+ * - When merging several chunks, at most one of the chunks can have side
+ *   effects
+ * - When one of the chunks has side effects, the entry points depending on that
+ *   chunk need to be a super set of the entry points depending on the other
+ *   chunks
+ * - Pure chunks can always be merged
+ * - We use the entry point dependence signature to calculate "chunk distance",
+ *   i.e. how likely it is that two chunks are loaded together
+ */
+function getOptimizedChunks(chunkModulesBySignature, minChunkSize) {
+    timeStart('optimize chunks', 3);
+    const chunkPartition = getPartitionedChunks(chunkModulesBySignature, minChunkSize);
+    console.log(`Created ${chunkPartition.big.pure.size +
+        chunkPartition.big.sideEffect.size +
+        chunkPartition.small.pure.size +
+        chunkPartition.small.sideEffect.size} chunks
+----- pure  side effects
+small ${`${chunkPartition.small.pure.size}`.padEnd(5, ' ')} ${chunkPartition.small.sideEffect.size}
+  big ${`${chunkPartition.big.pure.size}`.padEnd(5, ' ')} ${chunkPartition.big.sideEffect.size}
+Unoptimized chunks contain ${getNumberOfCycles(chunkPartition)} cycles.
+`);
+    const chunkAliases = new Map();
+    if (chunkPartition.small.sideEffect.size > 0) {
+        console.log(`Trying to find merge targets for ${chunkPartition.small.sideEffect.size} chunks smaller than ${prettyBytes(minChunkSize)} with side effects...`);
+        mergeChunks(chunkPartition.small.sideEffect, [chunkPartition.small.pure, chunkPartition.big.pure], minChunkSize, chunkPartition, chunkAliases);
+        console.log(`${chunkPartition.small.sideEffect.size} chunks smaller than ${prettyBytes(minChunkSize)} with side effects remaining.\nGenerated chunks contain ${getNumberOfCycles(chunkPartition)} cycles.\n`);
+    }
+    if (chunkPartition.small.pure.size > 0) {
+        console.log(`Trying to find merge targets for ${chunkPartition.small.pure.size} pure chunks smaller than ${prettyBytes(minChunkSize)}...`);
+        mergeChunks(chunkPartition.small.pure, [chunkPartition.small.pure, chunkPartition.big.sideEffect, chunkPartition.big.pure], minChunkSize, chunkPartition, chunkAliases);
+        console.log(`${chunkPartition.small.pure.size} pure chunks smaller than ${prettyBytes(minChunkSize)} remaining.\nGenerated chunks contain ${getNumberOfCycles(chunkPartition)} cycles.\n`);
+    }
+    timeEnd('optimize chunks', 3);
+    const result = [
+        ...chunkPartition.small.sideEffect,
+        ...chunkPartition.small.pure,
+        ...chunkPartition.big.sideEffect,
+        ...chunkPartition.big.pure
+    ];
+    console.log(`${result.length} chunks remaining.`);
+    return result;
+}
+const CHAR_DEPENDENT = 'X';
+const CHAR_INDEPENDENT = '_';
+const CHAR_CODE_DEPENDENT = CHAR_DEPENDENT.charCodeAt(0);
+function getPartitionedChunks(chunkModulesBySignature, minChunkSize) {
+    const smallPureChunks = [];
+    const bigPureChunks = [];
+    const smallSideEffectChunks = [];
+    const bigSideEffectChunks = [];
+    const chunkByModule = new Map();
     for (const [signature, modules] of Object.entries(chunkModulesBySignature)) {
+        const chunkDescription = {
+            dependencies: new Set(),
+            modules,
+            pure: true,
+            signature,
+            size: 0,
+            transitiveDependencies: new Set(),
+            transitiveDependentChunks: new Set()
+        };
         let size = 0;
-        checkModules: {
+        let pure = true;
+        for (const module of modules) {
+            chunkByModule.set(module, chunkDescription);
+            pure && (pure = !module.hasEffects());
+            size += module.magicString.toString().length;
+        }
+        chunkDescription.pure = pure;
+        chunkDescription.size = size;
+        (size < minChunkSize
+            ? pure
+                ? smallPureChunks
+                : smallSideEffectChunks
+            : pure
+                ? bigPureChunks
+                : bigSideEffectChunks).push(chunkDescription);
+    }
+    sortChunksAndAddDependencies([bigPureChunks, bigSideEffectChunks, smallPureChunks, smallSideEffectChunks], chunkByModule);
+    return {
+        big: { pure: new Set(bigPureChunks), sideEffect: new Set(bigSideEffectChunks) },
+        small: { pure: new Set(smallPureChunks), sideEffect: new Set(smallSideEffectChunks) }
+    };
+}
+function getNumberOfCycles(partition) {
+    const parents = new Set();
+    const analysedChunks = new Set();
+    let cycles = 0;
+    const analyseChunk = (chunk) => {
+        for (const dependency of chunk.dependencies) {
+            if (parents.has(dependency)) {
+                if (!analysedChunks.has(dependency)) {
+                    cycles++;
+                }
+                continue;
+            }
+            parents.add(dependency);
+            analyseChunk(dependency);
+        }
+        analysedChunks.add(chunk);
+    };
+    for (const chunk of [
+        ...partition.big.pure,
+        ...partition.big.sideEffect,
+        ...partition.small.pure,
+        ...partition.small.sideEffect
+    ]) {
+        if (!parents.has(chunk)) {
+            parents.add(chunk);
+            analyseChunk(chunk);
+        }
+    }
+    return cycles;
+}
+function sortChunksAndAddDependencies(chunkLists, chunkByModule) {
+    for (const chunks of chunkLists) {
+        chunks.sort(compareChunks);
+        for (const chunk of chunks) {
+            const { dependencies, modules, transitiveDependencies } = chunk;
+            const transitiveDependencyModules = new Set();
             for (const module of modules) {
-                if (module.hasEffects()) {
-                    break checkModules;
+                for (const dependency of module.getDependenciesToBeIncluded()) {
+                    const dependencyChunk = chunkByModule.get(dependency);
+                    if (dependencyChunk && dependencyChunk !== chunk) {
+                        dependencies.add(dependencyChunk);
+                        transitiveDependencyModules.add(dependency);
+                    }
                 }
-                size += module.magicString.toString().length;
-                if (size > minChunkSize) {
-                    break checkModules;
+            }
+            for (const module of transitiveDependencyModules) {
+                const transitiveDependency = chunkByModule.get(module);
+                if (transitiveDependency !== chunk) {
+                    transitiveDependencies.add(transitiveDependency);
+                    for (const dependency of module.getDependenciesToBeIncluded()) {
+                        if (!(dependency instanceof ExternalModule)) {
+                            transitiveDependencyModules.add(dependency);
+                        }
+                    }
                 }
             }
-            chunksToBeMerged.add({ alias, modules, signature, size });
-            continue;
         }
-        unmergeableChunks.push({ alias, modules, signature, size: null });
     }
-    return { chunksToBeMerged, unmergeableChunks };
+}
+function compareChunks({ size: sizeA }, { size: sizeB }) {
+    return sizeA - sizeB;
+}
+function mergeChunks(chunksToBeMerged, targetChunks, minChunkSize, chunkPartition, chunkAliases) {
+    for (const mergedChunk of chunksToBeMerged) {
+        replaceAliasedDependencies(mergedChunk, chunkAliases);
+        let closestChunk = null;
+        let closestChunkDistance = Infinity;
+        const { signature, modules, pure, size } = mergedChunk;
+        for (const targetChunk of concatLazy(targetChunks)) {
+            if (mergedChunk === targetChunk)
+                continue;
+            const distance = pure
+                ? getSignatureDistance(signature, targetChunk.signature, !targetChunk.pure)
+                : getSignatureDistance(targetChunk.signature, signature, true);
+            if (distance < closestChunkDistance && isValidMerge(mergedChunk, targetChunk, chunkAliases)) {
+                if (distance === 1) {
+                    closestChunk = targetChunk;
+                    break;
+                }
+                closestChunk = targetChunk;
+                closestChunkDistance = distance;
+            }
+        }
+        if (closestChunk) {
+            chunkAliases.set(mergedChunk, closestChunk);
+            chunksToBeMerged.delete(mergedChunk);
+            getChunksInPartition(closestChunk, minChunkSize, chunkPartition).delete(closestChunk);
+            closestChunk.modules.push(...modules);
+            closestChunk.size += size;
+            closestChunk.pure && (closestChunk.pure = pure);
+            closestChunk.signature = mergeSignatures(signature, closestChunk.signature);
+            const { dependencies, transitiveDependencies } = closestChunk;
+            for (const dependency of mergedChunk.dependencies) {
+                dependencies.add(dependency);
+            }
+            for (const dependency of mergedChunk.transitiveDependencies) {
+                transitiveDependencies.add(dependency);
+            }
+            dependencies.delete(closestChunk);
+            dependencies.delete(mergedChunk);
+            transitiveDependencies.delete(closestChunk);
+            transitiveDependencies.delete(mergedChunk);
+            getChunksInPartition(closestChunk, minChunkSize, chunkPartition).add(closestChunk);
+        }
+    }
+}
+function replaceAliasedDependencies(chunk, chunkAliases) {
+    for (const [alias, aliased] of chunkAliases) {
+        if (chunk.dependencies.has(alias)) {
+            chunk.dependencies.delete(alias);
+            chunk.dependencies.add(aliased);
+        }
+        if (chunk.transitiveDependencies.has(alias)) {
+            chunk.transitiveDependencies.delete(alias);
+            chunk.transitiveDependencies.add(aliased);
+        }
+    }
+}
+// Merging will not produce cycles if
+// - no chunk is a transitive dependency of the other, or
+// - none of the direct non-merged dependencies of a chunk have the other
+//   chunk as a transitive dependency
+function isValidMerge(mergedChunk, targetChunk, chunkAliases) {
+    if (hasTransitiveDependency(mergedChunk, targetChunk)) {
+        return false;
+    }
+    replaceAliasedDependencies(targetChunk, chunkAliases);
+    return !hasTransitiveDependency(targetChunk, mergedChunk);
+}
+function hasTransitiveDependency(dependentChunk, dependencyChunk) {
+    if (!dependentChunk.transitiveDependencies.has(dependencyChunk)) {
+        return false;
+    }
+    for (const dependency of dependentChunk.dependencies) {
+        if (dependency.transitiveDependencies.has(dependencyChunk)) {
+            return true;
+        }
+    }
+    return false;
+}
+function getChunksInPartition(chunk, minChunkSize, chunkPartition) {
+    const subPartition = chunk.size < minChunkSize ? chunkPartition.small : chunkPartition.big;
+    return chunk.pure ? subPartition.pure : subPartition.sideEffect;
 }
 function getSignatureDistance(sourceSignature, targetSignature, enforceSubset) {
     let distance = 0;

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.7.3
-	Sun, 11 Dec 2022 15:24:30 GMT - commit a0d4d69092484a0879377e16425b737ec541ae55
+	Rollup.js v3.7.5-0
+	Fri, 16 Dec 2022 10:54:15 GMT - commit 1ee5d10583f88926dc36b97e7b3870ee078327e2
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.7.3
-	Sun, 11 Dec 2022 15:24:30 GMT - commit a0d4d69092484a0879377e16425b737ec541ae55
+	Rollup.js v3.7.5-0
+	Fri, 16 Dec 2022 10:54:15 GMT - commit 1ee5d10583f88926dc36b97e7b3870ee078327e2
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.7.3
-	Sun, 11 Dec 2022 15:24:30 GMT - commit a0d4d69092484a0879377e16425b737ec541ae55
+	Rollup.js v3.7.5-0
+	Fri, 16 Dec 2022 10:54:15 GMT - commit 1ee5d10583f88926dc36b97e7b3870ee078327e2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.7.3
-	Sun, 11 Dec 2022 15:24:30 GMT - commit a0d4d69092484a0879377e16425b737ec541ae55
+	Rollup.js v3.7.5-0
+	Fri, 16 Dec 2022 10:54:15 GMT - commit 1ee5d10583f88926dc36b97e7b3870ee078327e2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.7.3
-	Sun, 11 Dec 2022 15:24:30 GMT - commit a0d4d69092484a0879377e16425b737ec541ae55
+	Rollup.js v3.7.5-0
+	Fri, 16 Dec 2022 10:54:15 GMT - commit 1ee5d10583f88926dc36b97e7b3870ee078327e2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.7.3
-	Sun, 11 Dec 2022 15:24:30 GMT - commit a0d4d69092484a0879377e16425b737ec541ae55
+	Rollup.js v3.7.5-0
+	Fri, 16 Dec 2022 10:54:15 GMT - commit 1ee5d10583f88926dc36b97e7b3870ee078327e2
 
 	https://github.com/rollup/rollup
 
@@ -31,7 +31,7 @@ function _interopNamespaceDefault(e) {
 
 const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
 
-var version$1 = "3.7.3";
+var version$1 = "3.7.5-0";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -5553,6 +5553,11 @@ const literalNumberMembers = assembleMemberDescriptions({
     toPrecision: returnsString,
     valueOf: returnsNumber
 }, objectMembers);
+/**
+ * RegExp are stateful when they have the global or sticky flags set.
+ * But if we actually don't use them, the side effect does not matter.
+ * the check logic in `hasEffectsOnInteractionAtPath`.
+ */
 const literalRegExpMembers = assembleMemberDescriptions({
     exec: returnsUnknown,
     test: returnsBoolean
@@ -9426,6 +9431,11 @@ class Literal extends NodeBase {
                 return true;
             }
             case INTERACTION_CALLED: {
+                if (this.included &&
+                    this.value instanceof RegExp &&
+                    (this.value.global || this.value.sticky)) {
+                    return true;
+                }
                 return (path.length !== 1 ||
                     hasMemberEffectWhenCalled(this.members, path[0], interaction, context));
             }
@@ -11784,7 +11794,12 @@ class PrivateIdentifier extends NodeBase {
 class Program extends NodeBase {
     constructor() {
         super(...arguments);
-        this.hasCachedEffect = false;
+        this.hasCachedEffect = null;
+    }
+    hasCachedEffects() {
+        return this.hasCachedEffect === null
+            ? (this.hasCachedEffect = this.hasEffects(createHasEffectsContext()))
+            : this.hasCachedEffect;
     }
     hasEffects(context) {
         // We are caching here to later more efficiently identify side-effect-free modules
@@ -13644,8 +13659,7 @@ class Module {
         return [null];
     }
     hasEffects() {
-        return (this.info.moduleSideEffects === 'no-treeshake' ||
-            (this.ast.included && this.ast.hasEffects(createHasEffectsContext())));
+        return this.info.moduleSideEffects === 'no-treeshake' || this.ast.hasCachedEffects();
     }
     include() {
         const context = createInclusionContext();
@@ -16244,12 +16258,132 @@ function getImportedBindingsPerDependency(renderedDependencies, resolveFileName)
 const QUERY_HASH_REGEX = /[#?]/;
 const resolveFileName = (dependency) => dependency.getFileName();
 
+const BYTE_UNITS = [
+	'B',
+	'kB',
+	'MB',
+	'GB',
+	'TB',
+	'PB',
+	'EB',
+	'ZB',
+	'YB',
+];
+
+const BIBYTE_UNITS = [
+	'B',
+	'kiB',
+	'MiB',
+	'GiB',
+	'TiB',
+	'PiB',
+	'EiB',
+	'ZiB',
+	'YiB',
+];
+
+const BIT_UNITS = [
+	'b',
+	'kbit',
+	'Mbit',
+	'Gbit',
+	'Tbit',
+	'Pbit',
+	'Ebit',
+	'Zbit',
+	'Ybit',
+];
+
+const BIBIT_UNITS = [
+	'b',
+	'kibit',
+	'Mibit',
+	'Gibit',
+	'Tibit',
+	'Pibit',
+	'Eibit',
+	'Zibit',
+	'Yibit',
+];
+
+/*
+Formats the given number using `Number#toLocaleString`.
+- If locale is a string, the value is expected to be a locale-key (for example: `de`).
+- If locale is true, the system default locale is used for translation.
+- If no value for locale is specified, the number is returned unmodified.
+*/
+const toLocaleString = (number, locale, options) => {
+	let result = number;
+	if (typeof locale === 'string' || Array.isArray(locale)) {
+		result = number.toLocaleString(locale, options);
+	} else if (locale === true || options !== undefined) {
+		result = number.toLocaleString(undefined, options);
+	}
+
+	return result;
+};
+
+function prettyBytes(number, options) {
+	if (!Number.isFinite(number)) {
+		throw new TypeError(`Expected a finite number, got ${typeof number}: ${number}`);
+	}
+
+	options = {
+		bits: false,
+		binary: false,
+		...options,
+	};
+
+	const UNITS = options.bits
+		? (options.binary ? BIBIT_UNITS : BIT_UNITS)
+		: (options.binary ? BIBYTE_UNITS : BYTE_UNITS);
+
+	if (options.signed && number === 0) {
+		return ` 0 ${UNITS[0]}`;
+	}
+
+	const isNegative = number < 0;
+	const prefix = isNegative ? '-' : (options.signed ? '+' : '');
+
+	if (isNegative) {
+		number = -number;
+	}
+
+	let localeOptions;
+
+	if (options.minimumFractionDigits !== undefined) {
+		localeOptions = {minimumFractionDigits: options.minimumFractionDigits};
+	}
+
+	if (options.maximumFractionDigits !== undefined) {
+		localeOptions = {maximumFractionDigits: options.maximumFractionDigits, ...localeOptions};
+	}
+
+	if (number < 1) {
+		const numberString = toLocaleString(number, options.locale, localeOptions);
+		return prefix + numberString + ' ' + UNITS[0];
+	}
+
+	const exponent = Math.min(Math.floor(options.binary ? Math.log(number) / Math.log(1024) : Math.log10(number) / 3), UNITS.length - 1);
+	number /= (options.binary ? 1024 : 1000) ** exponent;
+
+	if (!localeOptions) {
+		number = number.toPrecision(3);
+	}
+
+	const numberString = toLocaleString(Number(number), options.locale, localeOptions);
+
+	const unit = UNITS[exponent];
+
+	return prefix + numberString + ' ' + unit;
+}
+
 /**
  * Concatenate a number of iterables to a new iterable without fully evaluating
  * their iterators. Useful when e.g. working with large sets or lists and when
  * there is a chance that the iterators will not be fully exhausted.
  */
-function* concatLazy(...iterables) {
+function* concatLazy(iterables) {
     for (const iterable of iterables) {
         yield* iterable;
     }
@@ -16390,47 +16524,11 @@ function createChunks(allEntries, assignedEntriesByModule, minChunkSize) {
             alias: null,
             modules
         }))
-        : getOptimizedChunks(chunkModulesBySignature, minChunkSize);
-}
-function getOptimizedChunks(chunkModulesBySignature, minChunkSize) {
-    timeStart('optimize chunks', 3);
-    const { chunksToBeMerged, unmergeableChunks } = getMergeableChunks(chunkModulesBySignature, minChunkSize);
-    for (const sourceChunk of chunksToBeMerged) {
-        chunksToBeMerged.delete(sourceChunk);
-        let closestChunk = null;
-        let closestChunkDistance = Infinity;
-        const { signature, size, modules } = sourceChunk;
-        for (const targetChunk of concatLazy(chunksToBeMerged, unmergeableChunks)) {
-            const distance = getSignatureDistance(signature, targetChunk.signature, !chunksToBeMerged.has(targetChunk));
-            if (distance === 1) {
-                closestChunk = targetChunk;
-                break;
-            }
-            else if (distance < closestChunkDistance) {
-                closestChunk = targetChunk;
-                closestChunkDistance = distance;
-            }
-        }
-        if (closestChunk) {
-            closestChunk.modules.push(...modules);
-            if (chunksToBeMerged.has(closestChunk)) {
-                closestChunk.signature = mergeSignatures(signature, closestChunk.signature);
-                if ((closestChunk.size += size) > minChunkSize) {
-                    chunksToBeMerged.delete(closestChunk);
-                    unmergeableChunks.push(closestChunk);
-                }
-            }
-        }
-        else {
-            unmergeableChunks.push(sourceChunk);
-        }
-    }
-    timeEnd('optimize chunks', 3);
-    return unmergeableChunks;
+        : getOptimizedChunks(chunkModulesBySignature, minChunkSize).map(({ modules }) => ({
+            alias: null,
+            modules
+        }));
 }
-const CHAR_DEPENDENT = 'X';
-const CHAR_INDEPENDENT = '_';
-const CHAR_CODE_DEPENDENT = CHAR_DEPENDENT.charCodeAt(0);
 function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
     const chunkModules = Object.create(null);
     for (const [module, assignedEntries] of assignedEntriesByModule) {
@@ -16448,28 +16546,236 @@ function getChunkModulesBySignature(assignedEntriesByModule, allEntries) {
     }
     return chunkModules;
 }
-function getMergeableChunks(chunkModulesBySignature, minChunkSize) {
-    const chunksToBeMerged = new Set();
-    const unmergeableChunks = [];
-    const alias = null;
+/**
+ * This function tries to get rid of small chunks by merging them with other
+ * chunks. In order to merge chunks, one must obey the following rule:
+ * - When merging several chunks, at most one of the chunks can have side
+ *   effects
+ * - When one of the chunks has side effects, the entry points depending on that
+ *   chunk need to be a super set of the entry points depending on the other
+ *   chunks
+ * - Pure chunks can always be merged
+ * - We use the entry point dependence signature to calculate "chunk distance",
+ *   i.e. how likely it is that two chunks are loaded together
+ */
+function getOptimizedChunks(chunkModulesBySignature, minChunkSize) {
+    timeStart('optimize chunks', 3);
+    const chunkPartition = getPartitionedChunks(chunkModulesBySignature, minChunkSize);
+    console.log(`Created ${chunkPartition.big.pure.size +
+        chunkPartition.big.sideEffect.size +
+        chunkPartition.small.pure.size +
+        chunkPartition.small.sideEffect.size} chunks
+----- pure  side effects
+small ${`${chunkPartition.small.pure.size}`.padEnd(5, ' ')} ${chunkPartition.small.sideEffect.size}
+  big ${`${chunkPartition.big.pure.size}`.padEnd(5, ' ')} ${chunkPartition.big.sideEffect.size}
+Unoptimized chunks contain ${getNumberOfCycles(chunkPartition)} cycles.
+`);
+    const chunkAliases = new Map();
+    if (chunkPartition.small.sideEffect.size > 0) {
+        console.log(`Trying to find merge targets for ${chunkPartition.small.sideEffect.size} chunks smaller than ${prettyBytes(minChunkSize)} with side effects...`);
+        mergeChunks(chunkPartition.small.sideEffect, [chunkPartition.small.pure, chunkPartition.big.pure], minChunkSize, chunkPartition, chunkAliases);
+        console.log(`${chunkPartition.small.sideEffect.size} chunks smaller than ${prettyBytes(minChunkSize)} with side effects remaining.\nGenerated chunks contain ${getNumberOfCycles(chunkPartition)} cycles.\n`);
+    }
+    if (chunkPartition.small.pure.size > 0) {
+        console.log(`Trying to find merge targets for ${chunkPartition.small.pure.size} pure chunks smaller than ${prettyBytes(minChunkSize)}...`);
+        mergeChunks(chunkPartition.small.pure, [chunkPartition.small.pure, chunkPartition.big.sideEffect, chunkPartition.big.pure], minChunkSize, chunkPartition, chunkAliases);
+        console.log(`${chunkPartition.small.pure.size} pure chunks smaller than ${prettyBytes(minChunkSize)} remaining.\nGenerated chunks contain ${getNumberOfCycles(chunkPartition)} cycles.\n`);
+    }
+    timeEnd('optimize chunks', 3);
+    const result = [
+        ...chunkPartition.small.sideEffect,
+        ...chunkPartition.small.pure,
+        ...chunkPartition.big.sideEffect,
+        ...chunkPartition.big.pure
+    ];
+    console.log(`${result.length} chunks remaining.`);
+    return result;
+}
+const CHAR_DEPENDENT = 'X';
+const CHAR_INDEPENDENT = '_';
+const CHAR_CODE_DEPENDENT = CHAR_DEPENDENT.charCodeAt(0);
+function getPartitionedChunks(chunkModulesBySignature, minChunkSize) {
+    const smallPureChunks = [];
+    const bigPureChunks = [];
+    const smallSideEffectChunks = [];
+    const bigSideEffectChunks = [];
+    const chunkByModule = new Map();
     for (const [signature, modules] of Object.entries(chunkModulesBySignature)) {
+        const chunkDescription = {
+            dependencies: new Set(),
+            modules,
+            pure: true,
+            signature,
+            size: 0,
+            transitiveDependencies: new Set(),
+            transitiveDependentChunks: new Set()
+        };
         let size = 0;
-        checkModules: {
+        let pure = true;
+        for (const module of modules) {
+            chunkByModule.set(module, chunkDescription);
+            pure && (pure = !module.hasEffects());
+            size += module.magicString.toString().length;
+        }
+        chunkDescription.pure = pure;
+        chunkDescription.size = size;
+        (size < minChunkSize
+            ? pure
+                ? smallPureChunks
+                : smallSideEffectChunks
+            : pure
+                ? bigPureChunks
+                : bigSideEffectChunks).push(chunkDescription);
+    }
+    sortChunksAndAddDependencies([bigPureChunks, bigSideEffectChunks, smallPureChunks, smallSideEffectChunks], chunkByModule);
+    return {
+        big: { pure: new Set(bigPureChunks), sideEffect: new Set(bigSideEffectChunks) },
+        small: { pure: new Set(smallPureChunks), sideEffect: new Set(smallSideEffectChunks) }
+    };
+}
+function getNumberOfCycles(partition) {
+    const parents = new Set();
+    const analysedChunks = new Set();
+    let cycles = 0;
+    const analyseChunk = (chunk) => {
+        for (const dependency of chunk.dependencies) {
+            if (parents.has(dependency)) {
+                if (!analysedChunks.has(dependency)) {
+                    cycles++;
+                }
+                continue;
+            }
+            parents.add(dependency);
+            analyseChunk(dependency);
+        }
+        analysedChunks.add(chunk);
+    };
+    for (const chunk of [
+        ...partition.big.pure,
+        ...partition.big.sideEffect,
+        ...partition.small.pure,
+        ...partition.small.sideEffect
+    ]) {
+        if (!parents.has(chunk)) {
+            parents.add(chunk);
+            analyseChunk(chunk);
+        }
+    }
+    return cycles;
+}
+function sortChunksAndAddDependencies(chunkLists, chunkByModule) {
+    for (const chunks of chunkLists) {
+        chunks.sort(compareChunks);
+        for (const chunk of chunks) {
+            const { dependencies, modules, transitiveDependencies } = chunk;
+            const transitiveDependencyModules = new Set();
             for (const module of modules) {
-                if (module.hasEffects()) {
-                    break checkModules;
+                for (const dependency of module.getDependenciesToBeIncluded()) {
+                    const dependencyChunk = chunkByModule.get(dependency);
+                    if (dependencyChunk && dependencyChunk !== chunk) {
+                        dependencies.add(dependencyChunk);
+                        transitiveDependencyModules.add(dependency);
+                    }
                 }
-                size += module.magicString.toString().length;
-                if (size > minChunkSize) {
-                    break checkModules;
+            }
+            for (const module of transitiveDependencyModules) {
+                const transitiveDependency = chunkByModule.get(module);
+                if (transitiveDependency !== chunk) {
+                    transitiveDependencies.add(transitiveDependency);
+                    for (const dependency of module.getDependenciesToBeIncluded()) {
+                        if (!(dependency instanceof ExternalModule)) {
+                            transitiveDependencyModules.add(dependency);
+                        }
+                    }
                 }
             }
-            chunksToBeMerged.add({ alias, modules, signature, size });
-            continue;
         }
-        unmergeableChunks.push({ alias, modules, signature, size: null });
     }
-    return { chunksToBeMerged, unmergeableChunks };
+}
+function compareChunks({ size: sizeA }, { size: sizeB }) {
+    return sizeA - sizeB;
+}
+function mergeChunks(chunksToBeMerged, targetChunks, minChunkSize, chunkPartition, chunkAliases) {
+    for (const mergedChunk of chunksToBeMerged) {
+        replaceAliasedDependencies(mergedChunk, chunkAliases);
+        let closestChunk = null;
+        let closestChunkDistance = Infinity;
+        const { signature, modules, pure, size } = mergedChunk;
+        for (const targetChunk of concatLazy(targetChunks)) {
+            if (mergedChunk === targetChunk)
+                continue;
+            const distance = pure
+                ? getSignatureDistance(signature, targetChunk.signature, !targetChunk.pure)
+                : getSignatureDistance(targetChunk.signature, signature, true);
+            if (distance < closestChunkDistance && isValidMerge(mergedChunk, targetChunk, chunkAliases)) {
+                if (distance === 1) {
+                    closestChunk = targetChunk;
+                    break;
+                }
+                closestChunk = targetChunk;
+                closestChunkDistance = distance;
+            }
+        }
+        if (closestChunk) {
+            chunkAliases.set(mergedChunk, closestChunk);
+            chunksToBeMerged.delete(mergedChunk);
+            getChunksInPartition(closestChunk, minChunkSize, chunkPartition).delete(closestChunk);
+            closestChunk.modules.push(...modules);
+            closestChunk.size += size;
+            closestChunk.pure && (closestChunk.pure = pure);
+            closestChunk.signature = mergeSignatures(signature, closestChunk.signature);
+            const { dependencies, transitiveDependencies } = closestChunk;
+            for (const dependency of mergedChunk.dependencies) {
+                dependencies.add(dependency);
+            }
+            for (const dependency of mergedChunk.transitiveDependencies) {
+                transitiveDependencies.add(dependency);
+            }
+            dependencies.delete(closestChunk);
+            dependencies.delete(mergedChunk);
+            transitiveDependencies.delete(closestChunk);
+            transitiveDependencies.delete(mergedChunk);
+            getChunksInPartition(closestChunk, minChunkSize, chunkPartition).add(closestChunk);
+        }
+    }
+}
+function replaceAliasedDependencies(chunk, chunkAliases) {
+    for (const [alias, aliased] of chunkAliases) {
+        if (chunk.dependencies.has(alias)) {
+            chunk.dependencies.delete(alias);
+            chunk.dependencies.add(aliased);
+        }
+        if (chunk.transitiveDependencies.has(alias)) {
+            chunk.transitiveDependencies.delete(alias);
+            chunk.transitiveDependencies.add(aliased);
+        }
+    }
+}
+// Merging will not produce cycles if
+// - no chunk is a transitive dependency of the other, or
+// - none of the direct non-merged dependencies of a chunk have the other
+//   chunk as a transitive dependency
+function isValidMerge(mergedChunk, targetChunk, chunkAliases) {
+    if (hasTransitiveDependency(mergedChunk, targetChunk)) {
+        return false;
+    }
+    replaceAliasedDependencies(targetChunk, chunkAliases);
+    return !hasTransitiveDependency(targetChunk, mergedChunk);
+}
+function hasTransitiveDependency(dependentChunk, dependencyChunk) {
+    if (!dependentChunk.transitiveDependencies.has(dependencyChunk)) {
+        return false;
+    }
+    for (const dependency of dependentChunk.dependencies) {
+        if (dependency.transitiveDependencies.has(dependencyChunk)) {
+            return true;
+        }
+    }
+    return false;
+}
+function getChunksInPartition(chunk, minChunkSize, chunkPartition) {
+    const subPartition = chunk.size < minChunkSize ? chunkPartition.small : chunkPartition.big;
+    return chunk.pure ? subPartition.pure : subPartition.sideEffect;
 }
 function getSignatureDistance(sourceSignature, targetSignature, enforceSubset) {
     let distance = 0;
@@ -25303,6 +25609,7 @@ exports.loadFsEvents = loadFsEvents;
 exports.mergeOptions = mergeOptions;
 exports.normalizePluginOption = normalizePluginOption;
 exports.picomatch = picomatch$1;
+exports.prettyBytes = prettyBytes;
 exports.printQuotedStringList = printQuotedStringList;
 exports.relativeId = relativeId;
 exports.rollup = rollup;

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.7.3
-	Sun, 11 Dec 2022 15:24:30 GMT - commit a0d4d69092484a0879377e16425b737ec541ae55
+	Rollup.js v3.7.5-0
+	Fri, 16 Dec 2022 10:54:15 GMT - commit 1ee5d10583f88926dc36b97e7b3870ee078327e2
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.7.3
-	Sun, 11 Dec 2022 15:24:30 GMT - commit a0d4d69092484a0879377e16425b737ec541ae55
+	Rollup.js v3.7.5-0
+	Fri, 16 Dec 2022 10:54:15 GMT - commit 1ee5d10583f88926dc36b97e7b3870ee078327e2
 
 	https://github.com/rollup/rollup
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "3.7.3",
+  "version": "3.7.5-0",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",