lighthouse 8.5.1-dev.20211012 → 8.5.1

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

@@ -1,6 +1,6 @@
 // @ts-nocheck
 // generated by yarn build-cdt-lib
-const Platform = require('../Platform.js');
+const Common = require('../Common.js')
 "use strict";
 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
@@ -32,32 +32,100 @@ const Platform = require('../Platform.js');
  * 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;
-;
-;
-;
-;
-;
-;
-;
-;
-;
+
+/**
+ * @interface
+ */
+class SourceMap {
+    /**
+     * @return {string}
+     */
+    compiledURL() {
+    }
+    /**
+     * @return {string}
+     */
+    url() {
+    }
+    /**
+     * @return {!Array<string>}
+     */
+    sourceURLs() {
+    }
+    /**
+     * @param {string} sourceURL
+     * @return {?string}
+     */
+    embeddedContentByURL(sourceURL) {
+    }
+    /**
+     * @param {number} lineNumber in compiled resource
+     * @param {number} columnNumber in compiled resource
+     * @return {?SourceMapEntry}
+     */
+    findEntry(lineNumber, columnNumber) {
+    }
+    /**
+     * @param {string} sourceURL
+     * @param {number} lineNumber
+     * @param {number} columnNumber
+     * @return {?SourceMapEntry}
+     */
+    sourceLineMapping(sourceURL, lineNumber, columnNumber) {
+    }
+    /**
+     * @return {!Array<!SourceMapEntry>}
+     */
+    mappings() {
+    }
+    dispose() {
+    }
+}
+
+/**
+ * @unrestricted
+ */
 class SourceMapV3 {
     constructor() {
+        /** @type {number} */ this.version;
+        /** @type {string|undefined} */ this.file;
+        /** @type {!Array.<string>} */ this.sources;
+        /** @type {!Array.<!SourceMapV3.Section>|undefined} */ this.sections;
+        /** @type {string} */ this.mappings;
+        /** @type {string|undefined} */ this.sourceRoot;
+        /** @type {!Array.<string>|undefined} */ this.names;
     }
 }
