Merge final CI coverage parent into manual compact
This commit is contained in:
18
.github/workflows/ci.yml
vendored
18
.github/workflows/ci.yml
vendored
@@ -50,7 +50,7 @@ jobs:
|
|||||||
${{ vars.DSH_CI_FAILOVER == 'selfhosted'
|
${{ vars.DSH_CI_FAILOVER == 'selfhosted'
|
||||||
&& github.event.pull_request.user.login != 'dependabot[bot]'
|
&& github.event.pull_request.user.login != 'dependabot[bot]'
|
||||||
&& fromJSON('["self-hosted", "linux", "x64", "vm-backup"]')
|
&& fromJSON('["self-hosted", "linux", "x64", "vm-backup"]')
|
||||||
|| 'dsh-enterprise-ubuntu-latest-32core-test' }}
|
|| 'dsh-ubuntu-24-04-16core' }}
|
||||||
name: node 24 / static
|
name: node 24 / static
|
||||||
env:
|
env:
|
||||||
DSH_GATE_CONCURRENCY: '8'
|
DSH_GATE_CONCURRENCY: '8'
|
||||||
@@ -102,17 +102,15 @@ jobs:
|
|||||||
${{ vars.DSH_CI_FAILOVER == 'selfhosted'
|
${{ vars.DSH_CI_FAILOVER == 'selfhosted'
|
||||||
&& github.event.pull_request.user.login != 'dependabot[bot]'
|
&& github.event.pull_request.user.login != 'dependabot[bot]'
|
||||||
&& fromJSON('["self-hosted", "linux", "x64", "vm-backup"]')
|
&& fromJSON('["self-hosted", "linux", "x64", "vm-backup"]')
|
||||||
|| 'dsh-enterprise-ubuntu-24-04-32core-test' }}
|
|| 'dsh-ubuntu-24-04-16core' }}
|
||||||
name: node 24 / coverage
|
name: node 24 / coverage
|
||||||
env:
|
env:
|
||||||
# Failover shrinks the worker bound: the hosted 32-core runner is
|
# The hosted 16-core runner uses six coverage workers. The failover pool
|
||||||
# exclusive to one job, but the failover pool shares one 64-core VM
|
# shares one 64-core VM across six always-on runner instances, so each
|
||||||
# across six always-on runner instances, and the timing-sensitive
|
# instance may use eight while keeping the worst case at 8 × 6 = 48
|
||||||
# process suites have documented aggregate-contention failures.
|
# workers; process-bound suites remain isolated in forks.
|
||||||
# 8 × 6 instances = 48 workers worst case on 64 cores.
|
DSH_COVERAGE_MAX_WORKERS: ${{ vars.DSH_CI_FAILOVER == 'selfhosted' && github.event.pull_request.user.login != 'dependabot[bot]' && '8' || '6' }}
|
||||||
DSH_COVERAGE_MAX_WORKERS: ${{ vars.DSH_CI_FAILOVER == 'selfhosted' && github.event.pull_request.user.login != 'dependabot[bot]' && '8' || '8' }}
|
|
||||||
DSH_GATE_CONCURRENCY: '3'
|
DSH_GATE_CONCURRENCY: '3'
|
||||||
NODE_OPTIONS: '--max-old-space-size=8192'
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v6
|
- uses: actions/checkout@v6
|
||||||
with:
|
with:
|
||||||
@@ -167,7 +165,7 @@ jobs:
|
|||||||
${{ vars.DSH_CI_FAILOVER == 'selfhosted'
|
${{ vars.DSH_CI_FAILOVER == 'selfhosted'
|
||||||
&& github.event.pull_request.user.login != 'dependabot[bot]'
|
&& github.event.pull_request.user.login != 'dependabot[bot]'
|
||||||
&& fromJSON('["self-hosted", "linux", "x64", "vm-backup"]')
|
&& fromJSON('["self-hosted", "linux", "x64", "vm-backup"]')
|
||||||
|| 'dsh-enterprise-ubuntu-latest-32core-test' }}
|
|| 'dsh-ubuntu-24-04-16core' }}
|
||||||
name: node 24 / snapshots and artifacts
|
name: node 24 / snapshots and artifacts
|
||||||
env:
|
env:
|
||||||
DSH_GATE_CONCURRENCY: '8'
|
DSH_GATE_CONCURRENCY: '8'
|
||||||
|
|||||||
@@ -59,23 +59,9 @@ describe('connection node half', () => {
|
|||||||
const ctx = new Context()
|
const ctx = new Context()
|
||||||
ctx.provide('httpServer', fakeHttpServer(routes) as HttpServerService)
|
ctx.provide('httpServer', fakeHttpServer(routes) as HttpServerService)
|
||||||
ctx.provide('apiProxy', {} as unknown as ApiProxy)
|
ctx.provide('apiProxy', {} as unknown as ApiProxy)
|
||||||
// The apply throw also escapes cordis as a late rejection — the shape the
|
const fiber = ctx.plugin({ inject: [...inject], apply }, { trustedHosts: ['harness.internal/path'] })
|
||||||
// boot's installFailLoud is contracted to catch. Capture it so the run
|
await expect(fiber).rejects.toThrow(/not a bare host\[:port\] authority/)
|
||||||
// stays clean, same pattern as the webserver bind-failure test.
|
expect(routes).toHaveLength(0)
|
||||||
const rejections: unknown[] = []
|
|
||||||
const onUnhandled = (err: unknown): void => { rejections.push(err) }
|
|
||||||
process.on('unhandledRejection', onUnhandled)
|
|
||||||
try {
|
|
||||||
const fiber = ctx.plugin({ inject: [...inject], apply }, { trustedHosts: ['harness.internal/path'] })
|
|
||||||
await expect(fiber.await()).rejects.toThrow(/not a bare host\[:port\] authority/)
|
|
||||||
expect(routes).toHaveLength(0)
|
|
||||||
for (let i = 0; i < 100 && rejections.length === 0; i++) {
|
|
||||||
await new Promise(resolve => setTimeout(resolve, 10))
|
|
||||||
}
|
|
||||||
expect(rejections.map(String).join('\n')).toContain('not a bare host[:port] authority')
|
|
||||||
} finally {
|
|
||||||
process.off('unhandledRejection', onUnhandled)
|
|
||||||
}
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it('registers the /api prefix route and removes it with the fiber', async () => {
|
it('registers the /api prefix route and removes it with the fiber', async () => {
|
||||||
|
|||||||
@@ -41,8 +41,8 @@ interface Bench {
|
|||||||
|
|
||||||
async function boot(): Promise<Bench> {
|
async function boot(): Promise<Bench> {
|
||||||
const ctx = new Context()
|
const ctx = new Context()
|
||||||
ctx.plugin(SlotsService)
|
const fiber = ctx.plugin(SlotsService)
|
||||||
await ctx.fiber.await()
|
await fiber
|
||||||
// Service accessor (ctx.get reads the reflect store, which Service-class
|
// Service accessor (ctx.get reads the reflect store, which Service-class
|
||||||
// plugins do not write; the accessor is the product path).
|
// plugins do not write; the accessor is the product path).
|
||||||
const svc = ctx.slots
|
const svc = ctx.slots
|
||||||
|
|||||||
@@ -131,6 +131,26 @@ interface FaceProgramHost {
|
|||||||
readonly files: Map<string, ts.SourceFile | undefined>
|
readonly files: Map<string, ts.SourceFile | undefined>
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Process-wide parse cache for the bundled TypeScript default libraries.
|
||||||
|
* `typescript/lib/lib.*.d.ts` content is immutable for the process lifetime,
|
||||||
|
* so parses are shared across every {@link WorkspaceCaches} instance; the key
|
||||||
|
* carries the parse-affecting settings, keeping reuse exact.
|
||||||
|
*/
|
||||||
|
const defaultLibraryParses = new Map<string, ts.SourceFile | undefined>()
|
||||||
|
|
||||||
|
function defaultLibraryKey(fileName: string, languageVersionOrOptions: ts.ScriptTarget | ts.CreateSourceFileOptions): string {
|
||||||
|
const options = typeof languageVersionOrOptions === 'object'
|
||||||
|
? languageVersionOrOptions
|
||||||
|
: { languageVersion: languageVersionOrOptions }
|
||||||
|
return [
|
||||||
|
fileName,
|
||||||
|
String(options.languageVersion),
|
||||||
|
String(options.impliedNodeFormat ?? ''),
|
||||||
|
String(options.jsDocParsingMode ?? ''),
|
||||||
|
].join('\0')
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Shared memo over one immutable workspace snapshot. Passing one instance to
|
* Shared memo over one immutable workspace snapshot. Passing one instance to
|
||||||
* several analyzers (the batched and write-mode children reuse their parent's
|
* several analyzers (the batched and write-mode children reuse their parent's
|
||||||
@@ -185,6 +205,13 @@ export class WorkspaceCaches {
|
|||||||
// only fires under oldProgram reuse, which these fresh programs never
|
// only fires under oldProgram reuse, which these fresh programs never
|
||||||
// request, and invalidate() is the one supported re-read path.
|
// request, and invalidate() is the one supported re-read path.
|
||||||
host.getSourceFile = (fileName, languageVersionOrOptions, onError) => {
|
host.getSourceFile = (fileName, languageVersionOrOptions, onError) => {
|
||||||
|
if (isStandardLibraryFile(fileName)) {
|
||||||
|
const key = defaultLibraryKey(fileName, languageVersionOrOptions)
|
||||||
|
if (!defaultLibraryParses.has(key)) {
|
||||||
|
defaultLibraryParses.set(key, base(fileName, languageVersionOrOptions, onError))
|
||||||
|
}
|
||||||
|
return defaultLibraryParses.get(key)
|
||||||
|
}
|
||||||
if (!files.has(fileName)) files.set(fileName, base(fileName, languageVersionOrOptions, onError))
|
if (!files.has(fileName)) files.set(fileName, base(fileName, languageVersionOrOptions, onError))
|
||||||
return files.get(fileName)
|
return files.get(fileName)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,14 @@
|
|||||||
import { describe, expect, it, vi } from 'vitest'
|
import { describe, expect, it, vi } from 'vitest'
|
||||||
import { Context, Service } from 'cordis'
|
import { Context, FiberState, Service } from 'cordis'
|
||||||
import Loader from '@cordisjs/plugin-loader'
|
import Loader from '@cordisjs/plugin-loader'
|
||||||
|
import InvariantService from '@deepseek-ai/dsh-invariants'
|
||||||
import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants'
|
import type { InvariantInstaller } from '@deepseek-ai/dsh-invariants'
|
||||||
import { packageInvariantOwners } from './package-invariants.ts'
|
import { packageInvariantOwners } from './package-invariants.ts'
|
||||||
import {
|
import {
|
||||||
|
TEST_INVARIANT_READY_SERVICE,
|
||||||
testInvariantCompanionPaths,
|
testInvariantCompanionPaths,
|
||||||
testInvariantCompanions,
|
testInvariantCompanions,
|
||||||
|
type TestInvariantCompanion,
|
||||||
usesManualInvariantTree,
|
usesManualInvariantTree,
|
||||||
} from './test-invariants.ts'
|
} from './test-invariants.ts'
|
||||||
|
|
||||||
@@ -21,6 +24,32 @@ class TestInvariantProbe extends Service {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function deferred(): { readonly promise: Promise<void>; readonly resolve: () => void } {
|
||||||
|
let resolve!: () => void
|
||||||
|
const promise = new Promise<void>((done) => {
|
||||||
|
resolve = done
|
||||||
|
})
|
||||||
|
return { promise, resolve }
|
||||||
|
}
|
||||||
|
|
||||||
|
async function withFakeCompanions(
|
||||||
|
create: (path: string, index: number) => () => Promise<TestInvariantCompanion>,
|
||||||
|
run: () => Promise<void>,
|
||||||
|
): Promise<void> {
|
||||||
|
const mutable = testInvariantCompanions as Record<string, () => Promise<TestInvariantCompanion>>
|
||||||
|
const originals = Object.entries(mutable)
|
||||||
|
for (const [index, [path]] of originals.entries()) {
|
||||||
|
mutable[path] = create(path, index)
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
await run()
|
||||||
|
} finally {
|
||||||
|
for (const [path, load] of originals) {
|
||||||
|
mutable[path] = load
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
describe('global test invariant host', () => {
|
describe('global test invariant host', () => {
|
||||||
it('uses one exhaustive topology to reserve every package name with enabled checks', async () => {
|
it('uses one exhaustive topology to reserve every package name with enabled checks', async () => {
|
||||||
const ctx = new Context()
|
const ctx = new Context()
|
||||||
@@ -61,7 +90,8 @@ describe('global test invariant host', () => {
|
|||||||
return () => {}
|
return () => {}
|
||||||
})
|
})
|
||||||
const fakeContext = { invariants: { register } } as unknown as Context
|
const fakeContext = { invariants: { register } } as unknown as Context
|
||||||
for (const [rawPath, companion] of Object.entries(testInvariantCompanions)) {
|
for (const [rawPath, load] of Object.entries(testInvariantCompanions)) {
|
||||||
|
const companion = await load()
|
||||||
const path = rawPath.replace(/^\.\.\//, '')
|
const path = rawPath.replace(/^\.\.\//, '')
|
||||||
expect(companion.default, path).toBeUndefined()
|
expect(companion.default, path).toBeUndefined()
|
||||||
const unwrapped = loader.unwrapExports(companion) as typeof companion
|
const unwrapped = loader.unwrapExports(companion) as typeof companion
|
||||||
@@ -84,4 +114,233 @@ describe('global test invariant host', () => {
|
|||||||
expect(usesManualInvariantTree('/repo/packages/examples/agent-spine-demo/tests/agent-core.spec.ts')).toBe(true)
|
expect(usesManualInvariantTree('/repo/packages/examples/agent-spine-demo/tests/agent-core.spec.ts')).toBe(true)
|
||||||
expect(usesManualInvariantTree('/repo/packages/core/session/tests/session.spec.ts')).toBe(false)
|
expect(usesManualInvariantTree('/repo/packages/core/session/tests/session.spec.ts')).toBe(false)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('holds a root plugin until every lazy companion is active, then permits nested startup', async () => {
|
||||||
|
const delayedStarted = deferred()
|
||||||
|
const releaseDelayed = deferred()
|
||||||
|
const order: string[] = []
|
||||||
|
let delayedCompanion: TestInvariantCompanion | undefined
|
||||||
|
const companionNestedApply = vi.fn(function companionNestedApply() {})
|
||||||
|
|
||||||
|
await withFakeCompanions(
|
||||||
|
(path, index) => async () => {
|
||||||
|
const companion: TestInvariantCompanion = {
|
||||||
|
name: `test-invariant-${index}`,
|
||||||
|
inject: ['invariants'],
|
||||||
|
async apply(companionCtx) {
|
||||||
|
order.push(`companion-start:${path}`)
|
||||||
|
if (index === 0) {
|
||||||
|
delayedStarted.resolve()
|
||||||
|
await releaseDelayed.promise
|
||||||
|
}
|
||||||
|
if (index === 1) await companionCtx.plugin(companionNestedApply)
|
||||||
|
order.push(`companion-active:${path}`)
|
||||||
|
return () => {}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
if (index === 0) delayedCompanion = companion
|
||||||
|
return companion
|
||||||
|
},
|
||||||
|
async () => {
|
||||||
|
const ctx = new Context()
|
||||||
|
ctx.provide('testInvariantTargetDependency', true)
|
||||||
|
let nestedFiber: ReturnType<Context['plugin']> | undefined
|
||||||
|
const nestedApply = vi.fn(function nestedApply() {
|
||||||
|
order.push('nested')
|
||||||
|
})
|
||||||
|
const targetApply = Object.assign(vi.fn(function targetApply(targetCtx: Context) {
|
||||||
|
order.push('target')
|
||||||
|
nestedFiber = targetCtx.plugin(nestedApply)
|
||||||
|
}), {
|
||||||
|
inject: ['testInvariantTargetDependency'],
|
||||||
|
})
|
||||||
|
|
||||||
|
const targetFiber = ctx.plugin(targetApply)
|
||||||
|
expect(ctx.registry.get(targetApply)?.callback).toBe(targetApply)
|
||||||
|
expect(targetFiber.inject).toEqual({
|
||||||
|
testInvariantTargetDependency: null,
|
||||||
|
[TEST_INVARIANT_READY_SERVICE]: null,
|
||||||
|
})
|
||||||
|
|
||||||
|
await delayedStarted.promise
|
||||||
|
await Promise.resolve()
|
||||||
|
await Promise.resolve()
|
||||||
|
expect(targetApply).not.toHaveBeenCalled()
|
||||||
|
|
||||||
|
releaseDelayed.resolve()
|
||||||
|
await targetFiber
|
||||||
|
if (nestedFiber === undefined) throw new Error('target did not register its nested plugin')
|
||||||
|
await nestedFiber
|
||||||
|
|
||||||
|
expect(targetFiber.state).toBe(FiberState.ACTIVE)
|
||||||
|
expect(targetApply).toHaveBeenCalledOnce()
|
||||||
|
expect(nestedApply).toHaveBeenCalledOnce()
|
||||||
|
expect(companionNestedApply).toHaveBeenCalledOnce()
|
||||||
|
const targetIndex = order.indexOf('target')
|
||||||
|
expect(targetIndex).toBeGreaterThan(-1)
|
||||||
|
expect(order.slice(0, targetIndex)).toHaveLength(Object.keys(testInvariantCompanions).length * 2)
|
||||||
|
expect(order.at(-1)).toBe('nested')
|
||||||
|
|
||||||
|
if (delayedCompanion === undefined) throw new Error('delayed companion did not load')
|
||||||
|
await ctx.plugin(InvariantService, { enabled: true })
|
||||||
|
await ctx.plugin(delayedCompanion)
|
||||||
|
expect(ctx.registry.get(InvariantService)?.fibers).toHaveLength(1)
|
||||||
|
expect(ctx.registry.get(delayedCompanion)?.fibers).toHaveLength(1)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('holds plugins registered on a root-derived context until companion readiness', async () => {
|
||||||
|
const delayedStarted = deferred()
|
||||||
|
const releaseDelayed = deferred()
|
||||||
|
|
||||||
|
await withFakeCompanions(
|
||||||
|
(_path, index) => async () => ({
|
||||||
|
name: `test-invariant-${index}`,
|
||||||
|
inject: ['invariants'],
|
||||||
|
async apply() {
|
||||||
|
if (index === 0) {
|
||||||
|
delayedStarted.resolve()
|
||||||
|
await releaseDelayed.promise
|
||||||
|
}
|
||||||
|
return () => {}
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
async () => {
|
||||||
|
const ctx = new Context()
|
||||||
|
const rootApply = vi.fn(function rootApply() {})
|
||||||
|
const derivedApply = vi.fn(function derivedApply() {})
|
||||||
|
const derived = ctx.extend()
|
||||||
|
.isolate('testInvariantDerived')
|
||||||
|
.intercept('testInvariantDerived', {})
|
||||||
|
|
||||||
|
const rootFiber = ctx.plugin(rootApply)
|
||||||
|
const derivedFiber = derived.plugin(derivedApply)
|
||||||
|
|
||||||
|
await delayedStarted.promise
|
||||||
|
await Promise.resolve()
|
||||||
|
await Promise.resolve()
|
||||||
|
expect(rootApply).not.toHaveBeenCalled()
|
||||||
|
expect(derivedApply).not.toHaveBeenCalled()
|
||||||
|
expect(derivedFiber.inject).toEqual({
|
||||||
|
[TEST_INVARIANT_READY_SERVICE]: null,
|
||||||
|
})
|
||||||
|
|
||||||
|
releaseDelayed.resolve()
|
||||||
|
await Promise.all([rootFiber, derivedFiber])
|
||||||
|
expect(rootFiber.state).toBe(FiberState.ACTIVE)
|
||||||
|
expect(derivedFiber.state).toBe(FiberState.ACTIVE)
|
||||||
|
expect(rootApply).toHaveBeenCalledOnce()
|
||||||
|
expect(derivedApply).toHaveBeenCalledOnce()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it('holds a child registered externally on a pending target context', async () => {
|
||||||
|
const delayedStarted = deferred()
|
||||||
|
const releaseDelayed = deferred()
|
||||||
|
|
||||||
|
await withFakeCompanions(
|
||||||
|
(_path, index) => async () => ({
|
||||||
|
name: `test-invariant-${index}`,
|
||||||
|
inject: ['invariants'],
|
||||||
|
async apply() {
|
||||||
|
if (index === 0) {
|
||||||
|
delayedStarted.resolve()
|
||||||
|
await releaseDelayed.promise
|
||||||
|
}
|
||||||
|
return () => {}
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
async () => {
|
||||||
|
const ctx = new Context()
|
||||||
|
const targetApply = vi.fn(function targetApply() {})
|
||||||
|
const childApply = vi.fn(function childApply() {})
|
||||||
|
|
||||||
|
const targetFiber = ctx.plugin(targetApply)
|
||||||
|
const childFiber = targetFiber.ctx.plugin(childApply)
|
||||||
|
|
||||||
|
await delayedStarted.promise
|
||||||
|
await Promise.resolve()
|
||||||
|
await Promise.resolve()
|
||||||
|
expect(targetFiber.state).toBe(FiberState.PENDING)
|
||||||
|
expect(childFiber.state).toBe(FiberState.PENDING)
|
||||||
|
expect(targetApply).not.toHaveBeenCalled()
|
||||||
|
expect(childApply).not.toHaveBeenCalled()
|
||||||
|
expect(childFiber.inject).toEqual({
|
||||||
|
[TEST_INVARIANT_READY_SERVICE]: null,
|
||||||
|
})
|
||||||
|
|
||||||
|
releaseDelayed.resolve()
|
||||||
|
await Promise.all([targetFiber, childFiber])
|
||||||
|
expect(targetFiber.state).toBe(FiberState.ACTIVE)
|
||||||
|
expect(childFiber.state).toBe(FiberState.ACTIVE)
|
||||||
|
expect(targetApply).toHaveBeenCalledOnce()
|
||||||
|
expect(childApply).toHaveBeenCalledOnce()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
|
|
||||||
|
it.each(['load', 'startup'] as const)(
|
||||||
|
'rejects a target when a lazy companion fails during %s without starting the target',
|
||||||
|
async (phase) => {
|
||||||
|
const failure = new Error(`test invariant companion ${phase} failed`)
|
||||||
|
await withFakeCompanions(
|
||||||
|
(_path, index) => phase === 'load' && index === 0
|
||||||
|
? async () => { throw failure }
|
||||||
|
: async () => ({
|
||||||
|
name: `test-invariant-${index}`,
|
||||||
|
inject: ['invariants'],
|
||||||
|
async apply() {
|
||||||
|
if (phase === 'startup' && index === 0) throw failure
|
||||||
|
return () => {}
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
async () => {
|
||||||
|
const ctx = new Context()
|
||||||
|
const targetApply = vi.fn(function targetApply() {})
|
||||||
|
const targetFiber = ctx.plugin(targetApply)
|
||||||
|
|
||||||
|
await expect(targetFiber).rejects.toBe(failure)
|
||||||
|
expect(targetApply).not.toHaveBeenCalled()
|
||||||
|
expect(targetFiber.state).toBe(FiberState.PENDING)
|
||||||
|
await expect(targetFiber.dispose()).resolves.toBeUndefined()
|
||||||
|
expect(targetFiber.state).toBe(FiberState.DISPOSED)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
it('disposes a pending target without waiting for companion readiness', async () => {
|
||||||
|
const delayedStarted = deferred()
|
||||||
|
const releaseDelayed = deferred()
|
||||||
|
|
||||||
|
await withFakeCompanions(
|
||||||
|
(_path, index) => async () => ({
|
||||||
|
name: `test-invariant-${index}`,
|
||||||
|
inject: ['invariants'],
|
||||||
|
async apply() {
|
||||||
|
if (index === 0) {
|
||||||
|
delayedStarted.resolve()
|
||||||
|
await releaseDelayed.promise
|
||||||
|
}
|
||||||
|
return () => {}
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
async () => {
|
||||||
|
const ctx = new Context()
|
||||||
|
const targetApply = vi.fn(function targetApply() {})
|
||||||
|
const targetFiber = ctx.plugin(targetApply)
|
||||||
|
|
||||||
|
await delayedStarted.promise
|
||||||
|
await expect(targetFiber.dispose()).resolves.toBeUndefined()
|
||||||
|
expect(targetFiber.state).toBe(FiberState.DISPOSED)
|
||||||
|
expect(targetApply).not.toHaveBeenCalled()
|
||||||
|
|
||||||
|
releaseDelayed.resolve()
|
||||||
|
await targetFiber
|
||||||
|
expect(targetApply).not.toHaveBeenCalled()
|
||||||
|
},
|
||||||
|
)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -6,14 +6,14 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import { expect } from 'vitest'
|
import { expect } from 'vitest'
|
||||||
import { RegistryService } from 'cordis'
|
import { FiberState, Inject, RegistryService } from 'cordis'
|
||||||
import type { Context, Plugin } from 'cordis'
|
import type { Context, Plugin } from 'cordis'
|
||||||
import InvariantService from '@deepseek-ai/dsh-invariants'
|
import InvariantService from '@deepseek-ai/dsh-invariants'
|
||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
interface ImportMeta {
|
interface ImportMeta {
|
||||||
/** Eager Vite module-glob expansion used by the Vitest setup file. */
|
/** Lazy Vite module-glob expansion used by the Vitest setup file. */
|
||||||
glob<TModule>(pattern: string, options: { eager: true }): Record<string, TModule>
|
glob<TModule>(pattern: string): Record<string, () => Promise<TModule>>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -25,9 +25,18 @@ export interface TestInvariantCompanion {
|
|||||||
apply(ctx: Context): Promise<() => void>
|
apply(ctx: Context): Promise<() => void>
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Every package companion, discovered eagerly so coverage observes each registration. */
|
/** Private service dependency that holds ordinary root plugins until invariant startup completes. */
|
||||||
export const testInvariantCompanions: Readonly<Record<string, TestInvariantCompanion>> =
|
export const TEST_INVARIANT_READY_SERVICE = 'testInvariantReady'
|
||||||
import.meta.glob<TestInvariantCompanion>('../packages/*/*/src/invariant.ts', { eager: true })
|
|
||||||
|
/**
|
||||||
|
* Every package companion as a lazy loader keyed by glob path. Ordinary tests
|
||||||
|
* load only their owner's module; the exhaustive topology test loads and
|
||||||
|
* executes all of them, so aggregated coverage still observes every
|
||||||
|
* registration while per-file setup stops importing 168 companions and their
|
||||||
|
* transitive package sources.
|
||||||
|
*/
|
||||||
|
export const testInvariantCompanions: Readonly<Record<string, () => Promise<TestInvariantCompanion>>> =
|
||||||
|
import.meta.glob<TestInvariantCompanion>('../packages/*/*/src/invariant.ts')
|
||||||
|
|
||||||
/** Manual-topology suites whose names cannot follow the focused invariant convention. */
|
/** Manual-topology suites whose names cannot follow the focused invariant convention. */
|
||||||
const MANUAL_INVARIANT_TEST_EXCEPTIONS = [
|
const MANUAL_INVARIANT_TEST_EXCEPTIONS = [
|
||||||
@@ -36,12 +45,13 @@ const MANUAL_INVARIANT_TEST_EXCEPTIONS = [
|
|||||||
] as const
|
] as const
|
||||||
|
|
||||||
interface InvariantHost {
|
interface InvariantHost {
|
||||||
readonly fibers: readonly PluginFiber[]
|
|
||||||
readonly byCallback: ReadonlyMap<unknown, PluginFiber>
|
readonly byCallback: ReadonlyMap<unknown, PluginFiber>
|
||||||
|
readonly barrierOwners: WeakSet<Context['fiber']>
|
||||||
readonly ready: Promise<void>
|
readonly ready: Promise<void>
|
||||||
}
|
}
|
||||||
|
|
||||||
type PluginFiber = ReturnType<RegistryService['plugin']>
|
type PluginFiber = ReturnType<RegistryService['plugin']>
|
||||||
|
type PluginCallback = Plugin.Function | Plugin.Constructor
|
||||||
|
|
||||||
const hosts = new WeakMap<Context, InvariantHost>()
|
const hosts = new WeakMap<Context, InvariantHost>()
|
||||||
// oxlint-disable-next-line typescript/unbound-method -- every call below supplies its RegistryService receiver explicitly.
|
// oxlint-disable-next-line typescript/unbound-method -- every call below supplies its RegistryService receiver explicitly.
|
||||||
@@ -56,13 +66,24 @@ RegistryService.prototype.plugin = function(plugin: Plugin, config?: unknown, ge
|
|||||||
const callback = this.resolve(plugin)
|
const callback = this.resolve(plugin)
|
||||||
const existing = callback === undefined ? undefined : host.byCallback.get(callback)
|
const existing = callback === undefined ? undefined : host.byCallback.get(callback)
|
||||||
if (existing !== undefined) {
|
if (existing !== undefined) {
|
||||||
return this.ctx === root ? joinInvariantStartup(existing, host.ready) : existing
|
return hasBarrierOwner(host, this.ctx) ? existing : joinInvariantStartup(existing, host.ready)
|
||||||
}
|
}
|
||||||
|
|
||||||
const fiber = originalPlugin.call(this, plugin, config, getOuterStack)
|
// Causal descendants of a gated target have already crossed the barrier.
|
||||||
// A root-level await is the test's composition boundary. Nested plugin
|
// Host service and companion descendants also bypass it so their own startup
|
||||||
// fibers must not await their own companion parent through the global host.
|
// cannot depend on the readiness they are responsible for providing.
|
||||||
if (this.ctx !== root) return fiber
|
if (hasBarrierOwner(host, this.ctx)) {
|
||||||
|
return originalPlugin.call(this, plugin, config, getOuterStack)
|
||||||
|
}
|
||||||
|
if (callback === undefined) return originalPlugin.call(this, plugin, config, getOuterStack)
|
||||||
|
|
||||||
|
const fiber = originalPlugin.call(
|
||||||
|
this,
|
||||||
|
withInvariantReadiness(plugin, callback as PluginCallback),
|
||||||
|
config,
|
||||||
|
getOuterStack,
|
||||||
|
)
|
||||||
|
host.barrierOwners.add(fiber.ctx.fiber)
|
||||||
return joinInvariantStartup(fiber, host.ready)
|
return joinInvariantStartup(fiber, host.ready)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,48 +123,89 @@ export function testInvariantCompanionPaths(testPath: string): string[] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function startInvariantHost(root: Context): InvariantHost {
|
function startInvariantHost(root: Context): InvariantHost {
|
||||||
const fibers: PluginFiber[] = []
|
|
||||||
const byCallback = new Map<unknown, PluginFiber>()
|
const byCallback = new Map<unknown, PluginFiber>()
|
||||||
const mount = (plugin: Plugin, config?: unknown): void => {
|
const barrierOwners = new WeakSet<Context['fiber']>()
|
||||||
|
const mount = (plugin: Plugin, config?: unknown): PluginFiber => {
|
||||||
const fiber = originalPlugin.call(root.registry, plugin, config)
|
const fiber = originalPlugin.call(root.registry, plugin, config)
|
||||||
const callback = root.registry.resolve(plugin)
|
const callback = root.registry.resolve(plugin)
|
||||||
if (callback === undefined) throw new Error('test invariants: companion is not a valid Cordis plugin')
|
if (callback === undefined) throw new Error('test invariants: companion is not a valid Cordis plugin')
|
||||||
fibers.push(fiber)
|
|
||||||
byCallback.set(callback, fiber)
|
byCallback.set(callback, fiber)
|
||||||
|
barrierOwners.add(fiber.ctx.fiber)
|
||||||
|
return fiber
|
||||||
}
|
}
|
||||||
|
|
||||||
mount(InvariantService, { enabled: true })
|
// The service mounts synchronously so the intercepted registration that
|
||||||
|
// started this host immediately finds its own fiber in byCallback.
|
||||||
|
// Companions load and mount inside the ready chain (after the service is
|
||||||
|
// active, so their startup is directly joinable); every joined root plugin
|
||||||
|
// awaits ready, so none starts ahead of its package checks. Tests plugging
|
||||||
|
// a companion directly must await an earlier root plugin first — the
|
||||||
|
// duplicate-mount failure otherwise is loud (owner name already reserved).
|
||||||
|
const serviceFiber = mount(InvariantService, { enabled: true })
|
||||||
const testPath = expect.getState().testPath ?? ''
|
const testPath = expect.getState().testPath ?? ''
|
||||||
const companionPaths = testInvariantCompanionPaths(testPath)
|
const companionPaths = testInvariantCompanionPaths(testPath)
|
||||||
for (const path of companionPaths) {
|
const ready = requireActive(serviceFiber, 'invariant service').then(async () => {
|
||||||
const companion = testInvariantCompanions[path]
|
const companions = await Promise.all(companionPaths.map(async (path) => {
|
||||||
if (companion === undefined) {
|
const load = testInvariantCompanions[path]
|
||||||
throw new Error(`test invariants: selected companion vanished at ${path}`)
|
if (load === undefined) {
|
||||||
}
|
throw new Error(`test invariants: selected companion vanished at ${path}`)
|
||||||
if (!companion.inject.includes('invariants')) {
|
}
|
||||||
throw new Error(`test invariants: ${path} must inject the invariant service`)
|
const companion = await load()
|
||||||
}
|
if (!companion.inject.includes('invariants')) {
|
||||||
mount(companion)
|
throw new Error(`test invariants: ${path} must inject the invariant service`)
|
||||||
}
|
}
|
||||||
|
return { companion, path }
|
||||||
const [serviceFiber, ...companionFibers] = fibers
|
}))
|
||||||
if (serviceFiber === undefined) throw new Error('test invariants: service fiber was not mounted')
|
const companionFibers = companions.map(({ companion, path }) => ({
|
||||||
// A companion is initially PENDING on the invariant service, and Cordis
|
fiber: mount(companion),
|
||||||
// Fiber.await() only joins work already in flight. Wait for the service to
|
path,
|
||||||
// activate its dependants before joining their startup and failures.
|
}))
|
||||||
const ready = serviceFiber.await()
|
await Promise.all(companionFibers.map(({ fiber, path }) => requireActive(fiber, path)))
|
||||||
.then(() => Promise.all(companionFibers.map(fiber => fiber.await())))
|
root.provide(TEST_INVARIANT_READY_SERVICE, true)
|
||||||
.then(() => undefined)
|
})
|
||||||
const host = { fibers, byCallback, ready }
|
const host = { byCallback, barrierOwners, ready }
|
||||||
hosts.set(root, host)
|
hosts.set(root, host)
|
||||||
return host
|
return host
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function hasBarrierOwner(host: InvariantHost, ctx: Context): boolean {
|
||||||
|
let fiber = ctx.fiber
|
||||||
|
while (true) {
|
||||||
|
if (
|
||||||
|
host.barrierOwners.has(fiber)
|
||||||
|
&& (fiber.state === FiberState.LOADING || fiber.state === FiberState.ACTIVE)
|
||||||
|
) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
const parent = fiber.parent.fiber
|
||||||
|
if (parent === fiber) return false
|
||||||
|
fiber = parent
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function requireActive(fiber: PluginFiber, label: string): Promise<void> {
|
||||||
|
await fiber.await()
|
||||||
|
if (fiber.state !== FiberState.ACTIVE) {
|
||||||
|
throw new Error(`test invariants: ${label} settled without becoming active`)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function withInvariantReadiness(plugin: Plugin, callback: PluginCallback): Plugin.Object {
|
||||||
|
return {
|
||||||
|
apply: callback as Plugin.Function,
|
||||||
|
inject: {
|
||||||
|
...Inject.resolve(plugin.inject),
|
||||||
|
[TEST_INVARIANT_READY_SERVICE]: null,
|
||||||
|
},
|
||||||
|
...(plugin.name === undefined ? {} : { name: plugin.name }),
|
||||||
|
...(plugin.Config === undefined ? {} : { Config: plugin.Config }),
|
||||||
|
...(plugin.provide === undefined ? {} : { provide: plugin.provide }),
|
||||||
|
...(plugin.intercept === undefined ? {} : { intercept: plugin.intercept }),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
function joinInvariantStartup(fiber: PluginFiber, invariantReady: Promise<void>): PluginFiber {
|
function joinInvariantStartup(fiber: PluginFiber, invariantReady: Promise<void>): PluginFiber {
|
||||||
const readiness = fiber.await().then(async (loaded) => {
|
const readiness = invariantReady.then(() => fiber.await())
|
||||||
await invariantReady
|
|
||||||
return loaded
|
|
||||||
})
|
|
||||||
const joined = Object.create(fiber) as PluginFiber
|
const joined = Object.create(fiber) as PluginFiber
|
||||||
joined.then = readiness.then.bind(readiness)
|
joined.then = readiness.then.bind(readiness)
|
||||||
return joined
|
return joined
|
||||||
|
|||||||
@@ -37,9 +37,9 @@ const testIncludes = [
|
|||||||
'scripts/**/*.spec.ts',
|
'scripts/**/*.spec.ts',
|
||||||
]
|
]
|
||||||
|
|
||||||
// These suites exercise process-global state, process APIs, or timing-sensitive process I/O
|
// These suites exercise process-global state, process APIs, or timing-sensitive process I/O.
|
||||||
// that worker threads cannot isolate reliably under aggregate gate contention.
|
// Keep them in a separate project so Windows, whose main pool uses threads,
|
||||||
// Keep the narrow exception in forks while the rest of the inventory avoids per-file processes.
|
// still contains them in forks; POSIX uses forks for both projects.
|
||||||
const processBoundTests = [
|
const processBoundTests = [
|
||||||
'packages/subprocess/subprocess-local/tests/spawn.spec.ts',
|
'packages/subprocess/subprocess-local/tests/spawn.spec.ts',
|
||||||
'packages/context/time-context/tests/time-context.spec.ts',
|
'packages/context/time-context/tests/time-context.spec.ts',
|
||||||
@@ -55,17 +55,20 @@ export default defineConfig({
|
|||||||
// .tsx: client component specs (jsdom via per-file @vitest-environment pragma).
|
// .tsx: client component specs (jsdom via per-file @vitest-environment pragma).
|
||||||
include: testIncludes,
|
include: testIncludes,
|
||||||
exclude: windowsUnsupportedPackages.map(path => `${path}/tests/**/*.spec.ts`),
|
exclude: windowsUnsupportedPackages.map(path => `${path}/tests/**/*.spec.ts`),
|
||||||
// One coverage invocation aggregates both projects. Most suites use threads
|
// One coverage invocation aggregates both projects. POSIX uses forks to
|
||||||
// for lower startup/IPC overhead; only explicit process-bound suites fork.
|
// contain the Node CJS-lexer abort; Windows keeps threads for the main
|
||||||
|
// inventory and forks only the explicit process-bound project.
|
||||||
projects: [
|
projects: [
|
||||||
{
|
{
|
||||||
plugins: [pathsPlugin()],
|
plugins: [pathsPlugin()],
|
||||||
test: {
|
test: {
|
||||||
name: 'thread-safe',
|
name: 'thread-safe',
|
||||||
// Node 24 has aborted in its CJS lexer from a macOS arm64 worker
|
// Node 24 has aborted in its CJS lexer (v8::ToLocalChecked Empty
|
||||||
// thread. A fork contains that external runtime failure to the test
|
// MaybeLocal in cjs_lexer::Parse) from worker threads on macOS
|
||||||
// process; other hosts retain the lower-overhead thread pool.
|
// arm64 and later on Linux. A fork contains that external runtime
|
||||||
pool: process.platform === 'darwin' ? 'forks' : 'threads',
|
// failure to the test process; Windows keeps the thread pool, where
|
||||||
|
// the abort has not reproduced and process spawn is costlier.
|
||||||
|
pool: process.platform === 'win32' ? 'threads' : 'forks',
|
||||||
setupFiles: ['./scripts/test-invariants.ts'],
|
setupFiles: ['./scripts/test-invariants.ts'],
|
||||||
include: testIncludes,
|
include: testIncludes,
|
||||||
exclude: [
|
exclude: [
|
||||||
@@ -154,6 +157,10 @@ export default defineConfig({
|
|||||||
'packages/client/ui-sidebar/src/client/index.ts',
|
'packages/client/ui-sidebar/src/client/index.ts',
|
||||||
'packages/client/ui-skill/src/client/index.ts',
|
'packages/client/ui-skill/src/client/index.ts',
|
||||||
'packages/client/ui-workspace/src/client/index.ts',
|
'packages/client/ui-workspace/src/client/index.ts',
|
||||||
|
// These three whole-workspace Typert passes are pinned by fixture and
|
||||||
|
// byte-for-byte catalog tests; v8 instrumentation makes them the
|
||||||
|
// coverage lane's longest tail. The generator's lighter modules and
|
||||||
|
// future source files retain the 100% per-file threshold.
|
||||||
'packages/typert/generator/src/analyzer.ts',
|
'packages/typert/generator/src/analyzer.ts',
|
||||||
'packages/typert/generator/src/renderer.ts',
|
'packages/typert/generator/src/renderer.ts',
|
||||||
'packages/typert/generator/src/cordis-catalog.ts',
|
'packages/typert/generator/src/cordis-catalog.ts',
|
||||||
|
|||||||
Reference in New Issue
Block a user