@savvy-web/tsdown-plugins 2.4.16 → 2.5.0

package/build/build-target-groups.js

@@ -57,7 +57,7 @@ async function buildTargetGroups(options) {
 		logLevel: "silent",
 		customLogger: createTsdownLogger(collector, groupId)
 	};
-	const metricsPlugins = (groupId, pass) => collector === void 0 ? [] : [buildMetricsPlugin(collector, groupId, pass, verbose)];
+	const metricsPlugins = (groupId, pass, suppressMixedExports = false) => collector === void 0 ? [] : [buildMetricsPlugin(collector, groupId, pass, verbose, suppressMixedExports)];
 	const timingChecks = { checks: { pluginTimings: verbose } };
 	const timed = async (groupId, pass, run) => {
 		const timer = createTimer();
@@ -144,28 +144,24 @@ async function buildTargetGroups(options) {
 				...timingChecks,
 				...instrument(group.id),
 				...part.css !== void 0 ? { css: part.css } : {},
-				...partExternals?.length || partBundleNodeModules || partBundle?.length ? { deps: {
+				...partExternals?.length || partBundle?.length ? { deps: {
 					...partExternals?.length ? { neverBundle: partExternals } : {},
-					...partBundle?.length ? { alwaysBundle: partBundle } : {},
-					...partBundleNodeModules ? { skipNodeModulesBundle: false } : {}
+					...partBundle?.length ? { alwaysBundle: partBundle } : {}
 				} } : {},
 				...js.cjsDefault !== void 0 ? { cjsDefault: js.cjsDefault } : {},
 				plugins: [
 					...manifestPlugin ? [manifestPlugin] : [],
 					...js.format.includes("cjs") ? [nodeBuiltinDefaultInterop(), cjsDefaultInterop()] : [],
 					...options.extraPlugins ?? [],
-					...metricsPlugins(group.id, "js")
+					...metricsPlugins(group.id, "js", js.format.includes("cjs"))
 				]
 			}));
 			const dtsNeverBundle = [...partExternals ?? [], ...partDtsExternals ?? []];
 			if (options.emitDts === false || Object.keys(dts.entry).length === 0) continue;
-			const dtsDeps = dtsNeverBundle.length > 0 || partBundleNodeModules || dts.bundledPackages ? { deps: {
+			const dtsDeps = dtsNeverBundle.length > 0 || dts.bundledPackages ? { deps: {
 				...dtsNeverBundle.length > 0 ? { neverBundle: dtsNeverBundle } : {},
-				...partBundleNodeModules ? {
-					skipNodeModulesBundle: false,
-					...dts.bundledPackages ? { dts: { alwaysBundle: dts.bundledPackages } } : {}
-				} : dts.bundledPackages ? {
-					skipNodeModulesBundle: true,
+				...dts.bundledPackages ? partBundleNodeModules ? { dts: { alwaysBundle: dts.bundledPackages } } : {
+					neverBundle: true,
 					dts: { alwaysBundle: dts.bundledPackages }
 				} : {}
 			} } : {};
@@ -240,7 +236,7 @@ async function buildTargetGroups(options) {
 						plugins: [
 							...dts.format.includes("cjs") ? [nodeBuiltinDefaultInterop(), cjsDefaultInterop()] : [],
 							...options.extraPlugins ?? [],
-							...metricsPlugins(group.id, "dts")
+							...metricsPlugins(group.id, "dts", dts.format.includes("cjs"))
 						]
 					});
 				}
@@ -263,13 +259,10 @@ async function buildTargetGroups(options) {
 						define: decl.define,
 						...timingChecks,
 						logLevel: "silent",
-						...dtsNeverBundle.length > 0 || partBundleNodeModules || decl.bundledPackages ? { deps: {
+						...dtsNeverBundle.length > 0 || decl.bundledPackages ? { deps: {
 							...dtsNeverBundle.length > 0 ? { neverBundle: dtsNeverBundle } : {},
-							...partBundleNodeModules ? {
-								skipNodeModulesBundle: false,
-								...decl.bundledPackages ? { dts: { alwaysBundle: decl.bundledPackages } } : {}
-							} : decl.bundledPackages ? {
-								skipNodeModulesBundle: true,
+							...decl.bundledPackages ? partBundleNodeModules ? { dts: { alwaysBundle: decl.bundledPackages } } : {
+								neverBundle: true,
 								dts: { alwaysBundle: decl.bundledPackages }
 							} : {}
 						} } : {},
@@ -288,8 +281,7 @@ async function buildTargetGroups(options) {
 		const isProdGroup = group.id !== "dev";
 		const looseDeps = {
 			...options.externals?.length ? { neverBundle: options.externals } : {},
-			...options.bundle?.length ? { alwaysBundle: options.bundle } : {},
-			...options.bundleNodeModules ? { skipNodeModulesBundle: false } : {}
+			...options.bundle?.length ? { alwaysBundle: options.bundle } : {}
 		};
 		for (const lf of options.looseFiles ?? []) {
 			const hasCjs = lf.format === "cjs";
@@ -317,7 +309,7 @@ async function buildTargetGroups(options) {
 				plugins: [
 					...hasCjs ? [nodeBuiltinDefaultInterop(), cjsDefaultInterop()] : [],
 					...options.extraPlugins ?? [],
-					...metricsPlugins(group.id, "loose")
+					...metricsPlugins(group.id, "loose", hasCjs)
 				]
 			}));
 		}

package/index.d.ts

@@ -177,7 +177,10 @@ declare const DiagnosticEntry_base: Schema.Class<DiagnosticEntry, Schema.Struct<
   readonly source: Schema.Literals<readonly ["tsdown", "rolldown", "api-extractor"]>;
   readonly level: Schema.Literals<readonly ["warn", "error"]>;
   readonly text: Schema.String;
-  /** API Extractor messageId (e.g. "ae-forgotten-export"); used to group suppressed messages by type. */
+  /**
+   * Diagnostic identifier — an API Extractor messageId (e.g. "ae-forgotten-export") or a
+   * rolldown warning code (e.g. "MIXED_EXPORTS"); used to group suppressed messages by type.
+   */
   readonly code: Schema.optional<Schema.String>;
   /** True when shown as `warn` locally but a hard error in CI (drives the "[fails CI]" nudge). */
   readonly ciFatal: Schema.optional<Schema.Boolean>;
@@ -326,10 +329,11 @@ interface DeriveOptions {
    */
   readonly bundledPackages?: ReadonlyArray<string> | undefined;
   /**
-   * Force-bundle node_modules (and workspace) JS dependencies into the JS pass (tsdown
-   * `deps.skipNodeModulesBundle: false`). Consumed here ONLY to decide the JS pass's
-   * `unbundle` posture — see {@link DerivedTsdownOptions.unbundle} — the `deps` shape
-   * itself is computed separately in `buildTargetGroups`.
+   * Force-bundle node_modules (and workspace) JS dependencies into the JS pass.
+   * Consumed here ONLY to decide the JS pass's `unbundle` posture — see
+   * {@link DerivedTsdownOptions.unbundle} — which is the whole of its effect: tsdown
+   * already bundles anything the manifest does not declare as a production dependency,
+   * so no `deps` flag is needed to force it.
    */
   readonly bundleNodeModules?: boolean | undefined;
 }
@@ -544,7 +548,7 @@ interface BuildTargetGroupsOptions {
   /**
    * External packages whose declarations are inlined into the bundled dts
    * (rslib `dtsBundledPackages` equivalent). Forwarded to the dts pass as
-   * `deps.dts.alwaysBundle` alongside `skipNodeModulesBundle: true`; unlike
+   * `deps.dts.alwaysBundle` alongside `deps.neverBundle: true`; unlike
    * `deps.onlyBundle` this does not enable tsdown's strict-mode check that
    * errors on every unlisted transitive dependency. The JS pass is unaffected.
    */
@@ -552,16 +556,17 @@ interface BuildTargetGroupsOptions {
   /**
    * Force-bundle node_modules (and workspace) JS dependencies that are not
    * externalized, restoring the rslib bundle-everything-except-externals
-   * behavior. Sets tsdown `deps.skipNodeModulesBundle: false`; the dts pass
-   * posture mirrors the JS pass, so the bundled declarations are also
+   * behavior. Acts through the JS pass's `unbundle: false` posture, NOT through a
+   * `deps` flag: bundling node_modules is already tsdown's default for anything the
+   * manifest does not declare as a production dependency. The dts pass mirrors it by
+   * likewise leaving that default in place, so the bundled declarations are also
    * self-contained. Defaults to false (current behavior).
    */
   readonly bundleNodeModules?: boolean | undefined;
   /**
    * Force-bundle (inline) these packages into the JS output (tsdown `deps.alwaysBundle`),
    * even declared deps that would otherwise be auto-externalized. The inverse of
-   * `externals`. JS pass only; `alwaysBundle` is allowed alongside our
-   * `skipNodeModulesBundle: false` (the throw only fires when skipNodeModulesBundle is true).
+   * `externals`. JS pass only.
    */
   readonly bundle?: ReadonlyArray<string> | undefined;
   /** Output formats to emit. Defaults to esm-only when unset. */
@@ -1738,9 +1743,13 @@ declare function writeIssuesArtifact(opts: {
  * defensive onLog for rolldown-level diagnostics that bypass tsdown's logger. Append it to each
  * build pass's `plugins` array. `bytes` is taken from the in-memory chunk/asset content (no fs);
  * `gzip` is computed only when `verbose`.
+ *
+ * Set `suppressMixedExports` for a pass whose emitted CJS carries the `cjsDefaultInterop()`
+ * footer — see the onLog comment below for why rolldown's MIXED_EXPORTS advice does not apply
+ * there.
  * @public
  */
-declare function buildMetricsPlugin(collector: BuildCollector, groupId: string, pass: PassKind, verbose: boolean): Plugin;
+declare function buildMetricsPlugin(collector: BuildCollector, groupId: string, pass: PassKind, verbose: boolean, suppressMixedExports?: boolean): Plugin;
 //#endregion
 //#region src/report/services/EnvironmentDetector.d.ts
 /** @public */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/tsdown-plugins",
-	"version": "2.4.16",
+	"version": "2.5.0",
 	"private": false,
 	"description": "Interface-only tsdown/rolldown plugin pack powering @savvy-web/bundler",
 	"homepage": "https://github.com/savvy-web/systems/tree/main/packages/tsdown-plugins",
@@ -34,7 +34,7 @@
 		"@effected/npm": "^0.11.0",
 		"@effected/package-json": "^0.10.2",
 		"@effected/tsconfig-json": "^0.6.0",
-		"@effected/workspaces": "^0.15.0",
+		"@effected/workspaces": "^0.15.1",
 		"@microsoft/api-extractor": "^7.58.12",
 		"@microsoft/tsdoc": "^0.16.0",
 		"@microsoft/tsdoc-config": "^0.18.1",

package/report/metrics-plugin.js

@@ -16,9 +16,13 @@ function byteLength(content) {
 * defensive onLog for rolldown-level diagnostics that bypass tsdown's logger. Append it to each
 * build pass's `plugins` array. `bytes` is taken from the in-memory chunk/asset content (no fs);
 * `gzip` is computed only when `verbose`.
+*
+* Set `suppressMixedExports` for a pass whose emitted CJS carries the `cjsDefaultInterop()`
+* footer — see the onLog comment below for why rolldown's MIXED_EXPORTS advice does not apply
+* there.
 * @public
 */
-function buildMetricsPlugin(collector, groupId, pass, verbose) {
+function buildMetricsPlugin(collector, groupId, pass, verbose, suppressMixedExports = false) {
 	return {
 		name: "savvy:build-metrics",
 		writeBundle(_outputOptions, bundle) {
@@ -42,6 +46,15 @@ function buildMetricsPlugin(collector, groupId, pass, verbose) {
 				...l.loc?.line !== void 0 ? { line: l.loc.line } : {},
 				...l.loc?.column !== void 0 ? { column: l.loc.column } : {}
 			};
+			if (suppressMixedExports && l.code === "MIXED_EXPORTS") {
+				collector.recordSuppressed(groupId, {
+					source: "rolldown",
+					level: "warn",
+					code: "MIXED_EXPORTS",
+					...entry
+				});
+				return false;
+			}
 			if (level === "error") {
 				collector.recordError(groupId, {
 					source: "rolldown",

package/report/schema.js

@@ -16,7 +16,10 @@ var DiagnosticEntry = class extends Schema.Class("DiagnosticEntry")({
 	]),
 	level: Schema.Literals(["warn", "error"]),
 	text: Schema.String,
-	/** API Extractor messageId (e.g. "ae-forgotten-export"); used to group suppressed messages by type. */
+	/**
+	* Diagnostic identifier — an API Extractor messageId (e.g. "ae-forgotten-export") or a
+	* rolldown warning code (e.g. "MIXED_EXPORTS"); used to group suppressed messages by type.
+	*/
 	code: Schema.optional(Schema.String),
 	/** True when shown as `warn` locally but a hard error in CI (drives the "[fails CI]" nudge). */
 	ciFatal: Schema.optional(Schema.Boolean),

package/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.58.12"
+      "packageVersion": "7.58.13"
     }
   ]
 }