fix(package): use provided tsconfig when calling emitDts (#12612)

Handles second task of sveltejs/language-tools#2355
sveltejs · Sep 6, 2024 · c584dc2 · c584dc2
1 parent 2752d30
commit c584dc2
Show file tree

Hide file tree

Showing 19 changed files with 298 additions and 264 deletions.
diff --git a/.changeset/nine-rings-pretend.md b/.changeset/nine-rings-pretend.md
@@ -0,0 +1,5 @@
+---
+'@sveltejs/package': patch
+---
+
+fix: use input tsconfig when calling emitDts
diff --git a/packages/package/package.json b/packages/package/package.json
@@ -24,7 +24,7 @@
 		"kleur": "^4.1.5",
 		"sade": "^1.8.1",
 		"semver": "^7.5.4",
-		"svelte2tsx": "~0.7.0"
+		"svelte2tsx": "~0.7.16"
 	},
 	"devDependencies": {
 		"@sveltejs/vite-plugin-svelte": "^3.0.1",

diff --git a/packages/package/src/index.js b/packages/package/src/index.js
@@ -34,7 +34,7 @@ async function do_build(options, analyse_code) {
 	const files = scan(input, extensions);
 
 	if (options.types) {
-		await emit_dts(input, temp, options.cwd, alias, files);
+		await emit_dts(input, temp, options.cwd, alias, files, tsconfig);
 	}
 
 	for (const file of files) {
@@ -137,7 +137,7 @@ export async function watch(options) {
 
 			if (!errored && options.types) {
 				try {
-					await emit_dts(input, output, options.cwd, alias, files);
+					await emit_dts(input, output, options.cwd, alias, files, tsconfig);
 					console.log('Updated .d.ts files');
 				} catch (e) {
 					errored = true;

diff --git a/packages/package/src/typescript.js b/packages/package/src/typescript.js
@@ -17,8 +17,9 @@ import { load_pkg_json } from './config.js';
  * @param {string} cwd
  * @param {Record<string, string>} alias
  * @param {import('./types.js').File[]} files
+ * @param {string | undefined} tsconfig
  */
-export async function emit_dts(input, output, cwd, alias, files) {
+export async function emit_dts(input, output, cwd, alias, files, tsconfig) {
 	const tmp = `${output}/__package_types_tmp__`;
 	rimraf(tmp);
 	mkdirp(tmp);
@@ -32,7 +33,8 @@ export async function emit_dts(input, output, cwd, alias, files) {
 		svelteShimsPath: no_svelte_3
 			? require.resolve('svelte2tsx/svelte-shims-v4.d.ts')
 			: require.resolve('svelte2tsx/svelte-shims.d.ts'),
-		declarationDir: path.relative(cwd, tmp)
+		declarationDir: path.relative(cwd, tmp),
+		tsconfig
 	});
 
 	const handwritten = new Set();

diff --git a/packages/package/test/fixtures/javascript/expected/Test.svelte.d.ts b/packages/package/test/fixtures/javascript/expected/Test.svelte.d.ts
@@ -36,5 +36,7 @@ declare const __propDef: {
 			astring: string;
 		};
 	};
+	exports?: {};
+	bindings?: string;
 };
 export {};
diff --git a/packages/package/test/fixtures/javascript/expected/Test2.svelte.d.ts b/packages/package/test/fixtures/javascript/expected/Test2.svelte.d.ts
@@ -22,5 +22,7 @@ declare const __propDef: {
 		[evt: string]: CustomEvent<any>;
 	};
 	slots: {};
+	exports?: {};
+	bindings?: string;
 };
 export {};
diff --git a/packages/package/test/fixtures/javascript/expected/internal/Test.svelte.d.ts b/packages/package/test/fixtures/javascript/expected/internal/Test.svelte.d.ts
@@ -22,5 +22,7 @@ declare const __propDef: {
 		[evt: string]: CustomEvent<any>;
 	};
 	slots: {};
+	exports?: {};
+	bindings?: string;
 };
 export {};
diff --git a/packages/package/test/fixtures/resolve-alias/expected/Test.svelte.d.ts b/packages/package/test/fixtures/resolve-alias/expected/Test.svelte.d.ts
@@ -7,6 +7,8 @@ declare const __propDef: {
 		[evt: string]: CustomEvent<any>;
 	};
 	slots: {};
+	exports?: {};
+	bindings?: string;
 };
 export type TestProps = typeof __propDef.props;
 export type TestEvents = typeof __propDef.events;

diff --git a/packages/package/test/fixtures/svelte-3-types/tsconfig.json b/packages/package/test/fixtures/svelte-3-types/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"compilerOptions": {
 		"target": "ESNext",
-		"module": "ESNext"
+		"module": "ESNext",
+		"verbatimModuleSyntax": true
 	}
 }
diff --git a/packages/package/test/fixtures/svelte-kit/expected/Test.svelte.d.ts b/packages/package/test/fixtures/svelte-kit/expected/Test.svelte.d.ts
@@ -36,5 +36,7 @@ declare const __propDef: {
 			astring: string;
 		};
 	};
