Reduce hook installation tests

core/cli/src/install.ts

@@ -31,7 +31,7 @@ async function asyncFilter<T>(items: T[], predicate: (item: T) => Promise<boolea
   return results.filter(({ keep }) => keep).map(({ item }) => item)
 }
 
-const loadHookEntrypoints = async (
+export const loadHookEntrypoints = async (
   logger: Logger,
   config: ValidConfig
 ): Promise<Validated<Record<string, HookModule>>> => {
@@ -54,13 +54,9 @@ export const loadHookInstallations = async (
   config: ValidConfig
 ): Promise<Validated<Hook[]>> => {
   const hookClassResults = await loadHookEntrypoints(logger, config)
-  const installationResults = (
-    await hookClassResults
-      .map((hookClasses) =>
-        reducePluginHookInstallations(logger, config, hookClasses, config.plugins['app root'])
-      )
-      .awaitValue()
-  ).flatMap((installation) => installation)
+  const installationResults = hookClassResults.flatMap((hookClasses) =>
+    reducePluginHookInstallations(logger, config, hookClasses, config.plugins['app root'])
+  )
 
   const installationsWithoutConflicts = installationResults.flatMap((installations) => {
     const conflicts = findConflicts(installations)

core/cli/src/plugin/reduce-installations.ts

@@ -46,23 +46,19 @@ const extractForHook = (installation: HookInstallation | Conflict<HookInstallati
 //   - call `Hook.overrideChildInstallations` with the appropriate concrete Hook class, and
 
 //     the resulting installations and/or conflicts from `Hook.mergeChildInstallations` and `p`
-export async function reducePluginHookInstallations(
+export function reducePluginHookInstallations(
   logger: Logger,
   config: ValidConfig,
   hookModules: Record<string, HookModule>,
   plugin: Plugin
-): Promise<Validated<(HookInstallation | Conflict<HookInstallation>)[]>> {
+): Validated<(HookInstallation | Conflict<HookInstallation>)[]> {
   if (!plugin.rcFile || config.resolutionTrackers.reducedInstallationPlugins.has(plugin.id)) {
     return valid([])
   }
   config.resolutionTrackers.reducedInstallationPlugins.add(plugin.id)
 
   const rawChildInstallations = reduceValidated(
-    await Promise.all(
-      (plugin.children ?? []).map((child) =>
-        reducePluginHookInstallations(logger, config, hookModules, child)
-      )
-    )
+    (plugin.children ?? []).map((child) => reducePluginHookInstallations(logger, config, hookModules, child))
   ).map((installations) => installations.flat())
 
   if (!rawChildInstallations.valid) {

core/cli/test/plugin/files/single-install/merge-children/.toolkitrc.yml

@@ -0,0 +1,3 @@
+plugins:
+  - './a'
+  - './b'

core/cli/test/plugin/files/single-install/merge-children/a/.toolkitrc.yml

@@ -0,0 +1,6 @@
+version: 2
+
+options:
+  hooks:
+    - TestHook:
+        a: true

core/cli/test/plugin/files/single-install/merge-children/b/.toolkitrc.yml

@@ -0,0 +1,6 @@
+version: 2
+
+options:
+  hooks:
+    - TestHook:
+        b: true

core/cli/test/plugin/files/single-install/nested-override/.toolkitrc.yml

@@ -0,0 +1,2 @@
+plugins:
+  - './b'

core/cli/test/plugin/files/single-install/nested-override/a/.toolkitrc.yml

@@ -0,0 +1,6 @@
+version: 2
+
+options:
+  hooks:
+    - TestHook:
+        a: true

core/cli/test/plugin/files/single-install/nested-override/b/.toolkitrc.yml

@@ -0,0 +1,9 @@
+version: 2
+
+plugins:
+  - '../a'
+
+options:
+  hooks:
+    - TestHook:
+        b: true

core/cli/test/plugin/files/single-install/override-children/.toolkitrc.yml

@@ -0,0 +1,8 @@
+plugins:
+  - './a'
+  - './b'
+
+options:
+  hooks:
+    - TestHook:
+        c: true

core/cli/test/plugin/files/single-install/override-children/a/.toolkitrc.yml

@@ -0,0 +1,6 @@
+version: 2
+
+options:
+  hooks:
+    - TestHook:
+        a: true

core/cli/test/plugin/files/single-install/override-children/b/.toolkitrc.yml

@@ -0,0 +1,6 @@
+version: 2
+
+options:
+  hooks:
+    - TestHook:
+        b: true