devtools-tracing 1.1.1 → 1.2.1

package/lib/front_end/models/formatter/FormatterWorkerPool.ts

@@ -1,219 +0,0 @@
-// Copyright 2016 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import * as Common from '../../core/common/common.js';
-import * as FormatterActions from '../../entrypoints/formatter_worker/FormatterActions.js';  // eslint-disable-line @devtools/es-modules-import
-
-export {DefinitionKind, ScopeKind, type ScopeTreeNode} from '../../entrypoints/formatter_worker/FormatterActions.js';
-
-let formatterWorkerPoolInstance: FormatterWorkerPool|undefined;
-
-export class FormatterWorkerPool {
-  private taskQueue: Task[];
-  private workerTasks: Map<Common.Worker.WorkerWrapper, Task|null>;
-
-  constructor() {
-    this.taskQueue = [];
-    this.workerTasks = new Map();
-  }
-
-  static instance(): FormatterWorkerPool {
-    if (!formatterWorkerPoolInstance) {
-      formatterWorkerPoolInstance = new FormatterWorkerPool();
-    }
-
-    return formatterWorkerPoolInstance;
-  }
-
-  dispose(): void {
-    for (const task of this.taskQueue) {
-      console.error('rejecting task');
-      task.errorCallback(new Event('Worker terminated'));
-    }
-    for (const [worker, task] of this.workerTasks.entries()) {
-      task?.errorCallback(new Event('Worker terminated'));
-      worker.terminate(/* immediately=*/ true);
-    }
-  }
-
-  static removeInstance(): void {
-    formatterWorkerPoolInstance?.dispose();
-    formatterWorkerPoolInstance = undefined;
-  }
-
-  private createWorker(): Common.Worker.WorkerWrapper {
-    const worker = Common.Worker.WorkerWrapper.fromURL(
-        new URL('../../entrypoints/formatter_worker/formatter_worker-entrypoint.js', import.meta.url));
-    worker.onmessage = this.onWorkerMessage.bind(this, worker);
-    worker.onerror = this.onWorkerError.bind(this, worker);
-    return worker;
-  }
-
-  private processNextTask(): void {
-    const maxWorkers = Math.max(2, navigator.hardwareConcurrency - 1);
-
-    if (!this.taskQueue.length) {
-      return;
-    }
-
-    let freeWorker = [...this.workerTasks.keys()].find(worker => !this.workerTasks.get(worker));
-    if (!freeWorker && this.workerTasks.size < maxWorkers) {
-      freeWorker = this.createWorker();
-    }
-    if (!freeWorker) {
-      return;
-    }
-
-    const task = this.taskQueue.shift();
-    if (task) {
-      this.workerTasks.set(freeWorker, task);
-      freeWorker.postMessage({method: task.method, params: task.params});
-    }
-  }
-
-  private onWorkerMessage(worker: Common.Worker.WorkerWrapper, event: MessageEvent): void {
-    const task = this.workerTasks.get(worker);
-    if (!task) {
-      return;
-    }
-    if (task.isChunked && event.data && !event.data['isLastChunk']) {
-      task.callback(event.data);
-      return;
-    }
-
-    this.workerTasks.set(worker, null);
-    this.processNextTask();
-    task.callback(event.data ? event.data : null);
-  }
-
-  private onWorkerError(worker: Common.Worker.WorkerWrapper, event: Event): void {
-    console.error(event);
-    const task = this.workerTasks.get(worker);
-    worker.terminate();
-    this.workerTasks.delete(worker);
-
-    const newWorker = this.createWorker();
-    this.workerTasks.set(newWorker, null);
-    this.processNextTask();
-    if (task) {
-      task.errorCallback(event);
-    }
-  }
-
-  private runChunkedTask(
-      methodName: string, params: Record<string, string>, callback: (arg0: boolean, arg1: unknown) => void): void {
-    const task = new Task(methodName, params, onData, () => onData(null), true);
-    this.taskQueue.push(task);
-    this.processNextTask();
-
-    function onData(data: Object|null): void {
-      if (!data) {
-        callback(true, null);
-        return;
-      }
-      const isLastChunk = 'isLastChunk' in data && Boolean(data['isLastChunk']);
-      const chunk = 'chunk' in data && data['chunk'];
-      callback(isLastChunk, chunk);
-    }
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  private runTask(methodName: FormatterActions.FormatterActions, params: Record<string, unknown>): Promise<any> {
-    return new Promise((resolve, reject) => {
-      const task = new Task(methodName, params, resolve, reject, false);
-      this.taskQueue.push(task);
-      this.processNextTask();
-    });
-  }
-
-  format(mimeType: string, content: string, indentString: string): Promise<FormatterActions.FormatResult> {
-    const parameters = {mimeType, content, indentString};
-    return this.runTask(FormatterActions.FormatterActions.FORMAT, parameters) as Promise<FormatterActions.FormatResult>;
-  }
-
-  javaScriptSubstitute(expression: string, mapping: Map<string, string|null>): Promise<string> {
-    if (mapping.size === 0) {
-      return Promise.resolve(expression);
-    }
-    return this.runTask(FormatterActions.FormatterActions.JAVASCRIPT_SUBSTITUTE, {content: expression, mapping})
-        .then(result => result || '');
-  }
-
-  javaScriptScopeTree(expression: string, sourceType: 'module'|'script' = 'script'):
-      Promise<FormatterActions.ScopeTreeNode|null> {
-    return this.runTask(FormatterActions.FormatterActions.JAVASCRIPT_SCOPE_TREE, {content: expression, sourceType})
-        .then(result => result || null);
-  }
-
-  parseCSS(content: string, callback: (arg0: boolean, arg1: CSSRule[]) => void): void {
-    this.runChunkedTask(FormatterActions.FormatterActions.PARSE_CSS, {content}, onDataChunk);
-
-    // TODO(crbug.com/1172300) Ignored during the jsdoc to ts migration
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    function onDataChunk(isLastChunk: boolean, data: any): void {
-      const rules = (data || [] as CSSRule[]);
-      callback(isLastChunk, rules);
-    }
-  }
-}
-
-class Task {
-  method: string;
-  params: unknown;
-  callback: (arg0: MessageEvent|null) => void;
-  errorCallback: (arg0: Event) => void;
-  isChunked: boolean|undefined;
-  constructor(
-      method: string, params: unknown, callback: (arg0: MessageEvent|null) => void,
-      errorCallback: (arg0: Event) => void, isChunked?: boolean) {
-    this.method = method;
-    this.params = params;
-    this.callback = callback;
-    this.errorCallback = errorCallback;
-    this.isChunked = isChunked;
-  }
-}
-
-interface CSSProperty {
-  name: string;
-  nameRange: TextRange;
-  value: string;
-  valueRange: TextRange;
-  range: TextRange;
-  disabled?: boolean;
-}
-
-export function formatterWorkerPool(): FormatterWorkerPool {
-  return FormatterWorkerPool.instance();
-}
-
-export interface OutlineItem {
-  line: number;
-  column: number;
-  title: string;
-  subtitle?: string;
-}
-
-export interface CSSStyleRule {
-  selectorText: string;
-  styleRange: TextRange;
-  lineNumber: number;
-  columnNumber: number;
-  properties: CSSProperty[];
-}
-
-export interface CSSAtRule {
-  atRule: string;
-  lineNumber: number;
-  columnNumber: number;
-}
-
-export type CSSRule = CSSStyleRule|CSSAtRule;
-
-export interface TextRange {
-  startLine: number;
-  startColumn: number;
-  endLine: number;
-  endColumn: number;
-}

package/lib/front_end/models/formatter/ScriptFormatter.ts

@@ -1,112 +0,0 @@
-// Copyright 2011 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import * as Common from '../../core/common/common.js';
-import * as Platform from '../../core/platform/platform.js';
-import type * as FormatterActions from '../../entrypoints/formatter_worker/FormatterActions.js';
-
-import {formatterWorkerPool} from './FormatterWorkerPool.js';
-
-function locationToPosition(lineEndings: number[], lineNumber: number, columnNumber: number): number {
-  const position = lineNumber ? lineEndings[lineNumber - 1] + 1 : 0;
-  return position + columnNumber;
-}
-
-function positionToLocation(lineEndings: number[], position: number): number[] {
-  const lineNumber =
-      Platform.ArrayUtilities.upperBound(lineEndings, position - 1, Platform.ArrayUtilities.DEFAULT_COMPARATOR);
-  let columnNumber;
-  if (!lineNumber) {
-    columnNumber = position;
-  } else {
-    columnNumber = position - lineEndings[lineNumber - 1] - 1;
-  }
-  return [lineNumber, columnNumber];
-}
-
-export interface FormattedContent {
-  formattedContent: string;
-  formattedMapping: FormatterSourceMapping;
-}
-
-export async function format(
-    contentType: Common.ResourceType.ResourceType, mimeType: string, content: string,
-    indent: string =
-        Common.Settings.Settings.instance().moduleSetting('text-editor-indent').get()): Promise<FormattedContent> {
-  if (contentType.isDocumentOrScriptOrStyleSheet()) {
-    return await formatScriptContent(mimeType, content, indent);
-  }
-
-  return {formattedContent: content, formattedMapping: new IdentityFormatterSourceMapping()};
-}
-
-export async function formatScriptContent(
-    mimeType: string, content: string,
-    indent: string =
-        Common.Settings.Settings.instance().moduleSetting('text-editor-indent').get()): Promise<FormattedContent> {
-  const originalContent = content.replace(/\r\n?|[\n\u2028\u2029]/g, '\n').replace(/^\uFEFF/, '');
-
-  const pool = formatterWorkerPool();
-
-  let formatResult: FormatterActions.FormatResult = {content: originalContent, mapping: {original: [], formatted: []}};
-  try {
-    formatResult = await pool.format(mimeType, originalContent, indent);
-  } catch {
-  }
-  const originalContentLineEndings = Platform.StringUtilities.findLineEndingIndexes(originalContent);
-  const formattedContentLineEndings = Platform.StringUtilities.findLineEndingIndexes(formatResult.content);
-
-  const sourceMapping =
-      new FormatterSourceMappingImpl(originalContentLineEndings, formattedContentLineEndings, formatResult.mapping);
-  return {formattedContent: formatResult.content, formattedMapping: sourceMapping};
-}
-
-export interface FormatterSourceMapping {
-  originalToFormatted(lineNumber: number, columnNumber?: number): number[];
-  formattedToOriginal(lineNumber: number, columnNumber?: number): number[];
-}
-
-class IdentityFormatterSourceMapping implements FormatterSourceMapping {
-  originalToFormatted(lineNumber: number, columnNumber = 0): number[] {
-    return [lineNumber, columnNumber];
-  }
-
-  formattedToOriginal(lineNumber: number, columnNumber = 0): number[] {
-    return [lineNumber, columnNumber];
-  }
-}
-
-class FormatterSourceMappingImpl implements FormatterSourceMapping {
-  private readonly originalLineEndings: number[];
-  private readonly formattedLineEndings: number[];
-  private readonly mapping: FormatterActions.FormatMapping;
-
-  constructor(originalLineEndings: number[], formattedLineEndings: number[], mapping: FormatterActions.FormatMapping) {
-    this.originalLineEndings = originalLineEndings;
-    this.formattedLineEndings = formattedLineEndings;
-    this.mapping = mapping;
-  }
-
-  originalToFormatted(lineNumber: number, columnNumber?: number): number[] {
-    const originalPosition = locationToPosition(this.originalLineEndings, lineNumber, columnNumber || 0);
-    const formattedPosition = this.convertPosition(this.mapping.original, this.mapping.formatted, originalPosition);
-    return positionToLocation(this.formattedLineEndings, formattedPosition);
-  }
-
-  formattedToOriginal(lineNumber: number, columnNumber?: number): number[] {
-    const formattedPosition = locationToPosition(this.formattedLineEndings, lineNumber, columnNumber || 0);
-    const originalPosition = this.convertPosition(this.mapping.formatted, this.mapping.original, formattedPosition);
-    return positionToLocation(this.originalLineEndings, originalPosition);
-  }
-
-  private convertPosition(positions1: number[], positions2: number[], position: number): number {
-    const index =
-        Platform.ArrayUtilities.upperBound(positions1, position, Platform.ArrayUtilities.DEFAULT_COMPARATOR) - 1;
-    let convertedPosition: number = positions2[index] + position - positions1[index];
-    if (index < positions2.length - 1 && convertedPosition > positions2[index + 1]) {
-      convertedPosition = positions2[index + 1];
-    }
-    return convertedPosition;
-  }
-}

package/lib/front_end/models/formatter/formatter.ts

@@ -1,8 +0,0 @@
-// Copyright 2019 The Chromium Authors
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import * as FormatterWorkerPool from './FormatterWorkerPool.js';
-import * as ScriptFormatter from './ScriptFormatter.js';
-
-export {FormatterWorkerPool, ScriptFormatter};