@savvy-web/tsdown-plugins 2.9.2 → 2.9.4

package/meta/api-extractor.js

@@ -1,7 +1,7 @@
 import { MetaGenerationError } from "../errors.js";
 import { createMessageSuppressor } from "./message-suppressor.js";
 import { createRequire } from "node:module";
-import { existsSync, writeFileSync } from "node:fs";
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { dirname, isAbsolute, join, resolve } from "node:path";
 import { tmpdir } from "node:os";
 import { createHash } from "node:crypto";
@@ -24,6 +24,12 @@ const CI_FATAL_MESSAGE_IDS = /* @__PURE__ */ new Set(["ae-forgotten-export"]);
 * what the extractor's Program should hold: the entry `.d.ts` (`files`) plus the `types/*.d.ts`
 * legacy typings — the same effective roots as before minus everything under `src/`.
 *
+* The same failure class has a second route (#771): a self-name import (`import type * as Root from
+* "@scope/pkg"`) inside an emitted per-module `.d.ts` resolves, from a declarations tree with no
+* package.json, via TS package self-reference through the SOURCE manifest's `exports` into raw `.ts`
+* (`ae-wrong-input-file-type`, or an `Unable to follow symbol` crash). Run B therefore supplies `paths`
+* mapping each own export specifier to its declarations file, which wins over self-reference.
+*
 * Best-effort, mirroring `writeDtsEmitTsconfig`: a base that does not exist (e.g. a synthetic test
 * path) gets no variant — the original path is returned unchanged. The filename is deterministic
 * per (pid, base, entry) via a content hash (the two joined paths overflow a filename), so repeated
@@ -34,16 +40,31 @@ function writeApiExtractorTsconfig(options) {
 	const absBase = isAbsolute(options.tsconfigPath) ? options.tsconfigPath : resolve(options.tsconfigPath);
 	if (!existsSync(absBase)) return options.tsconfigPath;
 	const entryDts = isAbsolute(options.entryDtsPath) ? options.entryDtsPath : resolve(options.cwd, options.entryDtsPath);
+	const ownPaths = options.paths ?? {};
+	const hasPaths = Object.keys(ownPaths).length > 0;
 	const cfg = {
 		extends: absBase,
 		files: [entryDts],
-		include: [join(options.cwd, "types/*.d.ts")]
+		include: [join(options.cwd, "types/*.d.ts")],
+		...hasPaths ? { compilerOptions: { paths: {
+			...readBasePaths(absBase),
+			...ownPaths
+		} } } : {}
 	};
-	const hash = createHash("sha256").update(`${absBase}\0${entryDts}`).digest("hex").slice(0, 16);
+	const hash = createHash("sha256").update(`${absBase}\0${entryDts}${hasPaths ? `\0${JSON.stringify(ownPaths)}` : ""}`).digest("hex").slice(0, 16);
 	const path = join(tmpdir(), `tsconfig-api-extractor-${process.pid}-${hash}.json`);
 	writeFileSync(path, `${JSON.stringify(cfg, null, "	")}\n`, "utf-8");
 	return path;
 }
+/** The base tsconfig's own `compilerOptions.paths`, read best-effort from plain JSON (parse failure -> none). */
+function readBasePaths(absBase) {
+	try {
+		const paths = JSON.parse(readFileSync(absBase, "utf-8")).compilerOptions?.paths;
+		return typeof paths === "object" && paths !== null && !Array.isArray(paths) ? paths : {};
+	} catch {
+		return {};
+	}
+}
 /**
 * Map an API Extractor message to a collector DiagnosticInput, or undefined if not warn/error.
 *
@@ -78,7 +99,8 @@ function runApiExtractor(options) {
 			compiler: { tsconfigFilePath: writeApiExtractorTsconfig({
 				cwd: options.cwd,
 				tsconfigPath: options.tsconfigPath,
-				entryDtsPath: options.entryDtsPath
+				entryDtsPath: options.entryDtsPath,
+				paths: options.selfReferencePaths
 			}) },
 			docModel: options.emitDocModel === false ? { enabled: false } : {
 				enabled: true,

package/meta/generate.js

@@ -55,12 +55,19 @@ async function generateMeta(options) {
 		...e.code !== void 0 ? { code: e.code } : {},
 		...e.ciFatal !== void 0 ? { ciFatal: e.ciFatal } : {}
 	});
+	const exportPathFor = (entryName) => exportPaths[entryName] ?? (entryName === "index" ? "." : `./${entryName}`);
+	const selfReferencePaths = {};
+	if (splitDiagnostics) for (const name of entryNames) {
+		const exportPath = exportPathFor(name);
+		const specifier = exportPath === "." ? packageName : packageName + exportPath.slice(1);
+		selfReferencePaths[specifier] = [join(aeInputDir, `${entries[name]}.d.ts`)];
+	}
 	for (const entryName of entryNames) {
 		const modelEntryDts = join(dtsDir, `${entries[entryName]}.d.ts`);
 		const safeEntry = entryName.replace(/[\\/]/g, "__");
 		const perEntryApiJson = join(outMetaDir, `${safeEntry}.entry.api.json`);
 		intermediateApiJsons.push(perEntryApiJson);
-		const isMain = (exportPaths[entryName] ?? (entryName === "index" ? "." : `./${entryName}`)) === ".";
+		const isMain = exportPathFor(entryName) === ".";
 		const captureRollupOnlyFatal = splitDiagnostics && onMessage !== void 0 && ci !== true;
 		const rollupFatal = [];
 		const runBReported = /* @__PURE__ */ new Set();
@@ -98,6 +105,7 @@ async function generateMeta(options) {
 					tsdocConfigPath,
 					apiJsonPath: perEntryApiJson,
 					emitDocModel: false,
+					selfReferencePaths,
 					suppressWarnings: tsdoc.suppressWarnings,
 					...runBOnMessage !== void 0 ? { onMessage: runBOnMessage } : {},
 					...onSuppressed !== void 0 ? { onSuppressed } : {}
@@ -106,6 +114,7 @@ async function generateMeta(options) {
 				if (onMessage !== void 0) onMessage({
 					source: "api-extractor",
 					level: "warn",
+					code: "diagnostics-harvest-failed",
 					text: `Could not harvest per-module source locations for "${entryName}": ${String(err)}`
 				});
 			}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@savvy-web/tsdown-plugins",
-	"version": "2.9.2",
+	"version": "2.9.4",
 	"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",
@@ -30,24 +30,24 @@
 	},
 	"dependencies": {
 		"@changesets/get-release-plan": "^5.0.2",
-		"@effect/platform-node": "^4.0.3",
-		"@effected/glob": "^0.11.0",
-		"@effected/images": "^0.2.0",
-		"@effected/jsonc": "^0.16.0",
-		"@effected/npm": "^0.21.0",
-		"@effected/package-json": "^0.21.0",
-		"@effected/semver": "^0.12.0",
-		"@effected/tsconfig-json": "^0.14.0",
-		"@effected/walker": "^0.16.0",
-		"@effected/workspaces": "^0.33.0",
+		"@effect/platform-node": "^4.0.5",
+		"@effected/glob": "^0.13.0",
+		"@effected/images": "^0.4.0",
+		"@effected/jsonc": "^0.18.0",
+		"@effected/npm": "^0.23.0",
+		"@effected/package-json": "^0.23.0",
+		"@effected/semver": "^0.14.0",
+		"@effected/tsconfig-json": "^0.16.0",
+		"@effected/walker": "^0.18.0",
+		"@effected/workspaces": "^0.35.0",
 		"@microsoft/api-extractor": "7.59.1",
 		"@microsoft/tsdoc": "~0.16.0",
 		"@microsoft/tsdoc-config": "0.18.1",
-		"@tsdoctor/manifest": "^0.2.7",
-		"effect": "^4.0.3",
+		"@tsdoctor/manifest": "^0.2.9",
+		"effect": "^4.0.5",
 		"picocolors": "^1.1.1",
 		"std-env": "^4.3.0",
-		"tsdown": "^0.23.0",
+		"tsdown": "^0.23.1",
 		"typescript": "^6.0.3"
 	}
 }