fix: self update / loader update

Author: shigma

packages/core/src/events.ts

@@ -69,13 +69,13 @@ export class EventsService<C extends Context = Context> {
       })
     }
 
-    this.on('internal/update', function (config, _next) {
+    this.on('internal/update', function (config, _, next) {
       const cbs = [...this._hooks['internal/update'] || []]
-      const next = () => {
-        const cb = cbs.shift() ?? _next
-        return cb.call(this, config, next)
+      const _next = () => {
+        const cb = cbs.shift() ?? next
+        return cb.call(this, config, _next)
       }
-      return next()
+      return _next()
     }, { global: true, prepend: true })
   }
 
@@ -172,7 +172,7 @@ export interface Events<in C extends Context = Context> {
   'internal/error'(this: C, format: any, ...param: any[]): void
   'internal/warn'(this: C, format: any, ...param: any[]): void
   'internal/service'(this: C, name: string, value: any): void
-  'internal/update'(this: Fiber<C>, config: any, next: () => void): void
+  'internal/update'(this: Fiber<C>, config: any, noSave: boolean, next: () => void): void
   'internal/get'(ctx: C, name: string, error: Error, next: () => any): any
   'internal/set'(ctx: C, name: string, value: any, error: Error, next: () => boolean): boolean
   'internal/listener'(this: C, name: string, listener: any, prepend: boolean): void

packages/core/src/fiber.ts

@@ -430,10 +430,10 @@ export class Fiber<out C extends Context = Context> {
     await this.await()
   }
 
-  update(config: any) {
+  update(config: any, noSave = false) {
     this.assertActive()
     config = resolveConfig(this.runtime!, config)
-    this.context.waterfall(this, 'internal/update', config, () => {
+    this.context.waterfall(this, 'internal/update', config, noSave, () => {
       this.config = config
       this._error = undefined
       return this.restart()

packages/loader/src/config/entry.ts

@@ -36,7 +36,6 @@ export class Entry<C extends Context = Context> {
 
   public ctx: C
   public fiber?: Fiber<C>
-  public suspend = false
   public parent!: EntryGroup<C>
   // safety: call `entry.update()` immediately after creating an entry
   public options = {} as EntryOptions
@@ -87,8 +86,7 @@ export class Entry<C extends Context = Context> {
       Object.setPrototypeOf(this.ctx, this.parent.ctx)
 
       if (this.fiber?.uid && (diff.includes('config') || this.options.group)) {
-        this.suspend = true
-        this.fiber.update(this._resolveConfig(this.fiber.runtime!.callback))
+        this.fiber.update(this._resolveConfig(this.fiber.runtime!.callback), true)
       }
     })
   }

packages/loader/src/loader.ts

@@ -77,15 +77,16 @@ export abstract class Loader<C extends Context = Context> extends ImportTree<C>
 
     ctx.reflect.provide('loader', this, this[Service.check])
 
-    ctx.on('internal/update', function (config, next) {
+    ctx.on('internal/update', function (config, noSave, next) {
+      if (!this.entry || noSave) return next()
+      const unparse = this.runtime?.Config?.['simplify']
+      this.entry.options.config = unparse ? unparse(config) : config
+      this.entry.parent.tree.write()
+      return next()
+    }, { global: true, prepend: true })
+
+    ctx.on('internal/update', function (config, _, next) {
       if (!this.entry) return next()
-      if (this.entry.suspend) {
-        this.entry.suspend = false
-      } else {
-        const unparse = this.runtime?.Config?.['simplify']
-        this.entry.options.config = unparse ? unparse(config) : config
-        this.entry.parent.tree.write()
-      }
       self.showLog(this.entry, 'reload')
       return next()
     }, { global: true })

packages/loader/tests/index.spec.ts

@@ -15,9 +15,9 @@ describe('Loader: basic support', () => {
     await root.plugin(MockLoader)
     loader = root.loader as any
 
-    foo = loader.mock('foo', (ctx: Context) => ctx.on('internal/update', () => true))
-    bar = loader.mock('bar', (ctx: Context) => ctx.on('internal/update', () => true))
-    qux = loader.mock('qux', (ctx: Context) => ctx.on('internal/update', () => true))
+    foo = loader.mock('foo', (ctx: Context) => ctx.on('internal/update', () => {}))
+    bar = loader.mock('bar', (ctx: Context) => ctx.on('internal/update', () => {}))
+    qux = loader.mock('qux', (ctx: Context) => ctx.on('internal/update', () => {}))
   })
 
   it('loader initiate', async () => {