chrome-devtools-frontend 1.0.952284 → 1.0.952403

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/front_end/.eslintrc.js

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

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/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/entrypoints/formatter_worker/AcornTokenizer.ts

@@ -66,7 +66,7 @@ export class AcornTokenizer {
     // 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();
+      this.#nextTokenInternal();
     }
   }
 
@@ -94,7 +94,7 @@ export class AcornTokenizer {
     return token.type === 'Block';
   }
 
-  private nextTokenInternal(): TokenOrComment|undefined {
+  #nextTokenInternal(): TokenOrComment|undefined {
     if (this.#comments.length) {
       const nextComment = this.#comments.shift();
       // If this was the last comment to process, we need to make
@@ -113,7 +113,7 @@ export class AcornTokenizer {
   }
 
   nextToken(): TokenOrComment|null {
-    const token = this.nextTokenInternal();
+    const token = this.#nextTokenInternal();
     if (!token || token.type === Acorn.tokTypes.eof) {
       return null;
     }

package/front_end/entrypoints/formatter_worker/CSSFormatter.ts

@@ -75,11 +75,11 @@ export class CSSFormatter {
     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));
+    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 {
+  #tokenCallback(token: string, type: string|null, startPosition: number): void {
     startPosition += this.#fromOffset;
     const startLine = Platform.ArrayUtilities.lowerBound(
         this.#lineEndings, startPosition, Platform.ArrayUtilities.DEFAULT_COMPARATOR);

package/front_end/entrypoints/formatter_worker/ESTreeWalker.ts

@@ -30,10 +30,10 @@ export class ESTreeWalker {
   }
 
   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 {
+  #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
@@ -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,9 +75,9 @@ 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);
         }
       }
     }
@@ -85,9 +85,9 @@ export class ESTreeWalker {
     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);
     }
   }
 }

package/front_end/entrypoints/formatter_worker/FormattedContentBuilder.ts

@@ -31,11 +31,11 @@ export class FormattedContentBuilder {
       this.addSoftSpace();
     }
 
-    this.appendFormatting();
+    this.#appendFormatting();
 
     // Insert token.
