added tests + fixed missing declarationDir in excludes

privatenumber · Sep 11, 2024 · 29381de · 29381de
1 parent 774fc2f
commit 29381de
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/src/parse-tsconfig/index.ts b/src/parse-tsconfig/index.ts
@@ -176,20 +176,29 @@ const _parseTsconfig = (
 			}
 		}
 
-		let { outDir } = compilerOptions;
-		if (outDir) {
-			if (!Array.isArray(config.exclude)) {
-				config.exclude = [];
-			}
+		const outputFields = [
+			'outDir',
+			'declarationDir'
+		] as const satisfies Array<keyof NonNullable<TsConfigJson['compilerOptions']>>;
 
-			if (!config.exclude.includes(outDir)) {
-				config.exclude.push(outDir);
-			}
+		for (const outputField of outputFields) {
+			let outputPath = compilerOptions[outputField];
 
-			if (!outDir.startsWith(configDirPlaceholder)) {
-				outDir = normalizeRelativePath(outDir);
+			if (outputPath) {
+				if (!Array.isArray(config.exclude)) {
+					config.exclude = [];
+				}
+
+				if (!config.exclude.includes(outputPath)) {
+					config.exclude.push(outputPath);
+				}
+
+				if (!outputPath.startsWith(configDirPlaceholder)) {
+					outputPath = normalizeRelativePath(outputPath);
+				}
+
+				compilerOptions[outputField] = outputPath;
 			}
-			compilerOptions.outDir = outDir;
 		}
 	} else {
 		config.compilerOptions = {};

diff --git a/tests/specs/parse-tsconfig/extends/merges.spec.ts b/tests/specs/parse-tsconfig/extends/merges.spec.ts
@@ -492,6 +492,13 @@ export default testSuite(({ describe }) => {
 					'tsconfig.json': createTsconfigJson({
 						compilerOptions: {
 							outDir: '${configDir}-asdf/dist',
+							declarationDir: '${configDir}/dist/declaration',
+							outFile: '${configDir}/dist/outfile.js',
+							rootDir: '${configDir}/dist/src',
+							baseUrl: '${configDir}/dist/src',
+							tsBuildInfoFile: '${configDir}/dist/dist.tsbuildinfo',
+							rootDirs: ['${configDir}/src', '${configDir}/static'],
+							typeRoots: ['${configDir}/src/type', '${configDir}/types'],
 							paths: {
 								a: ['${configDir}_a/*'],
 								b: ['ignores/${configDir}/*'],