chrome-devtools-frontend 1.0.1014346 → 1.0.1015658

package/scripts/webidl-properties/index.js

@@ -21,8 +21,8 @@ const names = Object.keys(SPECS);
 const specs = await Promise.all(names.map(name => files[name].parse().then(idls => ({name, idls}))));
 
 const output = addMetadata(getIDLProps(specs));
-const missing = getMissingTypes(output);
 
+const missing = getMissingTypes(output);
 for (const type of missing) {
   console.warn('Found missing type:', type);
 }
@@ -32,6 +32,8 @@ const jsMetadataPath = path.join(frontendPath, 'front_end/models/javascript_meta
 const outPath = path.join(jsMetadataPath, 'DOMPinnedProperties.ts');
 const thisPath = path.relative(frontendPath, url.fileURLToPath(import.meta.url));
 
+const stringify = object => JSON.stringify(object, null, 2);
+
 fs.writeFileSync(outPath, `
 // Copyright 2022 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
@@ -41,7 +43,7 @@ fs.writeFileSync(outPath, `
 /**
  * All the specs used when generating the DOM pinned properties dataset.
  */
-export const SPECS = ${JSON.stringify(SPECS)};
+export const SPECS = ${stringify(SPECS)};
 
 export interface DOMPinnedWebIDLProp {
   // A flag specifying whether it's a "global" attribute.
@@ -49,6 +51,8 @@ export interface DOMPinnedWebIDLProp {
   // A bitfield of the specs in which the property is found.
   // If missing, it implies the default spec: "html".
   specs?: number;
+  // The "states" in which this property is "applicable".
+  rules?: Array<DOMPinnedWebIDLRule>;
 }
 
 export interface DOMPinnedWebIDLType {
@@ -62,12 +66,12 @@ export interface DOMPinnedWebIDLType {
     [PropName: string]: DOMPinnedWebIDLProp,
   };
   // The "states" in which only certain properties are "applicable".
-  states?: {
-    // A CSS selector such as "[type=checkbox]".
-    [State: string]: {
-      [PropName: string]: DOMPinnedWebIDLProp,
-    },
-  };
+  rules?: Array<DOMPinnedWebIDLRule>;
+}
+
+export interface DOMPinnedWebIDLRule {
+  when: string;
+  is: string;
 }
 
 export interface DOMPinnedPropertiesDataset {
@@ -81,5 +85,6 @@ export interface DOMPinnedPropertiesDataset {
  * This is an object with WebIDL type names as keys and their WebIDL properties
  * and inheritance/include chains as values.
  */
-export const DOMPinnedProperties: DOMPinnedPropertiesDataset = ${JSON.stringify(minimize(output))};
+export const DOMPinnedProperties: DOMPinnedPropertiesDataset = ${stringify(minimize(output))};
+
 `);

package/scripts/webidl-properties/tests.js

@@ -39,7 +39,7 @@ describe('DOM pinned properties dataset generation', function() {
       global: true,
       specs: ['html'],
     });
-    assert.strictEqual(type.states, undefined);
+    assert.strictEqual(type.rules, undefined);
   });
 
   it('generates valid data for HTMLInputElement', () => {
@@ -49,12 +49,34 @@ describe('DOM pinned properties dataset generation', function() {
     assert.deepEqual(type.props.checked, {
       global: false,
       specs: ['html'],
+      rules: [{when: 'type', is: 'checkbox'}, {when: 'type', is: 'radio'}],
     });
-    assert.deepEqual(type.states['[type=checkbox]'], {
-      checked: {global: false, specs: ['html']},
-      required: {global: false, specs: ['html']},
-      value: {global: false, specs: ['html']},
+    assert.deepEqual(type.props.required, {
+      global: false,
+      specs: ['html'],
+      rules: [
+        {when: 'type', is: 'text'}, {when: 'type', is: 'search'}, {when: 'type', is: 'url'}, {when: 'type', is: 'tel'},
+        {when: 'type', is: 'email'}, {when: 'type', is: 'password'}, {when: 'type', is: 'date'},
+        {when: 'type', is: 'month'}, {when: 'type', is: 'week'}, {when: 'type', is: 'time'},
+        {when: 'type', is: 'datetime-local'}, {when: 'type', is: 'number'}, {when: 'type', is: 'checkbox'},
+        {when: 'type', is: 'radio'}, {when: 'type', is: 'file'}
+      ]
+    });
+    assert.deepEqual(type.props.value, {
+      global: false,
+      specs: ['html'],
+      rules: type.rules,
     });
+    assert.deepEqual(type.rules, [
+      {when: 'type', is: 'hidden'},   {when: 'type', is: 'text'},  {when: 'type', is: 'search'},
+      {when: 'type', is: 'url'},      {when: 'type', is: 'tel'},   {when: 'type', is: 'email'},
+      {when: 'type', is: 'password'}, {when: 'type', is: 'date'},  {when: 'type', is: 'month'},
+      {when: 'type', is: 'week'},     {when: 'type', is: 'time'},  {when: 'type', is: 'datetime-local'},
+      {when: 'type', is: 'number'},   {when: 'type', is: 'range'}, {when: 'type', is: 'color'},
+      {when: 'type', is: 'checkbox'}, {when: 'type', is: 'radio'}, {when: 'type', is: 'file'},
+      {when: 'type', is: 'submit'},   {when: 'type', is: 'image'}, {when: 'type', is: 'reset'},
+      {when: 'type', is: 'button'},
+    ]);
   });
 
   it('generates valid data for MouseEvent', () => {
@@ -65,7 +87,7 @@ describe('DOM pinned properties dataset generation', function() {
       global: false,
       specs: ['uievents'],
     });
-    assert.strictEqual(type.states, undefined);
+    assert.strictEqual(type.rules, undefined);
   });
 
   it('generates valid data for PointerEvent', () => {
@@ -76,7 +98,7 @@ describe('DOM pinned properties dataset generation', function() {
       global: false,
       specs: ['pointerevents'],
     });
-    assert.strictEqual(type.states, undefined);
+    assert.strictEqual(type.rules, undefined);
   });
 
   it('generates an entry for DOMParser', () => {
@@ -84,7 +106,7 @@ describe('DOM pinned properties dataset generation', function() {
     assert.strictEqual(type.inheritance, null);
     assert.deepEqual(type.includes, []);
     assert.deepEqual(type.props, {});
-    assert.strictEqual(type.states, undefined);
+    assert.strictEqual(type.rules, undefined);
   });
 
   it('minimizes the data for HTMLInputElement', () => {
@@ -92,12 +114,34 @@ describe('DOM pinned properties dataset generation', function() {
     const type = minimized.HTMLInputElement;
     assert.strictEqual(type.inheritance, 'HTMLElement');
     assert.strictEqual(type.includes, undefined);
-    assert.deepEqual(type.props.checked, {});
-    assert.deepEqual(type.states['[type=checkbox]'], {
-      checked: {},
-      required: {},
-      value: {},
+    assert.deepEqual(type.props.checked, {
+      rules: [
+        {when: 'type', is: 'checkbox'},
+        {when: 'type', is: 'radio'},
+      ],
+    });
+    assert.deepEqual(type.props.required, {
+      rules: [
+        {when: 'type', is: 'text'}, {when: 'type', is: 'search'}, {when: 'type', is: 'url'}, {when: 'type', is: 'tel'},
+        {when: 'type', is: 'email'}, {when: 'type', is: 'password'}, {when: 'type', is: 'date'},
+        {when: 'type', is: 'month'}, {when: 'type', is: 'week'}, {when: 'type', is: 'time'},
+        {when: 'type', is: 'datetime-local'}, {when: 'type', is: 'number'}, {when: 'type', is: 'checkbox'},
+        {when: 'type', is: 'radio'}, {when: 'type', is: 'file'}
+      ],
     });
+    assert.deepEqual(type.props.value, {
+      rules: type.rules,
+    });
+    assert.deepEqual(type.rules, [
+      {when: 'type', is: 'hidden'},   {when: 'type', is: 'text'},  {when: 'type', is: 'search'},
+      {when: 'type', is: 'url'},      {when: 'type', is: 'tel'},   {when: 'type', is: 'email'},
+      {when: 'type', is: 'password'}, {when: 'type', is: 'date'},  {when: 'type', is: 'month'},
+      {when: 'type', is: 'week'},     {when: 'type', is: 'time'},  {when: 'type', is: 'datetime-local'},
+      {when: 'type', is: 'number'},   {when: 'type', is: 'range'}, {when: 'type', is: 'color'},
+      {when: 'type', is: 'checkbox'}, {when: 'type', is: 'radio'}, {when: 'type', is: 'file'},
+      {when: 'type', is: 'submit'},   {when: 'type', is: 'image'}, {when: 'type', is: 'reset'},
+      {when: 'type', is: 'button'},
+    ]);
   });
 
   it('minimizes the data for PointerEvent', () => {
@@ -108,7 +152,7 @@ describe('DOM pinned properties dataset generation', function() {
     assert.deepEqual(type.props.pressure, {
       specs: 8,
     });
-    assert.strictEqual(type.states, undefined);
+    assert.strictEqual(type.rules, undefined);
   });
 
   it('removes the entry for DOMParser in the minimized output', () => {