chrome-devtools-frontend 1.0.973645 → 1.0.975056

package/front_end/core/sdk/DOMModel.ts

@@ -1002,15 +1002,15 @@ export class DOMNodeShortcut {
 export class DOMDocument extends DOMNode {
   body: DOMNode|null;
   documentElement: DOMNode|null;
-  documentURL: string;
-  baseURL: string;
+  documentURL: Platform.DevToolsPath.UrlString;
+  baseURL: Platform.DevToolsPath.UrlString;
   constructor(domModel: DOMModel, payload: Protocol.DOM.Node) {
     super(domModel);
     this.body = null;
     this.documentElement = null;
     this.init(this, false, payload);
-    this.documentURL = payload.documentURL || '';
-    this.baseURL = payload.baseURL || '';
+    this.documentURL = (payload.documentURL || '') as Platform.DevToolsPath.UrlString;
+    this.baseURL = (payload.baseURL || '') as Platform.DevToolsPath.UrlString;
   }
 }
 
@@ -1243,10 +1243,10 @@ export class DOMModel extends SDKModel<EventTypes> {
 
   documentUpdated(): void {
     // If we have this.#pendingDocumentRequestPromise in flight,
-    // if it hits backend post #document update, it will contain most recent result.
-    const documentWasRequested = this.#document || this.#pendingDocumentRequestPromise;
+    // it will contain most recent result.
+    const documentWasRequested = this.#pendingDocumentRequestPromise;
     this.setDocument(null);
-    if (this.parentModel() && documentWasRequested) {
+    if (this.parentModel() && !documentWasRequested) {
       void this.requestDocument();
     }
   }

package/front_end/core/sdk/ResourceTreeModel.ts

@@ -140,7 +140,7 @@ export class ResourceTreeModel extends SDKModel<EventTypes> {
     if (mainFramePayload && mainFramePayload.frame.url !== ':') {
       this.dispatchEventToListeners(Events.WillLoadCachedResources);
       this.addFramesRecursively(null, mainFramePayload);
-      this.target().setInspectedURL(mainFramePayload.frame.url);
+      this.target().setInspectedURL(mainFramePayload.frame.url as Platform.DevToolsPath.UrlString);
     }
     this.#cachedResourcesProcessed = true;
     const runtimeModel = this.target().model(RuntimeModel);

package/front_end/core/sdk/SourceMap.ts

@@ -32,8 +32,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-// TODO(crbug.com/1253323): Casts to UrlString will be removed from this file when migration to branded types is complete.
-
 import * as TextUtils from '../../models/text_utils/text_utils.js';
 import * as Common from '../common/common.js';
 import * as i18n from '../i18n/i18n.js';
@@ -61,15 +59,17 @@ const str_ = i18n.i18n.registerUIStrings('core/sdk/SourceMap.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
 
 export interface SourceMap {
-  compiledURL(): string;
-  url(): string;
-  sourceURLs(): string[];
-  sourceContentProvider(sourceURL: string, contentType: Common.ResourceType.ResourceType):
+  compiledURL(): Platform.DevToolsPath.UrlString;
+  url(): Platform.DevToolsPath.UrlString;
+  sourceURLs(): Platform.DevToolsPath.UrlString[];
+  sourceContentProvider(sourceURL: Platform.DevToolsPath.UrlString, contentType: Common.ResourceType.ResourceType):
       TextUtils.ContentProvider.ContentProvider;
-  embeddedContentByURL(sourceURL: string): string|null;
+  embeddedContentByURL(sourceURL: Platform.DevToolsPath.UrlString): string|null;
   findEntry(lineNumber: number, columnNumber: number): SourceMapEntry|null;
-  findReverseRanges(sourceURL: string, lineNumber: number, columnNumber: number): TextUtils.TextRange.TextRange[];
-  sourceLineMapping(sourceURL: string, lineNumber: number, columnNumber: number): SourceMapEntry|null;
+  findReverseRanges(sourceURL: Platform.DevToolsPath.UrlString, lineNumber: number, columnNumber: number):
+      TextUtils.TextRange.TextRange[];
+  sourceLineMapping(sourceURL: Platform.DevToolsPath.UrlString, lineNumber: number, columnNumber: number):
+      SourceMapEntry|null;
   mappings(): SourceMapEntry[];
   mapsOrigin(): boolean;
 }
@@ -77,10 +77,10 @@ export interface SourceMap {
 export class SourceMapV3 {
   version!: number;
   file!: string|undefined;
-  sources!: string[];
+  sources!: Platform.DevToolsPath.UrlString[];
   sections!: Section[]|undefined;
   mappings!: string;
-  sourceRoot!: string|undefined;
+  sourceRoot!: Platform.DevToolsPath.UrlString|undefined;
   names!: string[]|undefined;
   sourcesContent!: string|undefined;
   constructor() {
@@ -105,13 +105,13 @@ export class Offset {
 export class SourceMapEntry {
   lineNumber: number;
   columnNumber: number;
-  sourceURL: string|undefined;
+  sourceURL: Platform.DevToolsPath.UrlString|undefined;
   sourceLineNumber: number;
   sourceColumnNumber: number;
   name: string|undefined;
 
   constructor(
-      lineNumber: number, columnNumber: number, sourceURL?: string, sourceLineNumber?: number,
+      lineNumber: number, columnNumber: number, sourceURL?: Platform.DevToolsPath.UrlString, sourceLineNumber?: number,
       sourceColumnNumber?: number, name?: string) {
     this.lineNumber = lineNumber;
     this.columnNumber = columnNumber;
@@ -136,14 +136,14 @@ for (let i = 0; i < base64Digits.length; ++i) {
   base64Map.set(base64Digits.charAt(i), i);
 }
 
-const sourceMapToSourceList = new WeakMap<SourceMapV3, string[]>();
+const sourceMapToSourceList = new WeakMap<SourceMapV3, Platform.DevToolsPath.UrlString[]>();
 
 export class TextSourceMap implements SourceMap {
   readonly #initiator: PageResourceLoadInitiator;
   #json: SourceMapV3|null;
-  readonly #compiledURLInternal: string;
-  readonly #sourceMappingURL: string;
-  readonly #baseURL: string;
+  readonly #compiledURLInternal: Platform.DevToolsPath.UrlString;
+  readonly #sourceMappingURL: Platform.DevToolsPath.UrlString;
+  readonly #baseURL: Platform.DevToolsPath.UrlString;
   #mappingsInternal: SourceMapEntry[]|null;
   readonly #sourceInfos: Map<Platform.DevToolsPath.UrlString, TextSourceMap.SourceInfo>;
 
@@ -152,12 +152,13 @@ export class TextSourceMap implements SourceMap {
    * for format description.
    */
   constructor(
-      compiledURL: string, sourceMappingURL: string, payload: SourceMapV3, initiator: PageResourceLoadInitiator) {
+      compiledURL: Platform.DevToolsPath.UrlString, sourceMappingURL: Platform.DevToolsPath.UrlString,
+      payload: SourceMapV3, initiator: PageResourceLoadInitiator) {
     this.#initiator = initiator;
     this.#json = payload;
     this.#compiledURLInternal = compiledURL;
     this.#sourceMappingURL = sourceMappingURL;
-    this.#baseURL = sourceMappingURL.startsWith('data:') ? compiledURL : sourceMappingURL;
+    this.#baseURL = (sourceMappingURL.startsWith('data:') ? compiledURL : sourceMappingURL);
 
     this.#mappingsInternal = null;
     this.#sourceInfos = new Map();
@@ -174,8 +175,9 @@ export class TextSourceMap implements SourceMap {
   /**
    * @throws {!Error}
    */
-  static async load(sourceMapURL: string, compiledURL: string, initiator: PageResourceLoadInitiator):
-      Promise<TextSourceMap> {
+  static async load(
+      sourceMapURL: Platform.DevToolsPath.UrlString, compiledURL: Platform.DevToolsPath.UrlString,
+      initiator: PageResourceLoadInitiator): Promise<TextSourceMap> {
     let updatedContent;
     try {
       const {content} = await PageResourceLoader.instance().loadResource(sourceMapURL, initiator);
@@ -195,11 +197,11 @@ export class TextSourceMap implements SourceMap {
     }
   }
 
-  compiledURL(): string {
+  compiledURL(): Platform.DevToolsPath.UrlString {
     return this.#compiledURLInternal;
   }
 
-  url(): string {
+  url(): Platform.DevToolsPath.UrlString {
     return this.#sourceMappingURL;
   }
 
@@ -216,8 +218,8 @@ export class TextSourceMap implements SourceMap {
     return new CompilerSourceMappingContentProvider(sourceURL, contentType, this.#initiator);
   }
 
-  embeddedContentByURL(sourceURL: string): string|null {
-    const entry = this.#sourceInfos.get(sourceURL as Platform.DevToolsPath.UrlString);
+  embeddedContentByURL(sourceURL: Platform.DevToolsPath.UrlString): string|null {
+    const entry = this.#sourceInfos.get(sourceURL);
     if (!entry) {
       return null;
     }
@@ -231,7 +233,8 @@ export class TextSourceMap implements SourceMap {
     return index ? mappings[index - 1] : null;
   }
 
-  sourceLineMapping(sourceURL: string, lineNumber: number, columnNumber: number): SourceMapEntry|null {
+  sourceLineMapping(sourceURL: Platform.DevToolsPath.UrlString, lineNumber: number, columnNumber: number):
+      SourceMapEntry|null {
     const mappings = this.mappings();
     const reverseMappings = this.reversedMappings(sourceURL);
     const first = Platform.ArrayUtilities.lowerBound(reverseMappings, lineNumber, lineComparator);
@@ -253,7 +256,8 @@ export class TextSourceMap implements SourceMap {
     }
   }
 
-  private findReverseIndices(sourceURL: string, lineNumber: number, columnNumber: number): number[] {
+  private findReverseIndices(sourceURL: Platform.DevToolsPath.UrlString, lineNumber: number, columnNumber: number):
+      number[] {
     const mappings = this.mappings();
     const reverseMappings = this.reversedMappings(sourceURL);
     const endIndex = Platform.ArrayUtilities.upperBound(
@@ -271,12 +275,14 @@ export class TextSourceMap implements SourceMap {
     return reverseMappings.slice(startIndex, endIndex);
   }
 
-  findReverseEntries(sourceURL: string, lineNumber: number, columnNumber: number): SourceMapEntry[] {
+  findReverseEntries(sourceURL: Platform.DevToolsPath.UrlString, lineNumber: number, columnNumber: number):
+      SourceMapEntry[] {
     const mappings = this.mappings();
     return this.findReverseIndices(sourceURL, lineNumber, columnNumber).map(i => mappings[i]);
   }
 
-  findReverseRanges(sourceURL: string, lineNumber: number, columnNumber: number): TextUtils.TextRange.TextRange[] {
+  findReverseRanges(sourceURL: Platform.DevToolsPath.UrlString, lineNumber: number, columnNumber: number):
+      TextUtils.TextRange.TextRange[] {
     const mappings = this.mappings();
     const indices = this.findReverseIndices(sourceURL, lineNumber, columnNumber);
     const ranges: TextUtils.TextRange.TextRange[] = [];
@@ -308,8 +314,8 @@ export class TextSourceMap implements SourceMap {
     return this.#mappingsInternal;
   }
 
-  private reversedMappings(sourceURL: string): number[] {
-    const info = this.#sourceInfos.get(sourceURL as Platform.DevToolsPath.UrlString);
+  private reversedMappings(sourceURL: Platform.DevToolsPath.UrlString): number[] {
+    const info = this.#sourceInfos.get(sourceURL);
     if (!info) {
       return [];
     }
@@ -354,9 +360,9 @@ export class TextSourceMap implements SourceMap {
 
   private parseSources(sourceMap: SourceMapV3): void {
     const sourcesList = [];
-    let sourceRoot = sourceMap.sourceRoot || '';
+    let sourceRoot = sourceMap.sourceRoot || '' as Platform.DevToolsPath.UrlString;
     if (sourceRoot && !sourceRoot.endsWith('/')) {
-      sourceRoot += '/';
+      sourceRoot = Common.ParsedURL.ParsedURL.concatenate(sourceRoot, '/');
     }
     for (let i = 0; i < sourceMap.sources.length; ++i) {
       let href = sourceMap.sources[i];
@@ -366,14 +372,14 @@ export class TextSourceMap implements SourceMap {
       // 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)) {
-        href = sourceRoot + href;
+        href = Common.ParsedURL.ParsedURL.concatenate(sourceRoot, href);
       }
       let url = Common.ParsedURL.ParsedURL.completeURL(this.#baseURL, href) || href;
       const source = sourceMap.sourcesContent && sourceMap.sourcesContent[i];
       if (url === this.#compiledURLInternal && source) {
-        url += '? [sm]';
+        url = Common.ParsedURL.ParsedURL.concatenate(url, '? [sm]');
       }
-      this.#sourceInfos.set(url as Platform.DevToolsPath.UrlString, new TextSourceMap.SourceInfo(source || null, null));
+      this.#sourceInfos.set(url, new TextSourceMap.SourceInfo(source || null, null));
       sourcesList.push(url);
     }
     sourceMapToSourceList.set(sourceMap, sourcesList);
@@ -393,7 +399,7 @@ export class TextSourceMap implements SourceMap {
     const sources = sourceMapToSourceList.get(map);
     const names = map.names || [];
     const stringCharIterator = new TextSourceMap.StringCharIterator(map.mappings);
-    let sourceURL: string|(string | undefined) = sources && sources[sourceIndex];
+    let sourceURL: Platform.DevToolsPath.UrlString|undefined = sources && sources[sourceIndex];
 
     while (true) {
       if (stringCharIterator.peek() === ',') {
@@ -461,7 +467,8 @@ export class TextSourceMap implements SourceMap {
     return negative ? -result : result;
   }
 
-  reverseMapTextRange(url: string, textRange: TextUtils.TextRange.TextRange): TextUtils.TextRange.TextRange|null {
+  reverseMapTextRange(url: Platform.DevToolsPath.UrlString, textRange: TextUtils.TextRange.TextRange):
+      TextUtils.TextRange.TextRange|null {
     function comparator(
         position: {
           lineNumber: number,

package/front_end/core/sdk/SourceMapManager.ts

@@ -110,8 +110,8 @@ export class SourceMapManager<T extends FrameAssociated> extends Common.ObjectWr
   }
 
   private resolveRelativeURLs(sourceURL: string, sourceMapURL: string): {
-    sourceURL: string,
-    sourceMapURL: string,
+    sourceURL: Platform.DevToolsPath.UrlString,
+    sourceMapURL: Platform.DevToolsPath.UrlString,
     sourceMapId: string,
   }|null {
     // |#sourceURL| can be a random string, but is generally an absolute path.

package/front_end/core/sdk/Target.ts

@@ -4,6 +4,7 @@
 
 import * as Common from '../common/common.js';
 import * as Host from '../host/host.js';
+import type * as Platform from '../platform/platform.js';
 import * as ProtocolClient from '../protocol_client/protocol_client.js';
 import type * as Protocol from '../../generated/protocol.js';
 import type {TargetManager} from './TargetManager.js';
@@ -12,7 +13,7 @@ import {SDKModel} from './SDKModel.js';
 export class Target extends ProtocolClient.InspectorBackend.TargetBase {
   readonly #targetManagerInternal: TargetManager;
   #nameInternal: string;
-  #inspectedURLInternal: string;
+  #inspectedURLInternal: Platform.DevToolsPath.UrlString;
   #inspectedURLName: string;
   readonly #capabilitiesMask: number;
   #typeInternal: Type;
@@ -31,7 +32,7 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
     super(needsNodeJSPatching, parentTarget, sessionId, connection);
     this.#targetManagerInternal = targetManager;
     this.#nameInternal = name;
-    this.#inspectedURLInternal = '';
+    this.#inspectedURLInternal = '' as Platform.DevToolsPath.UrlString;
     this.#inspectedURLName = '';
     this.#capabilitiesMask = 0;
     switch (type) {
@@ -165,11 +166,11 @@ export class Target extends ProtocolClient.InspectorBackend.TargetBase {
     return this.#modelByConstructor;
   }
 
-  inspectedURL(): string {
+  inspectedURL(): Platform.DevToolsPath.UrlString {
     return this.#inspectedURLInternal;
   }
 
-  setInspectedURL(inspectedURL: string): void {
+  setInspectedURL(inspectedURL: Platform.DevToolsPath.UrlString): void {
     this.#inspectedURLInternal = inspectedURL;
     const parsedURL = Common.ParsedURL.ParsedURL.fromString(inspectedURL);
     this.#inspectedURLName = parsedURL ? parsedURL.lastPathComponentWithFragment() : '#' + this.#idInternal;

package/front_end/entrypoints/formatter_worker/FormatterWorker.ts

@@ -42,6 +42,7 @@ import {HTMLFormatter} from './HTMLFormatter.js';
 import {IdentityFormatter} from './IdentityFormatter.js';
 import {JavaScriptFormatter} from './JavaScriptFormatter.js';
 import {JSONFormatter} from './JSONFormatter.js';
+import {computeSubstitution, applySubstitution} from './Substitute.js';
 
 export interface Chunk {
   // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
@@ -304,3 +305,5 @@ export function argumentsList(content: string): string[] {
     console.error = (): undefined => undefined;
   }
 })();
+
+export {applySubstitution, computeSubstitution};