@orkestrel/scaffold 0.0.17 → 0.0.18

package/dist/host/tests/setupPolicy.ts

@@ -240,7 +240,7 @@ export function isSelfContained(source: ts.SourceFile): boolean {
 			const clause = statement.importClause
 			const named = clause?.namedBindings
 			const erased =
-				clause?.isTypeOnly === true ||
+				clause?.phaseModifier === ts.SyntaxKind.TypeKeyword ||
 				(clause !== undefined &&
 					clause.name === undefined &&
 					named !== undefined &&
@@ -248,8 +248,9 @@ export function isSelfContained(source: ts.SourceFile): boolean {
 					named.elements.length > 0 &&
 					named.elements.every((element) => element.isTypeOnly))
 			if (erased) continue
-			if (!ts.isStringLiteral(statement.moduleSpecifier)) return false
-			const specifier = statement.moduleSpecifier.text
+			const moduleSpecifier = statement.moduleSpecifier
+			if (!ts.isStringLiteral(moduleSpecifier)) return false
+			const specifier = moduleSpecifier.text
 			if (!specifier.startsWith('node:') || !isBuiltin(specifier)) return false
 			builtin = true
 		}

package/dist/src/core/index.cjs

@@ -227,7 +227,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.17";
+var SCAFFOLD_RANGE = "^0.0.18";
 /** Tooling versions shared by scaffold and every generated workspace. */
 var BASE_DEV_DEPENDENCIES = Object.freeze({
 	"@microsoft/api-extractor": "^7.58.12",
@@ -4467,9 +4467,7 @@ describe('createApplication', () => {
 			'x'.repeat(204),
 			\`\${' '.repeat(MAX_APPLICATION_NAME_INPUT_LENGTH)}x\`,
 		]) {
-			expect(() => Reflect.apply(createApplication, undefined, [value])).toThrowError(
-				ApplicationError,
-			)
+			expect(() => Reflect.apply(createApplication, undefined, [value])).toThrow(ApplicationError)
 		}
 		const error = new ApplicationError('CONFIG', 'invalid')
 		expect(isApplicationError(error)).toBe(true)
@@ -4544,7 +4542,7 @@ describe('createBrowserApplication', () => {
 			{ name: 'x'.repeat(204) },
 			{ name: \`\${' '.repeat(MAX_BROWSER_APPLICATION_NAME_INPUT_LENGTH)}x\` },
 		]) {
-			expect(() => Reflect.apply(createBrowserApplication, undefined, [value])).toThrowError(
+			expect(() => Reflect.apply(createBrowserApplication, undefined, [value])).toThrow(
 				BrowserApplicationError,
 			)
 		}
@@ -4569,14 +4567,14 @@ describe('createBrowserApplication', () => {
 		const revocable = Proxy.revocable({}, {})
 		revocable.revoke()
 
-		expect(() => parseBrowserApplicationOptions(accessor)).toThrowError(BrowserApplicationError)
+		expect(() => parseBrowserApplicationOptions(accessor)).toThrow(BrowserApplicationError)
 		expect(reads).toBe(0)
-		expect(() => Reflect.apply(createBrowserApplication, undefined, [hostile])).toThrowError(
+		expect(() => Reflect.apply(createBrowserApplication, undefined, [hostile])).toThrow(
+			BrowserApplicationError,
+		)
+		expect(() => Reflect.apply(createBrowserApplication, undefined, [revocable.proxy])).toThrow(
 			BrowserApplicationError,
 		)
-		expect(() =>
-			Reflect.apply(createBrowserApplication, undefined, [revocable.proxy]),
-		).toThrowError(BrowserApplicationError)
 		expect(isBrowserApplicationError(new BrowserApplicationError('CONFIG', 'invalid'))).toBe(true)
 		expect(isBrowserApplicationError(new Error('plain'))).toBe(false)
 		expect(isBrowserApplicationError(revocable.proxy)).toBe(false)
@@ -4679,20 +4677,20 @@ describe('ApplicationServer', () => {
 	})
 
 	it('validates direct options before allocating a listener', () => {
-		expect(() => createApplicationServer({ host: ' ' })).toThrowError(
+		expect(() => createApplicationServer({ host: ' ' })).toThrow(
 			expect.objectContaining({ code: 'CONFIG' }),
 		)
-		expect(() => createApplicationServer({ port: Number.NaN })).toThrowError(
+		expect(() => createApplicationServer({ port: Number.NaN })).toThrow(
 			expect.objectContaining({ code: 'CONFIG' }),
 		)
-		expect(() => createApplicationServer({ port: -1 })).toThrowError(
+		expect(() => createApplicationServer({ port: -1 })).toThrow(
 			expect.objectContaining({ code: 'CONFIG' }),
 		)
-		expect(() => createApplicationServer({ timeout: 0 })).toThrowError(
+		expect(() => createApplicationServer({ timeout: 0 })).toThrow(
 			expect.objectContaining({ code: 'CONFIG' }),
 		)
 		for (const value of [null, 42, [], { host: 42 }, { port: [42] }]) {
-			expect(() => Reflect.apply(createApplicationServer, undefined, [value])).toThrowError(
+			expect(() => Reflect.apply(createApplicationServer, undefined, [value])).toThrow(
 				expect.objectContaining({ code: 'CONFIG' }),
 			)
 		}
@@ -4712,14 +4710,10 @@ describe('ApplicationServer', () => {
 			expect(server.port).toBe(0)
 
 			process.env.APP_PORT = '1e3'
-			expect(() => createApplicationServer()).toThrowError(
-				expect.objectContaining({ code: 'CONFIG' }),
-			)
+			expect(() => createApplicationServer()).toThrow(expect.objectContaining({ code: 'CONFIG' }))
 			process.env.APP_PORT = '0'
 			process.env.APP_START_TIMEOUT = '0'
-			expect(() => createApplicationServer()).toThrowError(
-				expect.objectContaining({ code: 'CONFIG' }),
-			)
+			expect(() => createApplicationServer()).toThrow(expect.objectContaining({ code: 'CONFIG' }))
 		} finally {
 			if (previousHost === undefined) delete process.env.APP_HOST
 			else process.env.APP_HOST = previousHost
@@ -5088,15 +5082,13 @@ describe('application environment parsers', () => {
 		'999.999.999.999',
 		\`\${'a'.repeat(64)}.example\`,
 	])('rejects hostile APP_HOST value %s before listener allocation', (value) => {
-		expect(() => parseApplicationHost(value)).toThrowError(
-			expect.objectContaining({ code: 'CONFIG' }),
-		)
+		expect(() => parseApplicationHost(value)).toThrow(expect.objectContaining({ code: 'CONFIG' }))
 	})
 
 	it.each([null, 42, [], { port: [42] }, { timeout: 0 }])(
 		'rejects hostile option container or leaf value %#',
 		(value) => {
-			expect(() => parseApplicationServerOptions(value)).toThrowError(
+			expect(() => parseApplicationServerOptions(value)).toThrow(
 				expect.objectContaining({ code: 'CONFIG' }),
 			)
 		},
@@ -5119,7 +5111,7 @@ describe('application environment parsers', () => {
 	])(
 		'rejects inherited, unknown, symbolic, accessor, instance, and hostile proxy options %#',
 		(value) => {
-			expect(() => parseApplicationServerOptions(value)).toThrowError(
+			expect(() => parseApplicationServerOptions(value)).toThrow(
 				expect.objectContaining({ code: 'CONFIG' }),
 			)
 		},
@@ -5630,7 +5622,7 @@ function packageManifest(spec) {
 	}
 	if (spec.bin) scripts["test:src:bin"] = "vitest run --config vite.config.ts --no-cache --reporter=dot --project src:bin";
 	if (spec.integration) scripts["test:integration"] = "vitest run --config vite.config.ts --no-cache --reporter=dot --project integration";
-	if (spec.bin && spec.integration) 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.bin && spec.integration) scripts["test:equivalence"] = "node -e \"const c=require('node:child_process'),p=process.env.npm_execpath;if(p===undefined)process.exit(1);const r=c.spawnSync(process.execPath,[p,'run','test:integration'],{stdio:'inherit',env:{...process.env,SCAFFOLD_BOUNDARY_EQUIVALENCE:'1'}});process.exit(r.status??1)\"";
 	if (spec.service) scripts["test:service"] = "vitest run --config vite.config.ts --no-cache --reporter=dot --project service";
 	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(" ");
@@ -5724,6 +5716,7 @@ function rootTsconfig(src, app = []) {
 			target: "ESNext",
 			module: "ESNext",
 			moduleResolution: "bundler",
+			allowImportingTsExtensions: true,
 			lib: [
 				"ESNext",
 				"DOM",
@@ -7824,6 +7817,7 @@ ${EXPORT_KEYWORD} const srcServer = (config?: UserConfig): UserConfig =>
 				outDir: 'dist/src/server',
 				target: 'node22',
 				rolldownOptions: {
+					platform: 'node',
 					external: (id: string) => id.startsWith('node:') || id.startsWith('@orkestrel/'),
 				},
 			},
@@ -7947,6 +7941,7 @@ ${EXPORT_KEYWORD} const srcServer = (config?: UserConfig): UserConfig =>
 					outDir: 'dist/src/server',
 					target: 'node22',
 					rolldownOptions: {
+						platform: 'node',
 						external: (id: string) =>
 							id === '@src/core' || id.startsWith('node:') || id.startsWith('@orkestrel/'),
 						output: [
@@ -8131,6 +8126,7 @@ ${EXPORT_KEYWORD} const srcServer = (config?: UserConfig): UserConfig =>
 				outDir: 'dist/src/server',
 				target: 'node22',
 				rolldownOptions: {
+					platform: 'node',
 					external: (id: string) =>
 						${coreExternal}id.startsWith('node:') || id.startsWith('@orkestrel/'),${coreOutput}
 				},
@@ -8309,7 +8305,7 @@ import {
 	outputBoundary,
 	srcCore,
 	resolveWorkspacePath,
-} from '../../vite.config'
+} from '../../vite.config.ts'
 
 export default defineConfig(
 	srcCore({
@@ -8394,7 +8390,7 @@ function srcViteConfig(environment) {
 	const anchor = environment === "browser" ? "srcBrowser" : "srcServer";
 	return `import { defineConfig } from 'vite'
 import dts from 'vite-plugin-dts'
-import { ${anchor}, resolveWorkspacePath } from '../../vite.config'
+import { ${anchor}, resolveWorkspacePath } from '../../vite.config.ts'
 
 // Types are bundled inline by vite-plugin-dts (see configs/src/vite.core.config.ts
 // for the same pattern).
@@ -8447,7 +8443,7 @@ function binTsconfig() {
 */
 function binViteConfig() {
 	return `import { defineConfig } from 'vite'
-import { srcBin } from '../../vite.config'
+import { srcBin } from '../../vite.config.ts'
 
 // The \`scaffold\` executable build — a single ESM lib file, no declarations (an
 // executable ships no types), with the \`#!/usr/bin/env node\` shebang re-emitted via
@@ -8514,7 +8510,7 @@ function appTsconfig(environment, hasCore) {
 function appViteConfig(environment) {
 	const anchor = environment === "browser" ? "appBrowser" : "appServer";
 	return `import { defineConfig } from 'vite'
-import { ${anchor} } from '../../vite.config'
+import { ${anchor} } from '../../vite.config.ts'
 
 export default defineConfig(${anchor}())
 `;