lighthouse 9.5.0-dev.20220620 → 9.5.0-dev.20220623

package/lighthouse-core/index.js

@@ -11,6 +11,8 @@ const ChromeProtocol = require('./gather/connections/cri.js');
 const Config = require('./config/config.js');
 const URL = require('./lib/url-shim.js');
 const fraggleRock = require('./fraggle-rock/api.js');
+const {initializeConfig} = require('./fraggle-rock/config/config.js');
+const {flagsToFRContext} = require('./config/config-helpers.js');
 
 /** @typedef {import('./gather/connections/connection.js')} Connection */
 
@@ -38,19 +40,14 @@ const fraggleRock = require('./fraggle-rock/api.js');
  * @return {Promise<LH.RunnerResult|undefined>}
  */
 async function lighthouse(url, flags = {}, configJSON, page) {
-  const configContext = {
-    configPath: flags.configPath,
-    settingsOverrides: flags,
-    logLevel: flags.logLevel,
-    hostname: flags.hostname,
-    port: flags.port,
-  };
+  const configContext = flagsToFRContext(flags);
   return fraggleRock.navigation(url, {page, config: configJSON, configContext});
 }
 
 /**
  * Run Lighthouse using the legacy navigation runner.
  * This is left in place for any clients that don't support FR navigations yet (e.g. Lightrider)
+ * @deprecated
  * @param {string=} url The URL to test. Optional if running in auditMode.
  * @param {LH.Flags=} flags Optional settings for the Lighthouse run. If present,
  *   they will override any settings in the config.
@@ -64,7 +61,7 @@ async function legacyNavigation(url, flags = {}, configJSON, userConnection) {
   flags.logLevel = flags.logLevel || 'error';
   log.setLevel(flags.logLevel);
 
-  const config = await generateConfig(configJSON, flags);
+  const config = await generateLegacyConfig(configJSON, flags);
   const computedCache = new Map();
   const options = {config, computedCache};
   const connection = userConnection || new ChromeProtocol(flags.port, flags.hostname);
@@ -83,14 +80,32 @@ async function legacyNavigation(url, flags = {}, configJSON, userConnection) {
  *   not present, the default config is used.
  * @param {LH.Flags=} flags Optional settings for the Lighthouse run. If present,
  *   they will override any settings in the config.
+ * @param {LH.Gatherer.GatherMode=} gatherMode Gather mode used to collect artifacts. If present
+ *   the config may override certain settings based on the mode.
+ * @return {Promise<LH.Config.FRConfig>}
+ */
+async function generateConfig(configJson, flags = {}, gatherMode = 'navigation') {
+  const configContext = flagsToFRContext(flags);
+  const {config} = await initializeConfig(configJson, {...configContext, gatherMode});
+  return config;
+}
+
+/**
+ * Generate a legacy Lighthouse Config.
+ * @deprecated
+ * @param {LH.Config.Json=} configJson Configuration for the Lighthouse run. If
+ *   not present, the default config is used.
+ * @param {LH.Flags=} flags Optional settings for the Lighthouse run. If present,
+ *   they will override any settings in the config.
  * @return {Promise<Config>}
  */
-function generateConfig(configJson, flags) {
+function generateLegacyConfig(configJson, flags) {
   return Config.fromJson(configJson, flags);
 }
 
 lighthouse.legacyNavigation = legacyNavigation;
 lighthouse.generateConfig = generateConfig;
+lighthouse.generateLegacyConfig = generateLegacyConfig;
 lighthouse.getAuditList = Runner.getAuditList;
 lighthouse.traceCategories = require('./gather/driver.js').traceCategories;
 lighthouse.Audit = require('./audits/audit.js');

package/lighthouse-core/lib/cdt/Common.js

@@ -0,0 +1,13 @@
+// @ts-nocheck
+/**
+ * @license Copyright 2022 The Lighthouse Authors. All Rights Reserved.
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+ */
+'use strict';
+
+const ParsedURL = require('./generated/ParsedURL.js');
+
+module.exports = {
+  ParsedURL,
+};

package/lighthouse-core/lib/cdt/Platform.js

@@ -52,4 +52,7 @@ module.exports = {
     lowerBound,
     upperBound,
   },
+  DevToolsPath: {
+    EmptyUrlString: '',
+  },
 };

package/lighthouse-core/lib/cdt/generated/ParsedURL.js

