@savvy-web/bundler 0.4.2 → 0.6.0

package/README.md

@@ -200,7 +200,7 @@ const config = defineBuild({
 });
 ```
 
-Each override carries the same `format`, `bundle`, `externals`, `bundleNodeModules`, `bundledPackages` and `dtsExternals` fields as the base config. An override does not inherit the base `externals` — list what that partition needs. The build errors if an override names an export path the package does not declare.
+Each override carries the same `format`, `bundle`, `externals`, `bundleNodeModules`, `bundledPackages` and `dtsExternals` fields as the base config, plus three partition-only fields: `platform` (the JS-pass target, `"node"` by default or `"browser"` for a client runtime), `css` (forwarded to tsdown's `css` option to enable `@tsdown/css`) and `outSubdir` (builds the partition into an isolated `<group>/pkg/<subdir>/` sub-package, for which exactly one export path may be pinned). An override does not inherit the base `externals` — list what that partition needs. The build errors if an override names an export path the package does not declare. These partition fields are what [`@savvy-web/rspress-builder`](https://www.npmjs.com/package/@savvy-web/rspress-builder) composes to build an RSPress plugin's browser runtime bundle.
 
 ## Loose files
 
@@ -277,7 +277,7 @@ const config = defineBuild({
 - **JSX, config-first** — JSX transform is inherited from `tsconfig.json` and overridable via the `jsx` field, feeding both the dts tsconfig and the tsdown transform.
 - **Dual-format output** — esm-only by default; set `format` to `["esm", "cjs"]` for a require-able CJS output with default-export interop, `.d.cts` declarations and dual `import`/`require` export conditions.
 - **Dependency bundling** — declared dependencies stay external by default; `bundle`, `bundleNodeModules`, `bundledPackages` and `dtsExternals` force-inline specific packages or all node_modules into the output, inline select declarations into the `.d.ts` or hold a package out of the declaration bundle when its types cannot be inlined.
-- **Per-entry overrides** — `overrides` pins a subset of export entries to their own format and bundling, so one entry can ship dual-format CJS in an otherwise ESM-only package without changing the rest.
+- **Per-entry overrides** — `overrides` pins a subset of export entries to their own format and bundling, so one entry can ship dual-format CJS in an otherwise ESM-only package without changing the rest; partition-only `platform`, `css` and `outSubdir` fields also let an entry build for the browser with CSS modules into its own sub-package.
 - **Loose files** — `looseFiles` emits standalone bundled files at literal output paths outside the exports/declaration/api-model graph, with the format inferred from the key extension; pair with `bundleNodeModules` for self-contained pnpm config-dependency pnpmfiles.
 - **Readable prod output** — prod output is unminified by default to keep stack traces legible and pass security scanners; `minify` opts back in.
 - **Default manifest stripping** — the published `package.json` drops build- and dev-only fields automatically; a custom `transform` replaces the default and can re-apply it via `defaultManifestTransform`.

package/config.js

@@ -26,14 +26,17 @@ function defineBuild(input = {}) {
 function parseArgs(argv) {
 	let target = "dev";
 	let watch = false;
+	let noExe = false;
 	for (let i = 0; i < argv.length; i++) if (argv[i] === "--target") {
 		const v = argv[i + 1];
 		if (v === "dev" || v === "prod" || v === "meta" || v === "exe") target = v;
 		i++;
 	} else if (argv[i] === "--watch") watch = true;
+	else if (argv[i] === "--no-exe") noExe = true;
 	return {
 		target,
-		watch
+		watch,
+		noExe
 	};
 }
 

package/index.d.ts

@@ -1,4 +1,4 @@
-import { BuildFormat, BuildTargetGroupsOptions, ExeConfig, GenerateMetaOptions, Json, JsxConfig, LooseFiles, MetaOptions, MetaResult, PublishTargets, RenderedOutput, RunExeBuildOptions, TargetGroupRef, TargetResolution, TsconfigJsx, defaultManifestTransform } from "@savvy-web/tsdown-plugins";
+import { BuildFormat, BuildPlatform, BuildTargetGroupsOptions, CssOptions, ExeConfig, GenerateMetaOptions, Json, JsxConfig, LooseFiles, MetaOptions, MetaResult, PublishTargets, RenderedOutput, RunExeBuildOptions, TargetGroupRef, TargetResolution, TsconfigJsx, defaultManifestTransform } from "@savvy-web/tsdown-plugins";
 
 //#region src/config.d.ts
 interface BuildEntryOverride {
@@ -10,6 +10,16 @@ interface BuildEntryOverride {
   readonly bundleNodeModules?: boolean | undefined;
   readonly bundledPackages?: ReadonlyArray<string> | undefined;
   readonly dtsExternals?: ReadonlyArray<string> | undefined;
+  /** JS-pass platform for this partition (default "node"). Use "browser" for an RSPress runtime. */
+  readonly platform?: BuildPlatform | undefined;
+  /** CSS handling forwarded to tsdown's `css` option (JS pass only). Enables `@tsdown/css`. */
+  readonly css?: CssOptions | undefined;
+  /**
+   * Build this entry's partition into a `<group>/pkg/<outSubdir>/` subdir as an isolated sub-package
+   * (e.g. an RSPress `./runtime`). The export's built path becomes `./<outSubdir>/index.{js,d.ts}`.
+   * Exactly ONE export path may be pinned per `outSubdir` override.
+   */
+  readonly outSubdir?: string | undefined;
 }
 interface OutputConfig {
   readonly console?: {
@@ -163,6 +173,8 @@ declare function defineBuild(input?: BuildConfigInput): BuildConfig;
 interface ParsedArgs {
   readonly target: "dev" | "prod" | "meta" | "exe";
   readonly watch: boolean;
+  /** Skip the SEA compile step of a dev/prod build (the manifest is still programmed). Used by `prepare`. */
+  readonly noExe: boolean;
 }
 declare function parseArgs(argv: ReadonlyArray<string>): ParsedArgs;
 //#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/bundler",
-	"version": "0.4.2",
+	"version": "0.6.0",
 	"private": false,
 	"description": "Zero-config tsdown-based bundler for Silk Suite TypeScript packages",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/bundler",
@@ -25,10 +25,11 @@
 			"import": "./index.js"
 		},
 		"./ecma.json": "./public/ecma.json",
+		"./tsconfig/ecma.json": "./public/ecma.json",
 		"./package.json": "./package.json"
 	},
 	"dependencies": {
-		"@savvy-web/tsdown-plugins": "0.4.2",
+		"@savvy-web/tsdown-plugins": "0.6.0",
 		"@tsdown/exe": "^0.22.1",
 		"tsdown": "^0.22.2"
 	},

package/public/ecma.json

@@ -25,7 +25,7 @@
 		"sourceMap": false,
 		"strict": true,
 		"strictNullChecks": true,
-		"target": "es2023",
+		"target": "es2025",
 		"tsBuildInfoFile": "${configDir}/dist/.tsbuildinfo.lib",
 		"typeRoots": ["${configDir}/node_modules/@types", "${configDir}/types"],
 		"verbatimModuleSyntax": true,

package/run.js

@@ -1,6 +1,6 @@
 import { parseArgs } from "./config.js";
-import { ConfigValidator, ConfigValidatorLive, ReportPipelineLive, buildTargetGroups, createEntryName, generateMeta, normalizeExeOptions, normalizeLooseFiles, normalizeMetaOptions, packageJsonEntries, readTsconfigJsx, removeDeclarationMaps, renderReport, resolveJsxConfig, resolveTargets, runExeBuild, writeResolvedTsconfig, writeTargetsBinding } from "@savvy-web/tsdown-plugins";
-import { readFileSync } from "node:fs";
+import { ConfigValidator, ConfigValidatorLive, ReportPipelineLive, buildEmittedManifest, buildTargetGroups, computeExeFileName, createEntryName, generateMeta, normalizeExeOptions, normalizeLooseFiles, normalizeMetaOptions, packageJsonEntries, readTsconfigJsx, removeDeclarationMaps, renderReport, resolveJsxConfig, resolveTargets, runExeBuild, writeResolvedTsconfig, writeTargetsBinding } from "@savvy-web/tsdown-plugins";
+import { copyFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
 import { Effect } from "effect";
 
@@ -35,9 +35,46 @@ function deriveExportPaths(entries, exportsMap) {
 	for (const [entryName, src] of Object.entries(entries)) out[entryName] = sourceToKey.get(src) ?? (entryName === "index" ? "." : `./${entryName}`);
 	return out;
 }
+/**
+* Fast-fail validation for `outSubdir` overrides, run on EVERY target path. The dev/prod override-partition
+* loop already validates these (and all other overrides) before building, but `--target meta` returns early
+* (before that loop) and remaps meta dts basenames via `applySubdirMetaEntries` — which assumes validated
+* input. Without this guard, a malformed `outSubdir` override (more than one entry, a non-canonical export
+* path, or an export path that is not a real build entry) would silently remap a wrong/nonexistent key on the
+* meta path. Mirrors the override loop's conditions and messages verbatim so every target path fast-fails
+* identically. No-op when there are no overrides or none set `outSubdir`.
+*/
+function validateSubdirOverrides(overrides, entries, packageName) {
+	if (overrides === void 0) return;
+	for (const ov of overrides) {
+		if (ov.outSubdir === void 0) continue;
+		if (ov.entries.length !== 1) throw new Error(`overrides: outSubdir "${ov.outSubdir}" must pin exactly one export path (got ${ov.entries.length})`);
+		const exportPath = ov.entries[0];
+		if (exportPath !== "." && !exportPath.startsWith("./")) throw new Error(`overrides: entry "${exportPath}" must be a canonical export path — use "." for the root or a "./"-prefixed subpath (e.g. "./changesets/markdownlint")`);
+		const flatName = createEntryName(exportPath, false);
+		if (entries[flatName] === void 0) throw new Error(`overrides: export path "${exportPath}" (entry "${flatName}") is not a build entry of ${packageName}`);
+	}
+}
+/**
+* For each `outSubdir` override, point its meta entry at the isolated sub-package barrel: the dts lives
+* at `<subdir>/index.d.ts` (not `<flatName>.d.ts`). Keyed by the stable flattened entry name so it
+* overwrites the default `dtsBasenames[flatName] = flatName` set from the full entry map. No-op when no
+* override sets `outSubdir`.
+*/
+function applySubdirMetaEntries(overrides, dtsBasenames, exportPaths) {
+	if (overrides === void 0) return;
+	for (const ov of overrides) {
+		if (ov.outSubdir === void 0) continue;
+		const exportPath = ov.entries[0];
+		if (exportPath === void 0) continue;
+		const flatName = createEntryName(exportPath, false);
+		dtsBasenames[flatName] = `${ov.outSubdir}/index`;
+		exportPaths[flatName] = exportPath;
+	}
+}
 /** Run a build from a normalized config. Pure orchestration; all IO injectable. */
 async function runBuild(config, options) {
-	const { target } = parseArgs(options.argv);
+	const { target, noExe } = parseArgs(options.argv);
 	const build = options.buildTargetGroups ?? buildTargetGroups;
 	const cwd = options.cwd;
 	const pkg = readPackageJson(cwd);
@@ -52,10 +89,6 @@ async function runBuild(config, options) {
 		} : {},
 		...jsx?.runtime === "classic" ? { jsx: "react" } : {}
 	})))(cwd);
-	const entries = packageJsonEntries({
-		pkg,
-		cwd
-	});
 	const exportsMap = options.readExports ? options.readExports() : pkg.exports;
 	const runGenerateMeta = options.generateMeta ?? generateMeta;
 	const publishTargets = (options.readPublishTargets ?? (() => {
@@ -76,6 +109,24 @@ async function runBuild(config, options) {
 		...config.meta !== void 0 && config.meta !== false ? { meta: config.meta } : {},
 		...config.looseFiles !== void 0 ? { looseFiles: config.looseFiles } : {}
 	})).pipe(Effect.provide(ConfigValidatorLive)));
+	const exeSpecs = config.exe !== void 0 ? normalizeExeOptions(config.exe, osCpuForValidate) : [];
+	if (config.exe !== void 0 && (exeSpecs.length !== 1 || (exeSpecs[0]?.targets.length ?? 0) !== 1)) throw new Error(`exe build requires exactly one binary with one target (got ${exeSpecs.length} spec(s), ${exeSpecs[0]?.targets.length ?? 0} target(s) on the first). A package's exports["."] resolves to a single SEA — cross-platform binaries must each ship as their own per-platform package.`);
+	const exeSpec = exeSpecs[0];
+	const exeTarget = exeSpec?.targets[0];
+	const exeFileName = exeSpec && exeTarget ? computeExeFileName(exeSpec.fileName, exeTarget) : void 0;
+	const exeEntrySource = exeSpec?.entry ?? "./src/bin.ts";
+	const exeRewrite = config.exe !== void 0 && exeFileName !== void 0 ? {
+		source: exeEntrySource,
+		fileName: exeFileName,
+		dir: "bin"
+	} : void 0;
+	const entries = packageJsonEntries({
+		pkg,
+		cwd,
+		...config.exe !== void 0 ? { excludeSources: [exeEntrySource] } : {}
+	});
+	const hasJsEntries = Object.keys(entries).length > 0;
+	validateSubdirOverrides(config.overrides, entries, packageName);
 	if (target === "meta") {
 		if (config.meta === false) {
 			(options.writeOutput ?? ((o) => process.stdout.write(`${o.content}\n`)))({
@@ -88,13 +139,15 @@ async function runBuild(config, options) {
 		const norm = normalizeMetaOptions(config.meta ?? {});
 		const dtsBasenames = {};
 		for (const name of Object.keys(entries)) dtsBasenames[name] = name;
+		const exportPaths = deriveExportPaths(entries, exportsMap);
+		applySubdirMetaEntries(config.overrides, dtsBasenames, exportPaths);
 		await runGenerateMeta({
 			cwd,
 			packageName,
 			tsconfigPath,
 			dtsDir: join(cwd, "dist", "dev", "pkg"),
 			entries: dtsBasenames,
-			exportPaths: deriveExportPaths(entries, exportsMap),
+			exportPaths,
 			outMetaDir: join(cwd, "dist", "dev", "meta"),
 			localPaths: norm.localPaths,
 			tsdoc: norm.tsdoc
@@ -108,22 +161,22 @@ async function runBuild(config, options) {
 	}
 	if (target === "exe") {
 		if (config.exe === void 0) throw new Error("`savvy build --target exe` requires an `exe` option in the build config");
-		const specs = normalizeExeOptions(config.exe, osCpuForValidate);
 		await (options.runExeBuild ?? runExeBuild)({
 			cwd,
 			outDir: join(cwd, "dist", "dev", "pkg", "bin"),
-			specs
+			specs: exeSpecs
 		});
 		(options.writeOutput ?? ((o) => process.stdout.write(`${o.content}\n`)))({
 			target: "stdout",
 			contentType: "text/plain",
-			content: `exe: compiled ${specs.length} binary/binaries for ${packageName}`
+			content: `exe: compiled ${exeSpecs.length} binary/binaries for ${packageName}`
 		});
 		return;
 	}
 	let overridePartitions = [];
 	let baseEntries = entries;
 	let dualExports;
+	const subdirExports = /* @__PURE__ */ new Set();
 	if (config.overrides) {
 		const partitions = [];
 		const overriddenEntryNames = /* @__PURE__ */ new Set();
@@ -131,14 +184,17 @@ async function runBuild(config, options) {
 		const dualExportKeys = /* @__PURE__ */ new Set();
 		const exportPathByEntry = deriveExportPaths(entries, exportsMap);
 		for (const ov of config.overrides) {
+			if (ov.outSubdir !== void 0 && ov.entries.length !== 1) throw new Error(`overrides: outSubdir "${ov.outSubdir}" must pin exactly one export path (got ${ov.entries.length})`);
 			const partEntry = {};
 			for (const exportPath of ov.entries) {
 				if (exportPath !== "." && !exportPath.startsWith("./")) throw new Error(`overrides: entry "${exportPath}" must be a canonical export path — use "." for the root or a "./"-prefixed subpath (e.g. "./changesets/markdownlint")`);
-				const entryName = createEntryName(exportPath, false);
-				const src = entries[entryName];
-				if (src === void 0) throw new Error(`overrides: export path "${exportPath}" (entry "${entryName}") is not a build entry of ${packageName}`);
+				const flatName = createEntryName(exportPath, false);
+				const src = entries[flatName];
+				if (src === void 0) throw new Error(`overrides: export path "${exportPath}" (entry "${flatName}") is not a build entry of ${packageName}`);
+				const entryName = ov.outSubdir !== void 0 ? "index" : flatName;
 				partEntry[entryName] = src;
-				overriddenEntryNames.add(entryName);
+				overriddenEntryNames.add(flatName);
+				if (ov.outSubdir !== void 0) subdirExports.add(exportPath);
 				if ((ov.format ?? config.format ?? ["esm"]).includes("cjs")) dualExportKeys.add(exportPath);
 			}
 			partitions.push({
@@ -148,7 +204,10 @@ async function runBuild(config, options) {
 				...ov.bundle !== void 0 ? { bundle: ov.bundle } : {},
 				...ov.bundleNodeModules !== void 0 ? { bundleNodeModules: ov.bundleNodeModules } : {},
 				...ov.bundledPackages !== void 0 ? { bundledPackages: ov.bundledPackages } : {},
-				...ov.dtsExternals !== void 0 ? { dtsExternals: ov.dtsExternals } : {}
+				...ov.dtsExternals !== void 0 ? { dtsExternals: ov.dtsExternals } : {},
+				...ov.platform !== void 0 ? { platform: ov.platform } : {},
+				...ov.css !== void 0 ? { css: ov.css } : {},
+				...ov.outSubdir !== void 0 ? { outSubdir: ov.outSubdir } : {}
 			});
 		}
 		const onlyBase = {};
@@ -170,7 +229,7 @@ async function runBuild(config, options) {
 		}],
 		resolution: void 0
 	} : deriveProdGroups(publishTargets, packageName);
-	await build({
+	if (hasJsEntries || config.exe === void 0) await build({
 		cwd,
 		version,
 		entry: config.overrides !== void 0 ? baseEntries : entries,
@@ -189,27 +248,65 @@ async function runBuild(config, options) {
 		...config.define !== void 0 ? { define: config.define } : {},
 		...overridePartitions.length > 0 ? { overrides: overridePartitions } : {},
 		...dualExports !== void 0 ? { dualExports } : {},
-		...looseFiles !== void 0 ? { looseFiles } : {}
+		...subdirExports.size > 0 ? { subdirExports } : {},
+		...looseFiles !== void 0 ? { looseFiles } : {},
+		...exeRewrite !== void 0 ? { exeRewrite } : {}
 	});
 	if (target === "prod" && resolution !== void 0) writeBinding(cwd, resolution);
-	if (target === "prod" && config.meta !== false) {
+	if (target === "prod" && config.meta !== false && (config.exe === void 0 || hasJsEntries)) {
 		const metaGroupId = (groups.find((g) => g.name === packageName) ?? groups[0])?.id ?? "npm";
 		const norm = normalizeMetaOptions(config.meta ?? {});
 		const dtsBasenames = {};
 		for (const name of Object.keys(entries)) dtsBasenames[name] = name;
+		const exportPaths = deriveExportPaths(entries, exportsMap);
+		applySubdirMetaEntries(config.overrides, dtsBasenames, exportPaths);
 		await runGenerateMeta({
 			cwd,
 			packageName,
 			tsconfigPath,
 			dtsDir: join(cwd, "dist", "prod", metaGroupId, "pkg"),
 			entries: dtsBasenames,
-			exportPaths: deriveExportPaths(entries, exportsMap),
+			exportPaths,
 			outMetaDir: join(cwd, "dist", "prod", metaGroupId, "meta"),
 			localPaths: [],
 			tsdoc: norm.tsdoc
 		});
 	}
 	if (target === "prod") for (const g of groups) removeDeclarationMaps(join(cwd, "dist", "prod", g.id, "pkg"));
+	if (config.exe !== void 0 && exeSpec !== void 0 && exeRewrite !== void 0 && exeFileName !== void 0) {
+		const runExe = options.runExeBuild ?? runExeBuild;
+		const groupOutDir = (g) => target === "dev" ? join(cwd, "dist", "dev", "pkg") : join(cwd, "dist", "prod", g.id, "pkg");
+		for (const g of groups) {
+			const outDir = groupOutDir(g);
+			if (!hasJsEntries) {
+				const manifest = await buildEmittedManifest({
+					pkg,
+					targetGroup: {
+						id: g.id,
+						name: g.name,
+						isProd: target === "prod"
+					},
+					devManifest: config.devManifest,
+					...config.transform !== void 0 ? { transform: config.transform } : {},
+					exeRewrite
+				});
+				mkdirSync(outDir, { recursive: true });
+				writeFileSync(join(outDir, "package.json"), `${JSON.stringify(manifest, null, "	")}\n`);
+				for (const file of ["LICENSE", "README.md"]) try {
+					copyFileSync(join(cwd, file), join(outDir, file));
+				} catch {}
+			}
+			if (!noExe) {
+				const binDir = join(outDir, "bin");
+				await runExe({
+					cwd,
+					outDir: binDir,
+					specs: exeSpecs
+				});
+				if (options.runExeBuild === void 0 && !existsSync(join(binDir, exeFileName))) throw new Error(`exe: expected compiled binary at ${join(binDir, exeFileName)} but it is missing — tsdown's emitted name may have drifted from computeExeFileName`);
+			}
+		}
+	}
 	const totalMs = Date.now() - startMs;
 	const reportEntries = Object.keys(entries);
 	const report = {