-    this.addMappingIfNeeded(offset);
-    this.addText(token);
+    this.#addMappingIfNeeded(offset);
+    this.#addText(token);
   }
 
   addSoftSpace(): void {
@@ -75,18 +75,18 @@ export class FormattedContentBuilder {
     return this.#formattedContent.join('') + (this.#newLines ? '\n' : '');
   }
 
-  private appendFormatting(): void {
+  #appendFormatting(): void {
     if (this.#newLines) {
       for (let i = 0; i < this.#newLines; ++i) {
-        this.addText('\n');
+        this.#addText('\n');
       }
-      this.addText(this.indent());
+      this.#addText(this.#indent());
     } else if (this.#softSpace) {
-      this.addText(' ');
+      this.#addText(' ');
     }
     if (this.#hardSpaces) {
       for (let i = 0; i < this.#hardSpaces; ++i) {
-        this.addText(' ');
+        this.#addText(' ');
       }
     }
     this.#newLines = 0;
@@ -94,7 +94,7 @@ export class FormattedContentBuilder {
     this.#hardSpaces = 0;
   }
 
-  private indent(): string {
+  #indent(): string {
     const cachedValue = this.#cachedIndents.get(this.#nestingLevel);
     if (cachedValue) {
       return cachedValue;
@@ -112,12 +112,12 @@ export class FormattedContentBuilder {
     return fullIndent;
   }
 
-  private addText(text: string): void {
+  #addText(text: string): void {
     this.#formattedContent.push(text);
     this.#formattedContentLength += text.length;
   }
 
-  private addMappingIfNeeded(originalPosition: number): void {
+  #addMappingIfNeeded(originalPosition: number): void {
     if (originalPosition - this.#lastOriginalPosition === this.#formattedContentLength - this.#lastFormattedPosition) {
       return;
     }

package/front_end/entrypoints/formatter_worker/HTMLFormatter.ts

@@ -27,10 +27,10 @@ export class HTMLFormatter {
     this.#text = text;
     this.#lineEndings = lineEndings;
     this.#model = new HTMLModel(text);
-    this.walk(this.#model.document());
+    this.#walk(this.#model.document());
   }
 
-  private formatTokensTill(element: FormatterElement, offset: number): void {
+  #formatTokensTill(element: FormatterElement, offset: number): void {
     if (!this.#model) {
       return;
     }
@@ -38,33 +38,33 @@ export class HTMLFormatter {
     let nextToken = this.#model.peekToken();
     while (nextToken && nextToken.startOffset < offset) {
       const token = (this.#model.nextToken() as Token);
-      this.formatToken(element, token);
+      this.#formatToken(element, token);
       nextToken = this.#model.peekToken();
     }
   }
 
-  private walk(element: FormatterElement): void {
+  #walk(element: FormatterElement): void {
     if (!element.openTag || !element.closeTag) {
       throw new Error('Element is missing open or close tag');
     }
 
     if (element.parent) {
-      this.formatTokensTill(element.parent, element.openTag.startOffset);
+      this.#formatTokensTill(element.parent, element.openTag.startOffset);
     }
-    this.beforeOpenTag(element);
-    this.formatTokensTill(element, element.openTag.endOffset);
-    this.afterOpenTag(element);
+    this.#beforeOpenTag(element);
+    this.#formatTokensTill(element, element.openTag.endOffset);
+    this.#afterOpenTag(element);
     for (let i = 0; i < element.children.length; ++i) {
-      this.walk(element.children[i]);
+      this.#walk(element.children[i]);
     }
 
-    this.formatTokensTill(element, element.closeTag.startOffset);
-    this.beforeCloseTag(element);
-    this.formatTokensTill(element, element.closeTag.endOffset);
-    this.afterCloseTag(element);
+    this.#formatTokensTill(element, element.closeTag.startOffset);
+    this.#beforeCloseTag(element);
+    this.#formatTokensTill(element, element.closeTag.endOffset);
+    this.#afterCloseTag(element);
   }
 
-  private beforeOpenTag(element: FormatterElement): void {
+  #beforeOpenTag(element: FormatterElement): void {
     if (!this.#model) {
       return;
     }
@@ -75,7 +75,7 @@ export class HTMLFormatter {
     this.#builder.addNewLine();
   }
 
-  private afterOpenTag(element: FormatterElement): void {
+  #afterOpenTag(element: FormatterElement): void {
     if (!this.#model) {
       return;
     }
@@ -87,7 +87,7 @@ export class HTMLFormatter {
     this.#builder.addNewLine();
   }
 
-  private beforeCloseTag(element: FormatterElement): void {
+  #beforeCloseTag(element: FormatterElement): void {
     if (!this.#model) {
       return;
     }
@@ -99,11 +99,11 @@ export class HTMLFormatter {
     this.#builder.addNewLine();
   }
 
-  private afterCloseTag(_element: FormatterElement): void {
+  #afterCloseTag(_element: FormatterElement): void {
     this.#builder.addNewLine();
   }
 
-  private formatToken(element: FormatterElement, token: Token): void {
+  #formatToken(element: FormatterElement, token: Token): void {
     if (Platform.StringUtilities.isWhitespace(token.value)) {
       return;
     }
@@ -130,7 +130,7 @@ export class HTMLFormatter {
     if (isBodyToken && element.name === 'script') {
       this.#builder.addNewLine();
       this.#builder.increaseNestingLevel();
-      if (this.scriptTagIsJavaScript(element)) {
+      if (this.#scriptTagIsJavaScript(element)) {
         this.#jsFormatter.format(this.#text || '', this.#lineEndings || [], token.startOffset, token.endOffset);
       } else {
         this.#builder.addToken(token.value, token.startOffset);
@@ -147,7 +147,7 @@ export class HTMLFormatter {
     this.#builder.addToken(token.value, token.startOffset);
   }
 
-  private scriptTagIsJavaScript(element: FormatterElement): boolean {
+  #scriptTagIsJavaScript(element: FormatterElement): boolean {
     if (!element.openTag) {
       return true;
     }
@@ -222,7 +222,7 @@ export class HTMLModel {
 
     this.#tokens = [];
     this.#tokenIndex = 0;
-    this.build(text);
+    this.#build(text);
 
     this.#attributes = new Map();
     this.#attributeName = '';
@@ -230,7 +230,7 @@ export class HTMLModel {
     this.#isOpenTag = false;
   }
 
-  private build(text: string): void {
+  #build(text: string): void {
     const tokenizer = createTokenizer('text/html');
     let lastOffset = 0;
     const lowerCaseText = text.toLowerCase();
@@ -266,7 +266,7 @@ export class HTMLModel {
         break;
       }
 
-      this.popElement(new Tag(element.name, text.length, text.length, new Map(), false, false));
+      this.#popElement(new Tag(element.name, text.length, text.length, new Map(), false, false));
     }
 
     function processToken(
@@ -279,7 +279,7 @@ export class HTMLModel {
       const tokenType = type ? new Set<string>(type.split(' ')) : new Set<string>();
       const token = new Token(tokenValue, tokenType, tokenStart, tokenEnd);
       this.#tokens.push(token);
-      this.updateDOM(token);
+      this.#updateDOM(token);
 
       const element = this.#stack[this.#stack.length - 1];
       if (element && (element.name === 'script' || element.name === 'style') && element.openTag &&
@@ -291,13 +291,13 @@ export class HTMLModel {
     }
   }
 
-  private updateDOM(token: Token): void {
+  #updateDOM(token: Token): void {
     const value = token.value;
     const type = token.type;
     switch (this.#state) {
       case ParseState.Initial:
         if (hasTokenInSet(type, 'bracket') && (value === '<' || value === '</')) {
-          this.onStartTag(token);
+          this.#onStartTag(token);
           this.#state = ParseState.Tag;
         }
         return;
@@ -309,7 +309,7 @@ export class HTMLModel {
           this.#attributes.set(this.#attributeName, '');
           this.#state = ParseState.AttributeName;
         } else if (hasTokenInSet(type, 'bracket') && (value === '>' || value === '/>')) {
-          this.onEndTag(token);
+          this.#onEndTag(token);
           this.#state = ParseState.Initial;
         }
         return;
@@ -317,7 +317,7 @@ export class HTMLModel {
         if (!type.size && value === '=') {
           this.#state = ParseState.AttributeValue;
         } else if (hasTokenInSet(type, 'bracket') && (value === '>' || value === '/>')) {
-          this.onEndTag(token);
+          this.#onEndTag(token);
           this.#state = ParseState.Initial;
         }
         return;
@@ -326,14 +326,14 @@ export class HTMLModel {
           this.#attributes.set(this.#attributeName, value);
           this.#state = ParseState.Tag;
         } else if (hasTokenInSet(type, 'bracket') && (value === '>' || value === '/>')) {
-          this.onEndTag(token);
+          this.#onEndTag(token);
           this.#state = ParseState.Initial;
         }
         return;
     }
   }
 
-  private onStartTag(token: Token): void {
+  #onStartTag(token: Token): void {
     this.#tagName = '';
     this.#tagStartOffset = token.startOffset;
     this.#tagEndOffset = null;
@@ -342,46 +342,46 @@ export class HTMLModel {
     this.#isOpenTag = token.value === '<';
   }
 
-  private onEndTag(token: Token): void {
+  #onEndTag(token: Token): void {
     this.#tagEndOffset = token.endOffset;
     const selfClosingTag = token.value === '/>' || SelfClosingTags.has(this.#tagName);
     const tag = new Tag(
         this.#tagName, this.#tagStartOffset || 0, this.#tagEndOffset, this.#attributes, this.#isOpenTag,
         selfClosingTag);
-    this.onTagComplete(tag);
+    this.#onTagComplete(tag);
   }
 
-  private onTagComplete(tag: Tag): void {
+  #onTagComplete(tag: Tag): void {
     if (tag.isOpenTag) {
       const topElement = this.#stack[this.#stack.length - 1];
       if (topElement) {
         const tagSet = AutoClosingTags.get(topElement.name);
         if (topElement !== this.#documentInternal && topElement.openTag && topElement.openTag.selfClosingTag) {
-          this.popElement(autocloseTag(topElement, topElement.openTag.endOffset));
+          this.#popElement(autocloseTag(topElement, topElement.openTag.endOffset));
         } else if (tagSet && tagSet.has(tag.name)) {
-          this.popElement(autocloseTag(topElement, tag.startOffset));
+          this.#popElement(autocloseTag(topElement, tag.startOffset));
         }
-        this.pushElement(tag);
+        this.#pushElement(tag);
       }
       return;
     }
 
     let lastTag = this.#stack[this.#stack.length - 1];
     while (this.#stack.length > 1 && lastTag && lastTag.name !== tag.name) {
-      this.popElement(autocloseTag(lastTag, tag.startOffset));
+      this.#popElement(autocloseTag(lastTag, tag.startOffset));
       lastTag = this.#stack[this.#stack.length - 1];
     }
     if (this.#stack.length === 1) {
       return;
     }
-    this.popElement(tag);
+    this.#popElement(tag);
 
     function autocloseTag(element: FormatterElement, offset: number): Tag {
       return new Tag(element.name, offset, offset, new Map(), false, false);
     }
   }
 
-  private popElement(closeTag: Tag): void {
+  #popElement(closeTag: Tag): void {
     const element = this.#stack.pop();
     if (!element) {
       return;
@@ -389,7 +389,7 @@ export class HTMLModel {
     element.closeTag = closeTag;
   }
 
-  private pushElement(openTag: Tag): void {
+  #pushElement(openTag: Tag): void {
     const topElement = this.#stack[this.#stack.length - 1];
     const newElement = new FormatterElement(openTag.name);
     if (topElement) {

package/front_end/entrypoints/formatter_worker/JavaScriptFormatter.ts

@@ -59,7 +59,7 @@ export class JavaScriptFormatter {
       ecmaVersion: ECMA_VERSION,
       allowHashBang: true,
     });
-    const walker = new ESTreeWalker(this.beforeVisit.bind(this), this.afterVisit.bind(this));
+    const walker = new ESTreeWalker(this.#beforeVisit.bind(this), this.#afterVisit.bind(this));
     // @ts-ignore Technically, the acorn Node type is a subclass of Acorn.ESTree.Node.
     // However, the acorn package currently exports its type without specifying
     // this relationship. So while this is allowed on runtime, we can't properly
@@ -67,7 +67,7 @@ export class JavaScriptFormatter {
     walker.walk(ast);
   }
 
-  private push(token: Acorn.Token|Acorn.Comment|null, format: string): void {
+  #push(token: Acorn.Token|Acorn.Comment|null, format: string): void {
     for (let i = 0; i < format.length; ++i) {
       if (format[i] === 's') {
         this.#builder.addSoftSpace();
@@ -91,7 +91,7 @@ export class JavaScriptFormatter {
     }
   }
 
-  private beforeVisit(node: Acorn.ESTree.Node): undefined {
+  #beforeVisit(node: Acorn.ESTree.Node): undefined {
     if (!node.parent) {
       return;
     }
@@ -99,23 +99,23 @@ export class JavaScriptFormatter {
     while ((token = this.#tokenizer.peekToken()) && token.start < node.start) {
       const token = (this.#tokenizer.nextToken() as TokenOrComment);
       // @ts-ignore Same reason as above about Acorn types and ESTree types
-      const format = this.formatToken(node.parent, token);
-      this.push(token, format);
+      const format = this.#formatToken(node.parent, token);
+      this.#push(token, format);
     }
     return;
   }
 
-  private afterVisit(node: Acorn.ESTree.Node): void {
+  #afterVisit(node: Acorn.ESTree.Node): void {
     let token;
     while ((token = this.#tokenizer.peekToken()) && token.start < node.end) {
       const token = (this.#tokenizer.nextToken() as TokenOrComment);
-      const format = this.formatToken(node, token);
-      this.push(token, format);
+      const format = this.#formatToken(node, token);
+      this.#push(token, format);
     }
-    this.push(null, this.finishNode(node));
+    this.#push(null, this.#finishNode(node));
   }
 
-  private inForLoopHeader(node: Acorn.ESTree.Node): boolean {
+  #inForLoopHeader(node: Acorn.ESTree.Node): boolean {
     const parent = node.parent;
     if (!parent) {
       return false;
@@ -131,7 +131,7 @@ export class JavaScriptFormatter {
     return false;
   }
 
-  private formatToken(node: Acorn.ESTree.Node, tokenOrComment: TokenOrComment): string {
+  #formatToken(node: Acorn.ESTree.Node, tokenOrComment: TokenOrComment): string {
     const AT = AcornTokenizer;
     if (AT.lineComment(tokenOrComment)) {
       return 'tn';
@@ -241,7 +241,7 @@ export class JavaScriptFormatter {
           // it exists. We can't fix that, unless we use proper typechecking
           allVariablesInitialized = allVariablesInitialized && Boolean(declarations[i].init);
         }
-        return !this.inForLoopHeader(node) && allVariablesInitialized ? 'nSSts' : 'ts';
+        return !this.#inForLoopHeader(node) && allVariablesInitialized ? 'nSSts' : 'ts';
       }
     } else if (node.type === 'PropertyDefinition') {
       if (AT.punctuator(token, '=')) {
@@ -356,13 +356,13 @@ export class JavaScriptFormatter {
     return AT.keyword(token) && !AT.keyword(token, 'this') ? 'ts' : 't';
   }
 
-  private finishNode(node: Acorn.ESTree.Node): string {
+  #finishNode(node: Acorn.ESTree.Node): string {
     if (node.type === 'WithStatement') {
       if (node.body && node.body.type !== 'BlockStatement') {
         return 'n<';
       }
     } else if (node.type === 'VariableDeclaration') {
-      if (!this.inForLoopHeader(node)) {
+      if (!this.#inForLoopHeader(node)) {
         return 'n';
       }
     } else if (node.type === 'ForStatement' || node.type === 'ForOfStatement' || node.type === 'ForInStatement') {