chrome-devtools-frontend 1.0.1006768 → 1.0.1007307

package/scripts/javascript_natives/helpers.js

@@ -10,9 +10,12 @@ import {fileURLToPath} from 'url';
 
 /** @type {Map<string, Map<string, string[][]>>} */
 const methods = new Map();
+/** @type {Map<string, string[]>} */
+const includes = new Map();
 
 export function clearState() {
   methods.clear();
+  includes.clear();
 }
 
 export function parseTSFunction(func, node) {
@@ -47,9 +50,22 @@ export function walkRoot(thing) {
     case 'namespace':
       walkMembers(thing);
       break;
+    case 'includes':
+      walkIncludes(thing);
+      break;
   }
 }
 
+/**
+ * @param {WebIDL2.IncludesType} thing
+ * */
+function walkIncludes(thing) {
+  if (includes.has(thing.includes)) {
+    includes.get(thing.includes).push(thing.target);
+  } else {
+    includes.set(thing.includes, [thing.target]);
+  }
+}
 /**
  * @param {WebIDL2.InterfaceType} thing
  * */
@@ -84,9 +100,7 @@ function walkMembers(thing) {
  * @param {WebIDL2.OperationMemberType} member
  * */
 function handleOperation(member) {
-  storeMethod(
-      member.special === 'static' ? (parent.name + 'Constructor') : member.parent.name, member.name,
-      member.arguments.map(argName));
+  storeMethod(member.parent.name, member.name, member.arguments.map(argName));
 }
 
 /**
@@ -177,13 +191,18 @@ export function postProcess(dryRun = false) {
       // All parents had the same signature so we emit an entry without receiver.
       functions.push({name, signatures: method.get('*')});
     } else {
+      const receiversMap = new Map();
       for (const [parent, signatures] of method) {
-        if (parent.endsWith('Constructor')) {
-          functions.push(
-              {name, signatures, static: true, receiver: parent.substring(0, parent.length - 'Constructor'.length)});
+        const receivers = receiversMap.get(JSON.stringify(signatures)) || new Set();
+        if (includes.has(parent)) {
+          includes.get(parent).forEach(receiver => receivers.add(receiver));
         } else {
-          functions.push({name, signatures, receiver: parent});
+          receivers.add(parent);
         }
+        receiversMap.set(JSON.stringify(signatures), receivers);
+      }
+      for (const [signatures, receivers] of receiversMap) {
+        functions.push({name, signatures: JSON.parse(signatures), receivers: Array.from(receivers)});
       }
     }
   }

package/scripts/javascript_natives/index.js

@@ -14,9 +14,11 @@ if (process.argv.length !== 4) {
 }
 
 const chromiumSource = process.argv[2];
-const typescriptSource = process.argv[3] + 'node_modules/typescript/lib/lib.esnext.d.ts';
+const REL_TS_LIB_PATH = '/node_modules/typescript/lib/';
+const typescriptSources =
+    fs.readdirSync(process.argv[3] + REL_TS_LIB_PATH).map(name => process.argv[3] + REL_TS_LIB_PATH + name);
 
-const program = ts.createProgram([typescriptSource], {noLib: false, types: []});
+const program = ts.createProgram({rootNames: typescriptSources, options: {noResolve: true, types: []}});
 
 for (const file of program.getSourceFiles()) {
   ts.forEachChild(file, node => {
@@ -30,7 +32,6 @@ for (const file of program.getSourceFiles()) {
     if (node.kind === ts.SyntaxKind.FunctionDeclaration) {
       parseTSFunction(node, {name: {text: 'Window'}});
     }
-
   });
 }
 

package/scripts/javascript_natives/tests.js

@@ -182,12 +182,12 @@ namespace console {
   {
     name: "diffSig",
     signatures: [["oneSig"]],
-    receiver: "Array"
+    receivers: ["Array"]
   },
   {
     name: "diffSig",
     signatures: [["twoSig"]],
-    receiver: "ReadonlyArray"
+    receivers: ["ReadonlyArray"]
   }
 ];`;
     assert.equal(output, expected);