@orkestrel/scaffold 0.0.88 → 0.0.89

package/dist/src/core/index.js

@@ -3,7 +3,7 @@ import { fillTemplate } from "@orkestrel/template";
 import { Emitter } from "@orkestrel/emitter";
 var package_default = {
 	name: "@orkestrel/scaffold",
-	version: "0.0.88",
+	version: "0.0.89",
 	description: "Scaffold workspaces with commands: new, audit, repair, catalog, and overwrite.",
 	keywords: [
 		"audit",
@@ -77,6 +77,7 @@ var package_default = {
 		"test:config": "vitest run --config vite.config.ts --no-cache --reporter=dot --project config",
 		"test:guides": "node --experimental-strip-types tests/guides.test.ts",
 		"test:skills": "vitest run --config vite.config.ts --no-cache --reporter=dot --project skills",
+		"test:templates": "vitest run --config vite.config.ts --no-cache --reporter=dot --project templates",
 		"test:distribution": "vitest run --config vite.config.ts --no-cache --reporter=dot --project distribution",
 		"test:probe": "vitest run --config vite.config.ts --no-cache --reporter=verbose --project probe",
 		"test:bench": "vitest bench --config vite.config.ts --no-cache --project probe",
@@ -90,7 +91,7 @@ var package_default = {
 		"build:inventory": "node -e \"import('./dist/src/server/index.js').then((m)=>{const p=process.argv[1]??'host.json',n=m.stageInventory(process.cwd(),p).entries.length;console.log('build-inventory: staged '+n+' file(s) into '+p)})\"",
 		"build:skills": "tsc -p configs/agents/tsconfig.skills.json --noEmit false --allowImportingTsExtensions false --rewriteRelativeImportExtensions --declaration false --sourceMap false --rootDir .agents/skills --outDir dist/agents/skills && npm run copy .agents/templates/brief.md dist/agents/templates/brief.md",
 		"prepack": "npm run build",
-		"prepublishOnly": "npm run format:check && npm run lint:check && npm run check && npm run build && npm test && npm run test:distribution -- --mode release"
+		"prepublishOnly": "npm run format:check && npm run lint:check && npm run check && npm run build && npm test && npm run test:templates && npm run test:distribution -- --mode release"
 	},
 	dependencies: {
 		"@orkestrel/console": "^0.0.15",
@@ -828,15 +829,29 @@ const resolve = {
 // merges it, so an override's arrays elsewhere concatenate with the base's rather than
 // replacing them.
 export function mergeOverride(base: UserConfig, override?: UserConfig): UserConfig {
-	if (override === undefined) return base
-	if ('command' in override && 'mode' in override) {
+	if (override !== undefined && 'command' in override && 'mode' in override) {
 		if (typeof override.mode !== 'string') {
 			throw new Error('The project invocation carries no string mode')
 		}
-		return { ...base, mode: override.mode }
+		override = { mode: override.mode }
+	}
+	const merged: UserConfig = override === undefined ? { ...base } : mergeConfig(base, override)
+	const name = merged.test?.name
+	const label = typeof name === 'string' ? name : name?.label
+	const browser = merged.test?.browser
+	if (label !== undefined && browser?.instances !== undefined) {
+		merged.test = {
+			...merged.test,
+			browser: {
+				...browser,
+				instances: browser.instances.map((instance) => ({
+					...instance,
+					name: instance.name ?? \`\${label} (\${instance.browser})\`,
+				})),
+			},
+		}
 	}
-	const merged: UserConfig = mergeConfig(base, override)
-	if (merged.plugins === undefined) return merged
+	if (merged.plugins === undefined || override === undefined) return merged
 	const candidates = override.plugins ?? []
 	const taken = new Set<number>()
 	const selected: PluginOption[] = []
@@ -1162,6 +1177,12 @@ export function srcBin(override?: UserConfig): UserConfig {
 		test: {
 			...browser.test,
 			name: { label: 'app:vue', color: 'magenta' },
+			browser: {
+				...browser.test?.browser,
+				instances: (browser.test?.browser?.instances ?? []).map(
+					({ name: _name, ...instance }) => instance,
+				),
+			},
 			include: ['tests/app/vue/**/*.test.ts'],
 {{journeyExclude}}		},
 	}
@@ -1178,7 +1199,7 @@ export function appJourney(
 ): UserConfig {
 	const application = resolveApplication(mode, applications)
 	const browser = applications[application]()
-	return {
+	const project: UserConfig = {
 		...browser,
 		test: {
 			...browser.test,
@@ -1190,9 +1211,13 @@ export function appJourney(
 				...browser.test?.browser,
 				enabled: true,
 				viewport: { width: variant.width, height: variant.height },
+				instances: (browser.test?.browser?.instances ?? []).map(
+					({ name: _name, ...instance }) => instance,
+				),
 			},
 		},
 	}
+	return mergeOverride(project)
 }
 `,
 			showcase: `
@@ -1479,12 +1504,12 @@ export function probe(override?: UserConfig): UserConfig {
 `,
 		integration: Object.freeze({
 			sheet: `export function integration(override?: UserConfig): UserConfig {
-	const project = sheetProject('integration', {
+	const project: UserConfig = {
 		test: {
 			include: ['tests/integration.test.ts'],
 {{global}}		},
-	})
-	return mergeOverride(project, override)
+	}
+	return sheetProject('integration', mergeOverride(project, override))
 }
 `,
 			module: `export function integration(override?: UserConfig): UserConfig {
@@ -2554,7 +2579,7 @@ import {
 import { tmpdir } from 'node:os'
 import { dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
-{{launcher}}import { afterAll, describe, expect, it } from 'vitest'
+{{launcher}}import { afterAll, beforeAll, describe, expect, it } from 'vitest'
 
 const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..')
 const NPM = process.platform === 'win32' ? 'npm.cmd' : 'npm'
@@ -2770,7 +2795,7 @@ function runNpm(args: readonly string[], cwd: string): SpawnSyncReturns<string>
 	return spawnSync(NPM, [...args], {
 		cwd,
 		encoding: 'utf8',
-		env: { ...process.env, npm_config_cache: CACHE },
+		env: { ...process.env, npm_config_cache: join(readScratch(), 'cache') },
 		shell: SHELL,
 		windowsHide: true,
 	})
@@ -3127,8 +3152,8 @@ function driveRuntime(stage: Stage, specifier: string, driver: string): readonly
 // published surface back off the installed tree. Every later claim reads this
 // result, so a failure here is raised where it happens rather than once per entry.
 function buildStage(): Stage {
-	const packed = join(SCRATCH, 'packed')
-	const consumer = join(SCRATCH, 'consumer')
+	const packed = join(readScratch(), 'packed')
+	const consumer = join(readScratch(), 'consumer')
 	mkdirSync(packed, { recursive: true })
 	const pack = runNpm(['pack', '--ignore-scripts', '--pack-destination', packed], ROOT)
 	if (pack.status !== 0) throw new Error(\`npm pack refused this workspace: \${readOutput(pack)}\`)
@@ -3202,21 +3227,31 @@ function buildStage(): Stage {
 	return { consumer, installed, archives, entries, subpaths, undeclared, excluded, targets }
 }
 
-const SCRATCH = mkdtempSync(join(tmpdir(), 'distribution-'))
-const CACHE = join(SCRATCH, 'cache')
-mkdirSync(CACHE, { recursive: true })
-// The scratch tree holds the npm cache, the packed archive, and the installed
-// consumer, so its removal is registered before the first thing that can throw.
+let scratch: string | undefined
+let staged: Stage | undefined
+
+function readScratch(): string {
+	if (scratch === undefined) {
+		throw new Error('The distribution setup has not allocated its scratch directory')
+	}
+	return scratch
+}
+
+beforeAll(() => {
+	scratch = mkdtempSync(join(tmpdir(), 'distribution-'))
+	mkdirSync(join(scratch, 'cache'), { recursive: true })
+	staged = openStage()
+})
+
 afterAll(() => {
-	rmSync(SCRATCH, { force: true, recursive: true })
+	if (scratch !== undefined) {
+		rmSync(scratch, { force: true, recursive: true, maxRetries: 3, retryDelay: 100 })
+	}
 })
 
 // Installing the packed archive resolves its own runtime dependencies, so an
 // unreachable registry leaves nothing to measure. Under release that is the gate
 // failing; anywhere else the suite skips and names the mechanism it wanted.
-//
-// A module that throws while loading never reaches the \`afterAll\` it registered,
-// so every throw here removes the scratch tree on its way out.
 function openStage(): Stage | undefined {
 	try {
 		if (runNpm(PING, ROOT).status !== 0) {
@@ -3227,17 +3262,14 @@ function openStage(): Stage | undefined {
 		}
 		return buildStage()
 	} catch (error) {
-		rmSync(SCRATCH, { force: true, recursive: true })
+		rmSync(readScratch(), { force: true, recursive: true, maxRetries: 3, retryDelay: 100 })
 		throw error
 	}
 }
 
-const STAGE = openStage()
-const STAGED = STAGE !== undefined
-
 describe('distribution classifiers', () => {
 	it('classifies synthetic export mappings without a registry stage', () => {
-		const root = join(SCRATCH, 'classifiers')
+		const root = join(readScratch(), 'classifiers')
 		writeFile(
 			join(root, 'package.json'),
 			JSON.stringify({
@@ -3306,10 +3338,10 @@ describe('distribution classifiers', () => {
 // The staged consumer, or a skip naming what the run could not reach. \`it.skipIf\`
 // carries no reason, so the gate sits here where the test context can state one.
 function requireStage(context: TestContext): Stage {
-	if (!STAGED) {
+	if (staged === undefined) {
 		return context.skip('\`npm ping\` did not answer, so nothing was packed or installed')
 	}
-	return STAGE
+	return staged
 }
 
 describe('installed package consumer', () => {
@@ -3395,50 +3427,43 @@ describe('installed package consumer', () => {
 	})
 {{guard}}})
 
-for (const entry of STAGE?.entries ?? []) {
-	describe(\`installed entry \${entry.subpath}\`, () => {
-		it.runIf(entry.importable)(
-			'publishes what it declares to a Node import, and no more',
-			(context) => {
-				const stage = requireStage(context)
-				// The exports-map walk resolved a declaration a typed importer reads, so an
-				// entry reaching this drive without one is reported for that rather than for
-				// what a consumer of a missing declaration goes on to say.
-				if (!entry.declaration.importable) {
-					throw new Error(\`\${entry.subpath} publishes no import declaration\`)
-				}
-				const published = driveRuntime(stage, entry.specifier, ESM_DRIVER)
-				const drivers = selectDrivers(entry, 'module')
-				expect(drivers).not.toStrictEqual([])
-				const reported = drivers.flatMap((driver) =>
-					checkSurface(stage, { entry, extension: 'ts', published, driver }),
-				)
-				expect(reported).toStrictEqual([])
-			},
-		)
+describe('installed entries', () => {
+	it('publishes what it declares to a Node import, and no more', (context) => {
+		const stage = requireStage(context)
+		const entries = stage.entries.filter((entry) => entry.importable)
+		if (entries.length === 0) return context.skip('No installed entry supports Node import')
+		for (const entry of entries) {
+			if (!entry.declaration.importable) {
+				throw new Error(\`\${entry.subpath} publishes no import declaration\`)
+			}
+			const published = driveRuntime(stage, entry.specifier, ESM_DRIVER)
+			const drivers = selectDrivers(entry, 'module')
+			expect(drivers).not.toStrictEqual([])
+			const reported = drivers.flatMap((driver) =>
+				checkSurface(stage, { entry, extension: 'ts', published, driver }),
+			)
+			expect(reported).toStrictEqual([])
+		}
+	})
 
-		it.runIf(entry.requirable)(
-			'publishes what it declares to a Node require, and no more',
-			(context) => {
-				const stage = requireStage(context)
-				if (!entry.declaration.requirable) {
-					throw new Error(\`\${entry.subpath} publishes no require declaration\`)
-				}
-				const published = driveRuntime(stage, entry.specifier, CJS_DRIVER)
-				// A subpath whose \`require\` resolves to a module that no typed CommonJS
-				// consumer can compile against carries no declared side to compare here, and
-				// whether it may publish one at all is the untypable set's question rather
-				// than this drive's. The preceding runtime drive ran either way.
-				const drivers = selectDrivers(entry, 'commonjs')
-				expect(drivers).not.toStrictEqual([])
-				const reported = drivers.flatMap((driver) =>
-					checkSurface(stage, { entry, extension: 'cts', published, driver }),
-				)
-				expect(reported).toStrictEqual([])
-			},
-		)
-{{drive}}	})
-}
+	it('publishes what it declares to a Node require, and no more', (context) => {
+		const stage = requireStage(context)
+		const entries = stage.entries.filter((entry) => entry.requirable)
+		if (entries.length === 0) return context.skip('No installed entry supports Node require')
+		for (const entry of entries) {
+			if (!entry.declaration.requirable) {
+				throw new Error(\`\${entry.subpath} publishes no require declaration\`)
+			}
+			const published = driveRuntime(stage, entry.specifier, CJS_DRIVER)
+			const drivers = selectDrivers(entry, 'commonjs')
+			expect(drivers).not.toStrictEqual([])
+			const reported = drivers.flatMap((driver) =>
+				checkSurface(stage, { entry, extension: 'cts', published, driver }),
+			)
+			expect(reported).toStrictEqual([])
+		}
+	})
+{{drive}}})
 `,
 			transport: `import { createServer } from 'node:http'
 `,
@@ -3547,36 +3572,37 @@ async function readBrowserExports(browser: Browser, bundle: string): Promise<rea
 }
 `,
 			drive: `
-		it.runIf(entry.browsable)(
-			'publishes what it declares to a real browser, and no more [requires a browser]',
-			async (context) => {
-				const stage = requireStage(context)
-				if (!entry.declaration.browsable) {
-					throw new Error(\`\${entry.subpath} publishes no browser declaration\`)
-				}
-				const options = resolveBrowser(resolvePinnedBrowser(), process.platform, process.env)
-				const browser = await launchBrowser(options).catch((error: unknown) => {
-					const cause = \`\${describeBrowser(options)} was rejected: \${String(error)}\`
-					if (RELEASE) throw new Error(\`The release gate requires a browser, and \${cause}\`)
-					return context.skip(\`No browser launched. \${cause}\`)
+	it('publishes what it declares to a real browser [requires a browser]', async (context) => {
+		const stage = requireStage(context)
+		const entries = stage.entries.filter((entry) => entry.browsable)
+		if (entries.length === 0) return context.skip('No installed entry supports a browser')
+		for (const entry of entries) {
+			if (!entry.declaration.browsable) {
+				throw new Error(\`\${entry.subpath} publishes no browser declaration\`)
+			}
+			const options = resolveBrowser(resolvePinnedBrowser(), process.platform, process.env)
+			const browser = await launchBrowser(options).catch((error: unknown) => {
+				const cause = \`\${describeBrowser(options)} was rejected: \${String(error)}\`
+				if (RELEASE) throw new Error(\`The release gate requires a browser, and \${cause}\`)
+				return context.skip(\`No browser launched. \${cause}\`)
+			})
+			try {
+				const bundle = await bundleEntry(stage, entry)
+				const published = await readBrowserExports(browser, bundle)
+				// A browser consumer reads the installed declarations through a bundler, so
+				// that is the one driver this face answers under.
+				const reported = checkSurface(stage, {
+					entry,
+					extension: 'ts',
+					published,
+					driver: BROWSER_DRIVER,
 				})
-				try {
-					const bundle = await bundleEntry(stage, entry)
-					const published = await readBrowserExports(browser, bundle)
-					// A browser consumer reads the installed declarations through a bundler, so
-					// that is the one driver this face answers under.
-					const reported = checkSurface(stage, {
-						entry,
-						extension: 'ts',
-						published,
-						driver: BROWSER_DRIVER,
-					})
-					expect(reported).toStrictEqual([])
-				} finally {
-					await browser.close()
-				}
-			},
-		)
+				expect(reported).toStrictEqual([])
+			} finally {
+				await browser.close()
+			}
+		}
+	})
 `,
 			guard: `
 	// This proof drives a Node import and a Node require and carries no browser
@@ -3588,7 +3614,7 @@ async function readBrowserExports(browser: Browser, bundle: string): Promise<rea
 	// a published browser face. \`vite\` selects nothing either, though the branch
 	// imports it: scaffold puts \`vite\` in every workspace's base development
 	// dependencies, whatever that workspace publishes. The later Node
-	// \`it.runIf\` predicates retire each matching Node drive for a face published
+	// entry filters retire each matching Node drive for a face published
 	// later, which leaves nothing measuring it. So it reddens here and names the
 	// subpath a browser branch is owed for. A workspace that gains one deletes this
 	// file and runs the \`repair\` verb, which writes the variant carrying that branch.