Add expandAll for expectations

src/common/internal/file_loader.ts

@@ -73,15 +73,17 @@ export abstract class TestFileLoader extends EventTarget {
     query: TestQuery,
     {
       subqueriesToExpand = [],
+      expandAll = false,
       maxChunkTime = Infinity,
-    }: { subqueriesToExpand?: string[]; maxChunkTime?: number } = {}
+    }: { subqueriesToExpand?: string[]; expandAll?: boolean; maxChunkTime?: number } = {}
   ): Promise<TestTree> {
     const tree = await loadTreeForQuery(this, query, {
       subqueriesToExpand: subqueriesToExpand.map(s => {
         const q = parseQuery(s);
         assert(q.level >= 2, () => `subqueriesToExpand entries should not be multi-file:\n  ${q}`);
         return q;
       }),
+      expandAll,
       maxChunkTime,
     });
     this.dispatchEvent(new MessageEvent<void>('finish'));

src/common/internal/tree.ts

@@ -286,8 +286,9 @@ export async function loadTreeForQuery(
   queryToLoad: TestQuery,
   {
     subqueriesToExpand,
+    expandAll = false,
     maxChunkTime = Infinity,
-  }: { subqueriesToExpand: TestQuery[]; maxChunkTime?: number }
+  }: { subqueriesToExpand: TestQuery[]; expandAll?: boolean; maxChunkTime?: number }
 ): Promise<TestTree> {
   const suite = queryToLoad.suite;
   const specs = await loader.listing(suite);
@@ -302,6 +303,7 @@ export async function loadTreeForQuery(
 
       // If toExpand == subquery, no expansion is needed (but it's still "seen").
       if (ordering === Ordering.Equal) seenSubqueriesToExpand[i] = true;
+      if (expandAll) return ordering === Ordering.Unordered;
       return ordering !== Ordering.StrictSubset;
     });
 

src/common/tools/gen_wpt_cts_html.ts

@@ -70,6 +70,8 @@ interface ConfigJSON {
     file: string;
     /** The prefix to trim from every line of the expectations_file. */
     prefix: string;
+    /** Expend all subtrees for provided expectations */
+    expandAll?: boolean;
   };
   /*No long path assert */
   noLongPathAssert?: boolean;
@@ -85,6 +87,7 @@ interface Config {
   expectations?: {
     file: string;
     prefix: string;
+    expandAll: boolean;
   };
 }
 
@@ -110,6 +113,7 @@ let config: Config;
         config.expectations = {
           file: path.resolve(jsonFileDir, configJSON.expectations.file),
           prefix: configJSON.expectations.prefix,
+          expandAll: configJSON.expectations.expandAll ?? false,
         };
       }
       break;
@@ -143,6 +147,7 @@ let config: Config;
         config.expectations = {
           file: expectationsFile,
           prefix: expectationsPrefix,
+          expandAll: false,
         };
       }
       break;
@@ -188,6 +193,7 @@ let config: Config;
     const rootQuery = new TestQueryMultiFile(config.suite, []);
     const tree = await loader.loadTree(rootQuery, {
       subqueriesToExpand: expectations.get(prefix),
+      expandAll: config.expectations?.expandAll,
       maxChunkTime: config.maxChunkTimeMS,
     });