@@ -0,0 +1,178 @@
+// @ts-nocheck
+// generated by yarn build-cdt-lib
+/* eslint-disable */
+"use strict";
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ParsedURL = exports.normalizePath = void 0;
+;
+/**
+ * http://tools.ietf.org/html/rfc3986#section-5.2.4
+ */
+function normalizePath(path) {
+    if (path.indexOf('..') === -1 && path.indexOf('.') === -1) {
+        return path;
+    }
+    // Remove leading slash (will be added back below) so we
+    // can handle all (including empty) segments consistently.
+    const segments = (path[0] === '/' ? path.substring(1) : path).split('/');
+    const normalizedSegments = [];
+    for (const segment of segments) {
+        if (segment === '.') {
+            continue;
+        }
+        else if (segment === '..') {
+            normalizedSegments.pop();
+        }
+        else {
+            normalizedSegments.push(segment);
+        }
+    }
+    let normalizedPath = normalizedSegments.join('/');
+    if (path[0] === '/' && normalizedPath) {
+        normalizedPath = '/' + normalizedPath;
+    }
+    if (normalizedPath[normalizedPath.length - 1] !== '/' &&
+        ((path[path.length - 1] === '/') || (segments[segments.length - 1] === '.') ||
+            (segments[segments.length - 1] === '..'))) {
+        normalizedPath = normalizedPath + '/';
+    }
+    return normalizedPath;
+}
+exports.normalizePath = normalizePath;
+class ParsedURL {
+    isValid;
+    url;
+    scheme;
+    user;
+    host;
+    port;
+    path;
+    queryParams;
+    fragment;
+    folderPathComponents;
+    lastPathComponent;
+    blobInnerScheme;
+    #displayNameInternal;
+    #dataURLDisplayNameInternal;
+    constructor(url) {
+        this.isValid = false;
+        this.url = url;
+        this.scheme = '';
+        this.user = '';
+        this.host = '';
+        this.port = '';
+        this.path = '';
+        this.queryParams = '';
+        this.fragment = '';
+        this.folderPathComponents = '';
+        this.lastPathComponent = '';
+        const isBlobUrl = this.url.startsWith('blob:');
+        const urlToMatch = isBlobUrl ? url.substring(5) : url;
+        const match = urlToMatch.match(ParsedURL.urlRegex());
+        if (match) {
+            this.isValid = true;
+            if (isBlobUrl) {
+                this.blobInnerScheme = match[2].toLowerCase();
+                this.scheme = 'blob';
+            }
+            else {
+                this.scheme = match[2].toLowerCase();
+            }
+            this.user = match[3] ?? '';
+            this.host = match[4] ?? '';
+            this.port = match[5] ?? '';
+            this.path = match[6] ?? '/';
+            this.queryParams = match[7] ?? '';
+            this.fragment = match[8] ?? '';
+        }
+        else {
+            if (this.url.startsWith('data:')) {
+                this.scheme = 'data';
+                return;
+            }
+            if (this.url.startsWith('blob:')) {
+                this.scheme = 'blob';
+                return;
+            }
+            if (this.url === 'about:blank') {
+                this.scheme = 'about';
+                return;
+            }
+            this.path = this.url;
+        }
+        const lastSlashIndex = this.path.lastIndexOf('/');
+        if (lastSlashIndex !== -1) {
+            this.folderPathComponents = this.path.substring(0, lastSlashIndex);
+            this.lastPathComponent = this.path.substring(lastSlashIndex + 1);
+        }
+        else {
+            this.lastPathComponent = this.path;
+        }
+    }
+    static concatenate(devToolsPath, ...appendage) {
+        return devToolsPath.concat(...appendage);
+    }
+    static beginsWithWindowsDriveLetter(url) {
+        return /^[A-Za-z]:/.test(url);
+    }
+    static beginsWithScheme(url) {
+        return /^[A-Za-z][A-Za-z0-9+.-]*:/.test(url);
+    }
+    static isRelativeURL(url) {
+        return !this.beginsWithScheme(url) || this.beginsWithWindowsDriveLetter(url);
+    }
+    get displayName() {
+        if (this.#displayNameInternal) {
+            return this.#displayNameInternal;
+        }
+        if (this.isDataURL()) {
+            return this.dataURLDisplayName();
+        }
+        if (this.isBlobURL()) {
+            return this.url;
+        }
+        if (this.isAboutBlank()) {
+            return this.url;
+        }
+        this.#displayNameInternal = this.lastPathComponent;
+        if (!this.#displayNameInternal) {
+            this.#displayNameInternal = (this.host || '') + '/';
+        }
+        if (this.#displayNameInternal === '/') {
+            this.#displayNameInternal = this.url;
+        }
+        return this.#displayNameInternal;
+    }
+    static urlRegexInstance = null;
+}
+exports.ParsedURL = ParsedURL;
+

