chrome-devtools-frontend 1.0.951410 → 1.0.952713

package/config/gni/devtools_grd_files.gni

@@ -281,6 +281,8 @@ grd_files_release_sources = [
   "front_end/models/issues_manager/descriptions/arInvalidTriggerPriority.md",
   "front_end/models/issues_manager/descriptions/arMissingAttributionData.md",
   "front_end/models/issues_manager/descriptions/arPermissionPolicyDisabled.md",
+  "front_end/models/issues_manager/descriptions/clientHintMetaTagAllowListInvalidOrigin.md",
+  "front_end/models/issues_manager/descriptions/clientHintMetaTagModifiedHTML.md",
   "front_end/models/issues_manager/descriptions/corsAllowCredentialsRequired.md",
   "front_end/models/issues_manager/descriptions/corsDisabledScheme.md",
   "front_end/models/issues_manager/descriptions/corsDisallowedByMode.md",
@@ -692,6 +694,7 @@ grd_files_debug_sources = [
   "front_end/models/har/Writer.js",
   "front_end/models/heap_snapshot_model/HeapSnapshotModel.js",
   "front_end/models/issues_manager/AttributionReportingIssue.js",
+  "front_end/models/issues_manager/ClientHintIssue.js",
   "front_end/models/issues_manager/ContentSecurityPolicyIssue.js",
   "front_end/models/issues_manager/ContrastCheckTrigger.js",
   "front_end/models/issues_manager/CorsIssue.js",

package/extension-api/ExtensionAPI.d.ts

@@ -4,7 +4,7 @@
 
 export namespace Chrome {
   export namespace DevTools {
-    export interface EventSink<ListenerT extends(...args: any) => any> {
+    export interface EventSink<ListenerT extends(...args: any) => void> {
       addListener(listener: ListenerT): void;
     }
 

package/front_end/.eslintrc.js

@@ -139,6 +139,12 @@ module.exports = {
           }
         ]
       }
+    },
+    {
+      'files': ['panels/**/components/*.ts', 'ui/components/**/*.ts', 'entrypoints/**/*.ts'],
+      'rules': {
+        'rulesdir/use_private_class_members': 2,
+      }
     }
   ]
 };

package/front_end/Tests.js

@@ -1562,6 +1562,16 @@
     return names.join(',');
   };
 
+  TestSuite.prototype.testSourceMapsFromExtension = function(extensionId) {
+    this.takeControl();
+    const debuggerModel = self.SDK.targetManager.mainTarget().model(SDK.DebuggerModel);
+    debuggerModel.sourceMapManager().addEventListener(
+        SDK.SourceMapManager.Events.SourceMapAttached, this.releaseControl.bind(this));
+
+    this.evaluateInConsole_(
+        `console.log(1) //# sourceMappingURL=chrome-extension://${extensionId}/source.map`, () => {});
+  };
+
   /**
    * Returns all loaded non anonymous uiSourceCodes.
    * @return {!Array.<!Workspace.UISourceCode>}

package/front_end/core/common/App.ts

@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @interface
- */
 export interface App {
   presentUI(document: Document): void;
 }

package/front_end/core/common/AppProvider.ts

@@ -6,9 +6,6 @@ import * as Root from '../root/root.js';
 
 import type {App} from './App.js';
 
-/**
- * @interface
- */
 export interface AppProvider {
   createApp(): App;
 }

package/front_end/core/common/JavaScriptMetaData.ts

