Merge pull request #22 from microsoft/connor4312/0.0.6

fix: preserve order when resolving configurations
microsoft · Feb 7, 2024 · 9f939e3 · 9f939e3
2 parents 11a07ce + 5de3842
commit 9f939e3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vscode/test-cli",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "Command-line runner for VS Code extension tests",
   "scripts": {
     "prepack": "npm run build",

diff --git a/src/bin.mts b/src/bin.mts
@@ -65,14 +65,12 @@ async function prepareConfigs(
   config: ResolvedTestConfiguration,
   enabledTests: Set<TestConfiguration>,
 ): Promise<IPreparedRun[]> {
-  const prepared: IPreparedRun[] = [];
-  await Promise.all(
+  return await Promise.all(
     [...enabledTests].map(async (test, i) => {
       for (const platform of platforms) {
         const p = await platform.prepare({ args, config, test });
         if (p) {
-          prepared.push(p);
-          return;
+          return p;
         }
       }
 
@@ -81,8 +79,6 @@ async function prepareConfigs(
       );
     }),
   );
-
-  return prepared;
 }
 
 const WATCH_RUN_DEBOUNCE = 500;
@@ -173,7 +169,9 @@ async function runPreparedConfigs(
 async function runConfigs(config: ResolvedTestConfiguration, enabledTests: Set<TestConfiguration>) {
   const prepared = await prepareConfigs(config, enabledTests);
   if (args.listConfiguration) {
-    console.log(JSON.stringify(prepared.map((p) => p.dumpJson())));
+    await new Promise((r) =>
+      process.stdout.write(JSON.stringify(prepared.map((p) => p.dumpJson())), r),
+    );
     return 0;
   }