rollup 2.69.0 → 2.69.1

package/dist/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.0
-	Wed, 02 Mar 2022 13:21:33 GMT - commit 10dc32678944cb276c2efe781b12350a8e0a5adf
+	Rollup.js v2.69.1
+	Fri, 04 Mar 2022 13:38:38 GMT - commit 994c1eccf4d53e416a010f47e54a2086f1a0f4e9
 
 
 	https://github.com/rollup/rollup

package/dist/shared/index.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.0
-	Wed, 02 Mar 2022 13:21:33 GMT - commit 10dc32678944cb276c2efe781b12350a8e0a5adf
+	Rollup.js v2.69.1
+	Fri, 04 Mar 2022 13:38:38 GMT - commit 994c1eccf4d53e416a010f47e54a2086f1a0f4e9
 
 
 	https://github.com/rollup/rollup

package/dist/shared/loadConfigFile.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.0
-	Wed, 02 Mar 2022 13:21:33 GMT - commit 10dc32678944cb276c2efe781b12350a8e0a5adf
+	Rollup.js v2.69.1
+	Fri, 04 Mar 2022 13:38:38 GMT - commit 994c1eccf4d53e416a010f47e54a2086f1a0f4e9
 
 
 	https://github.com/rollup/rollup

package/dist/shared/mergeOptions.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.0
-	Wed, 02 Mar 2022 13:21:33 GMT - commit 10dc32678944cb276c2efe781b12350a8e0a5adf
+	Rollup.js v2.69.1
+	Fri, 04 Mar 2022 13:38:38 GMT - commit 994c1eccf4d53e416a010f47e54a2086f1a0f4e9
 
 
 	https://github.com/rollup/rollup

package/dist/shared/rollup.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.0
-	Wed, 02 Mar 2022 13:21:33 GMT - commit 10dc32678944cb276c2efe781b12350a8e0a5adf
+	Rollup.js v2.69.1
+	Fri, 04 Mar 2022 13:38:38 GMT - commit 994c1eccf4d53e416a010f47e54a2086f1a0f4e9
 
 
 	https://github.com/rollup/rollup
@@ -28,7 +28,7 @@ function _interopNamespaceDefault(e) {
   return n;
 }
 