+	exports?: {};
+	bindings?: string;
 };
 export {};
diff --git a/packages/package/test/fixtures/typescript-esnext/expected/Plain.svelte.d.ts b/packages/package/test/fixtures/typescript-esnext/expected/Plain.svelte.d.ts
@@ -22,5 +22,7 @@ declare const __propDef: {
 		[evt: string]: CustomEvent<any>;
 	};
 	slots: {};
+	exports?: {};
+	bindings?: string;
 };
 export {};
diff --git a/packages/package/test/fixtures/typescript-esnext/expected/Test.svelte.d.ts b/packages/package/test/fixtures/typescript-esnext/expected/Test.svelte.d.ts
@@ -13,6 +13,8 @@ declare const __propDef: {
 			astring: string;
 		};
 	};
+	exports?: {};
+	bindings?: string;
 };
 export type TestProps = typeof __propDef.props;
 export type TestEvents = typeof __propDef.events;

diff --git a/packages/package/test/fixtures/typescript-esnext/expected/Test2.svelte.d.ts b/packages/package/test/fixtures/typescript-esnext/expected/Test2.svelte.d.ts
@@ -8,6 +8,8 @@ declare const __propDef: {
 		[evt: string]: CustomEvent<any>;
 	};
 	slots: {};
+	exports?: {};
+	bindings?: string;
 };
 export type Test2Props = typeof __propDef.props;
 export type Test2Events = typeof __propDef.events;

diff --git a/packages/package/test/fixtures/typescript-esnext/tsconfig.json b/packages/package/test/fixtures/typescript-esnext/tsconfig.json
@@ -1,6 +1,7 @@
 {
 	"compilerOptions": {
 		"target": "ESNext",
-		"module": "ESNext"
+		"module": "ESNext",
+		"verbatimModuleSyntax": true
 	}
 }
diff --git a/packages/package/test/fixtures/typescript-nodenext/expected/Test.svelte.d.ts b/packages/package/test/fixtures/typescript-nodenext/expected/Test.svelte.d.ts
@@ -13,6 +13,8 @@ declare const __propDef: {
 			astring: string;
 		};
 	};
+	exports?: {};
+	bindings?: string;
 };
 export type TestProps = typeof __propDef.props;
 export type TestEvents = typeof __propDef.events;

diff --git a/packages/package/test/fixtures/typescript-nodenext/tsconfig.json b/packages/package/test/fixtures/typescript-nodenext/tsconfig.json
@@ -2,6 +2,7 @@
 	"compilerOptions": {
 		"target": "ESNext",
 		"module": "NodeNext",
+		"verbatimModuleSyntax": true,
 		"moduleResolution": "NodeNext"
 	}
 }
diff --git a/packages/package/test/watch/expected/Test.svelte b/packages/package/test/watch/expected/Test.svelte
@@ -1,2 +1 @@
-<script>export let answer;
-</script>
+<script lang="ts">export let answer: number</script>
diff --git a/packages/package/test/watch/expected/Test.svelte.d.ts b/packages/package/test/watch/expected/Test.svelte.d.ts
@@ -7,6 +7,8 @@ declare const __propDef: {
         [evt: string]: CustomEvent<any>;
     };
     slots: {};
+    exports?: {};
+    bindings?: string;
 };
 export type TestProps = typeof __propDef.props;
 export type TestEvents = typeof __propDef.events;