pipework 0.288.0 → 0.289.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/README.md +2 -0
- package/REFERENCE.md +4 -0
- package/dist/cli/commands/test.d.ts.map +1 -1
- package/dist/cli/commands/test.js +13 -0
- package/dist/cli/commands/test.js.map +1 -1
- package/dist/core/config/discover.d.ts +2 -1
- package/dist/core/config/discover.d.ts.map +1 -1
- package/dist/core/config/discover.js +2 -2
- package/dist/core/config/discover.js.map +1 -1
- package/dist/core/config/import-config.d.ts +2 -1
- package/dist/core/config/import-config.d.ts.map +1 -1
- package/dist/core/config/import-config.js +3 -7
- package/dist/core/config/import-config.js.map +1 -1
- package/dist/core/config/schema.d.ts.map +1 -1
- package/dist/core/config/schema.js +3 -1
- package/dist/core/config/schema.js.map +1 -1
- package/dist/test/auto-setup.js +4 -1
- package/dist/test/auto-setup.js.map +1 -1
- package/dist/test/discover-fork.d.ts +6 -1
- package/dist/test/discover-fork.d.ts.map +1 -1
- package/dist/test/discover-fork.js +6 -2
- package/dist/test/discover-fork.js.map +1 -1
- package/dist/test/shared-registry-guard.d.ts +2 -0
- package/dist/test/shared-registry-guard.d.ts.map +1 -0
- package/dist/test/shared-registry-guard.js +35 -0
- package/dist/test/shared-registry-guard.js.map +1 -0
- package/dist/test/shared-registry.d.ts +16 -0
- package/dist/test/shared-registry.d.ts.map +1 -0
- package/dist/test/shared-registry.js +63 -0
- package/dist/test/shared-registry.js.map +1 -0
- package/dist/test/vitest-workspace.d.ts.map +1 -1
- package/dist/test/vitest-workspace.js +63 -13
- package/dist/test/vitest-workspace.js.map +1 -1
- package/package.json +6 -2
- package/src/cli/commands/test.ts +15 -0
- package/src/core/config/discover.ts +3 -3
- package/src/core/config/import-config.ts +9 -2
- package/src/core/config/schema.ts +3 -1
- package/src/test/auto-setup.ts +4 -1
- package/src/test/discover-fork.ts +7 -2
- package/src/test/shared-registry-guard.ts +41 -0
- package/src/test/shared-registry.ts +71 -0
- package/src/test/vitest-workspace.ts +66 -13
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { resolve, dirname } from 'node:path';
|
|
1
|
+
import { resolve, dirname, isAbsolute } from 'node:path';
|
|
2
2
|
import { configDefaults } from 'vitest/config';
|
|
3
3
|
import { findConfig, registerTsResolveHooks } from '../core/config/discover.js';
|
|
4
4
|
import { importConfig } from '../core/config/import-config.js';
|
|
@@ -6,6 +6,7 @@ import { loadEnvFiles } from '../core/config/env.js';
|
|
|
6
6
|
import { resolveModules } from '../workspace/discover.js';
|
|
7
7
|
import { workspaceSourcePaths } from '../workspace/source-paths.js';
|
|
8
8
|
import { pipework as pipeworkPlugin } from './vitest-plugin.js';
|
|
9
|
+
import { escapeGlob, findRegistryFiles, isolatedSiblingName } from './shared-registry.js';
|
|
9
10
|
const DEFAULT_TEST_TIMEOUT = 30_000;
|
|
10
11
|
export const DEFAULT_HOOK_TIMEOUT = 60_000;
|
|
11
12
|
// Pipework's own defaults, overridable per workspace, module and profile via
|
|
@@ -15,6 +16,8 @@ export const DEFAULT_HOOK_TIMEOUT = 60_000;
|
|
|
15
16
|
// worker costs a process spawn per file.
|
|
16
17
|
const DEFAULT_POOL = 'forks';
|
|
17
18
|
const DEFAULT_ISOLATE = false;
|
|
19
|
+
// Setup file that refuses registry-changing `vi` calls in a shared-registry project.
|
|
20
|
+
const SHARED_REGISTRY_GUARD = 'pipework/test/shared-registry';
|
|
18
21
|
/**
|
|
19
22
|
* Consumer excludes on TOP of vitest's defaults, not in place of them.
|
|
20
23
|
*
|
|
@@ -158,13 +161,11 @@ export function resolveVitestModules(vitestConfig, resolvedModules, configDir, w
|
|
|
158
161
|
const projects = [];
|
|
159
162
|
for (const [modulePath, moduleConfig] of [...included.entries()].sort(([a], [b]) => a.localeCompare(b))) {
|
|
160
163
|
refuseProjectCoverage(`vitest.modules["${modulePath}"].coverage`, moduleConfig);
|
|
161
|
-
|
|
162
|
-
projects.push(project);
|
|
164
|
+
pushRouted(projects, buildProjectConfig(modulePath, moduleConfig, vitestConfig, configDir, workspacePackages));
|
|
163
165
|
if (moduleConfig.profiles !== undefined) {
|
|
164
166
|
for (const [profileName, profileConfig] of Object.entries(moduleConfig.profiles).sort(([a], [b]) => a.localeCompare(b))) {
|
|
165
167
|
refuseProjectCoverage(`vitest.modules["${modulePath}"].profiles["${profileName}"].coverage`, profileConfig);
|
|
166
|
-
|
|
167
|
-
projects.push(profileProject);
|
|
168
|
+
pushRouted(projects, buildProfileConfig(modulePath, profileName, moduleConfig, profileConfig, vitestConfig, configDir, workspacePackages));
|
|
168
169
|
}
|
|
169
170
|
}
|
|
170
171
|
}
|
|
@@ -312,6 +313,7 @@ function buildProfileConfig(modulePath, profileName, moduleConfig, profileConfig
|
|
|
312
313
|
}
|
|
313
314
|
function buildProject(input) {
|
|
314
315
|
const inlineDeps = buildInlineDeps(input);
|
|
316
|
+
const shared = sharesRegistry(input);
|
|
315
317
|
return {
|
|
316
318
|
...input.extra,
|
|
317
319
|
plugins: [
|
|
@@ -335,7 +337,7 @@ function buildProject(input) {
|
|
|
335
337
|
inline: inlineDeps,
|
|
336
338
|
},
|
|
337
339
|
},
|
|
338
|
-
setupFiles: input.setupFiles,
|
|
340
|
+
setupFiles: shared ? [...input.setupFiles, SHARED_REGISTRY_GUARD] : input.setupFiles,
|
|
339
341
|
// `vitest.pool` / `vitest.isolate` are dedicated fields, so an explicitly
|
|
340
342
|
// configured one wins over `extra.test`; unset, the default above stands and
|
|
341
343
|
// `extra.test` still overrides it as it always did.
|
|
@@ -357,19 +359,24 @@ function buildSetupFiles(database, userSetupFiles) {
|
|
|
357
359
|
}
|
|
358
360
|
return files;
|
|
359
361
|
}
|
|
360
|
-
//
|
|
361
|
-
//
|
|
362
|
-
//
|
|
363
|
-
//
|
|
364
|
-
|
|
365
|
-
function buildInlineDeps(input) {
|
|
362
|
+
// Whether the project's workers share one module registry: the effective isolate is
|
|
363
|
+
// false and the pool is not a vm pool (those isolate per file whatever `isolate` says).
|
|
364
|
+
// Precedence mirrors buildProject's emitted config: dedicated field, then `extra.test`,
|
|
365
|
+
// then the default.
|
|
366
|
+
function sharesRegistry(input) {
|
|
366
367
|
const extraTest = 'test' in input.extra ? input.extra['test'] : {};
|
|
367
368
|
const extraIsolate = typeof extraTest['isolate'] === 'boolean' ? extraTest['isolate'] : undefined;
|
|
368
369
|
const extraPool = extraTest['pool'];
|
|
369
370
|
const isolate = input.isolate ?? extraIsolate ?? DEFAULT_ISOLATE;
|
|
370
371
|
const pool = input.pool ?? extraPool ?? DEFAULT_POOL;
|
|
372
|
+
return !isolate && pool !== 'vmThreads' && pool !== 'vmForks';
|
|
373
|
+
}
|
|
374
|
+
// Pipework is inlined only where the registry is not shared: a fresh module registry
|
|
375
|
+
// per file needs it. A shared-registry fork already matches Node's single module
|
|
376
|
+
// instance, so inlining buys nothing there.
|
|
377
|
+
function buildInlineDeps(input) {
|
|
371
378
|
const deps = new Set();
|
|
372
|
-
if (
|
|
379
|
+
if (!sharesRegistry(input)) {
|
|
373
380
|
deps.add('pipework');
|
|
374
381
|
}
|
|
375
382
|
for (const dep of input.inlineDeps) {
|
|
@@ -377,6 +384,49 @@ function buildInlineDeps(input) {
|
|
|
377
384
|
}
|
|
378
385
|
return [...deps];
|
|
379
386
|
}
|
|
387
|
+
// Routing for #1001. `isolate: false` projects keep one module registry per worker, and a
|
|
388
|
+
// file that calls vi.resetModules / vi.mock / vi.doMock / vi.unmock / vi.doUnmock breaks
|
|
389
|
+
// the files after it. Per project, the files its `include` selects (under `dir` or the
|
|
390
|
+
// root, minus its merged `exclude`) are read; those whose own text calls one move to a
|
|
391
|
+
// sibling project `<name>:registry-isolated` that is the same project with `isolate: true`
|
|
392
|
+
// and an `include` of exactly those files, and the project itself excludes them. Each
|
|
393
|
+
// project decides for itself from the file's text, so a file two projects select (a
|
|
394
|
+
// module and its profile, or nested module roots) is routed in each, and still runs once
|
|
395
|
+
// per project as before. Files are visited in sorted order, projects in config order.
|
|
396
|
+
function pushRouted(projects, project) {
|
|
397
|
+
const test = project.test;
|
|
398
|
+
const setup = test?.setupFiles;
|
|
399
|
+
if (test === undefined || typeof test.root !== 'string' || !Array.isArray(setup) || !setup.includes(SHARED_REGISTRY_GUARD)) {
|
|
400
|
+
projects.push(project);
|
|
401
|
+
return;
|
|
402
|
+
}
|
|
403
|
+
const root = test.root;
|
|
404
|
+
const name = String(test.name);
|
|
405
|
+
const dir = typeof test.dir === 'string' ? (isAbsolute(test.dir) ? test.dir : resolve(root, test.dir)) : root;
|
|
406
|
+
const include = test.include ?? [...configDefaults.include];
|
|
407
|
+
const exclude = test.exclude ?? [...configDefaults.exclude];
|
|
408
|
+
const routed = findRegistryFiles(dir, include, exclude);
|
|
409
|
+
if (routed.length === 0) {
|
|
410
|
+
projects.push(project);
|
|
411
|
+
return;
|
|
412
|
+
}
|
|
413
|
+
const escaped = routed.map(escapeGlob);
|
|
414
|
+
projects.push({
|
|
415
|
+
...project,
|
|
416
|
+
test: { ...test, exclude: [...exclude, ...escaped] },
|
|
417
|
+
});
|
|
418
|
+
projects.push({
|
|
419
|
+
...project,
|
|
420
|
+
test: {
|
|
421
|
+
...test,
|
|
422
|
+
name: isolatedSiblingName(name),
|
|
423
|
+
isolate: true,
|
|
424
|
+
include: escaped,
|
|
425
|
+
setupFiles: setup.filter(file => file !== SHARED_REGISTRY_GUARD),
|
|
426
|
+
server: { deps: { inline: [...new Set(['pipework', ...(test.server?.deps?.inline ?? [])])] } },
|
|
427
|
+
},
|
|
428
|
+
});
|
|
429
|
+
}
|
|
380
430
|
function closestMatch(input, candidates) {
|
|
381
431
|
if (candidates.length === 0)
|
|
382
432
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vitest-workspace.js","sourceRoot":"","sources":["../../src/test/vitest-workspace.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"vitest-workspace.js","sourceRoot":"","sources":["../../src/test/vitest-workspace.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "pipework",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.289.0",
|
|
4
4
|
"description": "TypeScript framework for multi-tenant SaaS applications. PostgreSQL-only.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"framework"
|
|
22
22
|
],
|
|
23
23
|
"engines": {
|
|
24
|
-
"node": ">=22"
|
|
24
|
+
"node": ">=22.5"
|
|
25
25
|
},
|
|
26
26
|
"exports": {
|
|
27
27
|
".": {
|
|
@@ -40,6 +40,10 @@
|
|
|
40
40
|
"import": "./dist/test/auto-setup.js",
|
|
41
41
|
"types": "./dist/test/auto-setup.d.ts"
|
|
42
42
|
},
|
|
43
|
+
"./test/shared-registry": {
|
|
44
|
+
"import": "./dist/test/shared-registry-guard.js",
|
|
45
|
+
"types": "./dist/test/shared-registry-guard.d.ts"
|
|
46
|
+
},
|
|
43
47
|
"./vitest-plugin": {
|
|
44
48
|
"import": "./dist/test/vitest-plugin.js",
|
|
45
49
|
"types": "./dist/test/vitest-plugin.d.ts"
|
package/src/cli/commands/test.ts
CHANGED
|
@@ -6,6 +6,8 @@ import { resolveAffected } from '../../workspace/affected.js'
|
|
|
6
6
|
import { findConfig } from '../../core/config/discover.js'
|
|
7
7
|
import { resolveModules, type ResolvedModule } from '../../workspace/discover.js'
|
|
8
8
|
import { shardArg, type Shard } from './shard.js'
|
|
9
|
+
import { resolveVitestModules } from '../../test/vitest-workspace.js'
|
|
10
|
+
import { isolatedSiblingName } from '../../test/shared-registry.js'
|
|
9
11
|
|
|
10
12
|
export interface TestOptions {
|
|
11
13
|
cwd: string
|
|
@@ -281,6 +283,19 @@ export function buildProjectArgs(
|
|
|
281
283
|
info(`Scoped to ${String(scopeResult.modules.size)} of ${String(effectiveModules.length)} module(s): ${[...scopeResult.modules].sort().join(', ')}`)
|
|
282
284
|
}
|
|
283
285
|
|
|
286
|
+
// A shared-registry project whose files call vi.resetModules or vi.mock has those files
|
|
287
|
+
// in a generated sibling project (#1001). The sibling runs wherever its parent does, so
|
|
288
|
+
// it is named beside it; the project names come from the same resolution vitest loads.
|
|
289
|
+
const generated = new Set(
|
|
290
|
+
resolveVitestModules(blueprint.vitest, effectiveModules, configDir, {}).map(p => String(p.test?.name)),
|
|
291
|
+
)
|
|
292
|
+
for (const name of [...projectNames]) {
|
|
293
|
+
const sibling = isolatedSiblingName(name)
|
|
294
|
+
if (!generated.has(sibling)) continue
|
|
295
|
+
projectNames.push(sibling)
|
|
296
|
+
databaseByProject.set(sibling, databaseByProject.get(name) ?? true)
|
|
297
|
+
}
|
|
298
|
+
|
|
284
299
|
const args: string[] = []
|
|
285
300
|
for (const name of projectNames) {
|
|
286
301
|
args.push('--project', name)
|
|
@@ -2,7 +2,7 @@ import { resolve, dirname } from 'node:path'
|
|
|
2
2
|
import { existsSync } from 'node:fs'
|
|
3
3
|
import type { Manifold } from '../pipework.js'
|
|
4
4
|
import { ConfigError } from './errors.js'
|
|
5
|
-
import { importConfig } from './import-config.js'
|
|
5
|
+
import { importConfig, type ConfigLoader } from './import-config.js'
|
|
6
6
|
import { registerTsResolveHooks } from './ts-inline-hooks.js'
|
|
7
7
|
|
|
8
8
|
export { registerTsResolveHooks }
|
|
@@ -21,7 +21,7 @@ const CONFIG_FILENAME = 'pipework.config.ts'
|
|
|
21
21
|
* leaves the variable alone; the test fork's `discoverForTestFork` consumes
|
|
22
22
|
* it after loading, so it never travels to processes a test spawns.
|
|
23
23
|
*/
|
|
24
|
-
export async function discoverInstance(cwd?: string): Promise<Manifold> {
|
|
24
|
+
export async function discoverInstance(cwd?: string, load?: ConfigLoader): Promise<Manifold> {
|
|
25
25
|
const start = cwd ?? process.cwd()
|
|
26
26
|
const override = process.env['PIPEWORK_CONFIG']
|
|
27
27
|
const configPath = override === undefined ? findConfig(start) : resolveOverride(override)
|
|
@@ -35,7 +35,7 @@ export async function discoverInstance(cwd?: string): Promise<Manifold> {
|
|
|
35
35
|
|
|
36
36
|
registerTsResolveHooks()
|
|
37
37
|
|
|
38
|
-
return importConfig(configPath)
|
|
38
|
+
return importConfig(configPath, load)
|
|
39
39
|
}
|
|
40
40
|
|
|
41
41
|
function resolveOverride(value: string): string {
|
|
@@ -9,10 +9,17 @@ import { setConfigBaseDir, clearConfigBaseDir } from './base-dir.js'
|
|
|
9
9
|
// resolver) goes through here so relative `migrations`/`schema` paths always
|
|
10
10
|
// resolve against the config file's directory, whichever entry path loads the
|
|
11
11
|
// config first in a process.
|
|
12
|
-
|
|
12
|
+
//
|
|
13
|
+
// `load` replaces the module loader, which is Node's `import()` by default. A test
|
|
14
|
+
// fork passes the vitest module runner's (#1006): the app's modules then evaluate
|
|
15
|
+
// once, in the same runner as the test files' imports, instead of once under Node.
|
|
16
|
+
export type ConfigLoader = (url: string) => Promise<Record<string, unknown>>
|
|
17
|
+
|
|
18
|
+
export async function importConfig(configPath: string, load?: ConfigLoader): Promise<Manifold> {
|
|
13
19
|
setConfigBaseDir(dirname(configPath))
|
|
14
20
|
try {
|
|
15
|
-
const
|
|
21
|
+
const url = pathToFileURL(configPath).href
|
|
22
|
+
const mod: Record<string, unknown> = load !== undefined ? await load(url) : await import(url)
|
|
16
23
|
const exported: unknown = mod['default'] ?? mod
|
|
17
24
|
|
|
18
25
|
if (!isManifold(exported)) {
|
|
@@ -274,7 +274,9 @@ const vitestProfileSchema = z.object({
|
|
|
274
274
|
isolate: z.boolean().optional().describe(
|
|
275
275
|
'Run each test file in a fresh worker. Pipework defaults to `false` — pipework\'s own ' +
|
|
276
276
|
'per-test database isolation already separates test state, and re-isolating the worker ' +
|
|
277
|
-
'costs a process spawn per file. Set `true` for a suite that relies on vitest\'s default.'
|
|
277
|
+
'costs a process spawn per file. Set `true` for a suite that relies on vitest\'s default. ' +
|
|
278
|
+
'In a project left at `false`, a file whose text calls vi.resetModules, vi.mock, vi.doMock, ' +
|
|
279
|
+
'vi.unmock or vi.doUnmock runs in a generated `<name>:registry-isolated` sibling.',
|
|
278
280
|
),
|
|
279
281
|
database: z.boolean().optional(),
|
|
280
282
|
setupFiles: z.array(z.string()).optional(),
|
package/src/test/auto-setup.ts
CHANGED
|
@@ -11,7 +11,10 @@ loadEnvFiles()
|
|
|
11
11
|
|
|
12
12
|
let _testContext: TestContext | null = null
|
|
13
13
|
|
|
14
|
-
|
|
14
|
+
// Loaded through this file's own `import()`, which vitest routes through its module runner
|
|
15
|
+
// (setup files always run there), not through Node: the config's app modules must be the
|
|
16
|
+
// instances the test files import (#1006).
|
|
17
|
+
const instance = await discoverForTestFork(url => import(/* @vite-ignore */ url) as Promise<Record<string, unknown>>)
|
|
15
18
|
|
|
16
19
|
_setTestState(instance)
|
|
17
20
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Manifold } from '../core/pipework.js'
|
|
2
2
|
import { discoverInstance } from '../core/config/discover.js'
|
|
3
|
+
import type { ConfigLoader } from '../core/config/import-config.js'
|
|
3
4
|
|
|
4
5
|
/**
|
|
5
6
|
* Load this test fork's manifold and consume `PIPEWORK_CONFIG`.
|
|
@@ -9,9 +10,13 @@ import { discoverInstance } from '../core/config/discover.js'
|
|
|
9
10
|
* migrate`, a CLI under test — inherits it and migrates the wrong package
|
|
10
11
|
* against the wrong manifold. Discovery failing leaves it set: the variable is
|
|
11
12
|
* part of the diagnosis.
|
|
13
|
+
*
|
|
14
|
+
* `load` is the test runner's own `import()` (#1006): the config's module graph is then
|
|
15
|
+
* evaluated by the same module runner as the test files' imports, so an app module
|
|
16
|
+
* (and its `pipe.define(...)`) runs once whether or not pipework is inlined.
|
|
12
17
|
*/
|
|
13
|
-
export async function discoverForTestFork(): Promise<Manifold> {
|
|
14
|
-
const instance = await discoverInstance()
|
|
18
|
+
export async function discoverForTestFork(load?: ConfigLoader): Promise<Manifold> {
|
|
19
|
+
const instance = await discoverInstance(undefined, load)
|
|
15
20
|
delete process.env['PIPEWORK_CONFIG']
|
|
16
21
|
return instance
|
|
17
22
|
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { vi } from 'vitest'
|
|
2
|
+
import { REGISTRY_CALLS } from './shared-registry.js'
|
|
3
|
+
|
|
4
|
+
// Setup file for projects that share one module registry per worker (`isolate: false`,
|
|
5
|
+
// non-vm pool). It replaces the `vi` calls that change the registry with a throw naming
|
|
6
|
+
// the test file and the fix. The workspace already routes a file whose own text calls
|
|
7
|
+
// them to an isolated sibling project; this catches a call it could not see, such as one
|
|
8
|
+
// reached through a helper (#1001). Idempotent: setup files re-run for every test file.
|
|
9
|
+
// Listed after the project's own setup files, so a mock a setup file registers on
|
|
10
|
+
// purpose still goes through.
|
|
11
|
+
|
|
12
|
+
const GUARDED = Symbol.for('pipework.sharedRegistryGuard')
|
|
13
|
+
|
|
14
|
+
function currentFile(): string {
|
|
15
|
+
const worker = (globalThis as { __vitest_worker__?: { filepath?: string } }).__vitest_worker__
|
|
16
|
+
return worker?.filepath ?? 'the running test file'
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export function refuse(call: string, file: string): Error {
|
|
20
|
+
return new Error(
|
|
21
|
+
`[pipework] vi.${call}() is refused in a shared-registry test project (called from ${file}).\n\n` +
|
|
22
|
+
' This project runs with isolate: false: every file in a worker shares one module\n' +
|
|
23
|
+
' registry, and pipework itself is not re-evaluated by vi.resetModules() or vi.mock().\n' +
|
|
24
|
+
' A reset re-runs the app\'s pipe.define(...) calls against the same registry, so the\n' +
|
|
25
|
+
' next file in the worker fails with "Duplicate domain definition", and a mock binds\n' +
|
|
26
|
+
' the importers of the file after it.\n' +
|
|
27
|
+
' The workspace routes a file to an isolated sibling project when its own text calls\n' +
|
|
28
|
+
' vi.resetModules, vi.mock, vi.doMock, vi.unmock or vi.doUnmock. This call was not found in\n' +
|
|
29
|
+
` the text of ${file}, so it was not routed.\n` +
|
|
30
|
+
' Fix: call it directly in the test file that needs it (not through a helper), or set\n' +
|
|
31
|
+
' `isolate: true` on this project or profile in pipework.config.ts.\n',
|
|
32
|
+
)
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const target = vi as unknown as Record<PropertyKey, unknown>
|
|
36
|
+
if (target[GUARDED] !== true) {
|
|
37
|
+
for (const call of REGISTRY_CALLS) {
|
|
38
|
+
target[call] = (): never => { throw refuse(call, currentFile()) }
|
|
39
|
+
}
|
|
40
|
+
target[GUARDED] = true
|
|
41
|
+
}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { readFileSync, globSync } from 'node:fs'
|
|
2
|
+
import { matchesGlob, resolve, sep } from 'node:path'
|
|
3
|
+
|
|
4
|
+
// A project with `isolate: false` (and a non-vm pool) keeps one module registry per
|
|
5
|
+
// worker. A test file that resets or mocks modules changes that registry for itself
|
|
6
|
+
// and for every file after it: `vi.resetModules()` re-evaluates the app's modules but
|
|
7
|
+
// not pipework (Node's own cache), so each `pipe.define(...)` runs twice against the
|
|
8
|
+
// one registry and the file after it fails at load (#1001). Such files are routed to an
|
|
9
|
+
// isolated sibling project from their own text; the guard setup file refuses the same
|
|
10
|
+
// calls in shared-registry projects for anything the text scan misses.
|
|
11
|
+
|
|
12
|
+
/** The `vi` calls that change a worker's module registry or the next file's importers. */
|
|
13
|
+
export const REGISTRY_CALLS = ['resetModules', 'mock', 'doMock', 'unmock', 'doUnmock'] as const
|
|
14
|
+
|
|
15
|
+
// `vi.mock(`, `vi.mock<T>(`, `vitest.doMock (` and `vi?.resetModules(`. Decided from the
|
|
16
|
+
// file's own text, comments and strings included: a miss is caught by the guard, a
|
|
17
|
+
// false hit only costs one isolated worker.
|
|
18
|
+
const REGISTRY_CALL_PATTERN = new RegExp(
|
|
19
|
+
`\\b(?:vi|vitest)\\s*\\??\\.\\s*(?:${REGISTRY_CALLS.join('|')})\\s*(?:<[^>]*>)?\\s*\\(`,
|
|
20
|
+
)
|
|
21
|
+
|
|
22
|
+
export function callsRegistryApi(text: string): boolean {
|
|
23
|
+
return REGISTRY_CALL_PATTERN.test(text)
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
/** Name of the isolated sibling that takes the registry-changing files of `project`. */
|
|
27
|
+
export function isolatedSiblingName(project: string): string {
|
|
28
|
+
return `${project}:registry-isolated`
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
/** Glob-escape a literal path, so `[id].test.ts` matches only itself. */
|
|
32
|
+
export function escapeGlob(path: string): string {
|
|
33
|
+
return path.replace(/[\\*?[\]{}()!|+@]/g, '\\$&')
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
/**
|
|
37
|
+
* The files `include` selects under `base`, minus `exclude`, as sorted `/`-separated
|
|
38
|
+
* paths relative to `base`. Vitest globs the same way, so this is the file set the
|
|
39
|
+
* project would run. A base that does not exist selects nothing.
|
|
40
|
+
*/
|
|
41
|
+
export function listProjectFiles(base: string, include: readonly string[], exclude: readonly string[]): string[] {
|
|
42
|
+
let found: string[]
|
|
43
|
+
try {
|
|
44
|
+
found = globSync([...include], {
|
|
45
|
+
cwd: base,
|
|
46
|
+
// Prune the two trees nothing is ever tested in, without walking them.
|
|
47
|
+
exclude: (path) => {
|
|
48
|
+
const name = path.split(/[\\/]/).pop()
|
|
49
|
+
return name === 'node_modules' || name === '.git'
|
|
50
|
+
},
|
|
51
|
+
})
|
|
52
|
+
} catch {
|
|
53
|
+
return []
|
|
54
|
+
}
|
|
55
|
+
const files = found
|
|
56
|
+
.map(file => file.split(sep).join('/'))
|
|
57
|
+
.filter(file => !exclude.some(pattern => matchesGlob(file, pattern)))
|
|
58
|
+
return [...new Set(files)].sort()
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
/** The files of the project whose own text calls a registry-changing `vi` API. */
|
|
62
|
+
export function findRegistryFiles(base: string, include: readonly string[], exclude: readonly string[]): string[] {
|
|
63
|
+
return listProjectFiles(base, include, exclude).filter(file => {
|
|
64
|
+
try {
|
|
65
|
+
return callsRegistryApi(readFileSync(resolve(base, file), 'utf8'))
|
|
66
|
+
} catch {
|
|
67
|
+
return false
|
|
68
|
+
}
|
|
69
|
+
})
|
|
70
|
+
}
|
|
71
|
+
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { resolve, dirname } from 'node:path'
|
|
1
|
+
import { resolve, dirname, isAbsolute } from 'node:path'
|
|
2
2
|
import { configDefaults } from 'vitest/config'
|
|
3
3
|
import type { ViteUserConfig, UserWorkspaceConfig } from 'vitest/config'
|
|
4
4
|
import type { VitestConfig, VitestModuleConfig, VitestProfileConfig, CoverageConfig } from '../core/config/schema.js'
|
|
@@ -10,6 +10,7 @@ import { loadEnvFiles } from '../core/config/env.js'
|
|
|
10
10
|
import { resolveModules } from '../workspace/discover.js'
|
|
11
11
|
import { workspaceSourcePaths } from '../workspace/source-paths.js'
|
|
12
12
|
import { pipework as pipeworkPlugin } from './vitest-plugin.js'
|
|
13
|
+
import { escapeGlob, findRegistryFiles, isolatedSiblingName } from './shared-registry.js'
|
|
13
14
|
|
|
14
15
|
const DEFAULT_TEST_TIMEOUT = 30_000
|
|
15
16
|
export const DEFAULT_HOOK_TIMEOUT = 60_000
|
|
@@ -22,6 +23,9 @@ export const DEFAULT_HOOK_TIMEOUT = 60_000
|
|
|
22
23
|
const DEFAULT_POOL = 'forks'
|
|
23
24
|
const DEFAULT_ISOLATE = false
|
|
24
25
|
|
|
26
|
+
// Setup file that refuses registry-changing `vi` calls in a shared-registry project.
|
|
27
|
+
const SHARED_REGISTRY_GUARD = 'pipework/test/shared-registry'
|
|
28
|
+
|
|
25
29
|
type PoolName = NonNullable<VitestConfig['pool']>
|
|
26
30
|
|
|
27
31
|
/**
|
|
@@ -199,14 +203,12 @@ export function resolveVitestModules(
|
|
|
199
203
|
|
|
200
204
|
for (const [modulePath, moduleConfig] of [...included.entries()].sort(([a], [b]) => a.localeCompare(b))) {
|
|
201
205
|
refuseProjectCoverage(`vitest.modules["${modulePath}"].coverage`, moduleConfig)
|
|
202
|
-
|
|
203
|
-
projects.push(project)
|
|
206
|
+
pushRouted(projects, buildProjectConfig(modulePath, moduleConfig, vitestConfig, configDir, workspacePackages))
|
|
204
207
|
|
|
205
208
|
if (moduleConfig.profiles !== undefined) {
|
|
206
209
|
for (const [profileName, profileConfig] of Object.entries(moduleConfig.profiles).sort(([a], [b]) => a.localeCompare(b))) {
|
|
207
210
|
refuseProjectCoverage(`vitest.modules["${modulePath}"].profiles["${profileName}"].coverage`, profileConfig)
|
|
208
|
-
|
|
209
|
-
projects.push(profileProject)
|
|
211
|
+
pushRouted(projects, buildProfileConfig(modulePath, profileName, moduleConfig, profileConfig, vitestConfig, configDir, workspacePackages))
|
|
210
212
|
}
|
|
211
213
|
}
|
|
212
214
|
}
|
|
@@ -411,6 +413,7 @@ interface ProjectBuildInput {
|
|
|
411
413
|
|
|
412
414
|
function buildProject(input: ProjectBuildInput): UserWorkspaceConfig {
|
|
413
415
|
const inlineDeps = buildInlineDeps(input)
|
|
416
|
+
const shared = sharesRegistry(input)
|
|
414
417
|
return {
|
|
415
418
|
...input.extra,
|
|
416
419
|
plugins: [
|
|
@@ -434,7 +437,7 @@ function buildProject(input: ProjectBuildInput): UserWorkspaceConfig {
|
|
|
434
437
|
inline: inlineDeps,
|
|
435
438
|
},
|
|
436
439
|
},
|
|
437
|
-
setupFiles: input.setupFiles,
|
|
440
|
+
setupFiles: shared ? [...input.setupFiles, SHARED_REGISTRY_GUARD] : input.setupFiles,
|
|
438
441
|
// `vitest.pool` / `vitest.isolate` are dedicated fields, so an explicitly
|
|
439
442
|
// configured one wins over `extra.test`; unset, the default above stands and
|
|
440
443
|
// `extra.test` still overrides it as it always did.
|
|
@@ -458,19 +461,25 @@ function buildSetupFiles(database: boolean, userSetupFiles: string[] | undefined
|
|
|
458
461
|
return files
|
|
459
462
|
}
|
|
460
463
|
|
|
461
|
-
//
|
|
462
|
-
//
|
|
463
|
-
//
|
|
464
|
-
//
|
|
465
|
-
|
|
466
|
-
function buildInlineDeps(input: ProjectBuildInput): string[] {
|
|
464
|
+
// Whether the project's workers share one module registry: the effective isolate is
|
|
465
|
+
// false and the pool is not a vm pool (those isolate per file whatever `isolate` says).
|
|
466
|
+
// Precedence mirrors buildProject's emitted config: dedicated field, then `extra.test`,
|
|
467
|
+
// then the default.
|
|
468
|
+
function sharesRegistry(input: ProjectBuildInput): boolean {
|
|
467
469
|
const extraTest = 'test' in input.extra ? input.extra['test'] as Record<string, unknown> : {}
|
|
468
470
|
const extraIsolate = typeof extraTest['isolate'] === 'boolean' ? extraTest['isolate'] : undefined
|
|
469
471
|
const extraPool = extraTest['pool']
|
|
470
472
|
const isolate = input.isolate ?? extraIsolate ?? DEFAULT_ISOLATE
|
|
471
473
|
const pool = input.pool ?? extraPool ?? DEFAULT_POOL
|
|
474
|
+
return !isolate && pool !== 'vmThreads' && pool !== 'vmForks'
|
|
475
|
+
}
|
|
476
|
+
|
|
477
|
+
// Pipework is inlined only where the registry is not shared: a fresh module registry
|
|
478
|
+
// per file needs it. A shared-registry fork already matches Node's single module
|
|
479
|
+
// instance, so inlining buys nothing there.
|
|
480
|
+
function buildInlineDeps(input: ProjectBuildInput): string[] {
|
|
472
481
|
const deps = new Set<string>()
|
|
473
|
-
if (
|
|
482
|
+
if (!sharesRegistry(input)) {
|
|
474
483
|
deps.add('pipework')
|
|
475
484
|
}
|
|
476
485
|
for (const dep of input.inlineDeps) {
|
|
@@ -479,6 +488,50 @@ function buildInlineDeps(input: ProjectBuildInput): string[] {
|
|
|
479
488
|
return [...deps]
|
|
480
489
|
}
|
|
481
490
|
|
|
491
|
+
// Routing for #1001. `isolate: false` projects keep one module registry per worker, and a
|
|
492
|
+
// file that calls vi.resetModules / vi.mock / vi.doMock / vi.unmock / vi.doUnmock breaks
|
|
493
|
+
// the files after it. Per project, the files its `include` selects (under `dir` or the
|
|
494
|
+
// root, minus its merged `exclude`) are read; those whose own text calls one move to a
|
|
495
|
+
// sibling project `<name>:registry-isolated` that is the same project with `isolate: true`
|
|
496
|
+
// and an `include` of exactly those files, and the project itself excludes them. Each
|
|
497
|
+
// project decides for itself from the file's text, so a file two projects select (a
|
|
498
|
+
// module and its profile, or nested module roots) is routed in each, and still runs once
|
|
499
|
+
// per project as before. Files are visited in sorted order, projects in config order.
|
|
500
|
+
function pushRouted(projects: UserWorkspaceConfig[], project: UserWorkspaceConfig): void {
|
|
501
|
+
const test = project.test
|
|
502
|
+
const setup = test?.setupFiles
|
|
503
|
+
if (test === undefined || typeof test.root !== 'string' || !Array.isArray(setup) || !setup.includes(SHARED_REGISTRY_GUARD)) {
|
|
504
|
+
projects.push(project)
|
|
505
|
+
return
|
|
506
|
+
}
|
|
507
|
+
const root = test.root
|
|
508
|
+
const name = String(test.name)
|
|
509
|
+
const dir = typeof test.dir === 'string' ? (isAbsolute(test.dir) ? test.dir : resolve(root, test.dir)) : root
|
|
510
|
+
const include = test.include ?? [...configDefaults.include]
|
|
511
|
+
const exclude = test.exclude ?? [...configDefaults.exclude]
|
|
512
|
+
const routed = findRegistryFiles(dir, include, exclude)
|
|
513
|
+
if (routed.length === 0) {
|
|
514
|
+
projects.push(project)
|
|
515
|
+
return
|
|
516
|
+
}
|
|
517
|
+
const escaped = routed.map(escapeGlob)
|
|
518
|
+
projects.push({
|
|
519
|
+
...project,
|
|
520
|
+
test: { ...test, exclude: [...exclude, ...escaped] },
|
|
521
|
+
})
|
|
522
|
+
projects.push({
|
|
523
|
+
...project,
|
|
524
|
+
test: {
|
|
525
|
+
...test,
|
|
526
|
+
name: isolatedSiblingName(name),
|
|
527
|
+
isolate: true,
|
|
528
|
+
include: escaped,
|
|
529
|
+
setupFiles: setup.filter(file => file !== SHARED_REGISTRY_GUARD),
|
|
530
|
+
server: { deps: { inline: [...new Set(['pipework', ...((test.server?.deps?.inline as string[] | undefined) ?? [])])] } },
|
|
531
|
+
},
|
|
532
|
+
})
|
|
533
|
+
}
|
|
534
|
+
|
|
482
535
|
function closestMatch(input: string, candidates: string[]): string | null {
|
|
483
536
|
if (candidates.length === 0) return null
|
|
484
537
|
|