-var version$1 = "2.69.0";
+var version$1 = "2.69.1";
 
 function ensureArray$1(items) {
     if (Array.isArray(items)) {
@@ -12151,29 +12151,23 @@ function getId(m) {
 
 function getOriginalLocation(sourcemapChain, location) {
     const filteredSourcemapChain = sourcemapChain.filter((sourcemap) => !!sourcemap.mappings);
-    while (filteredSourcemapChain.length > 0) {
+    traceSourcemap: while (filteredSourcemapChain.length > 0) {
         const sourcemap = filteredSourcemapChain.pop();
         const line = sourcemap.mappings[location.line - 1];
-        let locationFound = false;
-        if (line !== undefined) {
-            for (const segment of line) {
-                if (segment[0] >= location.column) {
-                    if (segment.length === 1)
-                        break;
+        if (line) {
+            const filteredLine = line.filter((segment) => segment.length > 1);
+            const lastSegment = filteredLine[filteredLine.length - 1];
+            for (const segment of filteredLine) {
+                if (segment[0] >= location.column || segment === lastSegment) {
                     location = {
                         column: segment[3],
-                        line: segment[2] + 1,
-                        name: segment.length === 5 ? sourcemap.names[segment[4]] : undefined,
-                        source: sourcemap.sources[segment[1]]
+                        line: segment[2] + 1
                     };
-                    locationFound = true;
-                    break;
+                    continue traceSourcemap;
                 }
             }
         }
-        if (!locationFound) {
-            throw new Error("Can't resolve original location of error.");
-        }
+        throw new Error("Can't resolve original location of error.");
     }
     return location;
 }
@@ -13927,6 +13921,7 @@ class Link {
     }
     traceMappings() {
         const sources = [];
+        const sourceIndexMap = new Map();
         const sourcesContent = [];
         const names = [];
         const nameIndexMap = new Map();
@@ -13934,41 +13929,36 @@ class Link {
         for (const line of this.mappings) {
             const tracedLine = [];
             for (const segment of line) {
-                if (segment.length == 1)
+                if (segment.length === 1)
                     continue;
                 const source = this.sources[segment[1]];
                 if (!source)
                     continue;
                 const traced = source.traceSegment(segment[2], segment[3], segment.length === 5 ? this.names[segment[4]] : '');
                 if (traced) {
-                    // newer sources are more likely to be used, so search backwards.
-                    let sourceIndex = sources.lastIndexOf(traced.source.filename);
-                    if (sourceIndex === -1) {
+                    const { column, line, name, source: { content, filename } } = traced;
+                    let sourceIndex = sourceIndexMap.get(filename);
+                    if (sourceIndex === undefined) {
                         sourceIndex = sources.length;
-                        sources.push(traced.source.filename);
-                        sourcesContent[sourceIndex] = traced.source.content;
+                        sources.push(filename);
+                        sourceIndexMap.set(filename, sourceIndex);
+                        sourcesContent[sourceIndex] = content;
                     }
                     else if (sourcesContent[sourceIndex] == null) {
-                        sourcesContent[sourceIndex] = traced.source.content;
+                        sourcesContent[sourceIndex] = content;
                     }
-                    else if (traced.source.content != null &&
-                        sourcesContent[sourceIndex] !== traced.source.content) {
+                    else if (content != null && sourcesContent[sourceIndex] !== content) {
                         return error({
-                            message: `Multiple conflicting contents for sourcemap source ${traced.source.filename}`
+                            message: `Multiple conflicting contents for sourcemap source ${filename}`
                         });
                     }
-                    const tracedSegment = [
-                        segment[0],
-                        sourceIndex,
-                        traced.line,
-                        traced.column
-                    ];
-                    if (traced.name) {
-                        let nameIndex = nameIndexMap.get(traced.name);
+                    const tracedSegment = [segment[0], sourceIndex, line, column];
+                    if (name) {
+                        let nameIndex = nameIndexMap.get(name);
                         if (nameIndex === undefined) {
                             nameIndex = names.length;
-                            names.push(traced.name);
-                            nameIndexMap.set(traced.name, nameIndex);
+                            names.push(name);
+                            nameIndexMap.set(name, nameIndex);
                         }
                         tracedSegment[4] = nameIndex;
                     }
@@ -13984,12 +13974,15 @@ class Link {
         if (!segments)
             return null;
         // binary search through segments for the given column
-        let i = 0;
-        let j = segments.length - 1;
-        while (i <= j) {
-            const m = (i + j) >> 1;
+        let searchStart = 0;
+        let searchEnd = segments.length - 1;
+        while (searchStart <= searchEnd) {
+            const m = (searchStart + searchEnd) >> 1;
             const segment = segments[m];
-            if (segment[0] === column) {
+            // If a sourcemap does not have sufficient resolution to contain a
+            // necessary mapping, e.g. because it only contains line information, we
+            // use the best approximation we could find
+            if (segment[0] === column || searchStart === searchEnd) {
                 if (segment.length == 1)
                     return null;
                 const source = this.sources[segment[1]];
@@ -13998,10 +13991,10 @@ class Link {
                 return source.traceSegment(segment[2], segment[3], segment.length === 5 ? this.names[segment[4]] : name);
             }
             if (segment[0] > column) {
-                j = m - 1;
+                searchEnd = m - 1;
             }
             else {
-                i = m + 1;
+                searchStart = m + 1;
             }
         }
         return null;

package/dist/shared/watch-cli.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.0
-	Wed, 02 Mar 2022 13:21:33 GMT - commit 10dc32678944cb276c2efe781b12350a8e0a5adf
+	Rollup.js v2.69.1
+	Fri, 04 Mar 2022 13:38:38 GMT - commit 994c1eccf4d53e416a010f47e54a2086f1a0f4e9
 
 
 	https://github.com/rollup/rollup

package/dist/shared/watch.js

@@ -1,7 +1,7 @@
 /*
   @license
-	Rollup.js v2.69.0
-	Wed, 02 Mar 2022 13:21:33 GMT - commit 10dc32678944cb276c2efe781b12350a8e0a5adf
+	Rollup.js v2.69.1
+	Fri, 04 Mar 2022 13:38:38 GMT - commit 994c1eccf4d53e416a010f47e54a2086f1a0f4e9
 
 
 	https://github.com/rollup/rollup

package/package.json

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