-exports.SourceMapV3 = SourceMapV3;
-class Section {
+/**
+ * @unrestricted
+ */
+SourceMapV3.Section = class {
     constructor() {
+        /** @type {!SourceMapV3} */ this.map;
+        /** @type {!SourceMapV3.Offset} */ this.offset;
     }
-}
-exports.Section = Section;
-class Offset {
+};
+/**
+ * @unrestricted
+ */
+SourceMapV3.Offset = class {
     constructor() {
+        /** @type {number} */ this.line;
+        /** @type {number} */ this.column;
     }
-}
-exports.Offset = Offset;
+};
+/**
+ * @unrestricted
+ */
 class SourceMapEntry {
+    /**
+     * @param {number} lineNumber
+     * @param {number} columnNumber
+     * @param {string=} sourceURL
+     * @param {number=} sourceLineNumber
+     * @param {number=} sourceColumnNumber
+     * @param {string=} name
+     */
     constructor(lineNumber, columnNumber, sourceURL, sourceLineNumber, sourceColumnNumber, name) {
         this.lineNumber = lineNumber;
         this.columnNumber = columnNumber;
@@ -66,6 +134,11 @@ class SourceMapEntry {
         this.sourceColumnNumber = sourceColumnNumber;
         this.name = name;
     }
+    /**
+     * @param {!SourceMapEntry} entry1
+     * @param {!SourceMapEntry} entry2
+     * @return {number}
+     */
     static compare(entry1, entry2) {
         if (entry1.lineNumber !== entry2.lineNumber) {
             return entry1.lineNumber - entry2.lineNumber;
@@ -73,59 +146,99 @@ class SourceMapEntry {
         return entry1.columnNumber - entry2.columnNumber;
     }
 }
-exports.SourceMapEntry = SourceMapEntry;
-const base64Digits = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
-const base64Map = new Map();
-for (let i = 0; i < base64Digits.length; ++i) {
-    base64Map.set(base64Digits.charAt(i), i);
-}
-const sourceMapToSourceList = new WeakMap();
+
+
+
+/**
+ * @implements {SourceMap}
+ * @unrestricted
+ */
 class TextSourceMap {
     /**
      * Implements Source Map V3 model. See https://github.com/google/closure-compiler/wiki/Source-Maps
      * for format description.
+     * @param {string} compiledURL
+     * @param {string} sourceMappingURL
+     * @param {!SourceMapV3} payload
      */
-    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)));
+    constructor(compiledURL, sourceMappingURL, payload) {
+        if (!TextSourceMap._base64Map) {
+            const base64Digits = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+            TextSourceMap._base64Map = {};
+            for (let i = 0; i < base64Digits.length; ++i) {
+                TextSourceMap._base64Map[base64Digits.charAt(i)] = i;
+            }
+        }
+        this._json = payload;
+        this._compiledURL = compiledURL;
+        this._sourceMappingURL = sourceMappingURL;
+        this._baseURL = sourceMappingURL.startsWith('data:') ? compiledURL : sourceMappingURL;
+        /** @type {?Array<!SourceMapEntry>} */
+        this._mappings = null;
+        /** @type {!Map<string, !TextSourceMap.SourceInfo>} */
+        this._sourceInfos = new Map();
+        if (this._json.sections) {
+            const sectionWithURL = !!this._json.sections.find(section => !!section.url);
             if (sectionWithURL) {
-                console.warn(`SourceMap "${sourceMappingURL}" contains unsupported "URL" field in one of its sections.`);
+                Common.console.warn(`SourceMap "${sourceMappingURL}" contains unsupported "URL" field in one of its sections.`);
             }
         }
-        this.eachSection(this.parseSources.bind(this));
+        this._eachSection(this._parseSources.bind(this));
     }
+    /**
+     * @override
+     * @return {string}
+     */
     compiledURL() {
-        return this.compiledURLInternal;
+        return this._compiledURL;
     }
+    /**
+     * @override
+     * @return {string}
+     */
     url() {
-        return this.sourceMappingURL;
+        return this._sourceMappingURL;
     }
+    /**
+     * @override
+     * @return {!Array.<string>}
+     */
     sourceURLs() {
-        return [...this.sourceInfos.keys()];
+        return this._sourceInfos.keysArray();
     }
+    /**
+     * @override
+     * @param {string} sourceURL
+     * @return {?string}
+     */
     embeddedContentByURL(sourceURL) {
-        const entry = this.sourceInfos.get(sourceURL);
-        if (!entry) {
+        if (!this._sourceInfos.has(sourceURL)) {
             return null;
         }
-        return entry.content;
+        return this._sourceInfos.get(sourceURL).content;
     }
+    /**
+     * @override
+     * @param {number} lineNumber in compiled resource
+     * @param {number} columnNumber in compiled resource
+     * @return {?SourceMapEntry}
+     */
     findEntry(lineNumber, columnNumber) {
         const mappings = this.mappings();
-        const index = Platform.ArrayUtilities.upperBound(mappings, undefined, (unused, entry) => lineNumber - entry.lineNumber || columnNumber - entry.columnNumber);
+        const index = mappings.upperBound(undefined, (unused, entry) => lineNumber - entry.lineNumber || columnNumber - entry.columnNumber);
         return index ? mappings[index - 1] : null;
     }
+    /**
+     * @override
+     * @param {string} sourceURL
+     * @param {number} lineNumber
+     * @param {number} columnNumber
+     * @return {?SourceMapEntry}
+     */
     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);
+        const mappings = this._reversedMappings(sourceURL);
+        const first = mappings.lowerBound(lineNumber, lineComparator);
+        const last = mappings.upperBound(lineNumber, lineComparator);
         if (first >= mappings.length || mappings[first].sourceLineNumber !== lineNumber) {
             return null;
         }
@@ -133,15 +246,26 @@ class TextSourceMap {
         if (!columnMappings.length) {
             return null;
         }
-        const index = Platform.ArrayUtilities.lowerBound(columnMappings, columnNumber, (columnNumber, mapping) => columnNumber - mapping.sourceColumnNumber);
+        const index = columnMappings.lowerBound(columnNumber, (columnNumber, mapping) => columnNumber - mapping.sourceColumnNumber);
         return index >= columnMappings.length ? columnMappings[columnMappings.length - 1] : columnMappings[index];
+        /**
+         * @param {number} lineNumber
+         * @param {!SourceMapEntry} mapping
+         * @return {number}
+         */
         function lineComparator(lineNumber, mapping) {
             return lineNumber - mapping.sourceLineNumber;
         }
     }
+    /**
+     * @param {string} sourceURL
+     * @param {number} lineNumber
+     * @param {number} columnNumber
+     * @return {!Array<!SourceMapEntry>}
+     */
     findReverseEntries(sourceURL, lineNumber, columnNumber) {
-        const mappings = this.reversedMappings(sourceURL);
-        const endIndex = Platform.ArrayUtilities.upperBound(mappings, undefined, (unused, entry) => lineNumber - entry.sourceLineNumber || columnNumber - entry.sourceColumnNumber);
+        const mappings = this._reversedMappings(sourceURL);
+        const endIndex = mappings.upperBound(undefined, (unused, entry) => lineNumber - entry.sourceLineNumber || columnNumber - entry.sourceColumnNumber);
         let startIndex = endIndex;
         while (startIndex > 0 && mappings[startIndex - 1].sourceLineNumber === mappings[endIndex - 1].sourceLineNumber &&
             mappings[startIndex - 1].sourceColumnNumber === mappings[endIndex - 1].sourceColumnNumber) {
@@ -149,25 +273,37 @@ class TextSourceMap {
         }
         return mappings.slice(startIndex, endIndex);
     }
-    /** @return {Array<{lineNumber: number, columnNumber: number, sourceURL?: string, sourceLineNumber, sourceColumnNumber: number, name?: string, lastColumnNumber?: number}>} */
-mappings() {
-        if (this.mappingsInternal === null) {
-            this.mappingsInternal = [];
-            this.eachSection(this.parseMap.bind(this));
-            this.json = null;
+    /**
+     * @override
+     * @return {!Array<!SourceMapEntry>}
+     */
+    mappings() {
+        if (this._mappings === null) {
+            this._mappings = [];
+            this._eachSection(this._parseMap.bind(this));
+            this._json = null;
         }
-        return /** @type {!Array<!SourceMapEntry>} */ this.mappingsInternal;
+        return /** @type {!Array<!SourceMapEntry>} */ (this._mappings);
     }
-    reversedMappings(sourceURL) {
-        const info = this.sourceInfos.get(sourceURL);
-        if (!info) {
+    /**
+     * @param {string} sourceURL
+     * @return {!Array.<!SourceMapEntry>}
+     */
+    _reversedMappings(sourceURL) {
+        if (!this._sourceInfos.has(sourceURL)) {
             return [];
         }
         const mappings = this.mappings();
+        const info = this._sourceInfos.get(sourceURL);
         if (info.reverseMappings === null) {
             info.reverseMappings = mappings.filter(mapping => mapping.sourceURL === sourceURL).sort(sourceMappingComparator);
         }
         return info.reverseMappings;
+        /**
+         * @param {!SourceMapEntry} a
+         * @param {!SourceMapEntry} b
+         * @return {number}
+         */
         function sourceMappingComparator(a, b) {
             if (a.sourceLineNumber !== b.sourceLineNumber) {
                 return a.sourceLineNumber - b.sourceLineNumber;
@@ -181,19 +317,22 @@ mappings() {
             return a.columnNumber - b.columnNumber;
         }
     }
-    eachSection(callback) {
-        if (!this.json) {
-            return;
-        }
-        if (!this.json.sections) {
-            callback(this.json, 0, 0);
+    /**
+     * @param {function(!SourceMapV3, number, number)} callback
+     */
+    _eachSection(callback) {
+        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) {
+    /**
+     * @param {!SourceMapV3} sourceMap
+     */
+    _parseSources(sourceMap) {
         const sourcesList = [];
         let sourceRoot = sourceMap.sourceRoot || '';
         if (sourceRoot && !sourceRoot.endsWith('/')) {
@@ -203,28 +342,27 @@ mappings() {
             const href = sourceRoot + sourceMap.sources[i];
             let url = '' || href;
             const source = sourceMap.sourcesContent && sourceMap.sourcesContent[i];
-            if (url === this.compiledURLInternal && source) {
+            if (url === this._compiledURL && source) {
             }
-            this.sourceInfos.set(url, new TextSourceMap.SourceInfo(source || null, null));
+            this._sourceInfos.set(url, new TextSourceMap.SourceInfo(source, null));
             sourcesList.push(url);
         }
-        sourceMapToSourceList.set(sourceMap, sourcesList);
+        sourceMap[TextSourceMap._sourcesListSymbol] = sourcesList;
     }
-    parseMap(map, lineNumber, columnNumber) {
+    /**
+     * @param {!SourceMapV3} map
+     * @param {number} lineNumber
+     * @param {number} columnNumber
+     */
+    _parseMap(map, lineNumber, columnNumber) {
         let sourceIndex = 0;
         let sourceLineNumber = 0;
         let sourceColumnNumber = 0;
         let nameIndex = 0;
-        // TODO(crbug.com/1011811): refactor away map.
-        // `sources` can be undefined if it wasn't previously
-        // processed and added to the list. However, that
-        // is not WAI and we should make sure that we can
-        // only reach this point when we are certain
-        // we have the list available.
-        const sources = sourceMapToSourceList.get(map);
+        const sources = map[TextSourceMap._sourcesListSymbol];
         const names = map.names || [];
         const stringCharIterator = new TextSourceMap.StringCharIterator(map.mappings);
-        let sourceURL = sources && sources[sourceIndex];
+        let sourceURL = sources[sourceIndex];
         while (true) {
             if (stringCharIterator.peek() === ',') {
                 stringCharIterator.next();
@@ -239,108 +377,134 @@ mappings() {
                     break;
                 }
             }
-            columnNumber += this.decodeVLQ(stringCharIterator);
-            if (!stringCharIterator.hasNext() || this.isSeparator(stringCharIterator.peek())) {
-                this.mappings().push(new SourceMapEntry(lineNumber, columnNumber));
+            columnNumber += this._decodeVLQ(stringCharIterator);
+            if (!stringCharIterator.hasNext() || this._isSeparator(stringCharIterator.peek())) {
+                this._mappings.push(new SourceMapEntry(lineNumber, columnNumber));
                 continue;
             }
-            const sourceIndexDelta = this.decodeVLQ(stringCharIterator);
+            const sourceIndexDelta = this._decodeVLQ(stringCharIterator);
             if (sourceIndexDelta) {
                 sourceIndex += sourceIndexDelta;
-                if (sources) {
-                    sourceURL = sources[sourceIndex];
-                }
+                sourceURL = sources[sourceIndex];
             }
-            sourceLineNumber += this.decodeVLQ(stringCharIterator);
-            sourceColumnNumber += this.decodeVLQ(stringCharIterator);
-            if (!stringCharIterator.hasNext() || this.isSeparator(stringCharIterator.peek())) {
-                this.mappings().push(new SourceMapEntry(lineNumber, columnNumber, sourceURL, sourceLineNumber, sourceColumnNumber));
+            sourceLineNumber += this._decodeVLQ(stringCharIterator);
+            sourceColumnNumber += this._decodeVLQ(stringCharIterator);
+            if (!stringCharIterator.hasNext() || this._isSeparator(stringCharIterator.peek())) {
+                this._mappings.push(new SourceMapEntry(lineNumber, columnNumber, sourceURL, sourceLineNumber, sourceColumnNumber));
                 continue;
             }
-            nameIndex += this.decodeVLQ(stringCharIterator);
-            this.mappings().push(new SourceMapEntry(lineNumber, columnNumber, sourceURL, sourceLineNumber, sourceColumnNumber, names[nameIndex]));
+            nameIndex += this._decodeVLQ(stringCharIterator);
+            this._mappings.push(new SourceMapEntry(lineNumber, columnNumber, sourceURL, sourceLineNumber, sourceColumnNumber, names[nameIndex]));
         }
         // As per spec, mappings are not necessarily sorted.
-        this.mappings().sort(SourceMapEntry.compare);
+        this._mappings.sort(SourceMapEntry.compare);
     }
-    isSeparator(char) {
+    /**
+     * @param {string} char
+     * @return {boolean}
+     */
+    _isSeparator(char) {
         return char === ',' || char === ';';
     }
-    decodeVLQ(stringCharIterator) {
+    /**
+     * @param {!TextSourceMap.StringCharIterator} stringCharIterator
+     * @return {number}
+     */
+    _decodeVLQ(stringCharIterator) {
         // Read unsigned value.
         let result = 0;
         let shift = 0;
-        let digit = TextSourceMap._VLQ_CONTINUATION_MASK;
-        while (digit & TextSourceMap._VLQ_CONTINUATION_MASK) {
-            digit = base64Map.get(stringCharIterator.next()) || 0;
+        let digit;
+        do {
+            digit = TextSourceMap._base64Map[stringCharIterator.next()];
             result += (digit & TextSourceMap._VLQ_BASE_MASK) << shift;
             shift += TextSourceMap._VLQ_BASE_SHIFT;
-        }
+        } while (digit & TextSourceMap._VLQ_CONTINUATION_MASK);
         // Fix the sign.
         const negative = result & 1;
         result >>= 1;
         return negative ? -result : result;
     }
+    /**
+     * @param {string} url
+     * @param {!TextUtils.TextRange} textRange
+     * @return {!TextUtils.TextRange}
+     */
     reverseMapTextRange(url, textRange) {
+        /**
+         * @param {!{lineNumber: number, columnNumber: number}} position
+         * @param {!SourceMapEntry} mapping
+         * @return {number}
+         */
         function comparator(position, mapping) {
             if (position.lineNumber !== mapping.sourceLineNumber) {
                 return position.lineNumber - mapping.sourceLineNumber;
             }
             return position.columnNumber - mapping.sourceColumnNumber;
         }
-        const mappings = this.reversedMappings(url);
-        if (!mappings.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 mappings = this._reversedMappings(url);
+        const startIndex = mappings.lowerBound({ lineNumber: textRange.startLine, columnNumber: textRange.startColumn }, comparator);
+        const endIndex = mappings.upperBound({ lineNumber: textRange.endLine, columnNumber: textRange.endColumn }, comparator);
         const startMapping = mappings[startIndex];
         const endMapping = mappings[endIndex];
-        return new TextUtils.TextRange.TextRange(startMapping.lineNumber, startMapping.columnNumber, endMapping.lineNumber, endMapping.columnNumber);
+        return new TextUtils.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 false;
+    /**
+     * @override
+     */
+    dispose() {
     }
 }
-exports.TextSourceMap = TextSourceMap;
-(function (TextSourceMap) {
-    // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    TextSourceMap._VLQ_BASE_SHIFT = 5;
-    // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    TextSourceMap._VLQ_BASE_MASK = (1 << 5) - 1;
-    // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    TextSourceMap._VLQ_CONTINUATION_MASK = 1 << 5;
-    class StringCharIterator {
-        constructor(string) {
-            this.string = string;
-            this.position = 0;
-        }
-        next() {
-            return this.string.charAt(this.position++);
-        }
-        peek() {
-            return this.string.charAt(this.position);
-        }
-        hasNext() {
-            return this.position < this.string.length;
-        }
+
+TextSourceMap._VLQ_BASE_SHIFT = 5;
+TextSourceMap._VLQ_BASE_MASK = (1 << 5) - 1;
+TextSourceMap._VLQ_CONTINUATION_MASK = 1 << 5;
+/**
+ * @unrestricted
+ */
+TextSourceMap.StringCharIterator = class {
+    /**
+     * @param {string} string
+     */
+    constructor(string) {
+        this._string = string;
+        this._position = 0;
     }
-    TextSourceMap.StringCharIterator = StringCharIterator;
-    class SourceInfo {
-        constructor(content, reverseMappings) {
-            this.content = content;
-            this.reverseMappings = reverseMappings;
-        }
+    /**
+     * @return {string}
+     */
+    next() {
+        return this._string.charAt(this._position++);
+    }
+    /**
+     * @return {string}
+     */
+    peek() {
+        return this._string.charAt(this._position);
+    }
+    /**
+     * @return {boolean}
+     */
+    hasNext() {
+        return this._position < this._string.length;
     }
-    TextSourceMap.SourceInfo = SourceInfo;
-})(TextSourceMap = exports.TextSourceMap || (exports.TextSourceMap = {}));
+};
+/**
+ * @unrestricted
+ */
+TextSourceMap.SourceInfo = class {
+    /**
+     * @param {?string} content
+     * @param {?Array<!SourceMapEntry>} reverseMappings
+     */
+    constructor(content, reverseMappings) {
+        this.content = content;
+        this.reverseMappings = reverseMappings;
+    }
+};
+TextSourceMap._sourcesListSymbol = Symbol('sourcesList');
+
+
+
 
-module.exports = TextSourceMap;
+module.exports = TextSourceMap

package/lighthouse-core/lib/csp-evaluator.js

@@ -18,7 +18,6 @@ const {Directive} = require('csp_evaluator/dist/csp.js');
 
 const log = require('lighthouse-logger');
 const i18n = require('../lib/i18n/i18n.js');
-const {isIcuMessage} = require('../../shared/localization/format.js');
 
 const UIStrings = {
   /** Message shown when a CSP does not have a base-uri directive. Shown in a table with a list of other CSP vulnerabilities and suggestions. "CSP" stands for "Content Security Policy". "base-uri", "'none'", and "'self'" do not need to be translated. */
@@ -131,7 +130,7 @@ function getTranslatedDescription(finding) {
   }
 
   // Return if translated result found.
-  if (isIcuMessage(result)) return result;
+  if (i18n.isIcuMessage(result)) return result;
 
   // If result was not translated, that means `finding.value` is included in the UI string.
   if (typeof result === 'string') return str_(result, {keyword: finding.value || ''});