package/lighthouse-core/lib/cdt/generated/SourceMap.js

@@ -1,7 +1,14 @@
 // @ts-nocheck
 // generated by yarn build-cdt-lib
-const Platform = require('../Platform.js');
+/* eslint-disable */
 "use strict";
+const Common = require('../Common.js');
+const Platform = require('../Platform.js');
+// Copyright 2021 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TextSourceMap = exports.SourceMapEntry = exports.Offset = exports.Section = exports.SourceMapV3 = void 0;
 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
@@ -15,7 +22,7 @@ const Platform = require('../Platform.js');
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of Google Inc. nor the names of its
+ *     * Neither the #name of Google Inc. nor the names of its
  * contributors may be used to endorse or promote products derived from
  * this software without specific prior written permission.
  *
@@ -31,8 +38,6 @@ const Platform = require('../Platform.js');
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TextSourceMap = exports.SourceMapEntry = exports.Offset = exports.Section = exports.SourceMapV3 = void 0;
 ;
 ;
 ;
@@ -43,21 +48,40 @@ exports.TextSourceMap = exports.SourceMapEntry = exports.Offset = exports.Sectio
 ;
 ;
 class SourceMapV3 {
+    version;
+    file;
+    sources;
+    sections;
+    mappings;
+    sourceRoot;
+    names;
+    sourcesContent;
     constructor() {
     }
 }
 exports.SourceMapV3 = SourceMapV3;
 class Section {
+    map;
+    offset;
+    url;
     constructor() {
     }
 }
 exports.Section = Section;
 class Offset {
+    line;
+    column;
     constructor() {
     }
 }
 exports.Offset = Offset;
 class SourceMapEntry {
+    lineNumber;
+    columnNumber;
+    sourceURL;
+    sourceLineNumber;
+    sourceColumnNumber;
+    name;
     constructor(lineNumber, columnNumber, sourceURL, sourceLineNumber, sourceColumnNumber, name) {
         this.lineNumber = lineNumber;
         this.columnNumber = columnNumber;
@@ -81,20 +105,27 @@ for (let i = 0; i < base64Digits.length; ++i) {
 }
 const sourceMapToSourceList = new WeakMap();
 class TextSourceMap {
+    #initiator;
+    #json;
+    #compiledURLInternal;
+    #sourceMappingURL;
+    #baseURL;
+    #mappingsInternal;
+    #sourceInfos;
     /**
      * Implements Source Map V3 model. See https://github.com/google/closure-compiler/wiki/Source-Maps
      * for format description.
      */
     constructor(compiledURL, sourceMappingURL, payload, initiator) {
-        this.initiator = initiator;
-        this.json = payload;
-        this.compiledURLInternal = compiledURL;
-        this.sourceMappingURL = sourceMappingURL;
-        this.baseURL = sourceMappingURL.startsWith('data:') ? compiledURL : sourceMappingURL;
-        this.mappingsInternal = null;
-        this.sourceInfos = new Map();
-        if (this.json.sections) {
-            const sectionWithURL = Boolean(this.json.sections.find(section => Boolean(section.url)));
+        this.#initiator = initiator;
+        this.#json = payload;
+        this.#compiledURLInternal = compiledURL;
+        this.#sourceMappingURL = sourceMappingURL;
+        this.#baseURL = (sourceMappingURL.startsWith('data:') ? compiledURL : sourceMappingURL);
+        this.#mappingsInternal = null;
+        this.#sourceInfos = new Map();
+        if (this.#json.sections) {
+            const sectionWithURL = Boolean(this.#json.sections.find(section => Boolean(section.url)));
             if (sectionWithURL) {
                 console.warn(`SourceMap "${sourceMappingURL}" contains unsupported "URL" field in one of its sections.`);
             }
@@ -102,16 +133,16 @@ class TextSourceMap {
         this.eachSection(this.parseSources.bind(this));
     }
     compiledURL() {
-        return this.compiledURLInternal;
+        return this.#compiledURLInternal;
     }
     url() {
-        return this.sourceMappingURL;
+        return this.#sourceMappingURL;
     }
     sourceURLs() {
-        return [...this.sourceInfos.keys()];
+        return [...this.#sourceInfos.keys()];
     }
     embeddedContentByURL(sourceURL) {
-        const entry = this.sourceInfos.get(sourceURL);
+        const entry = this.#sourceInfos.get(sourceURL);
         if (!entry) {
             return null;
         }
@@ -123,52 +154,92 @@ class TextSourceMap {
         return index ? mappings[index - 1] : null;
     }
     sourceLineMapping(sourceURL, lineNumber, columnNumber) {
-        const mappings = this.reversedMappings(sourceURL);
-        const first = Platform.ArrayUtilities.lowerBound(mappings, lineNumber, lineComparator);
-        const last = Platform.ArrayUtilities.upperBound(mappings, lineNumber, lineComparator);
-        if (first >= mappings.length || mappings[first].sourceLineNumber !== lineNumber) {
+        const mappings = this.mappings();
+        const reverseMappings = this.reversedMappings(sourceURL);
+        const first = Platform.ArrayUtilities.lowerBound(reverseMappings, lineNumber, lineComparator);
+        const last = Platform.ArrayUtilities.upperBound(reverseMappings, lineNumber, lineComparator);
+        if (first >= reverseMappings.length || mappings[reverseMappings[first]].sourceLineNumber !== lineNumber) {
             return null;
         }
-        const columnMappings = mappings.slice(first, last);
+        const columnMappings = reverseMappings.slice(first, last);
         if (!columnMappings.length) {
             return null;
         }
-        const index = Platform.ArrayUtilities.lowerBound(columnMappings, columnNumber, (columnNumber, mapping) => columnNumber - mapping.sourceColumnNumber);
-        return index >= columnMappings.length ? columnMappings[columnMappings.length - 1] : columnMappings[index];
-        function lineComparator(lineNumber, mapping) {
-            return lineNumber - mapping.sourceLineNumber;
+        const index = Platform.ArrayUtilities.lowerBound(columnMappings, columnNumber, (columnNumber, i) => columnNumber - mappings[i].sourceColumnNumber);
+        return index >= columnMappings.length ? mappings[columnMappings[columnMappings.length - 1]] :
+            mappings[columnMappings[index]];
+        function lineComparator(lineNumber, i) {
+            return lineNumber - mappings[i].sourceLineNumber;
         }
     }
-    findReverseEntries(sourceURL, lineNumber, columnNumber) {
-        const mappings = this.reversedMappings(sourceURL);
-        const endIndex = Platform.ArrayUtilities.upperBound(mappings, undefined, (unused, entry) => lineNumber - entry.sourceLineNumber || columnNumber - entry.sourceColumnNumber);
+    findReverseIndices(sourceURL, lineNumber, columnNumber) {
+        const mappings = this.mappings();
+        const reverseMappings = this.reversedMappings(sourceURL);
+        const endIndex = Platform.ArrayUtilities.upperBound(reverseMappings, undefined, (unused, i) => lineNumber - mappings[i].sourceLineNumber || columnNumber - mappings[i].sourceColumnNumber);
         let startIndex = endIndex;
-        while (startIndex > 0 && mappings[startIndex - 1].sourceLineNumber === mappings[endIndex - 1].sourceLineNumber &&
-            mappings[startIndex - 1].sourceColumnNumber === mappings[endIndex - 1].sourceColumnNumber) {
+        while (startIndex > 0 &&
+            mappings[reverseMappings[startIndex - 1]].sourceLineNumber ===
+                mappings[reverseMappings[endIndex - 1]].sourceLineNumber &&
+            mappings[reverseMappings[startIndex - 1]].sourceColumnNumber ===
+                mappings[reverseMappings[endIndex - 1]].sourceColumnNumber) {
             --startIndex;
         }
-        return mappings.slice(startIndex, endIndex);
+        return reverseMappings.slice(startIndex, endIndex);
+    }
+    findReverseEntries(sourceURL, lineNumber, columnNumber) {
+        const mappings = this.mappings();
+        return this.findReverseIndices(sourceURL, lineNumber, columnNumber).map(i => mappings[i]);
+    }
+    findReverseRanges(sourceURL, lineNumber, columnNumber) {
+        const mappings = this.mappings();
+        const indices = this.findReverseIndices(sourceURL, lineNumber, columnNumber);
+        const ranges = [];
+        for (let i = 0; i < indices.length; ++i) {
+            const startIndex = indices[i];
+            // Merge adjacent ranges.
+            let endIndex = startIndex + 1;
+            while (i + 1 < indices.length && endIndex === indices[i + 1]) {
+                ++endIndex;
+                ++i;
+            }
+            // Source maps don't contain end positions for entries, but each entry is assumed to
+            // span until the following entry. This doesn't work however in case of the last
+            // entry, where there's no following entry. We also don't know the number of lines
+            // and columns in the original source code (which might not be available at all), so
+            // for that case we store the maximum signed 32-bit integer, which is definitely going
+            // to be larger than any script we can process and can safely be serialized as part of
+            // the skip list we send to V8 with `Debugger.stepOver` (http://crbug.com/1305956).
+            const startLine = mappings[startIndex].lineNumber;
+            const startColumn = mappings[startIndex].columnNumber;
+            const endLine = endIndex < mappings.length ? mappings[endIndex].lineNumber : 2 ** 31 - 1;
+            const endColumn = endIndex < mappings.length ? mappings[endIndex].columnNumber : 2 ** 31 - 1;
+            ranges.push(new TextUtils.TextRange.TextRange(startLine, startColumn, endLine, endColumn));
+        }
+        return ranges;
     }
     /** @return {Array<{lineNumber: number, columnNumber: number, sourceURL?: string, sourceLineNumber: number, sourceColumnNumber: number, name?: string, lastColumnNumber?: number}>} */
-mappings() {
-        if (this.mappingsInternal === null) {
-            this.mappingsInternal = [];
+    mappings() {
+        if (this.#mappingsInternal === null) {
+            this.#mappingsInternal = [];
             this.eachSection(this.parseMap.bind(this));
-            this.json = null;
+            this.#json = null;
         }
-        return /** @type {!Array<!SourceMapEntry>} */ this.mappingsInternal;
+        return this.#mappingsInternal;
     }
     reversedMappings(sourceURL) {
-        const info = this.sourceInfos.get(sourceURL);
+        const info = this.#sourceInfos.get(sourceURL);
         if (!info) {
             return [];
         }
         const mappings = this.mappings();
         if (info.reverseMappings === null) {
-            info.reverseMappings = mappings.filter(mapping => mapping.sourceURL === sourceURL).sort(sourceMappingComparator);
+            const indexes = Array(mappings.length).fill(0).map((_, i) => i);
+            info.reverseMappings = indexes.filter(i => mappings[i].sourceURL === sourceURL).sort(sourceMappingComparator);
         }
         return info.reverseMappings;
-        function sourceMappingComparator(a, b) {
+        function sourceMappingComparator(indexA, indexB) {
+            const a = mappings[indexA];
+            const b = mappings[indexB];
             if (a.sourceLineNumber !== b.sourceLineNumber) {
                 return a.sourceLineNumber - b.sourceLineNumber;
             }
@@ -182,30 +253,43 @@ mappings() {
         }
     }
     eachSection(callback) {
-        if (!this.json) {
+        if (!this.#json) {
             return;
         }
-        if (!this.json.sections) {
-            callback(this.json, 0, 0);
+        if (!this.#json.sections) {
+            callback(this.#json, 0, 0);
             return;
         }
-        for (const section of this.json.sections) {
+        for (const section of this.#json.sections) {
             callback(section.map, section.offset.line, section.offset.column);
         }
     }
     parseSources(sourceMap) {
         const sourcesList = [];
-        let sourceRoot = sourceMap.sourceRoot || '';
-        if (sourceRoot && !sourceRoot.endsWith('/')) {
-            sourceRoot += '/';
-        }
+        const sourceRoot = sourceMap.sourceRoot || Platform.DevToolsPath.EmptyUrlString;
         for (let i = 0; i < sourceMap.sources.length; ++i) {
-            const href = sourceRoot + sourceMap.sources[i];
+            let href = sourceMap.sources[i];
+            // The source map v3 proposal says to prepend the sourceRoot to the source URL
+            // and if the resulting URL is not absolute, then resolve the source URL against
+            // the source map URL. Appending the sourceRoot (if one exists) is not likely to
+            // be meaningful or useful if the source URL is already absolute though. In this
+            // case, use the source URL as is without prepending the sourceRoot.
+            if (Common.ParsedURL.ParsedURL.isRelativeURL(href)) {
+                if (sourceRoot && !sourceRoot.endsWith('/') && href && !href.startsWith('/')) {
+                    href = Common.ParsedURL.ParsedURL.concatenate(sourceRoot, '/', href);
+                }
+                else {
+                    href = Common.ParsedURL.ParsedURL.concatenate(sourceRoot, href);
+                }
+            }
             let url = '' || href;
             const source = sourceMap.sourcesContent && sourceMap.sourcesContent[i];
-            if (url === this.compiledURLInternal && source) {
+            if (url === this.#compiledURLInternal && source) {
             }
-            this.sourceInfos.set(url, new TextSourceMap.SourceInfo(source || null, null));
+            if (this.#sourceInfos.has(url)) {
+                continue;
+            }
+            this.#sourceInfos.set(url, new TextSourceMap.SourceInfo(source || null, null));
             sourcesList.push(url);
         }
         sourceMapToSourceList.set(sourceMap, sourcesList);
@@ -282,27 +366,31 @@ mappings() {
         return negative ? -result : result;
     }
     reverseMapTextRange(url, textRange) {
-        function comparator(position, mapping) {
-            if (position.lineNumber !== mapping.sourceLineNumber) {
-                return position.lineNumber - mapping.sourceLineNumber;
+        function comparator(position, mappingIndex) {
+            if (position.lineNumber !== mappings[mappingIndex].sourceLineNumber) {
+                return position.lineNumber - mappings[mappingIndex].sourceLineNumber;
             }
-            return position.columnNumber - mapping.sourceColumnNumber;
+            return position.columnNumber - mappings[mappingIndex].sourceColumnNumber;
+        }
+        const reverseMappings = this.reversedMappings(url);
+        const mappings = this.mappings();
+        if (!reverseMappings.length) {
+            return null;
         }
-        const mappings = this.reversedMappings(url);
-        if (!mappings.length) {
+        const startIndex = Platform.ArrayUtilities.lowerBound(reverseMappings, { lineNumber: textRange.startLine, columnNumber: textRange.startColumn }, comparator);
+        const endIndex = Platform.ArrayUtilities.upperBound(reverseMappings, { lineNumber: textRange.endLine, columnNumber: textRange.endColumn }, comparator);
+        if (endIndex >= reverseMappings.length) {
             return null;
         }
-        const startIndex = Platform.ArrayUtilities.lowerBound(mappings, { lineNumber: textRange.startLine, columnNumber: textRange.startColumn }, comparator);
-        const endIndex = Platform.ArrayUtilities.upperBound(mappings, { lineNumber: textRange.endLine, columnNumber: textRange.endColumn }, comparator);
-        const startMapping = mappings[startIndex];
-        const endMapping = mappings[endIndex];
+        const startMapping = mappings[reverseMappings[startIndex]];
+        const endMapping = mappings[reverseMappings[endIndex]];
         return new TextUtils.TextRange.TextRange(startMapping.lineNumber, startMapping.columnNumber, endMapping.lineNumber, endMapping.columnNumber);
     }
     mapsOrigin() {
         const mappings = this.mappings();
         if (mappings.length > 0) {
             const firstEntry = mappings[0];
-            return (firstEntry === null || firstEntry === void 0 ? void 0 : firstEntry.lineNumber) === 0 || firstEntry.columnNumber === 0;
+            return firstEntry?.lineNumber === 0 || firstEntry.columnNumber === 0;
         }
         return false;
     }
@@ -319,6 +407,8 @@ exports.TextSourceMap = TextSourceMap;
     // eslint-disable-next-line @typescript-eslint/naming-convention
     TextSourceMap._VLQ_CONTINUATION_MASK = 1 << 5;
     class StringCharIterator {
+        string;
+        position;
         constructor(string) {
             this.string = string;
             this.position = 0;
@@ -335,6 +425,8 @@ exports.TextSourceMap = TextSourceMap;
     }
     TextSourceMap.StringCharIterator = StringCharIterator;
     class SourceInfo {
+        content;
+        reverseMappings;
         constructor(content, reverseMappings) {
             this.content = content;
             this.reverseMappings = reverseMappings;
@@ -343,4 +435,5 @@ exports.TextSourceMap = TextSourceMap;
     TextSourceMap.SourceInfo = SourceInfo;
 })(TextSourceMap = exports.TextSourceMap || (exports.TextSourceMap = {}));
 
+
 module.exports = TextSourceMap;