Typecheck browser_sdk/LogManager.js with TypeScript

[email protected]

Bug: 1011811
Change-Id: If381c01631c56dd6fdf7d71ae7f34414a12b237d
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2218012
Commit-Queue: Tim van der Lippe <[email protected]>
Reviewed-by: Jack Franklin <[email protected]>

Author: TimvdLippe

front_end/browser_sdk/LogManager.js

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @ts-nocheck
-// TODO(crbug.com/1011811): Enable TypeScript compiler checks
-
 import * as Common from '../common/common.js';
 import * as SDK from '../sdk/sdk.js';
 
+/** @type {!WeakMap<!SDK.LogModel.LogModel, !Array<!Common.EventTarget.EventDescriptor>>} */
+const modelToEventListeners = new WeakMap();
+
 /**
  * @implements {SDK.SDKModel.SDKModelObserver<!SDK.LogModel.LogModel>}
  */
@@ -23,15 +23,18 @@ export class LogManager {
   modelAdded(logModel) {
     const eventListeners = [];
     eventListeners.push(logModel.addEventListener(SDK.LogModel.Events.EntryAdded, this._logEntryAdded, this));
-    logModel[_eventSymbol] = eventListeners;
+    modelToEventListeners.set(logModel, eventListeners);
   }
 
   /**
    * @override
    * @param {!SDK.LogModel.LogModel} logModel
    */
   modelRemoved(logModel) {
-    Common.EventTarget.EventTarget.removeEventListeners(logModel[_eventSymbol]);
+    const eventListeners = modelToEventListeners.get(logModel);
+    if (eventListeners) {
+      Common.EventTarget.EventTarget.removeEventListeners(eventListeners);
+    }
   }
 
   /**
@@ -70,5 +73,3 @@ export class LogManager {
     }
   }
 }
-
-const _eventSymbol = Symbol('_events');

front_end/console/ConsoleViewMessage.js

@@ -145,17 +145,18 @@ export class ConsoleViewMessage {
       formattedMessage.appendChild(this._anchorElement);
     }
 
-    let table = this._message.parameters && this._message.parameters.length ? this._message.parameters[0] : null;
-    if (table) {
-      table = this._parameterToRemoteObject(table);
+    const table = this._message.parameters && this._message.parameters.length ? this._message.parameters[0] : null;
+    if (!table) {
+      return this._buildMessage();
     }
-    if (!table || !table.preview) {
+    const actualTable = this._parameterToRemoteObject(table);
+    if (!actualTable || !actualTable.preview) {
       return this._buildMessage();
     }
 
     const rawValueColumnSymbol = Symbol('rawValueColumn');
     const columnNames = [];
-    const preview = table.preview;
+    const preview = actualTable.preview;
     const rows = [];
     for (let i = 0; i < preview.properties.length; ++i) {
       const rowProperty = preview.properties[i];
@@ -182,7 +183,7 @@ export class ConsoleViewMessage {
         }
 
         if (columnRendered) {
-          const cellElement = this._renderPropertyPreviewOrAccessor(table, [rowProperty, cellProperty]);
+          const cellElement = this._renderPropertyPreviewOrAccessor(actualTable, [rowProperty, cellProperty]);
           cellElement.classList.add('console-message-nowrap-below');
           rowValue[cellProperty.name] = cellElement;
         }
@@ -212,7 +213,7 @@ export class ConsoleViewMessage {
       formattedResult.classList.add('console-message-text');
       const tableElement = formattedResult.createChild('div', 'console-message-formatted-table');
       const dataGridContainer = tableElement.createChild('span');
-      tableElement.appendChild(this._formatParameter(table, true, false));
+      tableElement.appendChild(this._formatParameter(actualTable, true, false));
       dataGridContainer.appendChild(this._dataGrid.element);
       formattedMessage.appendChild(formattedResult);
       this._dataGrid.renderInline();

front_end/sdk/ConsoleModel.js

@@ -491,7 +491,7 @@ export class ConsoleMessage {
    * @param {?string=} url
    * @param {number=} line
    * @param {number=} column
-   * @param {!Array.<!Protocol.Runtime.RemoteObject>=} parameters
+   * @param {!Array.<!Protocol.Runtime.RemoteObject|string>=} parameters
    * @param {!Protocol.Runtime.StackTrace=} stackTrace
    * @param {number=} timestamp
    * @param {!Protocol.Runtime.ExecutionContextId=} executionContextId