rollup 3.8.0 → 3.8.1

package/LICENSE.md

@@ -247,6 +247,23 @@ Repository: jonschlinkert/fill-range
 
 ---------------------------------------
 
+## flru
+License: MIT
+By: Luke Edwards
+Repository: lukeed/flru
+
+> MIT License
+> 
+> Copyright (c) Luke Edwards <luke.edwards05@gmail.com> (lukeed.com)
+> 
+> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+> 
+> The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+> 
+> THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---------------------------------------
+
 ## glob-parent
 License: ISC
 By: Gulp Team, Elan Shanker, Blaine Bublitz

package/dist/bin/rollup

@@ -2,8 +2,8 @@
 
 /*
   @license
-	Rollup.js v3.8.0
-	Thu, 22 Dec 2022 05:21:04 GMT - commit d750ef25d5b31bc21237963446c0a46789b8630b
+	Rollup.js v3.8.1
+	Fri, 23 Dec 2022 05:34:14 GMT - commit 571f3a83d4e24f7bfa9b085cf9736ccdf89e8251
 
 	https://github.com/rollup/rollup
 

package/dist/es/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.8.0
-	Thu, 22 Dec 2022 05:21:04 GMT - commit d750ef25d5b31bc21237963446c0a46789b8630b
+	Rollup.js v3.8.1
+	Fri, 23 Dec 2022 05:34:14 GMT - commit 571f3a83d4e24f7bfa9b085cf9736ccdf89e8251
 
 	https://github.com/rollup/rollup
 

package/dist/es/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.8.0
-	Thu, 22 Dec 2022 05:21:04 GMT - commit d750ef25d5b31bc21237963446c0a46789b8630b
+	Rollup.js v3.8.1
+	Fri, 23 Dec 2022 05:34:14 GMT - commit 571f3a83d4e24f7bfa9b085cf9736ccdf89e8251
 
 	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.8.0";
+var version$1 = "3.8.1";
 
 var charToInteger = {};
 var chars$1 = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=';
@@ -5566,7 +5566,7 @@ function getAndCreateKeys(esTreeNode) {
 
 const INCLUDE_PARAMETERS = 'variables';
 class NodeBase extends ExpressionEntity {
-    constructor(esTreeNode, parent, parentScope) {
+    constructor(esTreeNode, parent, parentScope, keepEsTreeNode = false) {
         super();
         /**
          * Nodes can apply custom deoptimizations once they become part of the
@@ -5575,7 +5575,9 @@ class NodeBase extends ExpressionEntity {
          * custom handlers
          */
         this.deoptimized = false;
-        this.esTreeNode = esTreeNode;
+        // Nodes can opt-in to keep the AST if needed during the build pipeline.
+        // Avoid true when possible as large AST takes up memory.
+        this.esTreeNode = keepEsTreeNode ? esTreeNode : null;
         this.keys = keys[esTreeNode.type] || getAndCreateKeys(esTreeNode);
         this.parent = parent;
         this.context = parent.context;
@@ -5661,7 +5663,7 @@ class NodeBase extends ExpressionEntity {
             code.appendLeft(this.end, ';');
         }
     }
-    parseNode(esTreeNode) {
+    parseNode(esTreeNode, keepEsTreeNodeKeys) {
         for (const [key, value] of Object.entries(esTreeNode)) {
             // That way, we can override this function to add custom initialisation and then call super.parseNode
             if (this.hasOwnProperty(key))
@@ -5683,11 +5685,11 @@ class NodeBase extends ExpressionEntity {
                 for (const child of value) {
                     this[key].push(child === null
                         ? null
-                        : new (this.context.getNodeConstructor(child.type))(child, this, this.scope));
+                        : new (this.context.getNodeConstructor(child.type))(child, this, this.scope, keepEsTreeNodeKeys?.includes(key)));
                 }
             }
             else {
-                this[key] = new (this.context.getNodeConstructor(value.type))(value, this, this.scope);
+                this[key] = new (this.context.getNodeConstructor(value.type))(value, this, this.scope, keepEsTreeNodeKeys?.includes(key));
             }
         }
     }