@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @interface
- */
 export interface JavaScriptMetaData {
   signaturesForNativeFunction(name: string): string[][]|null;
 

package/front_end/core/common/QueryParamHandler.ts

@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @interface
- */
 export interface QueryParamHandler {
   handleQueryParam(value: string): void;
 }

package/front_end/core/common/Runnable.ts

@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-/**
- * @interface
- */
 export interface Runnable {
   run(): Promise<void>;
 }

package/front_end/core/common/SimpleHistoryManager.ts

@@ -28,9 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/**
- * @interface
- */
 export interface HistoryEntry {
   valid(): boolean;
 

package/front_end/core/host/UserMetrics.ts

@@ -677,7 +677,8 @@ export const IssueCreated: {
   'QuirksModeIssue::QuirksMode': 58,
   'QuirksModeIssue::LimitedQuirksMode': 59,
   DeprecationIssue: 60,
-  'CorsIssue::PreflightAllowPrivateNetworkError': 61,
+  'ClientHintIssue::MetaTagAllowListInvalidOrigin': 61,
+  'ClientHintIssue::MetaTagModifiedHTML': 62,
 };
 
 // TODO(crbug.com/1167717): Make this a const enum again

package/front_end/core/i18n/locales/en-US.json

@@ -1322,6 +1322,9 @@
   "models/har/Writer.ts | writingFile": {
     "message": "Writing file…"
   },
+  "models/issues_manager/ClientHintIssue.ts | clientHintsInfrastructure": {
+    "message": "Client Hints Infrastructure"
+  },
   "models/issues_manager/ContentSecurityPolicyIssue.ts | contentSecurityPolicyEval": {
     "message": "Content Security Policy - Eval"
   },

package/front_end/core/i18n/locales/en-XL.json

@@ -1322,6 +1322,9 @@
   "models/har/Writer.ts | writingFile": {
     "message": "Ŵŕît́îńĝ f́îĺê…"
   },
+  "models/issues_manager/ClientHintIssue.ts | clientHintsInfrastructure": {
+    "message": "Ĉĺîén̂t́ Ĥín̂t́ŝ Ín̂f́r̂áŝt́r̂úĉt́ûŕê"
+  },
   "models/issues_manager/ContentSecurityPolicyIssue.ts | contentSecurityPolicyEval": {
     "message": "Ĉón̂t́êńt̂ Śêćûŕît́ŷ Ṕôĺîćŷ - Év̂ál̂"
   },

package/front_end/core/root/Runtime.ts

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-const originalConsole = console;
-const originalAssert = console.assert;
+import * as Platform from '../platform/platform.js';
 
 const queryParamsObject = new URLSearchParams(location.search);
 
@@ -100,13 +99,6 @@ export class Runtime {
     }
   }
 
-  static assert(value: boolean|undefined, message: string): void {
-    if (value) {
-      return;
-    }
-    originalAssert.call(originalConsole, value, message + ' ' + new Error().stack);
-  }
-
   static setPlatform(platform: string): void {
     runtimePlatform = platform;
   }
@@ -197,8 +189,8 @@ export class ExperimentsSupport {
   }
 
   register(experimentName: string, experimentTitle: string, unstable?: boolean, docLink?: string): void {
-    Runtime.assert(
-        !this.#experimentNames.has(experimentName), 'Duplicate registration of experiment ' + experimentName);
+    Platform.DCHECK(
+        () => !this.#experimentNames.has(experimentName), 'Duplicate registration of experiment ' + experimentName);
     this.#experimentNames.add(experimentName);
     this.#experiments.push(new Experiment(this, experimentName, experimentTitle, Boolean(unstable), docLink ?? ''));
   }
@@ -278,7 +270,7 @@ export class ExperimentsSupport {
   }
 
   private checkExperiment(experimentName: string): void {
-    Runtime.assert(this.#experimentNames.has(experimentName), 'Unknown experiment ' + experimentName);
+    Platform.DCHECK(() => this.#experimentNames.has(experimentName), 'Unknown experiment ' + experimentName);
   }
 }
 

package/front_end/core/sdk/OverlayPersistentHighlighter.ts

@@ -360,15 +360,9 @@ export class OverlayPersistentHighlighter {
   }
 }
 
-/**
- * @interface
- */
 export interface DOMModel {
   nodeForId(nodeId: Protocol.DOM.NodeId): void;
 }
-/**
- * @interface
- */
 export interface OverlayAgent {
   // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
   // eslint-disable-next-line @typescript-eslint/naming-convention
@@ -415,16 +409,10 @@ export interface OverlayAgent {
   }): void;
 }
 
-/**
- * @interface
- */
 export interface Target {
   overlayAgent(): OverlayAgent;
 }
 
-/**
- * @interface
- */
 export interface OverlayModel {
   getDOMModel(): DOMModel;
 

package/front_end/core/sdk/PageResourceLoader.ts

@@ -219,7 +219,8 @@ export class PageResourceLoader extends Common.ObjectWrapper.ObjectWrapper<Event
       return this.#loadOverride(url);
     }
     const parsedURL = new Common.ParsedURL.ParsedURL(url);
-    const eligibleForLoadFromTarget = getLoadThroughTargetSetting().get() && parsedURL && parsedURL.isHttpOrHttps();
+    const eligibleForLoadFromTarget =
+        getLoadThroughTargetSetting().get() && parsedURL && parsedURL.scheme !== 'file' && parsedURL.scheme !== 'data';
     Host.userMetrics.developerResourceScheme(this.getDeveloperResourceScheme(parsedURL));
     if (eligibleForLoadFromTarget) {
       try {

package/front_end/core/sdk/TracingManager.ts

@@ -94,9 +94,6 @@ export class TracingManager extends SDKModel<void> {
   }
 }
 
-/**
- * @interface
- */
 export interface TracingManagerClient {
   traceEventsCollected(events: EventPayload[]): void;
 

package/front_end/entrypoints/formatter_worker/AcornTokenizer.ts

@@ -34,28 +34,28 @@ export type TokenOrComment = Acorn.Token|Acorn.Comment;
  * out whether the next token should be the preceding comment or not.
  */
 export class AcornTokenizer {
-  private readonly content: string;
-  private readonly comments: Acorn.Comment[];
-  private tokenizer: {
+  readonly #content: string;
+  readonly #comments: Acorn.Comment[];
+  #tokenizer: {
     getToken(): Acorn.Token,
     [Symbol.iterator](): Iterator<Acorn.Token>,
   };
-  private textCursor: TextUtils.TextCursor.TextCursor;
-  private tokenLineStartInternal: number;
-  private tokenLineEndInternal: number;
-  private tokenColumnStartInternal: number;
-  private bufferedToken?: TokenOrComment;
+  #textCursor: TextUtils.TextCursor.TextCursor;
+  #tokenLineStartInternal: number;
+  #tokenLineEndInternal: number;
+  #tokenColumnStartInternal: number;
+  #bufferedToken?: TokenOrComment;
 
   constructor(content: string) {
-    this.content = content;
-    this.comments = [];
-    this.tokenizer =
-        Acorn.tokenizer(this.content, {onComment: this.comments, ecmaVersion: ECMA_VERSION, allowHashBang: true});
-    const contentLineEndings = Platform.StringUtilities.findLineEndingIndexes(this.content);
-    this.textCursor = new TextUtils.TextCursor.TextCursor(contentLineEndings);
-    this.tokenLineStartInternal = 0;
-    this.tokenLineEndInternal = 0;
-    this.tokenColumnStartInternal = 0;
+    this.#content = content;
+    this.#comments = [];
+    this.#tokenizer =
+        Acorn.tokenizer(this.#content, {onComment: this.#comments, ecmaVersion: ECMA_VERSION, allowHashBang: true});
+    const contentLineEndings = Platform.StringUtilities.findLineEndingIndexes(this.#content);
+    this.#textCursor = new TextUtils.TextCursor.TextCursor(contentLineEndings);
+    this.#tokenLineStartInternal = 0;
+    this.#tokenLineEndInternal = 0;
+    this.#tokenColumnStartInternal = 0;
     // If the first "token" should be a comment, we don't want to shift
     // the comment from the array (which happens in `nextTokenInternal`).
     // Therefore, we should bail out from retrieving the token if this
@@ -65,8 +65,8 @@ export class AcornTokenizer {
     // themselves. In that case, we first retrieve the actual token, before
     // we see the comment itself. In that case, we should proceed and
     // initialize `bufferedToken` as normal, to allow us to fix the reordering.
-    if (this.comments.length === 0) {
-      this.nextTokenInternal();
+    if (this.#comments.length === 0) {
+      this.#nextTokenInternal();
     }
   }
 
@@ -94,59 +94,59 @@ export class AcornTokenizer {
     return token.type === 'Block';
   }
 
-  private nextTokenInternal(): TokenOrComment|undefined {
-    if (this.comments.length) {
-      const nextComment = this.comments.shift();
+  #nextTokenInternal(): TokenOrComment|undefined {
+    if (this.#comments.length) {
+      const nextComment = this.#comments.shift();
       // If this was the last comment to process, we need to make
       // sure to update our `bufferedToken` to become the actual
       // token. This only happens when we are processing the very
       // first comment of a file (usually a hashbang comment)
       // in which case we don't have to fix the reordering of tokens.
-      if (!this.bufferedToken && this.comments.length === 0) {
-        this.bufferedToken = this.tokenizer.getToken();
+      if (!this.#bufferedToken && this.#comments.length === 0) {
+        this.#bufferedToken = this.#tokenizer.getToken();
       }
       return nextComment;
     }
-    const token = this.bufferedToken;
-    this.bufferedToken = this.tokenizer.getToken();
+    const token = this.#bufferedToken;
+    this.#bufferedToken = this.#tokenizer.getToken();
     return token;
   }
 
   nextToken(): TokenOrComment|null {
-    const token = this.nextTokenInternal();
+    const token = this.#nextTokenInternal();
     if (!token || token.type === Acorn.tokTypes.eof) {
       return null;
     }
 
-    this.textCursor.advance(token.start);
-    this.tokenLineStartInternal = this.textCursor.lineNumber();
-    this.tokenColumnStartInternal = this.textCursor.columnNumber();
+    this.#textCursor.advance(token.start);
+    this.#tokenLineStartInternal = this.#textCursor.lineNumber();
+    this.#tokenColumnStartInternal = this.#textCursor.columnNumber();
 
-    this.textCursor.advance(token.end);
-    this.tokenLineEndInternal = this.textCursor.lineNumber();
+    this.#textCursor.advance(token.end);
+    this.#tokenLineEndInternal = this.#textCursor.lineNumber();
     return token;
   }
 
   peekToken(): TokenOrComment|null {
-    if (this.comments.length) {
-      return this.comments[0];
+    if (this.#comments.length) {
+      return this.#comments[0];
     }
-    if (!this.bufferedToken) {
+    if (!this.#bufferedToken) {
       return null;
     }
-    return this.bufferedToken.type !== Acorn.tokTypes.eof ? this.bufferedToken : null;
+    return this.#bufferedToken.type !== Acorn.tokTypes.eof ? this.#bufferedToken : null;
   }
 
   tokenLineStart(): number {
-    return this.tokenLineStartInternal;
+    return this.#tokenLineStartInternal;
   }
 
   tokenLineEnd(): number {
-    return this.tokenLineEndInternal;
+    return this.#tokenLineEndInternal;
   }
 
   tokenColumnStart(): number {
-    return this.tokenColumnStartInternal;
+    return this.#tokenColumnStartInternal;
   }
 }
 

package/front_end/entrypoints/formatter_worker/CSSFormatter.ts

@@ -40,21 +40,21 @@ const cssTrimEnd = (tokenValue: string): string => {
 };
 
 export class CSSFormatter {
-  private readonly builder: FormattedContentBuilder;
-  private toOffset!: number;
-  private fromOffset!: number;
-  private lineEndings!: number[];
-  private lastLine: number;
-  private state: {
+  readonly #builder: FormattedContentBuilder;
+  #toOffset!: number;
+  #fromOffset!: number;
+  #lineEndings!: number[];
+  #lastLine: number;
+  #state: {
     eatWhitespace: (boolean|undefined),
     seenProperty: (boolean|undefined),
     inPropertyValue: (boolean|undefined),
     afterClosingBrace: (boolean|undefined),
   };
   constructor(builder: FormattedContentBuilder) {
-    this.builder = builder;
-    this.lastLine = -1;
-    this.state = {
+    this.#builder = builder;
+    this.#lastLine = -1;
+    this.#state = {
       eatWhitespace: undefined,
       seenProperty: undefined,
       inPropertyValue: undefined,
@@ -63,84 +63,84 @@ export class CSSFormatter {
   }
 
   format(text: string, lineEndings: number[], fromOffset: number, toOffset: number): void {
-    this.lineEndings = lineEndings;
-    this.fromOffset = fromOffset;
-    this.toOffset = toOffset;
-    this.state = {
+    this.#lineEndings = lineEndings;
+    this.#fromOffset = fromOffset;
+    this.#toOffset = toOffset;
+    this.#state = {
       eatWhitespace: undefined,
       seenProperty: undefined,
       inPropertyValue: undefined,
       afterClosingBrace: undefined,
     };
-    this.lastLine = -1;
+    this.#lastLine = -1;
     const tokenize = createTokenizer('text/css');
-    const oldEnforce = this.builder.setEnforceSpaceBetweenWords(false);
-    tokenize(text.substring(this.fromOffset, this.toOffset), this.tokenCallback.bind(this));
-    this.builder.setEnforceSpaceBetweenWords(oldEnforce);
+    const oldEnforce = this.#builder.setEnforceSpaceBetweenWords(false);
+    tokenize(text.substring(this.#fromOffset, this.#toOffset), this.#tokenCallback.bind(this));
+    this.#builder.setEnforceSpaceBetweenWords(oldEnforce);
   }
 
-  private tokenCallback(token: string, type: string|null, startPosition: number): void {
-    startPosition += this.fromOffset;
-    const startLine =
-        Platform.ArrayUtilities.lowerBound(this.lineEndings, startPosition, Platform.ArrayUtilities.DEFAULT_COMPARATOR);
-    if (startLine !== this.lastLine) {
-      this.state.eatWhitespace = true;
+  #tokenCallback(token: string, type: string|null, startPosition: number): void {
+    startPosition += this.#fromOffset;
+    const startLine = Platform.ArrayUtilities.lowerBound(
+        this.#lineEndings, startPosition, Platform.ArrayUtilities.DEFAULT_COMPARATOR);
+    if (startLine !== this.#lastLine) {
+      this.#state.eatWhitespace = true;
     }
-    if (type && (/^property/.test(type) || /^variable-2/.test(type)) && !this.state.inPropertyValue) {
-      this.state.seenProperty = true;
+    if (type && (/^property/.test(type) || /^variable-2/.test(type)) && !this.#state.inPropertyValue) {
+      this.#state.seenProperty = true;
     }
-    this.lastLine = startLine;
+    this.#lastLine = startLine;
     // https://drafts.csswg.org/css-syntax/#whitespace
     const isWhitespace = /^(?:\r?\n|[\t\f\r ])+$/.test(token);
     if (isWhitespace) {
-      if (!this.state.eatWhitespace) {
-        this.builder.addSoftSpace();
+      if (!this.#state.eatWhitespace) {
+        this.#builder.addSoftSpace();
       }
       return;
     }
-    this.state.eatWhitespace = false;
+    this.#state.eatWhitespace = false;
     if (token === '\n') {
       return;
     }
 
     if (token !== '}') {
-      if (this.state.afterClosingBrace) {
-        this.builder.addNewLine(true);
+      if (this.#state.afterClosingBrace) {
+        this.#builder.addNewLine(true);
       }
-      this.state.afterClosingBrace = false;
+      this.#state.afterClosingBrace = false;
     }
     if (token === '}') {
-      if (this.state.inPropertyValue) {
-        this.builder.addNewLine();
+      if (this.#state.inPropertyValue) {
+        this.#builder.addNewLine();
       }
-      this.builder.decreaseNestingLevel();
-      this.state.afterClosingBrace = true;
-      this.state.inPropertyValue = false;
-    } else if (token === ':' && !this.state.inPropertyValue && this.state.seenProperty) {
-      this.builder.addToken(token, startPosition);
-      this.builder.addSoftSpace();
-      this.state.eatWhitespace = true;
-      this.state.inPropertyValue = true;
-      this.state.seenProperty = false;
+      this.#builder.decreaseNestingLevel();
+      this.#state.afterClosingBrace = true;
+      this.#state.inPropertyValue = false;
+    } else if (token === ':' && !this.#state.inPropertyValue && this.#state.seenProperty) {
+      this.#builder.addToken(token, startPosition);
+      this.#builder.addSoftSpace();
+      this.#state.eatWhitespace = true;
+      this.#state.inPropertyValue = true;
+      this.#state.seenProperty = false;
       return;
     } else if (token === '{') {
-      this.builder.addSoftSpace();
-      this.builder.addToken(token, startPosition);
-      this.builder.addNewLine();
-      this.builder.increaseNestingLevel();
+      this.#builder.addSoftSpace();
+      this.#builder.addToken(token, startPosition);
+      this.#builder.addNewLine();
+      this.#builder.increaseNestingLevel();
       return;
     }
 
-    this.builder.addToken(cssTrimEnd(token), startPosition);
+    this.#builder.addToken(cssTrimEnd(token), startPosition);
 
-    if (type === 'comment' && !this.state.inPropertyValue && !this.state.seenProperty) {
-      this.builder.addNewLine();
+    if (type === 'comment' && !this.#state.inPropertyValue && !this.#state.seenProperty) {
+      this.#builder.addNewLine();
     }
-    if (token === ';' && this.state.inPropertyValue) {
-      this.state.inPropertyValue = false;
-      this.builder.addNewLine();
+    if (token === ';' && this.#state.inPropertyValue) {
+      this.#state.inPropertyValue = false;
+      this.#builder.addNewLine();
     } else if (token === '}') {
-      this.builder.addNewLine();
+      this.#builder.addNewLine();
     }
   }
 }

package/front_end/entrypoints/formatter_worker/ESTreeWalker.ts

@@ -7,16 +7,16 @@ import type * as Acorn from '../../third_party/acorn/acorn.js';
 const SkipSubTreeObject: Object = {};
 
 export class ESTreeWalker {
-  private readonly beforeVisit: (arg0: Acorn.ESTree.Node) => (Object | undefined);
-  private readonly afterVisit: Function;
-  private walkNulls: boolean;
+  readonly #beforeVisit: (arg0: Acorn.ESTree.Node) => (Object | undefined);
+  readonly #afterVisit: Function;
+  #walkNulls: boolean;
 
   constructor(
       beforeVisit: (arg0: Acorn.ESTree.Node) => (Object | undefined),
       afterVisit?: ((arg0: Acorn.ESTree.Node) => void)) {
-    this.beforeVisit = beforeVisit;
-    this.afterVisit = afterVisit || function(): void {};
-    this.walkNulls = false;
+    this.#beforeVisit = beforeVisit;
+    this.#afterVisit = afterVisit || function(): void {};
+    this.#walkNulls = false;
   }
 
   // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
@@ -26,15 +26,15 @@ export class ESTreeWalker {
   }
 
   setWalkNulls(value: boolean): void {
-    this.walkNulls = value;
+    this.#walkNulls = value;
   }
 
   walk(ast: Acorn.ESTree.Node): void {
-    this.innerWalk(ast, null);
+    this.#innerWalk(ast, null);
   }
 
-  private innerWalk(node: Acorn.ESTree.Node, parent: Acorn.ESTree.Node|null): void {
-    if (!node && parent && this.walkNulls) {
+  #innerWalk(node: Acorn.ESTree.Node, parent: Acorn.ESTree.Node|null): void {
+    if (!node && parent && this.#walkNulls) {
       const result = ({raw: 'null', value: null, parent: null} as Acorn.ESTree.SimpleLiteral);
       // Otherwise Closure can't handle the definition
       result.type = 'Literal';
@@ -47,8 +47,8 @@ export class ESTreeWalker {
     }
     node.parent = parent;
 
-    if (this.beforeVisit.call(null, node) === ESTreeWalker.SkipSubtree) {
-      this.afterVisit.call(null, node);
+    if (this.#beforeVisit.call(null, node) === ESTreeWalker.SkipSubtree) {
+      this.#afterVisit.call(null, node);
       return;
     }
 
@@ -62,10 +62,10 @@ export class ESTreeWalker {
       const templateLiteral = (node as Acorn.ESTree.TemplateLiteral);
       const expressionsLength = templateLiteral.expressions.length;
       for (let i = 0; i < expressionsLength; ++i) {
-        this.innerWalk(templateLiteral.quasis[i], templateLiteral);
-        this.innerWalk(templateLiteral.expressions[i], templateLiteral);
+        this.#innerWalk(templateLiteral.quasis[i], templateLiteral);
+        this.#innerWalk(templateLiteral.expressions[i], templateLiteral);
       }
-      this.innerWalk(templateLiteral.quasis[expressionsLength], templateLiteral);
+      this.#innerWalk(templateLiteral.quasis[expressionsLength], templateLiteral);
     } else {
       for (let i = 0; i < walkOrder.length; ++i) {
         // @ts-ignore We are doing type traversal here, but the strings
@@ -75,19 +75,19 @@ export class ESTreeWalker {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         const entity = (node[walkOrder[i]] as any);
         if (Array.isArray(entity)) {
-          this.walkArray((entity as Acorn.ESTree.Node[]), node);
+          this.#walkArray((entity as Acorn.ESTree.Node[]), node);
         } else {
-          this.innerWalk((entity as Acorn.ESTree.Node), node);
+          this.#innerWalk((entity as Acorn.ESTree.Node), node);
         }
       }
     }
 
-    this.afterVisit.call(null, node);
+    this.#afterVisit.call(null, node);
   }
 
-  private walkArray(nodeArray: Acorn.ESTree.Node[], parentNode: Acorn.ESTree.Node|null): void {
+  #walkArray(nodeArray: Acorn.ESTree.Node[], parentNode: Acorn.ESTree.Node|null): void {
     for (let i = 0; i < nodeArray.length; ++i) {
-      this.innerWalk(nodeArray[i], parentNode);
+      this.#innerWalk(nodeArray[i], parentNode);
     }
   }
 }