@orkestrel/scaffold 0.0.102 → 0.0.104

package/dist/host/tests/config.test.ts

@@ -70,7 +70,7 @@ import configuration, { resolveWorkspacePath } from '../vite.config.js'
 import * as rootConfiguration from '../vite.config.js'
 import tsconfig from '../tsconfig.json' with { type: 'json' }
 import {
-	ARTIFACT_IMPORT_CASES,
+	COMPUTED_IMPORT_PATHS,
 	collectSheets,
 	collectStudies,
 	collectFrameworks,
@@ -323,16 +323,27 @@ describe('selected faces', () => {
 		}
 		const script =
 			'vite build --config configs/src/vite.styles.config.ts && vite build --config configs/src/vite.themes.config.ts'
-		expect(inspectSheetConfiguration(project, script)).toEqual([])
-		expect(
-			inspectSheetConfiguration(
-				{ test: { ...project.test, setupFiles: ['./tests/setup.ts', './tests/setupBrowser.ts'] } },
-				script,
-			),
-		).toContain('./tests/setupStyles.ts')
-		expect(
-			inspectSheetConfiguration(project, script.split(' && ').reverse().join(' && ')),
-		).toContain('themes order')
+		const scratch = createPolicyScratch({ prefix: 'config-sheet-setup-' })
+		const withoutStyles = {
+			test: { ...project.test, setupFiles: ['./tests/setup.ts', './tests/setupBrowser.ts'] },
+		}
+		try {
+			expect(inspectSheetConfiguration(withoutStyles, script, scratch.path)).toEqual([])
+			scratch.write('tests/setupStyles.ts', 'export {}\n')
+			expect(inspectSheetConfiguration(project, script, scratch.path)).toEqual([])
+			expect(inspectSheetConfiguration(withoutStyles, script, scratch.path)).toContain(
+				'./tests/setupStyles.ts',
+			)
+			expect(
+				inspectSheetConfiguration(
+					project,
+					script.split(' && ').reverse().join(' && '),
+					scratch.path,
+				),
+			).toContain('themes order')
+		} finally {
+			scratch.destroy()
+		}
 	})
 
 	it('resolves showcase and journey modes for every occupied application', async () => {
@@ -707,19 +718,24 @@ describe('root configuration', () => {
 			)
 				.filter(([, path]) => existsSync(resolve(POLICY_ROOT, path)))
 				.map(([label, , include, setup]): [string, PolicyProject] => [label, { include, setup }]),
-			...['policy', 'config', 'guides', 'conformance', 'distribution', 'integration']
-				.filter((label) => existsSync(resolve(POLICY_ROOT, `tests/${label}.test.ts`)))
+			...['policy', 'config', 'guides', 'conformance', 'tree', 'distribution', 'integration']
+				.filter((label) => readdirSync(resolve(POLICY_ROOT, 'tests')).includes(`${label}.test.ts`))
 				.map((label): [string, PolicyProject] => [
 					label,
 					{
 						include: `tests/${label}.test.ts`,
 						setup: [
 							'./tests/setup.ts',
-							...(label === 'conformance' ? ['./tests/setupServer.ts'] : []),
+							...(label === 'conformance' || label === 'tree' ? ['./tests/setupServer.ts'] : []),
 							...(label === 'integration' &&
 							(collectSheets(POLICY_ROOT).length > 0 ||
 								existsSync(resolve(POLICY_ROOT, 'src/styles/themes/index.scss')))
-								? ['./tests/setupBrowser.ts', './tests/setupStyles.ts']
+								? [
+										'./tests/setupBrowser.ts',
+										...(existsSync(resolve(POLICY_ROOT, 'tests/setupStyles.ts'))
+											? ['./tests/setupStyles.ts']
+											: []),
+									]
 								: []),
 						],
 					},
@@ -910,8 +926,8 @@ describe('root configuration', () => {
 		// before its result is read. Extra factories are ignored without validating their result shape.
 		expect(extraLoads).toStrictEqual([])
 		for (const [label, project] of expected) expect(configured.get(label)).toStrictEqual(project)
-		for (const label of ['setup', 'setup:browser']) {
-			const name = label === 'setup' ? 'setup' : 'setupBrowser'
+		for (const label of ['setup', 'setup:browser', 'tree']) {
+			const name = label === 'setup:browser' ? 'setupBrowser' : label
 			expect(projects.some((entry) => typeof entry === 'function' && entry.name === name)).toBe(
 				expected.has(label),
 			)
@@ -1281,6 +1297,7 @@ describe('root configuration', () => {
 		const distribution = Object.getOwnPropertyDescriptor(scripts, 'test:distribution')?.value
 		const integration = Object.getOwnPropertyDescriptor(scripts, 'test:integration')?.value
 		const conformance = Object.getOwnPropertyDescriptor(scripts, 'test:conformance')?.value
+		const tree = Object.getOwnPropertyDescriptor(scripts, 'test:tree')?.value
 		const service = Object.getOwnPropertyDescriptor(scripts, 'test:service')?.value
 		const studies = Object.getOwnPropertyDescriptor(scripts, 'test:studies')?.value
 		const publish = Object.getOwnPropertyDescriptor(scripts, 'prepublishOnly')?.value
@@ -1307,6 +1324,7 @@ describe('root configuration', () => {
 		expect(registered.has('config')).toBe(true)
 		expect(registered.has('control')).toBe(false)
 		const hasConformance = registered.has('conformance')
+		const hasTree = registered.has('tree')
 		const hasDistribution = registered.has('distribution')
 		const hasService = registered.has('service')
 		const hasStudies = registered.has('studies')
@@ -1349,6 +1367,13 @@ describe('root configuration', () => {
 		expect(typeof test === 'string' && test.includes('npm run test:conformance')).toBe(
 			hasConformance,
 		)
+		expect(tree).toBe(
+			hasTree
+				? 'vitest run --config vite.config.ts --no-cache --reporter=dot --project tree'
+				: undefined,
+		)
+		expect(typeof test === 'string' && test.includes('npm run test:tree')).toBe(hasTree)
+		expect(typeof publish === 'string' && publish.includes('npm run test:tree')).toBe(false)
 		expect(service).toBe(
 			hasService
 				? 'vitest run --config vite.config.ts --no-cache --reporter=dot --project service'
@@ -2821,8 +2846,25 @@ createSomething({
 		expect(DATA_SOURCE_FILES).not.toContain('plugins.ts')
 	})
 
-	it('admits computed ESM imports only in artifact loaders while refusing computed require', () => {
-		const fixture = createPolicyScratch({ prefix: 'artifact-imports-' })
+	it('pins the global dynamic-require setting to esmodule false with no override touching it', () => {
+		const configured = readConfigRecord(
+			JSON.parse(readFileSync(resolve(POLICY_ROOT, '.oxlintrc.json'), 'utf8')),
+		)
+		expect(readConfigRecord(configured.rules)['import/no-dynamic-require']).toEqual([
+			'error',
+			{ esmodule: false },
+		])
+		if (!Array.isArray(configured.overrides)) throw new Error('Missing lint overrides')
+		const touching = configured.overrides
+			.map(readConfigRecord)
+			.filter(
+				(override) => readConfigRecord(override.rules)['import/no-dynamic-require'] !== undefined,
+			)
+		expect(touching).toEqual([])
+	})
+
+	it('permits a computed import() and refuses a computed require at every module path', () => {
+		const fixture = createPolicyScratch({ prefix: 'computed-imports-' })
 		try {
 			fixture.write(
 				'configs/policy.ts',
@@ -2831,64 +2873,50 @@ createSomething({
 			const configured = readConfigRecord(
 				JSON.parse(readFileSync(resolve(POLICY_ROOT, '.oxlintrc.json'), 'utf8')),
 			)
+			const required = COMPUTED_IMPORT_PATHS.map((path) => path.replace(/\.(\w+)$/u, '.require.$1'))
+			for (const path of COMPUTED_IMPORT_PATHS) {
+				fixture.write(path, 'const selected = process.argv[2]\nvoid import(selected)\ndebugger\n')
+			}
+			for (const path of required) {
+				fixture.write(path, 'const selected = process.argv[2]\nvoid require(selected)\ndebugger\n')
+			}
+			const paths = [...COMPUTED_IMPORT_PATHS, ...required]
 			// Include campaign fixtures even when the workspace's default lint walk ignores them.
 			fixture.write('.oxlintrc.json', JSON.stringify({ ...configured, ignorePatterns: [] }))
-			const written = ARTIFACT_IMPORT_CASES.map(([path, admitted]) => {
-				fixture.write(path, 'const selected = process.argv[2]\nvoid import(selected)\ndebugger\n')
-				const required = admitted ? path.replace(/\.(\w+)$/u, '.require.$1') : undefined
-				if (required !== undefined) {
-					fixture.write(
-						required,
-						'const selected = process.argv[2]\nvoid require(selected)\ndebugger\n',
-					)
-				}
-				return { path, required }
-			})
-			const paths = written.map(({ path }) => path)
-			const requires = written.flatMap(({ required }) => (required === undefined ? [] : [required]))
-			const codes = readImportDiagnostics(fixture.path, [...paths, ...requires])
-			for (const [path, admitted] of ARTIFACT_IMPORT_CASES) {
+			const codes = readImportDiagnostics(fixture.path, paths)
+			for (const path of COMPUTED_IMPORT_PATHS) {
 				expect({ path, refused: codes.has('import(no-dynamic-require) ' + path) }).toEqual({
 					path,
-					refused: !admitted,
+					refused: false,
 				})
-				expect(codes.has('eslint(no-debugger) ' + path)).toBe(true)
 			}
-			for (const path of requires) {
-				expect(codes.has('import(no-dynamic-require) ' + path)).toBe(true)
-				expect(codes.has('eslint(no-debugger) ' + path)).toBe(true)
+			for (const path of required) {
+				expect({ path, refused: codes.has('import(no-dynamic-require) ' + path) }).toEqual({
+					path,
+					refused: true,
+				})
 			}
+			// The sentinel proves each fixture was linted, so an unlinted path cannot read as permitted.
+			for (const path of paths) expect(codes.has('eslint(no-debugger) ' + path)).toBe(true)
 
-			expect(readConfigRecord(configured.rules)['import/no-dynamic-require']).toEqual([
-				'error',
-				{ esmodule: true },
-			])
-			if (!Array.isArray(configured.overrides)) throw new Error('Missing lint overrides')
-			const overrides = configured.overrides.map(readConfigRecord)
-			const artifact = overrides.filter(
-				(override) => readConfigRecord(override.rules)['import/no-dynamic-require'] !== undefined,
-			)
-			expect(artifact).toEqual([
-				{
-					files: [
-						'src/server/artifacts/**/*.{js,mjs,ts,mts}',
-						'tools/artifacts/**/*.{js,mjs,ts,mts}',
-						'.orkestrel/*/instruments/**/tools/artifacts/**/*.{js,mjs,ts,mts}',
-					],
-					rules: { 'import/no-dynamic-require': ['error', { esmodule: false }] },
-				},
-			])
+			// The control restores the ESM setting and must refuse the same computed imports.
 			fixture.write(
 				'.oxlintrc.json',
 				JSON.stringify({
 					...configured,
 					ignorePatterns: [],
-					overrides: overrides.filter((override) => !artifact.includes(override)),
+					rules: {
+						...readConfigRecord(configured.rules),
+						'import/no-dynamic-require': ['error', { esmodule: true }],
+					},
 				}),
 			)
-			const original = readImportDiagnostics(fixture.path, [...paths, ...requires])
-			for (const path of [...paths, ...requires]) {
-				expect(original.has('import(no-dynamic-require) ' + path)).toBe(true)
+			const strict = readImportDiagnostics(fixture.path, paths)
+			for (const path of paths) {
+				expect({ path, refused: strict.has('import(no-dynamic-require) ' + path) }).toEqual({
+					path,
+					refused: true,
+				})
 			}
 		} finally {
 			fixture.destroy()
@@ -2913,72 +2941,89 @@ createSomething({
 					const pattern = readConfigRecord(patternValue)
 					const message = pattern.message
 					if (typeof message !== 'string') throw new Error('Missing pattern message')
-					const listed: ReadonlyArray<readonly [string, boolean]> = message.includes('URL schemes')
-						? [
-								['https://host/x', true],
-								['data:text/plain,x', true],
-								['node:fs', false],
-								['n:entry', true],
-								['no:entry', true],
-								['nod:entry', true],
-								['nodea:entry', true],
-								['1bad:entry', false],
-								['./data:entry', false],
-							]
-						: message.includes('noncanonical dot')
+					const alias = /@src\/(core|browser|server) alias/u.exec(message)?.[1]
+					const listed: ReadonlyArray<readonly [string, boolean]> =
+						alias !== undefined
 							? [
-									['../core/../server/index.js', true],
-									['../core/./index.js', true],
-									['../core/index.js', false],
-									['./index.js', false],
-									['../../core/index.js', false],
-									['.../../index.js', true],
-									['.name/../index.js', true],
+									[`../${alias}/index.js`, true],
+									[`../../${alias}/types.js`, true],
+									[`../../src/${alias}/index.js`, true],
+									[`../${alias}`, true],
+									[`../${alias}/`, true],
+									[`../${alias}?raw`, true],
+									[`../${alias}#fragment`, true],
+									[`@src/${alias}`, false],
+									[`./${alias}/index.js`, false],
+									[`../${alias}x/index.js`, false],
+									[`../${alias}.ext/index.js`, false],
 								]
-							: message.includes('sibling sheet')
+							: message.includes('URL schemes')
 								? [
-										['@src/print', true],
-										['../print/index.js', true],
-										['@src/core', false],
-										['@src/browser', false],
-										['@src/vue', false],
-										['@app/core', false],
-										['@app/browser', false],
-										['@src/corex', true],
-										['@src/', true],
-										['../src/print/index.js', true],
-										['../browser?x', true],
-										['../print.ext/index.js', false],
-										...(Array.isArray(block.files) &&
-										block.files.some(
-											(file: unknown) => typeof file === 'string' && file.startsWith('app/vue/'),
-										)
-											? [['@app/print', true] as const]
-											: []),
-									]
-								: [
-										[
-											message.includes('absolute paths')
-												? '/machine/module.js'
-												: message.includes('normalized traversal')
-													? './../core/index.js'
-													: message.includes('forward slashes')
-														? '..\\core\\index.js'
-														: message.includes('compiler API')
-															? 'typescript'
-															: message.includes('private app')
-																? '@app/core'
-																: message.includes('stylesheets')
-																	? './index.css'
-																	: message.includes('host-independent') ||
-																		  message.includes('Node or server')
-																		? 'node:fs'
-																		: message.includes('Vue extension')
-																			? '@src/vue'
-																			: '@src/browser',
-											true,
-										],
+										['https://host/x', true],
+										['data:text/plain,x', true],
+										['node:fs', false],
+										['n:entry', true],
+										['no:entry', true],
+										['nod:entry', true],
+										['nodea:entry', true],
+										['1bad:entry', false],
+										['./data:entry', false],
 									]
+								: message.includes('noncanonical dot')
+									? [
+											['../core/../server/index.js', true],
+											['../core/./index.js', true],
+											['../core/index.js', false],
+											['./index.js', false],
+											['../../core/index.js', false],
+											['.../../index.js', true],
+											['.name/../index.js', true],
+										]
+									: message.includes('sibling sheet')
+										? [
+												['@src/print', true],
+												['../print/index.js', true],
+												['@src/core', false],
+												['@src/browser', false],
+												['@src/vue', false],
+												['@app/core', false],
+												['@app/browser', false],
+												['@src/corex', true],
+												['@src/', true],
+												['../src/print/index.js', true],
+												['../browser?x', true],
+												['../print.ext/index.js', false],
+												...(Array.isArray(block.files) &&
+												block.files.some(
+													(file: unknown) =>
+														typeof file === 'string' && file.startsWith('app/vue/'),
+												)
+													? [['@app/print', true] as const]
+													: []),
+											]
+										: [
+												[
+													message.includes('absolute paths')
+														? '/machine/module.js'
+														: message.includes('normalized traversal')
+															? './../core/index.js'
+															: message.includes('forward slashes')
+																? '..\\core\\index.js'
+																: message.includes('compiler API')
+																	? 'typescript'
+																	: message.includes('private app')
+																		? '@app/core'
+																		: message.includes('stylesheets')
+																			? './index.css'
+																			: message.includes('host-independent') ||
+																				  message.includes('Node or server')
+																				? 'node:fs'
+																				: message.includes('Vue extension')
+																					? '@src/vue'
+																					: '@src/browser',
+													true,
+												],
+											]
 					const face =
 						message.includes('another styles face') && typeof pattern.regex === 'string'
 							? /@src\/(bootstrap|tailwindcss|styles)\(/u.exec(pattern.regex)?.[1]
@@ -3132,21 +3177,34 @@ createSomething({
 										]),
 								]
 							: []),
+						...(['src/browser', 'src/server', 'src/vue', 'src/bin'].includes(owner)
+							? ['../core/index.js', '../../src/core/index.js']
+							: []),
+						...(owner === 'src/vue' ? ['../browser/index.js', '../../src/browser/index.js'] : []),
+						...(owner === 'src/bin' ? ['../server/index.js', '../../src/server/index.js'] : []),
 					]
 					const admitted = [
 						...(owner.endsWith('/vue')
 							? [
 									'@src/core',
 									'@src/browser',
-									'../core/index.js',
-									'../browser/index.js',
 									'vue',
 									'@vue/runtime-core',
 									...(owner.startsWith('app/')
-										? ['@app/core', '@app/browser', '@src/vue', '../../src/vue/index.js']
+										? [
+												'@app/core',
+												'@app/browser',
+												'@src/vue',
+												'../../src/vue/index.js',
+												'../browser/index.js',
+											]
 										: []),
 								]
 							: ['@src/core']),
+						...(['src/browser', 'src/server', 'src/vue', 'src/bin'].includes(owner)
+							? []
+							: ['../core/index.js']),
+						...(owner === 'src/bin' ? ['@src/server'] : []),
 						...(sheet
 							? [
 									...faces
@@ -3174,7 +3232,6 @@ createSomething({
 								[
 									...admitted,
 									'./index.js',
-									'../core/index.js',
 									...(owner.endsWith('/server') || owner === 'src/bin' ? ['node:fs'] : []),
 								],
 								false,
@@ -3930,36 +3987,22 @@ describe('configuration helpers', () => {
 		)
 	})
 
-	it('admits computed artifact imports through Vite while retaining literal boundary inspection', async () => {
-		for (const [path] of ARTIFACT_IMPORT_CASES.filter(([, admitted]) => admitted)) {
+	it('admits a computed import() through Vite at every module path while collecting literal specifiers', async () => {
+		for (const path of [...COMPUTED_IMPORT_PATHS, '../outside/src/server/load.ts']) {
 			await expect(
 				configHelpers.environmentAssetSources(
 					'void import(process.argv[2])',
 					resolve(POLICY_ROOT, path),
 				),
 			).resolves.toEqual([])
-		}
-		for (const [path] of ARTIFACT_IMPORT_CASES.filter(([, admitted]) => !admitted)) {
 			await expect(
 				configHelpers.environmentAssetSources(
-					'void import(process.argv[2])',
+					"void import('@src/browser')",
 					resolve(POLICY_ROOT, path),
 				),
-			).rejects.toThrow('Dynamic imports must use static string values')
+			).resolves.toEqual(['@src/browser'])
 		}
-		await expect(
-			configHelpers.environmentAssetSources(
-				"void import('@src/browser')",
-				resolve(POLICY_ROOT, 'src/server/artifacts/Artifacts.ts'),
-			),
-		).resolves.toEqual(['@src/browser'])
 		expect(configHelpers.environmentSourceError('src/server', '@src/browser')).toBeDefined()
-		await expect(
-			configHelpers.environmentAssetSources(
-				'void import(process.argv[2])',
-				resolve(POLICY_ROOT, '../outside/src/server/artifacts/Artifacts.ts'),
-			),
-		).rejects.toThrow('Dynamic imports must use static string values')
 	})
 
 	it('drives each plugin through its real Vite hooks', async () => {

package/dist/host/tests/policy.test.ts

@@ -88,10 +88,23 @@ describe('surface policy controls', () => {
 		}
 	})
 
-	it('refuses a target catalog row absent from the installed guides', () => {
+	it('ignores a target catalog row the installed scaffold does not stage', () => {
 		const scratch = createPolicySurfaceFixture()
 		try {
 			scratch.write(POLICY_CATALOG_FILE, createPolicyCatalog(['other', 'sample', 'uncovered']))
+			expect(inspectPolicyWorkspace(scratch.path)).toEqual([])
+		} finally {
+			scratch.destroy()
+		}
+	})
+
+	it('refuses a staged catalog row absent from the installed guides', () => {
+		const scratch = createPolicySurfaceFixture()
+		try {
+			scratch.write(
+				`${POLICY_SURFACE_HOST}/${POLICY_SURFACE_CATALOG}`,
+				createPolicyCatalog(['other', 'sample', 'uncovered']),
+			)
 			expect(inspectPolicyWorkspace(scratch.path)).toEqual([
 				{
 					rule: 'surface',
@@ -212,6 +225,31 @@ describe('surface policy controls', () => {
 		}
 	})
 
+	it('excludes the distribution harness in an adopter while reporting target-owned collisions', () => {
+		const scratch = createPolicySurfaceFixture()
+		try {
+			scratch.write('tests/setupDistribution.ts', 'export function readShared() {}\n')
+			expect(inspectPolicyWorkspace(scratch.path)).toEqual([])
+			scratch.write('tests/setupExtra.ts', 'export function readShared() {}\n')
+			expect(inspectPolicyWorkspace(scratch.path)).toEqual([
+				{
+					rule: 'mirror',
+					path: 'tests/setupExtra.ts',
+					message:
+						'exporting setup module requires its sibling proof or an import from tests/setup.test.ts',
+				},
+				{
+					rule: 'surface',
+					path: 'tests/setupExtra.ts',
+					line: 1,
+					message: 'surface name belongs to one package: readShared (other)',
+				},
+			])
+		} finally {
+			scratch.destroy()
+		}
+	})
+
 	it('refuses a barrel statement outside the relative star-export population', () => {
 		const scratch = createPolicySurfaceFixture()
 		try {