From 34fc5cd4727b71322e57e571160ed7d05c3b7cdd Mon Sep 17 00:00:00 2001 From: systemfsoftware-bot Date: Thu, 29 Oct 2026 15:24:23 -0400 Subject: [PATCH] refactor(schema)!: conform to the effect-tsgo 0.54 lint rules Claude-Session: https://claude.ai/code/session_017rX35xUAHEjVVaDKVVzubW --- .../src/TraceComparison.schema.ts | 28 +++++---- .../src/compare-traces.workflow.ts | 14 +++-- .../src/project-trace.workflow.ts | 26 +++++--- .../KillSignalDecision.schema.ts | 14 +++-- .../ProcessExitDecision.schema.ts | 14 +++-- .../classify-process-exit.workflow.ts | 8 ++- .../select-kill-signals.workflow.ts | 8 ++- .../classify-peer-close.workflow.ts | 16 +++-- .../Supervisor/ChildExitDecision.schema.ts | 10 ++- .../Supervisor/SupervisorTerminated.schema.ts | 14 +++-- .../classify-child-exit.workflow.ts | 10 +-- .../src/Supervisor/supervisor-commands.ts | 2 +- .../src/kernel/SupervisorState.schema.ts | 24 ++++--- .../src/kernel/evolve-supervisor.workflow.ts | 10 +-- .../interpret-supervision-event.workflow.ts | 62 +++++++++++-------- .../failure-corpus/crash.schema.ts | 2 +- .../supervisor-give-up.integration.test.ts | 2 +- ...ervisor-nested-give-up.integration.test.ts | 4 +- 18 files changed, 162 insertions(+), 106 deletions(-) diff --git a/packages/effect-daemon-conformance/src/TraceComparison.schema.ts b/packages/effect-daemon-conformance/src/TraceComparison.schema.ts index 97d5b0a..58b402f 100644 --- a/packages/effect-daemon-conformance/src/TraceComparison.schema.ts +++ b/packages/effect-daemon-conformance/src/TraceComparison.schema.ts @@ -4,22 +4,26 @@ const ComparisonTypeId: unique symbol = Symbol.for('@systemfsoftware/effect-daem type ComparisonTypeId = typeof ComparisonTypeId /** The candidate reproduced the reference within its declaration. */ -export class TracesConform extends Schema.TaggedClass()('TracesConform', { - scenario: Schema.String, - medium: Schema.String, - compared: Schema.Int, -}) { +export class TracesConform + extends Schema.TaggedClass()('TracesConform', { + scenario: Schema.String, + medium: Schema.String, + compared: Schema.Int, + }) +{ readonly [ComparisonTypeId] = ComparisonTypeId } /** The candidate first diverged from the reference at `index`. */ -export class TracesDiverge extends Schema.TaggedClass()('TracesDiverge', { - scenario: Schema.String, - medium: Schema.String, - index: Schema.Int, - reference: Schema.String, - candidate: Schema.String, -}) { +export class TracesDiverge + extends Schema.TaggedClass()('TracesDiverge', { + scenario: Schema.String, + medium: Schema.String, + index: Schema.Int, + reference: Schema.String, + candidate: Schema.String, + }) +{ readonly [ComparisonTypeId] = ComparisonTypeId } diff --git a/packages/effect-daemon-conformance/src/compare-traces.workflow.ts b/packages/effect-daemon-conformance/src/compare-traces.workflow.ts index be7248b..402360a 100644 --- a/packages/effect-daemon-conformance/src/compare-traces.workflow.ts +++ b/packages/effect-daemon-conformance/src/compare-traces.workflow.ts @@ -4,12 +4,14 @@ import type { ObservedStep } from './Trace.schema.js' import { ObservedStep as ObservedStepSchema } from './Trace.schema.js' import { TraceComparison, TracesConform, TracesDiverge } from './TraceComparison.schema.js' -export class CompareTraces extends Schema.TaggedClass()('CompareTraces', { - scenario: Schema.String, - medium: Schema.String, - reference: Schema.Array(ObservedStepSchema), - candidate: Schema.Array(ObservedStepSchema), -}) { +export class CompareTraces + extends Schema.TaggedClass()('CompareTraces', { + scenario: Schema.String, + medium: Schema.String, + reference: Schema.Array(ObservedStepSchema), + candidate: Schema.Array(ObservedStepSchema), + }) +{ static readonly [Workflow.InstrumentationBrand] = {} as const } diff --git a/packages/effect-daemon-conformance/src/project-trace.workflow.ts b/packages/effect-daemon-conformance/src/project-trace.workflow.ts index cf215a9..fcb0546 100644 --- a/packages/effect-daemon-conformance/src/project-trace.workflow.ts +++ b/packages/effect-daemon-conformance/src/project-trace.workflow.ts @@ -8,26 +8,32 @@ const ProjectionTypeId: unique symbol = Symbol.for('@systemfsoftware/effect-daem type ProjectionTypeId = typeof ProjectionTypeId /** A declaration demanded no loss: the projected steps equal the trace's own. */ -export class TracePreserved extends Schema.TaggedClass()('TracePreserved', { - steps: Schema.Array(ObservedStepSchema), -}) { +export class TracePreserved + extends Schema.TaggedClass()('TracePreserved', { + steps: Schema.Array(ObservedStepSchema), + }) +{ readonly [ProjectionTypeId] = ProjectionTypeId } /** A declaration erased something: a report was coarsened or a stop order relaxed. */ -export class TraceReduced extends Schema.TaggedClass()('TraceReduced', { - steps: Schema.Array(ObservedStepSchema), -}) { +export class TraceReduced + extends Schema.TaggedClass()('TraceReduced', { + steps: Schema.Array(ObservedStepSchema), + }) +{ readonly [ProjectionTypeId] = ProjectionTypeId } export const TraceProjection = Schema.Union([TracePreserved, TraceReduced]) export type TraceProjection = typeof TraceProjection.Type -export class ProjectTrace extends Schema.TaggedClass()('ProjectTrace', { - trace: ConformanceTrace, - declaration: Supervisor.Medium.MediumDeclaration, -}) { +export class ProjectTrace + extends Schema.TaggedClass()('ProjectTrace', { + trace: ConformanceTrace, + declaration: Supervisor.Medium.MediumDeclaration, + }) +{ static readonly [Workflow.InstrumentationBrand] = {} as const } diff --git a/packages/effect-daemon-process/src/ProcessMedium/KillSignalDecision.schema.ts b/packages/effect-daemon-process/src/ProcessMedium/KillSignalDecision.schema.ts index ff19e9d..c298f9f 100644 --- a/packages/effect-daemon-process/src/ProcessMedium/KillSignalDecision.schema.ts +++ b/packages/effect-daemon-process/src/ProcessMedium/KillSignalDecision.schema.ts @@ -6,17 +6,21 @@ const KillSignalDecisionTypeId: unique symbol = Symbol.for( ) type KillSignalDecisionTypeId = typeof KillSignalDecisionTypeId -export class BrutalKill extends Schema.TaggedClass()('BrutalKill', {}) { +export class BrutalKill extends Schema.TaggedClass()('BrutalKill', {}) { readonly [KillSignalDecisionTypeId] = KillSignalDecisionTypeId } -export class GracefulKill extends Schema.TaggedClass()('GracefulKill', { - forceKillAfterMillis: Schema.Int, -}) { +export class GracefulKill + extends Schema.TaggedClass()('GracefulKill', { + forceKillAfterMillis: Schema.Int, + }) +{ readonly [KillSignalDecisionTypeId] = KillSignalDecisionTypeId } -export class PatientKill extends Schema.TaggedClass()('PatientKill', {}) { +export class PatientKill + extends Schema.TaggedClass()('PatientKill', {}) +{ readonly [KillSignalDecisionTypeId] = KillSignalDecisionTypeId } diff --git a/packages/effect-daemon-process/src/ProcessMedium/ProcessExitDecision.schema.ts b/packages/effect-daemon-process/src/ProcessMedium/ProcessExitDecision.schema.ts index a40e0bb..4ebbb40 100644 --- a/packages/effect-daemon-process/src/ProcessMedium/ProcessExitDecision.schema.ts +++ b/packages/effect-daemon-process/src/ProcessMedium/ProcessExitDecision.schema.ts @@ -6,14 +6,18 @@ const ProcessExitDecisionTypeId: unique symbol = Symbol.for( ) type ProcessExitDecisionTypeId = typeof ProcessExitDecisionTypeId -export class ProcessExitNormal extends Schema.TaggedClass()('ProcessExitNormal', {}) { +export class ProcessExitNormal + extends Schema.TaggedClass()('ProcessExitNormal', {}) +{ readonly [ProcessExitDecisionTypeId] = ProcessExitDecisionTypeId } -export class ProcessExitAbnormal extends Schema.TaggedClass()('ProcessExitAbnormal', { - code: Schema.Int, - signal: Schema.String, -}) { +export class ProcessExitAbnormal + extends Schema.TaggedClass()('ProcessExitAbnormal', { + code: Schema.Int, + signal: Schema.String, + }) +{ readonly [ProcessExitDecisionTypeId] = ProcessExitDecisionTypeId } diff --git a/packages/effect-daemon-process/src/ProcessMedium/classify-process-exit.workflow.ts b/packages/effect-daemon-process/src/ProcessMedium/classify-process-exit.workflow.ts index 6e60e37..dda5bb2 100644 --- a/packages/effect-daemon-process/src/ProcessMedium/classify-process-exit.workflow.ts +++ b/packages/effect-daemon-process/src/ProcessMedium/classify-process-exit.workflow.ts @@ -4,9 +4,11 @@ import * as Result from 'effect/Result' import { ProcessExit } from './ProcessExit.schema.js' import { ProcessExitAbnormal, ProcessExitDecision, ProcessExitNormal } from './ProcessExitDecision.schema.js' -export class ClassifyProcessExit extends Schema.TaggedClass()('ClassifyProcessExit', { - exit: ProcessExit, -}) { +export class ClassifyProcessExit + extends Schema.TaggedClass()('ClassifyProcessExit', { + exit: ProcessExit, + }) +{ static readonly [Workflow.InstrumentationBrand] = {} as const } diff --git a/packages/effect-daemon-process/src/ProcessMedium/select-kill-signals.workflow.ts b/packages/effect-daemon-process/src/ProcessMedium/select-kill-signals.workflow.ts index 6350fb5..571845f 100644 --- a/packages/effect-daemon-process/src/ProcessMedium/select-kill-signals.workflow.ts +++ b/packages/effect-daemon-process/src/ProcessMedium/select-kill-signals.workflow.ts @@ -4,9 +4,11 @@ import { Match, Schema } from 'effect' import * as Result from 'effect/Result' import { BrutalKill, GracefulKill, KillSignalDecision, PatientKill } from './KillSignalDecision.schema.js' -export class SelectKillSignals extends Schema.TaggedClass()('SelectKillSignals', { - mode: Supervisor.Medium.ShutdownMode, -}) { +export class SelectKillSignals + extends Schema.TaggedClass()('SelectKillSignals', { + mode: Supervisor.Medium.ShutdownMode, + }) +{ static readonly [Workflow.InstrumentationBrand] = {} as const } diff --git a/packages/effect-daemon-socket/src/SocketMedium/classify-peer-close.workflow.ts b/packages/effect-daemon-socket/src/SocketMedium/classify-peer-close.workflow.ts index 677ad0b..a107a24 100644 --- a/packages/effect-daemon-socket/src/SocketMedium/classify-peer-close.workflow.ts +++ b/packages/effect-daemon-socket/src/SocketMedium/classify-peer-close.workflow.ts @@ -7,20 +7,26 @@ const PeerCloseTypeId: unique symbol = Symbol.for( ) type PeerCloseTypeId = typeof PeerCloseTypeId -export class PeerClosedCleanly extends Schema.TaggedClass()('PeerClosedCleanly', {}) { +export class PeerClosedCleanly + extends Schema.TaggedClass()('PeerClosedCleanly', {}) +{ readonly [PeerCloseTypeId] = PeerCloseTypeId } -export class PeerClosedAbnormally extends Schema.TaggedClass()('PeerClosedAbnormally', {}) { +export class PeerClosedAbnormally + extends Schema.TaggedClass()('PeerClosedAbnormally', {}) +{ readonly [PeerCloseTypeId] = PeerCloseTypeId } export const PeerCloseDecision = Schema.Union([PeerClosedCleanly, PeerClosedAbnormally]) export type PeerCloseDecision = typeof PeerCloseDecision.Type -export class ClassifyPeerClose extends Schema.TaggedClass()('ClassifyPeerClose', { - code: Schema.Int, -}) { +export class ClassifyPeerClose + extends Schema.TaggedClass()('ClassifyPeerClose', { + code: Schema.Int, + }) +{ static readonly [Workflow.InstrumentationBrand] = {} as const } diff --git a/packages/effect-daemon-spec/src/Supervisor/ChildExitDecision.schema.ts b/packages/effect-daemon-spec/src/Supervisor/ChildExitDecision.schema.ts index 7db5266..f95d74c 100644 --- a/packages/effect-daemon-spec/src/Supervisor/ChildExitDecision.schema.ts +++ b/packages/effect-daemon-spec/src/Supervisor/ChildExitDecision.schema.ts @@ -9,17 +9,21 @@ const ChildExitTypeId: unique symbol = Symbol.for( type ChildExitTypeId = typeof ChildExitTypeId /** The child ended on its own success. */ -export class NormalExit extends Schema.TaggedClass()('Normal', {}) { +export class NormalExit extends Schema.TaggedClass()('Normal', {}) { readonly [ChildExitTypeId] = ChildExitTypeId } /** The child was interrupted — an owned shutdown, or one it raised itself. */ -export class ShutdownExit extends Schema.TaggedClass()('Shutdown', {}) { +export class ShutdownExit + extends Schema.TaggedClass()('Shutdown', {}) +{ readonly [ChildExitTypeId] = ChildExitTypeId } /** The child failed with something other than an interruption. */ -export class AbnormalExit extends Schema.TaggedClass()('Abnormal', {}) { +export class AbnormalExit + extends Schema.TaggedClass()('Abnormal', {}) +{ readonly [ChildExitTypeId] = ChildExitTypeId } diff --git a/packages/effect-daemon-spec/src/Supervisor/SupervisorTerminated.schema.ts b/packages/effect-daemon-spec/src/Supervisor/SupervisorTerminated.schema.ts index 6783b3a..3350b2e 100644 --- a/packages/effect-daemon-spec/src/Supervisor/SupervisorTerminated.schema.ts +++ b/packages/effect-daemon-spec/src/Supervisor/SupervisorTerminated.schema.ts @@ -3,12 +3,14 @@ import { TerminationReason } from '../kernel/TerminationReport.schema.js' const firstLine = (text: string): string => text.split('\n')[0] ?? '' -export class SupervisorTerminated extends Schema.TaggedError()('SupervisorTerminated', { - name: Schema.String, - reason: TerminationReason, - cause: Schema.Cause(Schema.Unknown, Schema.Unknown), -}) { +export class SupervisorTerminated + extends Schema.TaggedError()('SupervisorTerminated', { + supervisor: Schema.String, + reason: TerminationReason, + cause: Schema.Cause(Schema.Unknown, Schema.Unknown), + }) +{ override get message(): string { - return `Supervisor "${this.name}" terminated (${this.reason._tag}): ${firstLine(Cause.pretty(this.cause))}` + return `Supervisor "${this.supervisor}" terminated (${this.reason._tag}): ${firstLine(Cause.pretty(this.cause))}` } } diff --git a/packages/effect-daemon-spec/src/Supervisor/classify-child-exit.workflow.ts b/packages/effect-daemon-spec/src/Supervisor/classify-child-exit.workflow.ts index 884840a..bfd3bdc 100644 --- a/packages/effect-daemon-spec/src/Supervisor/classify-child-exit.workflow.ts +++ b/packages/effect-daemon-spec/src/Supervisor/classify-child-exit.workflow.ts @@ -3,10 +3,12 @@ import { Cause, Exit, Match, Schema } from 'effect' import * as Result from 'effect/Result' import { AbnormalExit, ChildExitDecision, NormalExit, ShutdownExit } from './ChildExitDecision.schema.js' -export class ClassifyChildExit extends Schema.TaggedClass()('ClassifyChildExit', { - stopping: Schema.Boolean, - exit: Schema.Exit(Schema.Void, Schema.Unknown, Schema.Unknown), -}) { +export class ClassifyChildExit + extends Schema.TaggedClass()('ClassifyChildExit', { + stopping: Schema.Boolean, + exit: Schema.Exit(Schema.Void, Schema.Unknown, Schema.Unknown), + }) +{ static readonly [Workflow.InstrumentationBrand] = {} as const } diff --git a/packages/effect-daemon-spec/src/Supervisor/supervisor-commands.ts b/packages/effect-daemon-spec/src/Supervisor/supervisor-commands.ts index 84253a0..d231f20 100644 --- a/packages/effect-daemon-spec/src/Supervisor/supervisor-commands.ts +++ b/packages/effect-daemon-spec/src/Supervisor/supervisor-commands.ts @@ -309,7 +309,7 @@ const executeTerminate = ( Effect.asVoid( Deferred.fail( terminatedLatchOf(acquired.handle), - new SupervisorTerminated({ name: acquired.handle.name, reason: command.reason, cause }), + new SupervisorTerminated({ supervisor: acquired.handle.name, reason: command.reason, cause }), ), ), ))), diff --git a/packages/effect-daemon-spec/src/kernel/SupervisorState.schema.ts b/packages/effect-daemon-spec/src/kernel/SupervisorState.schema.ts index 2c91c5b..a3ae498 100644 --- a/packages/effect-daemon-spec/src/kernel/SupervisorState.schema.ts +++ b/packages/effect-daemon-spec/src/kernel/SupervisorState.schema.ts @@ -38,33 +38,39 @@ export type SupervisorCore = typeof SupervisorCore.Type export const ChildStart = Schema.Struct({ childId: ChildId, generation: Generation }) export type ChildStart = typeof ChildStart.Type -export class Running extends Schema.TaggedClass()('Running', { core: SupervisorCore }) { +export class Running + extends Schema.TaggedClass()('Running', { core: SupervisorCore }) +{ readonly [StateTypeId] = StateTypeId } -export class Restarting extends Schema.TaggedClass()('Restarting', { +export class Restarting extends Schema.TaggedClass()('Restarting', { core: SupervisorCore, pending: Schema.Array(ChildStart), }) { readonly [StateTypeId] = StateTypeId } -export class CoolingDown extends Schema.TaggedClass()('CoolingDown', { +export class CoolingDown extends Schema.TaggedClass()('CoolingDown', { core: SupervisorCore, millis: PositiveMillis, }) { readonly [StateTypeId] = StateTypeId } -export class ShuttingDown extends Schema.TaggedClass()('ShuttingDown', { - core: SupervisorCore, - reason: TerminationReason, - exit: SupervisorExit, -}) { +export class ShuttingDown + extends Schema.TaggedClass()('ShuttingDown', { + core: SupervisorCore, + reason: TerminationReason, + exit: SupervisorExit, + }) +{ readonly [StateTypeId] = StateTypeId } -export class Terminated extends Schema.TaggedClass()('Terminated', { reason: TerminationReason }) { +export class Terminated extends Schema.TaggedClass()('Terminated', { + reason: TerminationReason, +}) { readonly [StateTypeId] = StateTypeId } diff --git a/packages/effect-daemon-spec/src/kernel/evolve-supervisor.workflow.ts b/packages/effect-daemon-spec/src/kernel/evolve-supervisor.workflow.ts index 842dd2d..690c3c6 100644 --- a/packages/effect-daemon-spec/src/kernel/evolve-supervisor.workflow.ts +++ b/packages/effect-daemon-spec/src/kernel/evolve-supervisor.workflow.ts @@ -3,10 +3,12 @@ import { Result, Schema } from 'effect' import { SupervisionDecision } from './interpret-supervision-event.workflow.js' import { evolved, SupervisorState } from './SupervisorState.schema.js' -export class SupervisionEvolution extends Schema.TaggedClass()('SupervisionEvolution', { - state: SupervisorState, - decision: SupervisionDecision, -}) { +export class SupervisionEvolution + extends Schema.TaggedClass()('SupervisionEvolution', { + state: SupervisorState, + decision: SupervisionDecision, + }) +{ static readonly [Workflow.InstrumentationBrand] = {} as const } diff --git a/packages/effect-daemon-spec/src/kernel/interpret-supervision-event.workflow.ts b/packages/effect-daemon-spec/src/kernel/interpret-supervision-event.workflow.ts index 7ee235b..9db39d1 100644 --- a/packages/effect-daemon-spec/src/kernel/interpret-supervision-event.workflow.ts +++ b/packages/effect-daemon-spec/src/kernel/interpret-supervision-event.workflow.ts @@ -32,33 +32,37 @@ import { SupervisorExit, TerminationReason } from './TerminationReport.schema.js const DecisionTypeId: unique symbol = Symbol.for('@systemfsoftware/effect-daemon/SupervisionDecision') -export class Stale extends Schema.TaggedClass()('Stale', {}) { +export class Stale extends Schema.TaggedClass()('Stale', {}) { readonly [DecisionTypeId] = DecisionTypeId } -export class Continue extends Schema.TaggedClass()('Continue', { +export class Continue extends Schema.TaggedClass()('Continue', { core: SupervisorCore, commands: SupervisorCommands, }) { readonly [DecisionTypeId] = DecisionTypeId } -export class RestartChildren extends Schema.TaggedClass()('RestartChildren', { - core: SupervisorCore, - pending: Schema.Array(ChildStart), - commands: SupervisorCommands, -}) { +export class RestartChildren + extends Schema.TaggedClass()('RestartChildren', { + core: SupervisorCore, + pending: Schema.Array(ChildStart), + commands: SupervisorCommands, + }) +{ readonly [DecisionTypeId] = DecisionTypeId } -export class StartChildren extends Schema.TaggedClass()('StartChildren', { - core: SupervisorCore, - commands: SupervisorCommands, -}) { +export class StartChildren + extends Schema.TaggedClass()('StartChildren', { + core: SupervisorCore, + commands: SupervisorCommands, + }) +{ readonly [DecisionTypeId] = DecisionTypeId } -export class CoolDown extends Schema.TaggedClass()('CoolDown', { +export class CoolDown extends Schema.TaggedClass()('CoolDown', { core: SupervisorCore, millis: PositiveMillis, commands: SupervisorCommands, @@ -66,25 +70,29 @@ export class CoolDown extends Schema.TaggedClass()('CoolDown', { readonly [DecisionTypeId] = DecisionTypeId } -export class StopChildren extends Schema.TaggedClass()('StopChildren', { - core: SupervisorCore, - reason: TerminationReason, - exit: SupervisorExit, - commands: SupervisorCommands, -}) { +export class StopChildren + extends Schema.TaggedClass()('StopChildren', { + core: SupervisorCore, + reason: TerminationReason, + exit: SupervisorExit, + commands: SupervisorCommands, + }) +{ readonly [DecisionTypeId] = DecisionTypeId } -export class Terminate extends Schema.TaggedClass()('Terminate', { +export class Terminate extends Schema.TaggedClass()('Terminate', { reason: TerminationReason, commands: SupervisorCommands, }) { readonly [DecisionTypeId] = DecisionTypeId } -export class RefuseDynamicStart extends Schema.TaggedClass()('RefuseDynamicStart', { - commands: SupervisorCommands, -}) { +export class RefuseDynamicStart + extends Schema.TaggedClass()('RefuseDynamicStart', { + commands: SupervisorCommands, + }) +{ readonly [DecisionTypeId] = DecisionTypeId } @@ -100,10 +108,12 @@ export const SupervisionDecision = Schema.Union([ ]) export type SupervisionDecision = typeof SupervisionDecision.Type -export class SupervisionStep extends Schema.TaggedClass()('SupervisionStep', { - state: SupervisorState, - event: SupervisionEvent, -}) { +export class SupervisionStep + extends Schema.TaggedClass()('SupervisionStep', { + state: SupervisorState, + event: SupervisionEvent, + }) +{ static readonly [Workflow.InstrumentationBrand] = {} as const } diff --git a/packages/effect-daemon-spec/tests/__fixtures__/failure-corpus/crash.schema.ts b/packages/effect-daemon-spec/tests/__fixtures__/failure-corpus/crash.schema.ts index dd32086..2af1e90 100644 --- a/packages/effect-daemon-spec/tests/__fixtures__/failure-corpus/crash.schema.ts +++ b/packages/effect-daemon-spec/tests/__fixtures__/failure-corpus/crash.schema.ts @@ -1,6 +1,6 @@ import { Schema } from 'effect' -export class ChildCrash extends Schema.TaggedError()('ChildCrash', { +export class ChildCrash extends Schema.TaggedError()('ChildCrash', { detail: Schema.String, }) { override get message(): string { diff --git a/packages/effect-daemon-spec/tests/supervisor-give-up.integration.test.ts b/packages/effect-daemon-spec/tests/supervisor-give-up.integration.test.ts index bd50c74..097bfbc 100644 --- a/packages/effect-daemon-spec/tests/supervisor-give-up.integration.test.ts +++ b/packages/effect-daemon-spec/tests/supervisor-give-up.integration.test.ts @@ -99,7 +99,7 @@ Feature('An owner whose supervisor gives up') ({ failure }, expect) => expect({ error: failure.error, - name: failure.error.name, + name: failure.error.supervisor, defects: failure.error.cause.pipe(defectsOf), elapsed: failure.after - failure.before, }).toMatchObject({ diff --git a/packages/effect-daemon-spec/tests/supervisor-nested-give-up.integration.test.ts b/packages/effect-daemon-spec/tests/supervisor-nested-give-up.integration.test.ts index 749e050..c489c24 100644 --- a/packages/effect-daemon-spec/tests/supervisor-nested-give-up.integration.test.ts +++ b/packages/effect-daemon-spec/tests/supervisor-nested-give-up.integration.test.ts @@ -119,10 +119,10 @@ Feature('A supervisor giving up under another supervisor') ), Then('the owner sees a typed give-up naming the outer supervisor, whose cause carries the inner give-up')( ({ failure }, expect) => { - const innerNames = failure.cause.pipe(errorsOf).map((error) => error.name) + const innerNames = failure.cause.pipe(errorsOf).map((error) => error.supervisor) return expect({ failure: failure, - name: failure.name, + name: failure.supervisor, innerNames, }).toMatchObject({ failure: expect.schemaMatching(Supervisor.SupervisorTerminated),