Fix CXX debugging extension build

Fix TypeScript build issues

Bug: none
Change-Id: I73d6870b64c5f8ad76746dc1d4358fa013689b10
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/6269096
Reviewed-by: Paul Irish <[email protected]>
Commit-Queue: Nikolay Vitkov <[email protected]>
Reviewed-by: Philip Pfaffe <[email protected]>

Author: Lightning00Blade

eslint.config.mjs

@@ -601,6 +601,7 @@ export default [
       'test/**/*.ts',
       '**/testing/*.ts',
       'scripts/eslint_rules/test/**/*.js',
+      'extensions/cxx_debugging/e2e/**',
     ],
 
     rules: {

extensions/cxx_debugging/e2e/TestDriver.ts

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import {assert} from 'chai';
-import type {ElementHandle, JSHandle} from 'puppeteer-core';
+import type {ElementHandle} from 'puppeteer-core';
 import {TestConfig} from 'test/conductor/test_config.js';
 import {
   CONSOLE_TAB_SELECTOR,
@@ -90,7 +90,7 @@ describe('CXX Debugging Extension Test Suite', function() {
           const stopped = await waitFor(PAUSE_INDICATOR_SELECTOR);
           const stoppedText = await waitForFunction(async () => stopped.evaluate(node => node.textContent));
 
-          assert.equal(stoppedText, pausedReasonText(reason));
+          assert.strictEqual(stoppedText, pausedReasonText(reason));
 
           const pausedLocation = await retrieveTopCallFrameWithoutResuming();
           if (pausedLocation?.includes('…')) {
@@ -121,9 +121,9 @@ describe('CXX Debugging Extension Test Suite', function() {
                 }
               } else {
                 if (variableType) {
-                  assert.equal(scopeVariable, `${variableName}: ${variableType}`);
+                  assert.strictEqual(scopeVariable, `${variableName}: ${variableType}`);
                 } else if (value) {
-                  assert.equal(scopeVariable, `${variableName}: ${value}`);
+                  assert.strictEqual(scopeVariable, `${variableName}: ${value}`);
                 }
               }
             }
@@ -142,7 +142,7 @@ describe('CXX Debugging Extension Test Suite', function() {
                     .map(node => node.textContent);
               });
               const result = evaluateResults[evaluateResults.length - 1];
-              assert.equal(result, value.toString());
+              assert.strictEqual(result, value.toString());
             }
 
             await openSourcesPanel();
@@ -174,12 +174,12 @@ async function readScopeView(scope: string, variable: string[]) {
     throw new Error(`Scope entry for ${scope} not found`);
   }
 
-  let parentNode = await scopeElement.evaluateHandle(n => n.nextElementSibling);
+  let parentNode = await scopeElement.evaluateHandle(n => n.nextElementSibling!);
   assert(parentNode, 'Scope element has no siblings');
 
   const result = [];
   for (const node of variable) {
-    const elementHandle: ElementHandle<Element> = await getMember(node, parentNode);
+    const elementHandle = await getMember(node, parentNode);
     const isExpanded = await elementHandle.evaluate((node: Element) => {
       node.scrollIntoView();
       return node.getAttribute('aria-expanded');
@@ -202,12 +202,12 @@ async function readScopeView(scope: string, variable: string[]) {
       result.push(await name.evaluate(node => node.textContent));
     }
 
-    parentNode = await elementHandle.evaluateHandle(n => n.nextElementSibling);
+    parentNode = await elementHandle.evaluateHandle(n => n.nextElementSibling!);
     assert(parentNode, 'Element has no siblings');
   }
   return result;
 
-  async function getMember(name: string, parentNode: ElementHandle|JSHandle<null>): Promise<ElementHandle<Element>> {
+  async function getMember(name: string, parentNode: ElementHandle): Promise<ElementHandle<Element>> {
     if (name.startsWith('$')) {
       const index = parseInt(name.slice(1), 10);
       if (!isNaN(index)) {

extensions/cxx_debugging/e2e/standalone/MemoryInspector_test.ts

@@ -9,7 +9,7 @@ import {
   PAUSE_INDICATOR_SELECTOR,
 } from 'test/e2e/helpers/sources-helpers';
 import {
-  clickElement,
+  click,
   getBrowserAndPages,
   getPendingEvents,
   installEventListener,
@@ -41,11 +41,12 @@ describe('LinearMemoryInspector', () => {
     const stopped = await waitFor(PAUSE_INDICATOR_SELECTOR);
     const stoppedText = await waitForFunction(async () => stopped.evaluate(node => node.textContent));
 
-    assert.equal(stoppedText, 'Paused on breakpoint');
+    assert.strictEqual(stoppedText, 'Paused on breakpoint');
 
     const localVariable = await waitFor('[data-object-property-name-for-test="d"]');
-    const memIcon = await waitFor('[title="Open in Memory inspector panel"]', localVariable);
-    await clickElement(memIcon);
+    await click('[title="Open in Memory inspector panel"]', {
+      root: localVariable,
+    });
 
     const byteHighlights = await waitForMany('.byte-cell.highlight-area', 8);
     const byteHighlightText = await Promise.all(byteHighlights.map(cell => cell.evaluate(cell => cell.textContent)));

extensions/cxx_debugging/src/CustomFormatters.ts

@@ -33,7 +33,7 @@ export interface TypeInfo {
 }
 
 export interface WasmInterface {
-  readMemory(offset: number, length: number): Uint8Array;
+  readMemory(offset: number, length: number): Uint8Array<ArrayBuffer>;
   getOp(op: number): WasmValue;
   getLocal(local: number): WasmValue;
   getGlobal(global: number): WasmValue;
@@ -607,7 +607,7 @@ export class HostWasmInterface {
     this.stopId = stopId;
     this.view = new WasmMemoryView(this);
   }
-  readMemory(offset: number, length: number): Uint8Array {
+  readMemory(offset: number, length: number): Uint8Array<ArrayBuffer> {
     return new Uint8Array(this.hostInterface.getWasmLinearMemory(offset, length, this.stopId));
   }
   getOp(op: number): WasmValue {

extensions/cxx_debugging/src/Formatters.ts

@@ -96,11 +96,13 @@ function formatLibCXXString<T extends CharArrayConstructor>(
 
     const copyLen = Math.min(stringSize * charSize, Constants.MAX_STRING_LEN);
     const bytes = wasm.readMemory(data, copyLen);
+    // @ts-expect-error https://github.com/microsoft/TypeScript/pull/60934
     const text = new charType(bytes.buffer, bytes.byteOffset, stringSize) as InstanceType<T>;
     return {size: stringSize, string: decode(text)};
   }
 
   const bytes = shortString.$('__data_').asDataView(0, size * charSize);
+  // @ts-expect-error https://github.com/microsoft/TypeScript/pull/60934
   const text = new charType(bytes.buffer, bytes.byteOffset, size) as InstanceType<T>;
   return {size, string: decode(text)};
 }
@@ -147,7 +149,8 @@ CustomFormatters.addFormatter({
   format: formatLibCXX32String,
 });
 
-type CharArrayConstructor = typeof Uint8Array|typeof Uint16Array|typeof Uint32Array;
+type CharArrayConstructor = Uint8ArrayConstructor|Uint16ArrayConstructor|Uint32ArrayConstructor;
+
 function formatRawString<T extends CharArrayConstructor>(
     wasm: WasmInterface, value: Value, charType: T, decode: (chars: InstanceType<T>) => string): string|{
   [key: string]: Value|null,
@@ -164,13 +167,15 @@ function formatRawString<T extends CharArrayConstructor>(
     // Copy PAGE_SIZE bytes
     const buffer = deref.asDataView(bufferSize, Constants.PAGE_SIZE);
     // Convert to charType
+    // @ts-expect-error https://github.com/microsoft/TypeScript/pull/60934
     const substr = new charType(buffer.buffer, buffer.byteOffset, buffer.byteLength / charSize);
     const strlen = substr.indexOf(0);
     if (strlen >= 0) {
       // buffer size is in bytes, strlen in characters
       const str = new charType(bufferSize / charSize + strlen) as InstanceType<T>;
       for (let i = 0; i < slices.length; ++i) {
         str.set(
+            // @ts-expect-error TypeScript can't find the deduce the intersection type correctly
             new charType(slices[i].buffer, slices[i].byteOffset, slices[i].byteLength / charSize),
             i * Constants.PAGE_SIZE / charSize);
       }
@@ -185,12 +190,16 @@ function formatRawString<T extends CharArrayConstructor>(
 export function formatCString(wasm: WasmInterface, value: Value): string|{
   [key: string]: Value|null,
 }
-{ return formatRawString(wasm, value, Uint8Array, str => new TextDecoder().decode(str)); }
+{
+  return formatRawString(wasm, value, Uint8Array, str => new TextDecoder().decode(str));
+}
 
 export function formatU16CString(wasm: WasmInterface, value: Value): string|{
   [key: string]: Value|null,
 }
-{ return formatRawString(wasm, value, Uint16Array, str => new TextDecoder('utf-16le').decode(str)); }
+{
+  return formatRawString(wasm, value, Uint16Array, str => new TextDecoder('utf-16le').decode(str));
+}
 
 export function formatCWString(wasm: WasmInterface, value: Value): string|{
   [key: string]: Value|null,

extensions/cxx_debugging/tests/TestUtils.ts

@@ -70,8 +70,8 @@ export function nonNull<T>(value: T|null|undefined): T {
   return value as T;
 }
 
-export function remoteObject(value: Chrome.DevTools.RemoteObject|Chrome.DevTools.ForeignObject|
-                             null): Chrome.DevTools.RemoteObject {
+export function remoteObject(value: Chrome.DevTools.RemoteObject|Chrome.DevTools.ForeignObject|null):
+    Chrome.DevTools.RemoteObject {
   assert.exists(value);
   assert(value.type !== 'reftype');
   return value;
@@ -83,7 +83,7 @@ export class TestWasmInterface implements WasmInterface {
   globals = new Map<number, WasmValue>();
   stack = new Map<number, WasmValue>();
 
-  readMemory(offset: number, length: number): Uint8Array {
+  readMemory(offset: number, length: number): Uint8Array<ArrayBuffer> {
     return new Uint8Array(this.memory, offset, length);
   }
   getOp(op: number): WasmValue {