fix(atlas): emit afterPrepare events for non-atlas observers

strvcom · Dec 13, 2018 · 3e4f2e4 · 3e4f2e4
1 parent 1a2f3c5
commit 3e4f2e4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/packages/atlas/src/atlas.mjs b/packages/atlas/src/atlas.mjs
@@ -407,20 +407,19 @@ class Atlas {
       }
     }
 
-    // Prepare all components, in parallel 💪
+    // Prepare hooks
+    await Promise.all([...hooks].map(([, container]) => container.prepare({ catalog })))
+
+    // Prepare actions and services in parallel 🚀
     void (await Promise.all([
-      ...Array.from(hooks).map(async ([, container]) => ({
-        expose: false,
-        value: await container.prepare({ catalog }),
+      ...Array.from(actions).map(async ([alias, container]) => ({
+        expose: container.Component.internal ? false : 'actions',
+        value: await container.prepare({ catalog, hooks }),
+        alias,
       })),
       ...Array.from(services).map(async ([alias, container]) => ({
         expose: container.Component.internal ? false : 'services',
-        value: await container.prepare({ catalog }),
-        alias,
-      })),
-      ...Array.from(actions).map(async ([alias, container]) => ({
-        expose: container.Component.internal ? false : 'actions',
-        value: await container.prepare({ catalog }),
+        value: await container.prepare({ catalog, hooks }),
         alias,
       })),
     ]))
@@ -447,7 +446,7 @@ class Atlas {
     await Promise.all([
       ...Array.from(hooks),
       ...Array.from(actions),
-    ].map(([, container]) => container.start({ hooks })))
+    ].map(([, container]) => container.start()))
 
     // Start all services, in the order they were added to the instance 💪
     // Ordering is important here! Some services should be started as the last ones because they

diff --git a/packages/atlas/src/private/component-container.mjs b/packages/atlas/src/private/component-container.mjs
@@ -111,15 +111,18 @@ class ComponentContainer {
    *
    * @param     {Object}          options           Input options
    * @param     {Object}          options.catalog   Atlas catalog of all components
+   * @param     {Map}             options.hooks     Hooks available in the application
    * @return    {Promise<this>}
    */
   async prepare(options) {
     this::mkcatalog(this.#catalog, options)
+    this::mkobservers(this.#observers, { hooks: options.hooks })
 
     switch (this.type) {
       case 'service': {
         this.component.log.trace('prepare:before')
         this.instance = await this.component.prepare()
+        await this.#observers::dispatch('afterPrepare', this.instance)
         this.component.log.trace('prepare:after')
         break
       }
@@ -136,17 +139,14 @@ class ComponentContainer {
   /**
    * Start the component
    *
-   * @param     {Object}    opts            Additional options
-   * @param     {Map}       opts.hooks      Hooks available in the application
    * @return    {Promise<this.component>}
    */
-  async start(opts) {
+  async start() {
     if (this.started) {
       return this.component
     }
 
     this.component.log.trace('start:before')
-    this::mkobservers(this.#observers, { hooks: opts.hooks })
 
     switch (this.type) {
       case 'service':
@@ -167,6 +167,7 @@ class ComponentContainer {
         break
     }
 
+    this.component.log.trace('start:after')
     this.started = true
 
     return this.component
@@ -221,7 +222,7 @@ class ComponentContainer {
  * @return    {void}
  */
 function mkobservers(observers, { hooks }) {
-  for (const [alias, container] of hooks) {
+  for (const [alias, container] of hooks || new Map()) {
     const target = container.aliases[container.Component.observes]
 
     if (this.alias === target) {