@@ -10674,6 +10676,10 @@ class ImportExpression extends NodeBase {
     initialise() {
         this.context.addDynamicImport(this);
     }
+    parseNode(esTreeNode) {
+        // Keep the source AST to be used by renderDynamicImport
+        super.parseNode(esTreeNode, ['source']);
+    }
     render(code, options) {
         const { snippets: { _, getDirectReturnFunction, getObject, getPropertyAccess } } = options;
         if (this.inlineNamespace) {
@@ -13264,9 +13270,7 @@ class Module {
         this.transformDependencies = transformDependencies;
         this.customTransformCache = customTransformCache;
         this.updateOptions(moduleOptions);
-        if (!ast) {
-            ast = this.tryParse();
-        }
+        const moduleAst = ast || this.tryParse();
         timeEnd('generate ast', 3);
         timeStart('analyze ast', 3);
         this.resolvedIds = resolvedIds || Object.create(null);
@@ -13308,14 +13312,33 @@ class Module {
         };
         this.scope = new ModuleScope(this.graph.scope, this.astContext);
         this.namespace = new NamespaceVariable(this.astContext);
-        this.ast = new Program(ast, { context: this.astContext, type: 'Module' }, this.scope);
-        this.info.ast = ast;
+        this.ast = new Program(moduleAst, { context: this.astContext, type: 'Module' }, this.scope);
+        // Assign AST directly if has existing one as there's no way to drop it from memory.
+        // If cache is enabled, also assign directly as otherwise it takes more CPU and memory to re-compute.
+        if (ast || this.options.cache !== false) {
+            this.info.ast = moduleAst;
+        }
+        else {
+            // Make lazy and apply LRU cache to not hog the memory
+            Object.defineProperty(this.info, 'ast', {
+                get: () => {
+                    if (this.graph.astLru.has(fileName)) {
+                        return this.graph.astLru.get(fileName);
+                    }
+                    else {
+                        const parsedAst = this.tryParse();
+                        this.graph.astLru.set(fileName, parsedAst);
+                        return parsedAst;
+                    }
+                }
+            });
+        }
         timeEnd('analyze ast', 3);
     }
     toJSON() {
         return {
             assertions: this.info.assertions,
-            ast: this.ast.esTreeNode,
+            ast: this.info.ast,
             code: this.info.code,
             customTransformCache: this.customTransformCache,
             // eslint-disable-next-line unicorn/prefer-spread
@@ -15269,6 +15292,9 @@ class Chunk {
                             continue;
                         }
                         const chunkDep = this.renderedDependencies.get(chunk);
+                        if (!chunkDep) {
+                            continue;
+                        }
                         const { imports, reexports } = chunkDep;
                         const importedByReexported = reexports?.find(({ reexported }) => reexported === exportName);
                         const isImported = imports?.find(({ imported }) => imported === importedByReexported?.imported);
@@ -22328,6 +22354,50 @@ const acorn = /*#__PURE__*/Object.defineProperty({
   version
 }, Symbol.toStringTag, { value: 'Module' });
 
+function flru (max) {
+	var num, curr, prev;
+	var limit = max || 1;
+
+	function keep(key, value) {
+		if (++num > limit) {
+			prev = curr;
+			reset(1);
+			++num;
+		}
+		curr[key] = value;
+	}
+
+	function reset(isPartial) {
+		num = 0;
+		curr = Object.create(null);
+		isPartial || (prev=Object.create(null));
+	}
+
+	reset();
+
+	return {
+		clear: reset,
+		has: function (key) {
+			return curr[key] !== void 0 || prev[key] !== void 0;
+		},
+		get: function (key) {
+			var val = curr[key];
+			if (val !== void 0) return val;
+			if ((val=prev[key]) !== void 0) {
+				keep(key, val);
+				return val;
+			}
+		},
+		set: function (key, value) {
+			if (curr[key] !== void 0) {
+				curr[key] = value;
+			} else {
+				keep(key, value);
+			}
+		}
+	};
+}
+
 function resolveIdViaPlugins(source, importer, pluginDriver, moduleLoaderResolveId, skip, customOptions, isEntry, assertions) {
     let skipped = null;
     let replaceContext = null;
@@ -23629,6 +23699,7 @@ function normalizeEntryModules(entryModules) {
 class Graph {
     constructor(options, watcher) {
         this.options = options;
+        this.astLru = flru(5);
         this.cachedModules = new Map();
         this.deoptimizationTracker = new PathTracker();
         this.entryModules = [];
@@ -24731,10 +24802,12 @@ async function rollupInternal(rawInputOptions, watcher) {
     const { options: inputOptions, unsetOptions: unsetInputOptions } = await getInputOptions(rawInputOptions, watcher !== null);
     initialiseTimers(inputOptions);
     const graph = new Graph(inputOptions, watcher);
-    // remove the cache option from the memory after graph creation (cache is not used anymore)
+    // remove the cache object from the memory after graph creation (cache is not used anymore)
     const useCache = rawInputOptions.cache !== false;
-    delete inputOptions.cache;
-    delete rawInputOptions.cache;
+    if (rawInputOptions.cache) {
+        inputOptions.cache = undefined;
+        rawInputOptions.cache = undefined;
+    }
     timeStart('BUILD', 1);
     await catchUnfinishedHookActions(graph.pluginDriver, async () => {
         try {

package/dist/es/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.8.0
-	Thu, 22 Dec 2022 05:21:04 GMT - commit d750ef25d5b31bc21237963446c0a46789b8630b
+	Rollup.js v3.8.1
+	Fri, 23 Dec 2022 05:34:14 GMT - commit 571f3a83d4e24f7bfa9b085cf9736ccdf89e8251
 
 	https://github.com/rollup/rollup
 

package/dist/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.8.0
-	Thu, 22 Dec 2022 05:21:04 GMT - commit d750ef25d5b31bc21237963446c0a46789b8630b
+	Rollup.js v3.8.1
+	Fri, 23 Dec 2022 05:34:14 GMT - commit 571f3a83d4e24f7bfa9b085cf9736ccdf89e8251
 
 	https://github.com/rollup/rollup
 

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.8.0
-	Thu, 22 Dec 2022 05:21:04 GMT - commit d750ef25d5b31bc21237963446c0a46789b8630b
+	Rollup.js v3.8.1
+	Fri, 23 Dec 2022 05:34:14 GMT - commit 571f3a83d4e24f7bfa9b085cf9736ccdf89e8251
 
 	https://github.com/rollup/rollup
 

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.8.0
-	Thu, 22 Dec 2022 05:21:04 GMT - commit d750ef25d5b31bc21237963446c0a46789b8630b
+	Rollup.js v3.8.1
+	Fri, 23 Dec 2022 05:34:14 GMT - commit 571f3a83d4e24f7bfa9b085cf9736ccdf89e8251
 
 	https://github.com/rollup/rollup
 

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.8.0
-	Thu, 22 Dec 2022 05:21:04 GMT - commit d750ef25d5b31bc21237963446c0a46789b8630b
+	Rollup.js v3.8.1
+	Fri, 23 Dec 2022 05:34:14 GMT - commit 571f3a83d4e24f7bfa9b085cf9736ccdf89e8251
 
 	https://github.com/rollup/rollup
 

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.8.0
-	Thu, 22 Dec 2022 05:21:04 GMT - commit d750ef25d5b31bc21237963446c0a46789b8630b
+	Rollup.js v3.8.1
+	Fri, 23 Dec 2022 05:34:14 GMT - commit 571f3a83d4e24f7bfa9b085cf9736ccdf89e8251
 
 	https://github.com/rollup/rollup
 
@@ -31,7 +31,7 @@ function _interopNamespaceDefault(e) {
 
 const tty__namespace = /*#__PURE__*/_interopNamespaceDefault(tty);
 
-var version$1 = "3.8.0";
+var version$1 = "3.8.1";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -6082,7 +6082,7 @@ function getAndCreateKeys(esTreeNode) {
 
 const INCLUDE_PARAMETERS = 'variables';
 class NodeBase extends ExpressionEntity {
-    constructor(esTreeNode, parent, parentScope) {
+    constructor(esTreeNode, parent, parentScope, keepEsTreeNode = false) {
         super();
         /**
          * Nodes can apply custom deoptimizations once they become part of the
@@ -6091,7 +6091,9 @@ class NodeBase extends ExpressionEntity {
          * custom handlers
          */
         this.deoptimized = false;
-        this.esTreeNode = esTreeNode;
+        // Nodes can opt-in to keep the AST if needed during the build pipeline.
+        // Avoid true when possible as large AST takes up memory.
+        this.esTreeNode = keepEsTreeNode ? esTreeNode : null;
         this.keys = keys[esTreeNode.type] || getAndCreateKeys(esTreeNode);
         this.parent = parent;
         this.context = parent.context;
@@ -6177,7 +6179,7 @@ class NodeBase extends ExpressionEntity {
             code.appendLeft(this.end, ';');
         }
     }
-    parseNode(esTreeNode) {
+    parseNode(esTreeNode, keepEsTreeNodeKeys) {
         for (const [key, value] of Object.entries(esTreeNode)) {
             // That way, we can override this function to add custom initialisation and then call super.parseNode
             if (this.hasOwnProperty(key))
@@ -6199,11 +6201,11 @@ class NodeBase extends ExpressionEntity {
                 for (const child of value) {
                     this[key].push(child === null
                         ? null
-                        : new (this.context.getNodeConstructor(child.type))(child, this, this.scope));
+                        : new (this.context.getNodeConstructor(child.type))(child, this, this.scope, keepEsTreeNodeKeys?.includes(key)));
                 }
             }
             else {
-                this[key] = new (this.context.getNodeConstructor(value.type))(value, this, this.scope);
+                this[key] = new (this.context.getNodeConstructor(value.type))(value, this, this.scope, keepEsTreeNodeKeys?.includes(key));
             }
         }
     }
@@ -11190,6 +11192,10 @@ class ImportExpression extends NodeBase {
     initialise() {
         this.context.addDynamicImport(this);
     }
+    parseNode(esTreeNode) {
+        // Keep the source AST to be used by renderDynamicImport
+        super.parseNode(esTreeNode, ['source']);
+    }
     render(code, options) {
         const { snippets: { _, getDirectReturnFunction, getObject, getPropertyAccess } } = options;
         if (this.inlineNamespace) {
@@ -13780,9 +13786,7 @@ class Module {
         this.transformDependencies = transformDependencies;
         this.customTransformCache = customTransformCache;
         this.updateOptions(moduleOptions);
-        if (!ast) {
-            ast = this.tryParse();
-        }
+        const moduleAst = ast || this.tryParse();
         timeEnd('generate ast', 3);
         timeStart('analyze ast', 3);
         this.resolvedIds = resolvedIds || Object.create(null);
@@ -13824,14 +13828,33 @@ class Module {
         };
         this.scope = new ModuleScope(this.graph.scope, this.astContext);
         this.namespace = new NamespaceVariable(this.astContext);
-        this.ast = new Program(ast, { context: this.astContext, type: 'Module' }, this.scope);
-        this.info.ast = ast;
+        this.ast = new Program(moduleAst, { context: this.astContext, type: 'Module' }, this.scope);
+        // Assign AST directly if has existing one as there's no way to drop it from memory.
+        // If cache is enabled, also assign directly as otherwise it takes more CPU and memory to re-compute.
+        if (ast || this.options.cache !== false) {
+            this.info.ast = moduleAst;
+        }
+        else {
+            // Make lazy and apply LRU cache to not hog the memory
+            Object.defineProperty(this.info, 'ast', {
+                get: () => {
+                    if (this.graph.astLru.has(fileName)) {
+                        return this.graph.astLru.get(fileName);
+                    }
+                    else {
+                        const parsedAst = this.tryParse();
+                        this.graph.astLru.set(fileName, parsedAst);
+                        return parsedAst;
+                    }
+                }
+            });
+        }
         timeEnd('analyze ast', 3);
     }
     toJSON() {
         return {
             assertions: this.info.assertions,
-            ast: this.ast.esTreeNode,
+            ast: this.info.ast,
             code: this.info.code,
             customTransformCache: this.customTransformCache,
             // eslint-disable-next-line unicorn/prefer-spread
@@ -15785,6 +15808,9 @@ class Chunk {
                             continue;
                         }
                         const chunkDep = this.renderedDependencies.get(chunk);
+                        if (!chunkDep) {
+                            continue;
+                        }
                         const { imports, reexports } = chunkDep;
                         const importedByReexported = reexports?.find(({ reexported }) => reexported === exportName);
                         const isImported = imports?.find(({ imported }) => imported === importedByReexported?.imported);
@@ -22844,6 +22870,50 @@ const acorn = /*#__PURE__*/Object.defineProperty({
   version
 }, Symbol.toStringTag, { value: 'Module' });
 
+function flru (max) {
+	var num, curr, prev;
+	var limit = max || 1;
+
+	function keep(key, value) {
+		if (++num > limit) {
+			prev = curr;
+			reset(1);
+			++num;
+		}
+		curr[key] = value;
+	}
+
+	function reset(isPartial) {
+		num = 0;
+		curr = Object.create(null);
+		isPartial || (prev=Object.create(null));
+	}
+
+	reset();
+
+	return {
+		clear: reset,
+		has: function (key) {
+			return curr[key] !== void 0 || prev[key] !== void 0;
+		},
+		get: function (key) {
+			var val = curr[key];
+			if (val !== void 0) return val;
+			if ((val=prev[key]) !== void 0) {
+				keep(key, val);
+				return val;
+			}
+		},
+		set: function (key, value) {
+			if (curr[key] !== void 0) {
+				curr[key] = value;
+			} else {
+				keep(key, value);
+			}
+		}
+	};
+}
+
 function resolveIdViaPlugins(source, importer, pluginDriver, moduleLoaderResolveId, skip, customOptions, isEntry, assertions) {
     let skipped = null;
     let replaceContext = null;
@@ -24145,6 +24215,7 @@ function normalizeEntryModules(entryModules) {
 class Graph {
     constructor(options, watcher) {
         this.options = options;
+        this.astLru = flru(5);
         this.cachedModules = new Map();
         this.deoptimizationTracker = new PathTracker();
         this.entryModules = [];
@@ -25150,10 +25221,12 @@ async function rollupInternal(rawInputOptions, watcher) {
     const { options: inputOptions, unsetOptions: unsetInputOptions } = await getInputOptions(rawInputOptions, watcher !== null);
     initialiseTimers(inputOptions);
     const graph = new Graph(inputOptions, watcher);
-    // remove the cache option from the memory after graph creation (cache is not used anymore)
+    // remove the cache object from the memory after graph creation (cache is not used anymore)
     const useCache = rawInputOptions.cache !== false;
-    delete inputOptions.cache;
-    delete rawInputOptions.cache;
+    if (rawInputOptions.cache) {
+        inputOptions.cache = undefined;
+        rawInputOptions.cache = undefined;
+    }
     timeStart('BUILD', 1);
     await catchUnfinishedHookActions(graph.pluginDriver, async () => {
         try {

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.8.0
-	Thu, 22 Dec 2022 05:21:04 GMT - commit d750ef25d5b31bc21237963446c0a46789b8630b
+	Rollup.js v3.8.1
+	Fri, 23 Dec 2022 05:34:14 GMT - commit 571f3a83d4e24f7bfa9b085cf9736ccdf89e8251
 
 	https://github.com/rollup/rollup
 

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v3.8.0
-	Thu, 22 Dec 2022 05:21:04 GMT - commit d750ef25d5b31bc21237963446c0a46789b8630b
+	Rollup.js v3.8.1
+	Fri, 23 Dec 2022 05:34:14 GMT - commit 571f3a83d4e24f7bfa9b085cf9736ccdf89e8251
 
 	https://github.com/rollup/rollup
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rollup",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "description": "Next-generation ES module bundler",
   "main": "dist/rollup.js",
   "module": "dist/es/rollup.js",
@@ -90,6 +90,7 @@
     "eslint-plugin-prettier": "^4.2.1",
     "eslint-plugin-unicorn": "^44.0.2",
     "fixturify": "^2.1.1",
+    "flru": "^1.0.2",
     "fs-extra": "^10.1.0",
     "github-api": "^3.4.0",
     "hash.js": "^1.1.7",