Skip to content

Commit

Permalink
refactor!: move to stable assembler hooks APIs
Browse files Browse the repository at this point in the history
  • Loading branch information
Julien-R44 committed Jun 2, 2024
1 parent 293e100 commit b6b8795
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 19 deletions.
16 changes: 2 additions & 14 deletions src/hooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,22 @@ import {
RcFile,
AssemblerHookNode,
AssemblerHookHandler,
HttpServerMessageHookHandler,
SourceFileChangedHookHandler,
} from '@adonisjs/application/types'
import { RuntimeException } from '@poppinss/utils'
import Hooks from '@poppinss/hooks'

export class AssemblerHooks {
#config: RcFile['unstable_assembler']
#config: RcFile['hooks']

#hooks = new Hooks<{
onBuildStarting: [Parameters<AssemblerHookHandler>, []]
onBuildCompleted: [Parameters<AssemblerHookHandler>, []]
onDevServerStarted: [Parameters<AssemblerHookHandler>, []]
onSourceFileChanged: [Parameters<SourceFileChangedHookHandler>, []]
onHttpServerMessage: [Parameters<HttpServerMessageHookHandler>, []]
}>()

constructor(config: RcFile['unstable_assembler']) {
constructor(config: RcFile['hooks']) {
this.#config = config
}

Expand Down Expand Up @@ -56,9 +54,6 @@ export class AssemblerHooks {
...(this.#config?.onSourceFileChanged || []).map(async (node) =>
this.#hooks.add('onSourceFileChanged', await this.#resolveHookNode(node))
),
...(this.#config?.onHttpServerMessage || []).map(async (node) =>
this.#hooks.add('onHttpServerMessage', await this.#resolveHookNode(node))
),
])
}

Expand Down Expand Up @@ -103,11 +98,4 @@ export class AssemblerHooks {
async onBuildCompleted(...args: Parameters<AssemblerHookHandler>) {
await this.#hooks.runner('onBuildCompleted').run(...args)
}

/**
* When a message is received from the HTTP server process
*/
async onHttpServerMessage(...args: Parameters<HttpServerMessageHookHandler>) {
await this.#hooks.runner('onHttpServerMessage').run(...args)
}
}
7 changes: 2 additions & 5 deletions src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,7 @@ export type DevServerOptions = {
/**
* Hooks to execute at different stages
*/
hooks?: Pick<
NonNullable<RcFile['unstable_assembler']>,
'onDevServerStarted' | 'onSourceFileChanged' | 'onHttpServerMessage'
>
hooks?: Pick<NonNullable<RcFile['hooks']>, 'onDevServerStarted' | 'onSourceFileChanged'>
}

/**
Expand Down Expand Up @@ -224,7 +221,7 @@ export type BundlerOptions = {
/**
* Hooks to execute at different stages
*/
hooks?: Pick<NonNullable<RcFile['unstable_assembler']>, 'onBuildCompleted' | 'onBuildStarting'>
hooks?: Pick<NonNullable<RcFile['hooks']>, 'onBuildCompleted' | 'onBuildStarting'>
}

/**
Expand Down

0 comments on commit b6b8795

Please sign in to comment.