chrome-devtools-frontend 1.0.1380117 → 1.0.1402249

package/front_end/core/common/ParsedURL.test.ts

@@ -159,17 +159,17 @@ describe('Parsed URL', () => {
 
   it('checks that URL is valid', () => {
     const urlTest = 'http://www.example.com#?test';
-    assert.strictEqual(ParsedURL.isValidUrlString(urlTest), true, 'URL validation was incorrect');
+    assert.isTrue(ParsedURL.isValidUrlString(urlTest), 'URL validation was incorrect');
   });
 
   it('checks that file:// URL is valid', () => {
     const urlTest = 'file:///usr/lib';
-    assert.strictEqual(ParsedURL.isValidUrlString(urlTest), true, 'URL validation was incorrect');
+    assert.isTrue(ParsedURL.isValidUrlString(urlTest), 'URL validation was incorrect');
   });
 
   it('checks that "://" is not a valid URL', () => {
     const urlTest = '://';
-    assert.strictEqual(ParsedURL.isValidUrlString(urlTest), false, 'URL validation was incorrect');
+    assert.isFalse(ParsedURL.isValidUrlString(urlTest), 'URL validation was incorrect');
   });
 
   it('converts URL with a hash to a URL without a hash', () => {
@@ -358,7 +358,7 @@ describe('Parsed URL', () => {
     const hrefTest = 'www.example.com';
     const baseUrlTest = 'www.example.com' as Platform.DevToolsPath.UrlString;
     const completeUrl = ParsedURL.completeURL(baseUrlTest, hrefTest);
-    assert.strictEqual(completeUrl, null, 'complete URL is not returned correctly');
+    assert.isNull(completeUrl, 'complete URL is not returned correctly');
   });
 
   it('uses the completeURL function to return the href if the base URL is a data URL', () => {
@@ -421,7 +421,7 @@ describe('Parsed URL', () => {
     const splitResult = ParsedURL.splitLineAndColumn(stringTest);
     assert.strictEqual(splitResult.url, 'http://www.example.com/foo.js', 'URL is not correct');
     assert.strictEqual(splitResult.lineNumber, 14, 'line number is incorrect');
-    assert.strictEqual(splitResult.columnNumber, undefined, 'column number is incorrect');
+    assert.isUndefined(splitResult.columnNumber, 'column number is incorrect');
   });
 
   it('uses the splitLineAndColumn function to return the line and column numbers if the URL contains them', () => {

package/front_end/core/common/Progress.test.ts

@@ -64,7 +64,7 @@ describe('Composite Progress Bar', () => {
     const composite = new CompositeProgress(indicator);
     const subProgress = composite.createSubProgress();
 
-    assert.strictEqual(indicator.getTitle, undefined);
+    assert.isUndefined(indicator.getTitle);
     assert.strictEqual(indicator.getWorkCompleted, 0);
     assert.strictEqual(indicator.getTotalWork, 1);
 
@@ -98,7 +98,7 @@ describe('Composite Progress Bar', () => {
     // Creates a sub progress with the weight of 3
     const subProgress2 = composite.createSubProgress(3);
 
-    assert.strictEqual(indicator.getTitle, undefined);
+    assert.isUndefined(indicator.getTitle);
     assert.strictEqual(indicator.getWorkCompleted, 0);
     assert.strictEqual(indicator.getTotalWork, 1);
 
@@ -154,17 +154,17 @@ describe('Composite Progress Bar', () => {
     const composite1 = new CompositeProgress(subProgress01);
     const subProgress11 = composite1.createSubProgress(10);  // Weight should have no effect
 
-    assert.strictEqual(indicator.getTitle, undefined);
+    assert.isUndefined(indicator.getTitle);
     assert.strictEqual(indicator.getWorkCompleted, 0);
     assert.strictEqual(indicator.getTotalWork, 1);
 
     subProgress11.setWorked(10);
-    assert.strictEqual(indicator.getTitle, undefined);
+    assert.isUndefined(indicator.getTitle);
     assert.strictEqual(indicator.getWorkCompleted, 0);
     assert.strictEqual(indicator.getTotalWork, 1);
 
     subProgress11.setTotalWork(100);
-    assert.strictEqual(indicator.getTitle, undefined);
+    assert.isUndefined(indicator.getTitle);
     assert.strictEqual(indicator.getWorkCompleted, 0.1);
     assert.strictEqual(indicator.getTotalWork, 1);
 
@@ -188,14 +188,14 @@ describe('Composite Progress Bar', () => {
     const composite = new CompositeProgress(indicator);
     const subProgress = composite.createSubProgress();
 
-    assert.strictEqual(indicator.getTitle, undefined);
+    assert.isUndefined(indicator.getTitle);
     assert.strictEqual(indicator.getWorkCompleted, 0);
     assert.strictEqual(indicator.getTotalWork, 1);
     assert.strictEqual(subProgress.getWorked(), 0);
 
     subProgress.incrementWorked();
 
-    assert.strictEqual(indicator.getTitle, undefined);
+    assert.isUndefined(indicator.getTitle);
     assert.strictEqual(indicator.getWorkCompleted, 0);
     assert.strictEqual(indicator.getTotalWork, 1);
     assert.strictEqual(subProgress.getWorked(), 1);

package/front_end/core/common/ResolverBase.test.ts

@@ -62,7 +62,7 @@ describe('ResolverBase', () => {
         throw new Error('This should not get called');
       });
       resolver.assertIsListening();
-      assert.strictEqual(obj, null);
+      assert.isNull(obj);
       resolver.clear();
     });
 
@@ -70,7 +70,7 @@ describe('ResolverBase', () => {
       const resolver = new ResolverTestImpl();
       const waitForCall = new Promise<TestClass>(resolve => {
         const obj = resolver.tryGet(id, resolve);
-        assert.strictEqual(obj, null);
+        assert.isNull(obj);
       });
       resolver.assertIsListening();
       resolver.onResolve(id, testObj);

package/front_end/core/common/ResourceType.test.ts

@@ -34,7 +34,7 @@ describeWithEnvironment('ResourceType class', () => {
     assert.strictEqual(
         resourceType.category().shortTitle(), 'Category Test Short Title',
         'category short title was not set correctly');
-    assert.strictEqual(resourceType.isTextType(), true, 'resource type was not set correctly');
+    assert.isTrue(resourceType.isTextType(), 'resource type was not set correctly');
   });
 
   it('is able to return a document resource from the string "text/html"', () => {
@@ -411,13 +411,13 @@ describeWithEnvironment('ResourceType class', () => {
 
   it('treats a Ping as Other', () => {
     const resourceType = resourceTypes.Ping;
-    assert.strictEqual(resourceType.isTextType(), false, 'A ping is not a text type');
+    assert.isFalse(resourceType.isTextType(), 'A ping is not a text type');
     assert.strictEqual(resourceType.canonicalMimeType(), '', 'A ping does not have an associated mime type');
   });
 
   it('treats a CSPViolationsReport as Other', () => {
     const resourceType = resourceTypes.CSPViolationReport;
-    assert.strictEqual(resourceType.isTextType(), false, 'A ping is not a text type');
+    assert.isFalse(resourceType.isTextType(), 'A ping is not a text type');
     assert.strictEqual(resourceType.canonicalMimeType(), '', 'A ping does not have an associated mime type');
   });
 });

package/front_end/core/common/SettingRegistration.test.ts

@@ -70,10 +70,8 @@ describe('SettingRegistration', () => {
     const enableSettingCommands = allCommands.filter(
         command => command.title === enableTitle &&
             command.category === Common.Settings.getLocalizedSettingsCategory(settingCategory));
-    assert.strictEqual(
-        disableSettingCommands.length, 1, 'Commands for changing a setting\'s value were not added correctly');
-    assert.strictEqual(
-        enableSettingCommands.length, 1, 'Commands for changing a setting\'s value were not added correctly');
+    assert.lengthOf(disableSettingCommands, 1, 'Commands for changing a setting\'s value were not added correctly');
+    assert.lengthOf(enableSettingCommands, 1, 'Commands for changing a setting\'s value were not added correctly');
   });
 
   it('triggers a setting\'s change listener when a setting is set', () => {

package/front_end/core/common/SettingRegistration.ts

@@ -74,6 +74,10 @@ const UIStrings = {
    * section allows users to configure which DevTools data is synced via Chrome Sync.
    */
   sync: 'Sync',
+  /**
+   * @description Text for the privacy section of the page.
+   */
+  privacy: 'Privacy',
 };
 const str_ = i18n.i18n.registerUIStrings('core/common/SettingRegistration.ts', UIStrings);
 const i18nString = i18n.i18n.getLocalizedString.bind(undefined, str_);
@@ -142,6 +146,7 @@ export const enum SettingCategory {
   EXTENSIONS = 'EXTENSIONS',
   ADORNER = 'ADORNER',
   SYNC = 'SYNC',
+  PRIVACY = 'PRIVACY',
 }
 
 export function getLocalizedSettingsCategory(category: SettingCategory): Platform.UIString.LocalizedString {
@@ -182,6 +187,8 @@ export function getLocalizedSettingsCategory(category: SettingCategory): Platfor
       return i18n.i18n.lockedString('');
     case SettingCategory.SYNC:
       return i18nString(UIStrings.sync);
+    case SettingCategory.PRIVACY:
+      return i18nString(UIStrings.privacy);
   }
 }
 
@@ -323,5 +330,5 @@ interface RawSettingExtensionOption {
 export type SettingExtensionOption = LocalizedSettingExtensionOption|RawSettingExtensionOption;
 export type DisabledConditionResult = {
   disabled: true,
-  reason: string,
+  reasons: string[],
 }|{disabled: false};

package/front_end/core/common/Settings.ts

@@ -367,7 +367,7 @@ export class Deprecation {
 
 export class Setting<V> {
   #titleFunction?: () => Platform.UIString.LocalizedString;
-  #titleInternal!: string;
+  #titleInternal!: Platform.UIString.LocalizedString;
   #registration: SettingRegistration|null = null;
   #requiresUserAction?: boolean;
   #value?: V;
@@ -395,14 +395,14 @@ export class Setting<V> {
     this.eventSupport.removeEventListener(this.name, listener, thisObject);
   }
 
-  title(): string {
+  title(): Platform.UIString.LocalizedString {
     if (this.#titleInternal) {
       return this.#titleInternal;
     }
     if (this.#titleFunction) {
       return this.#titleFunction();
     }
-    return '';
+    return '' as Platform.UIString.LocalizedString;
   }
 
   setTitleFunction(titleFunction: (() => Platform.UIString.LocalizedString)|undefined): void {
@@ -411,7 +411,7 @@ export class Setting<V> {
     }
   }
 
-  setTitle(title: string): void {
+  setTitle(title: Platform.UIString.LocalizedString): void {
     this.#titleInternal = title;
   }
 
@@ -431,14 +431,14 @@ export class Setting<V> {
     return this.#disabled || false;
   }
 
-  disabledReason(): string|undefined {
+  disabledReasons(): string[] {
     if (this.#registration?.disabledCondition) {
       const result = this.#registration.disabledCondition(Settings.instance().getHostConfig());
       if (result.disabled) {
-        return result.reason;
+        return result.reasons;
       }
     }
-    return undefined;
+    return [];
   }
 
   setDisabled(disabled: boolean): void {

package/front_end/core/common/common.ts

@@ -15,6 +15,7 @@ import * as EventTarget from './EventTarget.js';
 import * as JavaScriptMetaData from './JavaScriptMetaData.js';
 import * as Lazy from './Lazy.js';
 import * as Linkifier from './Linkifier.js';
+import * as MapWithDefault from './MapWithDefault.js';
 import * as Mutex from './Mutex.js';
 import * as ObjectWrapper from './Object.js';
 import * as ParsedURL from './ParsedURL.js';
@@ -40,21 +41,21 @@ import * as Worker from './Worker.js';
  * update all references to `Common.UIString` to `Platform.UIString`.
  */
 export {UIString} from '../platform/platform.js';
-
 export {
   App,
   AppProvider,
   Base64,
   CharacterIdMap,
   Color,
-  ColorUtils,
   ColorConverter,
+  ColorUtils,
   Console,
   Debouncer,
   EventTarget,
   JavaScriptMetaData,
   Lazy,
   Linkifier,
+  MapWithDefault,
   Mutex,
   ObjectWrapper,
   ParsedURL,
@@ -65,8 +66,8 @@ export {
   Revealer,
   Runnable,
   SegmentedRange,
-  Settings,
   SettingRegistration,
+  Settings,
   SimpleHistoryManager,
   StringOutputStream,
   TextDictionary,

package/front_end/core/dom_extension/DOMExtension.test.ts

@@ -7,12 +7,14 @@ import './dom_extension.js';
 declare global {
   interface HTMLElement {
     traverseNextNode(node: HTMLElement): HTMLElement;
+    createChild<K extends keyof HTMLElementTagNameMap>(tagName: K, className?: string, content?: string):
+        HTMLElementTagNameMap[K];
     createChild(tagName: string, className?: string, content?: string): HTMLElement;
   }
 }
 
 function createSlot(parent: HTMLElement, name?: string) {
-  const slot = parent.createChild('slot') as HTMLSlotElement;
+  const slot = parent.createChild('slot');
   if (name) {
     slot.name = name;
   }
@@ -47,7 +49,7 @@ describe('DataGrid', () => {
         */
 
     let node: HTMLElement = component1;
-    assert.strictEqual(node.nodeValue, null, 'root node value is incorrect');
+    assert.isNull(node.nodeValue, 'root node value is incorrect');
     assert.strictEqual(node.nodeName, 'DIV', 'root node name is incorrect');
     assert.strictEqual(node.className, 'component1', 'root node class is incorrect');
 

package/front_end/core/dom_extension/DOMExtension.ts

@@ -175,8 +175,11 @@ self.createDocumentFragment = function(): DocumentFragment {
   return document.createDocumentFragment();
 };
 
-Element.prototype.createChild = function(elementName: string, className?: string, customElementType?: string): Element {
-  const element = document.createElement(elementName, {is: customElementType});
+DocumentFragment.prototype.createChild = Element.prototype.createChild = function(
+    elementName: string,
+    className?: string,
+    ): Element {
+  const element = document.createElement(elementName);
   if (className) {
     element.className = className;
   }
@@ -184,8 +187,6 @@ Element.prototype.createChild = function(elementName: string, className?: string
   return element;
 };
 
-DocumentFragment.prototype.createChild = Element.prototype.createChild;
-
 self.AnchorBox = class {
   constructor(x?: number, y?: number, width?: number, height?: number) {
     this.x = x || 0;

package/front_end/core/host/AidaClient.test.ts

@@ -12,8 +12,8 @@ describeWithEnvironment('AidaClient', () => {
   it('adds no model temperature if console insights is not enabled', () => {
     const stub = getGetHostConfigStub({});
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
-    assert.deepStrictEqual(request, {
-      input: 'foo',
+    assert.deepEqual(request, {
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       client_feature: 1,
       functionality_type: 2,
@@ -29,8 +29,8 @@ describeWithEnvironment('AidaClient', () => {
       },
     });
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
-    assert.deepStrictEqual(request, {
-      input: 'foo',
+    assert.deepEqual(request, {
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       options: {
         temperature: 0.5,
@@ -49,8 +49,8 @@ describeWithEnvironment('AidaClient', () => {
       },
     });
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
-    assert.deepStrictEqual(request, {
-      input: 'foo',
+    assert.deepEqual(request, {
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       options: {
         temperature: 0,
@@ -69,8 +69,8 @@ describeWithEnvironment('AidaClient', () => {
       },
     });
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
-    assert.deepStrictEqual(request, {
-      input: 'foo',
+    assert.deepEqual(request, {
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       client_feature: 1,
       functionality_type: 2,
@@ -87,8 +87,8 @@ describeWithEnvironment('AidaClient', () => {
       },
     });
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
-    assert.deepStrictEqual(request, {
-      input: 'foo',
+    assert.deepEqual(request, {
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       options: {
         model_id: TEST_MODEL_ID,
@@ -111,8 +111,8 @@ describeWithEnvironment('AidaClient', () => {
       },
     });
     const request = Host.AidaClient.AidaClient.buildConsoleInsightsRequest('foo');
-    assert.deepStrictEqual(request, {
-      input: 'foo',
+    assert.deepEqual(request, {
+      current_message: {parts: [{text: 'foo'}], role: Host.AidaClient.Role.USER},
       client: 'CHROME_DEVTOOLS',
       metadata: {
         disable_user_content_logging: true,
@@ -153,11 +153,28 @@ describeWithEnvironment('AidaClient', () => {
 
     const provider = new Host.AidaClient.AidaClient();
     const results = await getAllResults(provider);
-    assert.deepStrictEqual(results, [
-      {explanation: 'hello ', metadata: {rpcGlobalId: 123}, completed: false},
-      {explanation: 'hello brave ', metadata: {rpcGlobalId: 123}, completed: false},
-      {explanation: 'hello brave new world!', metadata: {rpcGlobalId: 123}, completed: false},
-      {explanation: 'hello brave new world!', metadata: {rpcGlobalId: 123}, completed: true},
+    assert.deepEqual(results, [
+      {
+        explanation: 'hello ',
+        metadata: {rpcGlobalId: 123},
+        completed: false,
+      },
+      {
+        explanation: 'hello brave ',
+        metadata: {rpcGlobalId: 123},
+        completed: false,
+      },
+      {
+        explanation: 'hello brave new world!',
+        metadata: {rpcGlobalId: 123},
+        completed: false,
+      },
+      {
+        explanation: 'hello brave new world!',
+        metadata: {rpcGlobalId: 123},
+        functionCalls: undefined,
+        completed: true,
+      },
     ]);
   });
 
@@ -174,9 +191,18 @@ describeWithEnvironment('AidaClient', () => {
 
     const provider = new Host.AidaClient.AidaClient();
     const results = await getAllResults(provider);
-    assert.deepStrictEqual(results, [
-      {explanation: 'hello world', metadata: {rpcGlobalId: 123}, completed: false},
-      {explanation: 'hello world', metadata: {rpcGlobalId: 123}, completed: true},
+    assert.deepEqual(results, [
+      {
+        explanation: 'hello world',
+        metadata: {rpcGlobalId: 123},
+        completed: false,
+      },
+      {
+        explanation: 'hello world',
+        metadata: {rpcGlobalId: 123},
+        functionCalls: undefined,
+        completed: true,
+      },
     ]);
   });
 
@@ -207,7 +233,7 @@ describeWithEnvironment('AidaClient', () => {
 
     const provider = new Host.AidaClient.AidaClient();
     const results = await getAllResults(provider);
-    assert.deepStrictEqual(results, [
+    assert.deepEqual(results, [
       {
         explanation: 'Friends, Romans, countrymen, lend me your ears;\n' +
             'I come to bury Caesar, not to praise him.\n',
@@ -255,6 +281,7 @@ describeWithEnvironment('AidaClient', () => {
             'If it were so, it was a grievous fault,\n' +
             'And grievously hath Caesar answer’d it.\n',
         metadata: {rpcGlobalId: 123},
+        functionCalls: undefined,
         completed: true,
       },
     ]);
@@ -266,7 +293,7 @@ describeWithEnvironment('AidaClient', () => {
           const response = JSON.stringify([
             {
               textChunk: {text: 'Chunk1\n'},
-              metadata: {rpcGlobalId: 123, attributionMetadata: {attributionAction: 'BLOCK', citations: []}},
+              metadata: {rpcGlobalId: 123},
             },
             {
               textChunk: {text: 'Chunk2\n'},
@@ -286,19 +313,16 @@ describeWithEnvironment('AidaClient', () => {
 
     const provider = new Host.AidaClient.AidaClient();
     const results = await getAllResults(provider);
-    assert.deepStrictEqual(results, [
+    assert.deepEqual(results, [
       {
         explanation: 'Chunk1\n' +
             'Chunk2\n',
         metadata: {
           rpcGlobalId: 123,
-          attributionMetadata: [
-            {attributionAction: Host.AidaClient.RecitationAction.BLOCK, citations: []},
-            {
-              attributionAction: Host.AidaClient.RecitationAction.CITE,
-              citations: [{startIndex: 0, endIndex: 1, url: 'https://example.com'}],
-            },
-          ],
+          attributionMetadata: {
+            attributionAction: Host.AidaClient.RecitationAction.CITE,
+            citations: [{startIndex: 0, endIndex: 1, url: 'https://example.com'}],
+          },
         },
         completed: false,
       },
@@ -307,19 +331,49 @@ describeWithEnvironment('AidaClient', () => {
             'Chunk2\n',
         metadata: {
           rpcGlobalId: 123,
-          attributionMetadata: [
-            {attributionAction: Host.AidaClient.RecitationAction.BLOCK, citations: []},
-            {
-              attributionAction: Host.AidaClient.RecitationAction.CITE,
-              citations: [{startIndex: 0, endIndex: 1, url: 'https://example.com'}],
-            },
-          ],
+          attributionMetadata: {
+            attributionAction: Host.AidaClient.RecitationAction.CITE,
+            citations: [{startIndex: 0, endIndex: 1, url: 'https://example.com'}],
+          },
         },
+        functionCalls: undefined,
         completed: true,
       },
     ]);
   });
 
+  it('throws on attributionAction of "block"', async () => {
+    sinon.stub(Host.InspectorFrontendHost.InspectorFrontendHostInstance, 'doAidaConversation')
+        .callsFake(async (_, streamId, callback) => {
+          const response = JSON.stringify([
+            {
+              textChunk: {text: 'Chunk1\n'},
+              metadata: {rpcGlobalId: 123, attributionMetadata: {attributionAction: 'NO_ACTION', citations: []}},
+            },
+            {
+              textChunk: {text: 'Chunk2\n'},
+              metadata: {
+                rpcGlobalId: 123,
+                attributionMetadata: {attributionAction: 'BLOCK', citations: []},
+              },
+            },
+          ]);
+          const chunks = response.split(',{');
+          await new Promise(resolve => setTimeout(resolve, 0));
+          Host.ResourceLoader.streamWrite(streamId, chunks[0] + ',{' + chunks[1]);
+          await new Promise(resolve => setTimeout(resolve, 0));
+          callback({statusCode: 200});
+        });
+
+    const provider = new Host.AidaClient.AidaClient();
+    try {
+      await getAllResults(provider);
+      expect.fail('provider.fetch did not throw');
+    } catch (err) {
+      assert.instanceOf(err, Host.AidaClient.AidaBlockError);
+    }
+  });
+
   it('handles subsequent code chunks', async () => {
     sinon.stub(Host.InspectorFrontendHost.InspectorFrontendHostInstance, 'doAidaConversation')
         .callsFake(async (_, streamId, callback) => {
@@ -337,7 +391,7 @@ describeWithEnvironment('AidaClient', () => {
 
     const provider = new Host.AidaClient.AidaClient();
     const results = (await getAllResults(provider)).map(r => r.explanation);
-    assert.deepStrictEqual(results, [
+    assert.deepEqual(results, [
       'hello ',
       'hello \n`````\nbrave \n`````\n',
       'hello \n`````\nbrave new World()\n`````\n',