same for ts-plugin (major version bump)

Author: dummdidumm

packages/typescript-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "typescript-svelte-plugin",
-    "version": "0.2.0",
+    "version": "0.3.0",
     "description": "A TypeScript Plugin providing Svelte intellisense",
     "main": "dist/src/index.js",
     "scripts": {

packages/typescript-plugin/src/module-loader.ts

@@ -3,30 +3,7 @@ import { ConfigManager } from './config-manager';
 import { Logger } from './logger';
 import { SvelteSnapshotManager } from './svelte-snapshots';
 import { createSvelteSys } from './svelte-sys';
-import { ensureRealSvelteFilePath, isVirtualSvelteFilePath } from './utils';
-
-// TODO remove when we update to typescript 5.0
-declare module 'typescript/lib/tsserverlibrary' {
-    interface LanguageServiceHost {
-        /** @deprecated supply resolveModuleNameLiterals instead for resolution that can handle newer resolution modes like nodenext */
-        resolveModuleNames?(
-            moduleNames: string[],
-            containingFile: string,
-            reusedNames: string[] | undefined,
-            redirectedReference: ts.ResolvedProjectReference | undefined,
-            options: ts.CompilerOptions,
-            containingSourceFile?: ts.SourceFile
-        ): (ts.ResolvedModule | undefined)[];
-        resolveModuleNameLiterals?(
-            moduleLiterals: readonly ts.StringLiteralLike[],
-            containingFile: string,
-            redirectedReference: ts.ResolvedProjectReference | undefined,
-            options: ts.CompilerOptions,
-            containingSourceFile: ts.SourceFile,
-            reusedNames: readonly ts.StringLiteralLike[] | undefined
-        ): readonly ts.ResolvedModuleWithFailedLookupLocations[];
-    }
-}
+import { ensureRealSvelteFilePath, isSvelteFilePath, isVirtualSvelteFilePath } from './utils';
 
 /**
  * Caches resolved modules.
@@ -161,12 +138,22 @@ export function patchModuleLoader(
 
         return resolved.map((tsResolvedModule, idx) => {
             const moduleName = moduleNames[idx];
-            if (tsResolvedModule || !ensureRealSvelteFilePath(moduleName).endsWith('.svelte')) {
+            if (
+                !isSvelteFilePath(moduleName) ||
+                // corresponding .d.ts files take precedence over .svelte files
+                tsResolvedModule?.resolvedFileName.endsWith('.d.ts') ||
+                tsResolvedModule?.resolvedFileName.endsWith('.d.svelte.ts')
+            ) {
                 return tsResolvedModule;
             }
 
-            return resolveSvelteModuleNameFromCache(moduleName, containingFile, compilerOptions)
-                .resolvedModule;
+            const result = resolveSvelteModuleNameFromCache(
+                moduleName,
+                containingFile,
+                compilerOptions
+            ).resolvedModule;
+            // .svelte takes precedence over .svelte.ts etc
+            return result ?? tsResolvedModule;
         });
     }
 
@@ -238,14 +225,19 @@ export function patchModuleLoader(
 
         return resolved.map((tsResolvedModule, idx) => {
             const moduleName = moduleLiterals[idx].text;
+
             if (
-                tsResolvedModule.resolvedModule ||
-                !ensureRealSvelteFilePath(moduleName).endsWith('.svelte')
+                !isSvelteFilePath(moduleName) ||
+                // corresponding .d.ts files take precedence over .svelte files
+                tsResolvedModule?.resolvedModule?.resolvedFileName.endsWith('.d.ts') ||
+                tsResolvedModule?.resolvedModule?.resolvedFileName.endsWith('.d.svelte.ts')
             ) {
                 return tsResolvedModule;
             }
 
-            return resolveSvelteModuleNameFromCache(moduleName, containingFile, options);
+            const result = resolveSvelteModuleNameFromCache(moduleName, containingFile, options);
+            // .svelte takes precedence over .svelte.ts etc
+            return result ?? tsResolvedModule;
         });
     }
 

packages/typescript-plugin/src/svelte-sys.ts

@@ -30,7 +30,7 @@ export function createSvelteSys(ts: _ts, logger: Logger) {
         const realpath = ts.sys.realpath;
         svelteSys.realpath = function (path) {
             if (isVirtualSvelteFilePath(path)) {
-                return realpath(toRealSvelteFilePath(path)) + '.ts';
+                return realpath(toRealSvelteFilePath(path));
             }
             return realpath(path);
         };

packages/typescript-plugin/src/utils.ts

@@ -8,11 +8,17 @@ export function isSvelteFilePath(filePath: string) {
 }
 
 export function isVirtualSvelteFilePath(filePath: string) {
-    return filePath.endsWith('.svelte.ts');
+    return filePath.endsWith('.d.svelte.ts');
 }
 
 export function toRealSvelteFilePath(filePath: string) {
-    return filePath.slice(0, -'.ts'.length);
+    return filePath.slice(0, -11 /* 'd.svelte.ts'.length */) + 'svelte';
+}
+
+export function toVirtualSvelteFilePath(svelteFilePath: string) {
+    return isVirtualSvelteFilePath(svelteFilePath)
+        ? svelteFilePath
+        : svelteFilePath.slice(0, -6 /* 'svelte'.length */) + 'd.svelte.ts';
 }
 
 export function ensureRealSvelteFilePath(filePath: string) {