@orkestrel/scaffold 0.0.6 → 0.0.7

package/dist/src/core/index.cjs

@@ -221,7 +221,7 @@ var DEFAULT_VERSION = "0.0.1";
 /** The `engines.node` range the `blueprint` builder fills. */
 var DEFAULT_ENGINES = `>=${MINIMUM_NODE_VERSION}`;
 /** The devDependency range generated packages pin `@orkestrel/scaffold` at. */
-var SCAFFOLD_RANGE = "^0.0.6";
+var SCAFFOLD_RANGE = "^0.0.7";
 /** Tooling versions shared by scaffold and every generated workspace. */
 var BASE_DEV_DEPENDENCIES = Object.freeze({
 	"@microsoft/api-extractor": "^7.58.12",
@@ -5602,6 +5602,7 @@ function packageManifest(spec) {
 	}
 	if (spec.engine) scripts["test:src:bin"] = "vitest run --config vite.config.ts --no-cache --reporter=dot --project src:bin";
 	if (spec.engine) scripts["test:integration"] = "vitest run --config vite.config.ts --no-cache --reporter=dot --project integration";
+	if (spec.engine) scripts["test:equivalence"] = "node -e \"const c=require('node:child_process'),n=process.platform==='win32'?'npm.cmd':'npm',r=c.spawnSync(n,['run','test:integration'],{stdio:'inherit',env:{...process.env,SCAFFOLD_BOUNDARY_EQUIVALENCE:'1'}});process.exit(r.status??1)\"";
 	if (spec.app.length > 0) {
 		scripts["test:app"] = "vitest run --config vite.config.ts --no-cache --reporter=dot " + spec.app.map((environment) => `--project ${APP_MATRIX[environment].project}`).join(" ");
 		for (const environment of spec.app) scripts[`test:app:${environment}`] = `vitest run --config vite.config.ts --no-cache --reporter=dot --project ${APP_MATRIX[environment].project}`;
@@ -5762,6 +5763,37 @@ function viteMachinery(src, app = [], engine = false) {
 	};
 }
 /**
+* Render the root Vitest project registration, preserving browser ownership
+* supplied by the caller.
+*
+* @param registrations - Ordered project factory identifiers with optional browser labels.
+* @param browser - Whether the generated configuration carries browser machinery.
+* @returns The rendered root `test` property.
+*
+* @example
+* ```ts
+* renderViteTest([{ project: 'srcCore' }], false)
+* // '\ttest: {\n\t\tprojects: [srcCore],\n\t},'
+* ```
+*/
+function renderViteTest(registrations, browser) {
+	const projects = registrations.map((registration) => registration.project);
+	const inlineProjects = `		projects: [${projects.join(", ")}],`;
+	const renderedProjects = computeColumnWidth(inlineProjects) <= 100 ? inlineProjects : `		projects: [
+${projects.map((project) => `			${project},`).join("\n")}
+		],`;
+	if (!browser) return `	test: {
+${renderedProjects}
+	},`;
+	return `	test: gateBrowserProjects(
+		[
+${registrations.map((registration) => registration.browser === void 0 ? `{ project: ${registration.project} }` : `{ project: ${registration.project}, browser: ${serializeTypeScriptString(registration.browser)} }`).map((registration) => `			${registration},`).join("\n")}
+		],
+		hasChromium,
+		process.argv,
+	),`;
+}
+/**
 * The rendered import / `resolve` header block every `rootViteConfig` shape
 * prefixes — the environment boundary and every guarantee it enforces ship
 * unconditionally; `machinery` selects only the host-specific pipelines layered
@@ -5799,6 +5831,7 @@ import { parse as parseVue } from 'vue/compiler-sfc'
 		transform: {
 			order: 'pre',
 			async handler(code, id) {
+				if (!isWorkspaceBoundaryModule(id)) return null
 				const restored = /[?&]html-proxy(?:[=&]|$)/.test(id) ? restoreIgnoredHtml(code) : code
 				const target = workspacePath(id)
 				const physicalImporter = physicalPath(id)
@@ -5958,6 +5991,7 @@ import { parse as parseVue } from 'vue/compiler-sfc'
 		transform: {
 			order: 'pre',
 			async handler(code, id) {
+				if (!isWorkspaceBoundaryModule(id)) return null
 				const target = workspacePath(id)
 				const physicalImporter = physicalPath(id)
 				const importerPackageRoot = trustedPackageRootFor(physicalImporter, trustedPackageRoots)
@@ -6040,6 +6074,7 @@ import { parse as parseVue } from 'vue/compiler-sfc'
 		transform: {
 			order: 'pre',
 			async handler(code, id) {
+				if (!isWorkspaceBoundaryModule(id)) return null
 				const target = workspacePath(id)
 				const physicalImporter = physicalPath(id)
 				const importerPackageRoot = trustedPackageRootFor(physicalImporter, trustedPackageRoots)
@@ -6131,6 +6166,64 @@ ${EXPORT_KEYWORD} function workspacePath(path: string): string | undefined {
 	return relativePath
 }
 
+${EXPORT_KEYWORD} function isBoundaryExemptModule(id: string): boolean {
+	const normalizedId = id.replaceAll('\\\\', '/')
+	const [path] = normalizedId.split(/[?#]/)
+	if (
+		path === undefined ||
+		normalizedId.startsWith('\\0') ||
+		normalizedId.includes('virtual:') ||
+		normalizedId === '@vite/client' ||
+		normalizedId === '@vite/env' ||
+		normalizedId.startsWith('/@id/') ||
+		normalizedId.startsWith('/@vite/') ||
+		normalizedId.startsWith('/__vite') ||
+		normalizedId.startsWith('/__vitest') ||
+		normalizedId.startsWith('@vitest/browser') ||
+		normalizedId.includes('/@vitest/browser/')
+	) {
+		return true
+	}
+	let physicalId: string | undefined
+	try {
+		physicalId = physicalPath(id).replaceAll('\\\\', '/')
+	} catch {
+		physicalId = undefined
+	}
+	for (const candidate of physicalId === undefined ? [path] : [path, physicalId]) {
+		if (candidate.split('/').some((segment) => segment.toLowerCase() === 'node_modules')) {
+			return true
+		}
+	}
+	return false
+}
+
+${EXPORT_KEYWORD} function isWorkspaceBoundaryModule(id: string): boolean {
+	if (isBoundaryExemptModule(id)) return false
+	const normalizedId = id.replaceAll('\\\\', '/')
+	const [path] = normalizedId.split(/[?#]/)
+	if (path === undefined) return false
+	let candidate = path.startsWith('/@fs/') ? path.slice('/@fs/'.length) : path
+	try {
+		if (/^file:/i.test(candidate)) candidate = fileURLToPath(candidate)
+	} catch {
+		return false
+	}
+	const rootRelative = /^\\/(?:app|src)\\/(?:core|browser|server)\\//.test(candidate)
+	const absoluteCandidate = rootRelative
+		? resolvePath(WORKSPACE_ROOT, candidate.slice(1))
+		: isAbsolute(candidate)
+			? candidate
+			: resolvePath(WORKSPACE_ROOT, candidate)
+	const relativeId = relative(WORKSPACE_ROOT, absoluteCandidate).replaceAll('\\\\', '/')
+	return (
+		relativeId !== '..' &&
+		!relativeId.startsWith('../') &&
+		!isAbsolute(relativeId) &&
+		/^(?:app|src)\\/(?:core|browser|server)\\//.test(relativeId)
+	)
+}
+
 ${EXPORT_KEYWORD} function isOutsideWorkspacePath(path: string): boolean {
 	const [pathWithoutQuery] = path.split('?')
 	if (pathWithoutQuery === undefined) return false
@@ -6769,6 +6862,7 @@ ${EXPORT_KEYWORD} function finalizeHtml(): Plugin {
 	const transformed = await transformWithOxc(code, path)
 	const visitor = new Visitor({
 		ImportExpression(node) {
+			if (emitted) return
 			let value: string | undefined
 			if (node.source.type === 'Literal' && typeof node.source.value === 'string') {
 				value = node.source.value
@@ -6867,8 +6961,8 @@ ${needsVue ? `		configureServer(server) {
 			})
 		},
 ` : ""}		async resolveId(source, importer) {
-			if (importer === undefined) return null
-			if (source.startsWith('\\0')) return null
+			if (importer === undefined || !isWorkspaceBoundaryModule(importer)) return null
+			if (isBoundaryExemptModule(source)) return null
 			const normalizedSource = source.replaceAll('\\\\', '/')
 			const sourceError = environmentSourceError(owner, normalizedSource)
 			if (sourceError !== undefined) this.error(sourceError)
@@ -6945,6 +7039,7 @@ ${needsVue ? `		configureServer(server) {
 			return null
 		},
 		async load(id) {
+			if (!isWorkspaceBoundaryModule(id)) return null
 			const physicalImporter = physicalPath(id)
 			const trustedPackageRoot = trustedPackageRootFor(physicalImporter, trustedPackageRoots)
 			const inferredPackageRoot =
@@ -7002,6 +7097,7 @@ ${needsVue ? `		configureServer(server) {
 					const physical = physicalPath(
 						isAbsolute(original) ? original : resolvePath(environmentRoot, original),
 					)
+					if (isBoundaryExemptModule(original) || isBoundaryExemptModule(physical)) continue
 					const target = workspacePath(physical)
 					if (target === undefined) {
 						if (trustedPackageRootFor(physical, trustedPackageRoots) === undefined) {
@@ -7017,6 +7113,7 @@ ${needsVue ? `		configureServer(server) {
 		buildEnd(error) {
 			if (error !== undefined) return
 			for (const id of this.getModuleIds()) {
+				if (!isWorkspaceBoundaryModule(id)) continue
 				const target = workspacePath(id)
 				if (target === undefined) {
 					if (
@@ -7073,7 +7170,58 @@ ${CONST_KEYWORD} resolve = {
 	}, {}),
 }
 
-${needsBrowser ? `${EXPORT_KEYWORD} ${CONST_KEYWORD} ENVIRONMENT_CSS = Object.freeze({
+${needsBrowser ? `${EXPORT_KEYWORD} function gateBrowserProjects(
+	registrations: readonly {
+		readonly project: () => UserConfig
+		readonly browser?: string
+	}[],
+	available: boolean,
+	argv: readonly string[],
+): NonNullable<UserConfig['test']> {
+	const projects: UserConfig[] = []
+	const gated: string[] = []
+	for (const registration of registrations) {
+		if (registration.browser !== undefined && !available) {
+			gated.push(registration.browser)
+			projects.push({
+				resolve,
+				test: {
+					name: { label: registration.browser, color: 'yellow' },
+					include: [],
+					environment: 'node',
+					browser: { enabled: false },
+				},
+			})
+			continue
+		}
+		projects.push(registration.project())
+	}
+	if (gated.length === 0) return { projects }
+	console.warn(\`browser projects skipped: Chromium absent (\${gated.join(', ')})\`)
+	const filters: string[] = []
+	let readable = true
+	for (let index = 0; index < argv.length; index += 1) {
+		const argument = argv[index]
+		if (argument === '--project') {
+			const filter = argv[index + 1]
+			if (filter === undefined) {
+				readable = false
+				continue
+			}
+			filters.push(filter)
+			index += 1
+			continue
+		}
+		if (argument?.startsWith('--project=') === true) {
+			filters.push(argument.slice('--project='.length))
+		}
+	}
+	return readable && filters.length > 0 && filters.every((filter) => gated.includes(filter))
+		? { passWithNoTests: true, projects }
+		: { projects }
+}
+
+${EXPORT_KEYWORD} ${CONST_KEYWORD} ENVIRONMENT_CSS = Object.freeze({
 	transformer: 'lightningcss',
 	lightningcss: {
 		visitor: () => {
@@ -7144,7 +7292,6 @@ function singleSrcViteConfig(environment) {
 	const machinery = viteMachinery([environment]);
 	const header = viteHeader(machinery);
 	if (environment === "browser") return `${header}
-if (!hasChromium) console.warn('browser projects skipped: Chromium absent (${SRC_MATRIX.browser.project})')
 ${EXPORT_KEYWORD} const srcBrowser = (config?: UserConfig): UserConfig =>
 	mergeConfig(
 		{
@@ -7169,11 +7316,10 @@ ${EXPORT_KEYWORD} const srcBrowser = (config?: UserConfig): UserConfig =>
 			},
 			test: {
 				name: { label: 'src:browser', color: 'yellow' },
-				include: hasChromium ? ['tests/src/browser/**/*.test.ts'] : [],
-				passWithNoTests: !hasChromium,
+				include: ['tests/src/browser/**/*.test.ts'],
 				setupFiles: ['./tests/setup.ts', './tests/setupBrowser.ts'],
 				browser: {
-					enabled: hasChromium,
+					enabled: true,
 					provider: playwright(),
 					instances: [{ browser: 'chromium', headless: true }],
 				},
@@ -7202,9 +7348,15 @@ ${EXPORT_KEYWORD} const guides = (config?: UserConfig): UserConfig =>
 
 export default defineConfig({
 	resolve,
-	test: {
-		projects: [...(hasChromium ? [srcBrowser] : []), policy, guides],
-	},
+	test: gateBrowserProjects(
+		[
+			{ project: srcBrowser, browser: 'src:browser' },
+			{ project: policy },
+			{ project: guides },
+		],
+		hasChromium,
+		process.argv,
+	),
 })
 `;
 	return `${header}
@@ -7324,12 +7476,11 @@ ${EXPORT_KEYWORD} const srcBrowser = (config?: UserConfig): UserConfig =>
 				},
 				test: {
 					name: { label: 'src:browser', color: 'yellow' },
-					include: hasChromium ? ['tests/src/browser/**/*.test.ts'] : [],
-					passWithNoTests: !hasChromium,
+					include: ['tests/src/browser/**/*.test.ts'],
 					exclude: ['tests/src/core/**/*.test.ts'],
 					setupFiles: ['./tests/setup.ts', './tests/setupBrowser.ts'],
 					browser: {
-						enabled: hasChromium,
+						enabled: true,
 						provider: playwright(),
 						instances: [{ browser: 'chromium', headless: true }],
 					},
@@ -7427,20 +7578,17 @@ ${EXPORT_KEYWORD} const integration = (config?: UserConfig): UserConfig =>
 	)
 ` : "";
 	const blocks = nonCore.map((environment) => environment === "browser" ? browserBlock : serverBlock).join("") + binBlock;
-	const projectNames = [
-		...hasCore ? ["srcCore"] : [],
-		...nonCore.map((environment) => environment === "browser" ? "...(hasChromium ? [srcBrowser] : [])" : `src${pascalCase(environment)}`),
-		"policy",
-		"guides",
-		...engine ? ["srcBin"] : [],
-		...engine ? ["integration"] : []
-	];
-	const inlineProjects = `		projects: [${projectNames.join(", ")}],`;
-	const renderedProjects = computeColumnWidth(inlineProjects) <= 100 ? inlineProjects : `		projects: [
-${projectNames.map((project) => `			${project},`).join("\n")}
-		],`;
+	const registrations = [];
+	if (hasCore) registrations.push({ project: "srcCore" });
+	for (const environment of nonCore) registrations.push(environment === "browser" ? {
+		project: "srcBrowser",
+		browser: SRC_MATRIX.browser.project
+	} : { project: "srcServer" });
+	registrations.push({ project: "policy" }, { project: "guides" });
+	if (engine) registrations.push({ project: "srcBin" }, { project: "integration" });
+	const renderedTest = renderViteTest(registrations, machinery.browser);
 	return `${header}
-${machinery.browser ? `if (!hasChromium) console.warn('browser projects skipped: Chromium absent (${SRC_MATRIX.browser.project})')\n` : ""}${EXPORT_KEYWORD} const srcCore = (config?: UserConfig): UserConfig =>
+${EXPORT_KEYWORD} const srcCore = (config?: UserConfig): UserConfig =>
 	mergeConfig(
 		{
 			resolve,
@@ -7478,9 +7626,7 @@ ${EXPORT_KEYWORD} const guides = (config?: UserConfig): UserConfig =>
 ${blocks}
 export default defineConfig({
 	resolve,
-	test: {
-${renderedProjects}
-	},
+${renderedTest}
 })
 `;
 }
@@ -7502,10 +7648,10 @@ function applicationViteConfig(src, app, engine = false) {
 	const hasSourceCore = src.includes("core");
 	const machinery = viteMachinery(src, app, engine);
 	const header = viteHeader(machinery);
-	const projects = [];
+	const registrations = [];
 	const blocks = [];
 	if (src.includes("core")) {
-		projects.push("srcCore");
+		registrations.push({ project: "srcCore" });
 		blocks.push(`
 ${EXPORT_KEYWORD} const srcCore = (config?: UserConfig): UserConfig =>
 	mergeConfig(
@@ -7527,7 +7673,10 @@ ${EXPORT_KEYWORD} const srcCore = (config?: UserConfig): UserConfig =>
 `);
 	}
 	if (src.includes("browser")) {
-		projects.push("...(hasChromium ? [srcBrowser] : [])");
+		registrations.push({
+			project: "srcBrowser",
+			browser: SRC_MATRIX.browser.project
+		});
 		const coreOutput = hasSourceCore ? `
 					output: { paths: { '@src/core': '../core/index.js' } },` : "";
 		const coreExternal = hasSourceCore ? `id === '@src/core' || ` : "";
@@ -7556,11 +7705,10 @@ ${EXPORT_KEYWORD} const srcBrowser = (config?: UserConfig): UserConfig =>
 			},
 			test: {
 				name: { label: 'src:browser', color: 'yellow' },
-				include: hasChromium ? ['tests/src/browser/**/*.test.ts'] : [],
-				passWithNoTests: !hasChromium,
+				include: ['tests/src/browser/**/*.test.ts'],
 				${hasSourceCore ? "exclude: ['tests/src/core/**/*.test.ts'],\n				" : ""}setupFiles: ['./tests/setup.ts', './tests/setupBrowser.ts'],
 				browser: {
-					enabled: hasChromium,
+					enabled: true,
 					provider: playwright(),
 					instances: [{ browser: 'chromium', headless: true }],
 				},
@@ -7572,7 +7720,7 @@ ${EXPORT_KEYWORD} const srcBrowser = (config?: UserConfig): UserConfig =>
 `);
 	}
 	if (src.includes("server")) {
-		projects.push("srcServer");
+		registrations.push({ project: "srcServer" });
 		const coreOutput = hasSourceCore ? `
 					output: [
 						{
@@ -7623,7 +7771,7 @@ ${EXPORT_KEYWORD} const srcServer = (config?: UserConfig): UserConfig =>
 `);
 	}
 	if (app.includes("core")) {
-		projects.push("appCore");
+		registrations.push({ project: "appCore" });
 		blocks.push(`
 ${EXPORT_KEYWORD} const appCore = (config?: UserConfig): UserConfig =>
 	mergeConfig(
@@ -7644,7 +7792,10 @@ ${EXPORT_KEYWORD} const appCore = (config?: UserConfig): UserConfig =>
 `);
 	}
 	if (app.includes("browser")) {
-		projects.push("...(hasChromium ? [appBrowser()] : [])");
+		registrations.push({
+			project: "appBrowser",
+			browser: APP_MATRIX.browser.project
+		});
 		blocks.push(`
 ${EXPORT_KEYWORD} function appBrowser(...config: readonly never[]): UserConfig {
 	if (config.length > 0) {
@@ -7685,11 +7836,10 @@ ${EXPORT_KEYWORD} function appBrowser(...config: readonly never[]): UserConfig {
 			name: { label: '${APP_MATRIX.browser.project}', color: 'blue' },
 			root: resolveWorkspacePath('.'),
 			dir: resolveWorkspacePath('.'),
-			include: hasChromium ? ['tests/app/browser/**/*.test.ts'] : [],
-			passWithNoTests: !hasChromium,
+			include: ['tests/app/browser/**/*.test.ts'],
 			setupFiles: ['./tests/setup.ts', './tests/setupBrowser.ts'],
 			browser: {
-				enabled: hasChromium,
+				enabled: true,
 				provider: playwright(),
 				instances: [{ browser: 'chromium', headless: true }],
 			},
@@ -7700,7 +7850,7 @@ ${EXPORT_KEYWORD} function appBrowser(...config: readonly never[]): UserConfig {
 `);
 	}
 	if (app.includes("server")) {
-		projects.push("appServer");
+		registrations.push({ project: "appServer" });
 		blocks.push(`
 ${EXPORT_KEYWORD} const appServer = (config?: UserConfig): UserConfig =>
 	mergeConfig(
@@ -7734,7 +7884,7 @@ ${EXPORT_KEYWORD} const appServer = (config?: UserConfig): UserConfig =>
 `);
 	}
 	if (engine) {
-		projects.push("srcBin", "integration");
+		registrations.push({ project: "srcBin" }, { project: "integration" });
 		blocks.push(`
 ${EXPORT_KEYWORD} const srcBin = (config?: UserConfig): UserConfig =>
 	mergeConfig(
@@ -7778,22 +7928,10 @@ ${EXPORT_KEYWORD} const integration = (config?: UserConfig): UserConfig =>
 	)
 `);
 	}
-	const projectNames = [
-		...projects,
-		"policy",
-		"guides"
-	];
-	const inlineProjects = `		projects: [${projectNames.join(", ")}],`;
-	const renderedProjects = computeColumnWidth(inlineProjects) <= 100 ? inlineProjects : `		projects: [
-${projectNames.map((project) => `			${project},`).join("\n")}
-		],`;
-	const browserProjects = [...src.includes("browser") ? [SRC_MATRIX.browser.project] : [], ...app.includes("browser") ? [APP_MATRIX.browser.project] : []];
-	const browserNotice = serializeTypeScriptString(`browser projects skipped: Chromium absent (${browserProjects.join(", ")})`);
-	const inlineBrowserNotice = `if (!hasChromium) console.warn(${browserNotice})`;
-	const renderedBrowserNotice = browserProjects.length === 0 ? void 0 : computeColumnWidth(inlineBrowserNotice) <= 100 ? inlineBrowserNotice : `if (!hasChromium)
-	console.warn(${browserNotice})`;
+	registrations.push({ project: "policy" }, { project: "guides" });
+	const renderedTest = renderViteTest(registrations, machinery.browser);
 	return `${header}
-${renderedBrowserNotice === void 0 ? "" : `${renderedBrowserNotice}\n`}${policyViteProject()}
+${policyViteProject()}
 ${EXPORT_KEYWORD} const guides = (config?: UserConfig): UserConfig =>
 	mergeConfig(
 		{
@@ -7812,9 +7950,7 @@ ${EXPORT_KEYWORD} const guides = (config?: UserConfig): UserConfig =>
 ${blocks.join("")}
 export default defineConfig({
 	resolve,
-	test: {
-${renderedProjects}
-	},
+${renderedTest}
 })
 `;
 }
@@ -9415,6 +9551,7 @@ exports.rangeToFreshness = rangeToFreshness;
 exports.renderArray = renderArray;
 exports.renderObject = renderObject;
 exports.renderValue = renderValue;
+exports.renderViteTest = renderViteTest;
 exports.rootTsconfig = rootTsconfig;
 exports.rootViteConfig = rootViteConfig;
 exports.selectHostPaths = selectHostPaths;