fix: correctly detect real Svelte files for declarationMap (#2443)

#2442
sveltejs · Jul 18, 2024 · 527c2ad · 527c2ad
1 parent 027ab23
commit 527c2ad
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/packages/svelte2tsx/src/emitDts.ts b/packages/svelte2tsx/src/emitDts.ts
@@ -172,10 +172,6 @@ async function createTsCompilerHost(options: any, svelteMap: SvelteMap) {
             fileName = pathPrefix ? path.join(pathPrefix, fileName) : fileName;
             if (fileName.endsWith('d.ts.map')) {
                 data = data.replace(/"sources":\["(.+?)"\]/, (_, sourcePath: string) => {
-                    // Due to our hack of treating .svelte files as .ts files, we need to adjust the extension
-                    if (sourcePath.endsWith('.svelte.ts')) {
-                        sourcePath = sourcePath.slice(0, -3);
-                    }
                     // The inverse of the pathPrefix adjustment
                     sourcePath =
                         pathPrefix && sourcePath.includes(pathPrefix)
@@ -184,6 +180,12 @@ async function createTsCompilerHost(options: any, svelteMap: SvelteMap) {
                                   sourcePath.indexOf(pathPrefix) + pathPrefix.length + 1
                               )
                             : sourcePath;
+                    // Due to our hack of treating .svelte files as .ts files, we need to adjust the extension
+                    if (
+                        svelteMap.get(path.join(options.rootDir, toRealSvelteFilepath(sourcePath)))
+                    ) {
+                        sourcePath = toRealSvelteFilepath(sourcePath);
+                    }
                     return `"sources":["${sourcePath}"]`;
                 });
             } else if (fileName.endsWith('js.map')) {

diff --git a/...elte2tsx/test/emitDts/samples/typescript-declarationMap/expected/testSvelteTs.svelte.d.ts b/...elte2tsx/test/emitDts/samples/typescript-declarationMap/expected/testSvelteTs.svelte.d.ts
@@ -0,0 +1,3 @@
+export declare class TestSvelteTs {
+}
+//# sourceMappingURL=testSvelteTs.svelte.d.ts.map
diff --git a/...2tsx/test/emitDts/samples/typescript-declarationMap/expected/testSvelteTs.svelte.d.ts.map b/...2tsx/test/emitDts/samples/typescript-declarationMap/expected/testSvelteTs.svelte.d.ts.map
diff --git a/...ages/svelte2tsx/test/emitDts/samples/typescript-declarationMap/src/testSvelteTs.svelte.ts b/...ages/svelte2tsx/test/emitDts/samples/typescript-declarationMap/src/testSvelteTs.svelte.ts
@@ -0,0 +1 @@
+export class TestSvelteTs {}
diff --git a/packages/svelte2tsx/test/emitDts/samples/typescript-declarationMap/tsconfig.json b/packages/svelte2tsx/test/emitDts/samples/typescript-declarationMap/tsconfig.json
@@ -9,7 +9,8 @@
         "esModuleInterop": true,
         "allowJs": true,
         "checkJs": true,
-        "declarationMap": true
+        "declarationMap": true,
+        "declaration": true
     },
     "include": ["./src/**/*.d.ts", "./src/**/*.js", "./src/**/*.ts", "./src/**/*.svelte"]
 }