From e5196d85ed778d282c7df2ee22f3f91be19d846c Mon Sep 17 00:00:00 2001 From: Yichen Jiang Date: Tue, 8 Sep 2026 17:46:35 +0800 Subject: [PATCH] refactor(settings): keep each event's literal dispatch at its call site, share only the delivery loop --- packages/settings/settings/src/index.ts | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/packages/settings/settings/src/index.ts b/packages/settings/settings/src/index.ts index dcf6cc8377..9364dcd1de 100644 --- a/packages/settings/settings/src/index.ts +++ b/packages/settings/settings/src/index.ts @@ -209,6 +209,9 @@ declare module '@deepseek-ai/cordis' { } } +/** The listeners `ctx.events.dispatch('emit', …)` returns for one event, called with its payload. */ +type EmitListeners = Array<(...listenerArgs: unknown[]) => unknown> + /** * A write refused because the namespace moved since the caller read it. The * Service Definition's serialized write queue orders writes; it cannot tell a fresh writer @@ -1073,7 +1076,9 @@ export abstract class SettingsProvider extends Service { /** Contained fan-out of `settings/document-updated`, the way {@link commit} emits `settings/updated`. */ private emitDocumentUpdated(ns: SettingsNamespace, revision: number, scope: SettingsScopeId | undefined): void { - this.emitContained(ns, 'settings/document-updated', scope === undefined ? [ns, revision] : [ns, revision, scope]) + const payload: unknown[] = scope === undefined ? [ns, revision] : [ns, revision, scope] + const args = ['settings/document-updated', ...payload] + this.deliver(ns, this.ctx.events.dispatch('emit', args) as EmitListeners, payload) } /** Commit a resolved value when changed: swap, notify watchers, emit the event. */ @@ -1106,19 +1111,20 @@ export abstract class SettingsProvider extends Service { // harness-fatal by design and rethrow after every listener ran; any other // failure is contained so one broken observer cannot wedge the commit // path (and, through it, a provider's reload loop). - this.emitContained(ns, 'settings/updated', registration.scope === undefined + const payload: unknown[] = registration.scope === undefined ? [ns, next, prev, source] - : [ns, next, prev, source, registration.scope]) + : [ns, next, prev, source, registration.scope] + const args = ['settings/updated', ...payload] + this.deliver(ns, this.ctx.events.dispatch('emit', args) as EmitListeners, payload) } /** - * Emit one settings event to every listener in turn: an invariant violation + * Call each listener of one settings event in turn: an invariant violation * rethrows after the rest ran, any other failure is contained. */ - private emitContained(ns: SettingsNamespace, event: string, payload: unknown[]): void { + private deliver(ns: SettingsNamespace, listeners: EmitListeners, payload: unknown[]): void { let invariantFailure: unknown - const args = [event, ...payload] - for (const listener of this.ctx.events.dispatch('emit', args) as Array<(...listenerArgs: unknown[]) => unknown>) { + for (const listener of listeners) { try { const returned = listener(...payload) if (returned != null && typeof (returned as PromiseLike).then === 'function') {