(feat) support node16/nodenext

package.json

@@ -16,7 +16,7 @@
         "lint": "prettier --check . && eslint \"packages/**/*.{ts,js}\""
     },
     "dependencies": {
-        "typescript": "^4.7.2"
+        "typescript": "^4.7.3"
     },
     "devDependencies": {
         "@sveltejs/eslint-config": "github:sveltejs/eslint-config#v5.2.0",

packages/language-server/src/plugins/typescript/module-loader.ts

@@ -5,7 +5,9 @@ import { createSvelteSys } from './svelte-sys';
 import {
     ensureRealSvelteFilePath,
     getExtensionFromScriptKind,
-    isVirtualSvelteFilePath
+    isSvelteFilePath,
+    isVirtualSvelteFilePath,
+    toVirtualSvelteFilePath
 } from './utils';
 
 /**
@@ -67,6 +69,38 @@ class ModuleResolutionCache {
     }
 }
 
+class ImpliedNodeFormatResolver {
+    private alreadyResolved = new Map<string, ReturnType<typeof ts.getModeForResolutionAtIndex>>();
+
+    resolve(
+        importIdxInFile: number,
+        sourceFile: ts.SourceFile | undefined,
+        compilerOptions: ts.CompilerOptions
+    ) {
+        let mode = undefined;
+        if (sourceFile) {
+            if (!sourceFile.impliedNodeFormat && isSvelteFilePath(sourceFile.fileName)) {
+                // impliedNodeFormat is not set for Svelte files, because the TS function which
+                // calculates this works with a fixed set of file extensions,
+                // which .svelte is obv not part of. Make it work by faking a TS file.
+                if (!this.alreadyResolved.has(sourceFile.fileName)) {
+                    sourceFile.impliedNodeFormat = ts.getImpliedNodeFormatForFile(
+                        toVirtualSvelteFilePath(sourceFile.fileName) as any,
+                        undefined,
+                        ts.sys,
+                        compilerOptions
+                    );
+                    this.alreadyResolved.set(sourceFile.fileName, sourceFile.impliedNodeFormat);
+                } else {
+                    sourceFile.impliedNodeFormat = this.alreadyResolved.get(sourceFile.fileName);
+                }
+            }
+            mode = ts.getModeForResolutionAtIndex(sourceFile, importIdxInFile);
+        }
+        return mode;
+    }
+}
+
 /**
  * Creates a module loader specifically for `.svelte` files.
  *
@@ -85,6 +119,7 @@ export function createSvelteModuleLoader(
 ) {
     const svelteSys = createSvelteSys(getSnapshot);
     const moduleCache = new ModuleResolutionCache();
+    const impliedNodeFormatResolver = new ImpliedNodeFormatResolver();
 
     return {
         fileExists: svelteSys.fileExists,
@@ -103,31 +138,50 @@ export function createSvelteModuleLoader(
 
     function resolveModuleNames(
         moduleNames: string[],
-        containingFile: string
+        containingFile: string,
+        _reusedNames: string[] | undefined,
+        _redirectedReference: ts.ResolvedProjectReference | undefined,
+        _options: ts.CompilerOptions,
+        containingSourceFile?: ts.SourceFile | undefined
     ): Array<ts.ResolvedModule | undefined> {
-        return moduleNames.map((moduleName) => {
+        return moduleNames.map((moduleName, index) => {
             if (moduleCache.has(moduleName, containingFile)) {
                 return moduleCache.get(moduleName, containingFile);
             }
 
-            const resolvedModule = resolveModuleName(moduleName, containingFile);
+            const resolvedModule = resolveModuleName(
+                moduleName,
+                containingFile,
+                containingSourceFile,
+                index
+            );
             moduleCache.set(moduleName, containingFile, resolvedModule);
             return resolvedModule;
         });
     }
 
     function resolveModuleName(
         name: string,
-        containingFile: string
+        containingFile: string,
+        containingSourceFile: ts.SourceFile | undefined,
+        index: number
     ): ts.ResolvedModule | undefined {
+        const mode = impliedNodeFormatResolver.resolve(
+            index,
+            containingSourceFile,
+            compilerOptions
+        );
         // Delegate to the TS resolver first.
         // If that does not bring up anything, try the Svelte Module loader
         // which is able to deal with .svelte files.
         const tsResolvedModule = ts.resolveModuleName(
             name,
             containingFile,
             compilerOptions,
-            ts.sys
+            ts.sys,
+            undefined,
+            undefined,
+            mode
         ).resolvedModule;
         if (tsResolvedModule && !isVirtualSvelteFilePath(tsResolvedModule.resolvedFileName)) {
             return tsResolvedModule;
@@ -137,7 +191,10 @@ export function createSvelteModuleLoader(
             name,
             containingFile,
             compilerOptions,
-            svelteSys
+            svelteSys,
+            undefined,
+            undefined,
+            mode
         ).resolvedModule;
         if (
             !svelteResolvedModule ||

packages/language-server/src/plugins/typescript/service.ts

@@ -292,8 +292,6 @@ async function createLanguageService(
         const forcedCompilerOptions: ts.CompilerOptions = {
             allowNonTsExtensions: true,
             target: ts.ScriptTarget.Latest,
-            module: ts.ModuleKind.ESNext,
-            moduleResolution: ts.ModuleResolutionKind.NodeJs,
             allowJs: true,
             noEmit: true,
             declaration: false,
@@ -344,6 +342,25 @@ async function createLanguageService(
             ...parsedConfig.options,
             ...forcedCompilerOptions
         };
+        if (
+            !compilerOptions.moduleResolution ||
+            compilerOptions.moduleResolution === ts.ModuleResolutionKind.Classic
+        ) {
+            compilerOptions.moduleResolution = ts.ModuleResolutionKind.NodeJs;
+        }
+        if (
+            !compilerOptions.module ||
+            [
+                ts.ModuleKind.AMD,
+                ts.ModuleKind.CommonJS,
+                ts.ModuleKind.ES2015,
+                ts.ModuleKind.None,
+                ts.ModuleKind.System,
+                ts.ModuleKind.UMD
+            ].includes(compilerOptions.module)
+        ) {
+            compilerOptions.module = ts.ModuleKind.ESNext;
+        }
 
         // detect which JSX namespace to use (svelte | svelteNative) if not specified or not compatible
         if (!compilerOptions.jsxFactory || !compilerOptions.jsxFactory.startsWith('svelte')) {

packages/language-server/src/plugins/typescript/utils.ts

@@ -76,6 +76,10 @@ export function toRealSvelteFilePath(filePath: string) {
     return filePath.slice(0, -'.ts'.length);
 }
 
+export function toVirtualSvelteFilePath(filePath: string) {
+    return filePath.endsWith('.ts') ? filePath : filePath + '.ts';
+}
+
 export function ensureRealSvelteFilePath(filePath: string) {
     return isVirtualSvelteFilePath(filePath) ? toRealSvelteFilePath(filePath) : filePath;
 }

packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/node16/bar.js

@@ -0,0 +1,2 @@
+export const foo = true;
+export const baz = true;

packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/node16/expected.json

@@ -0,0 +1,10 @@
+[
+    {
+        "range": { "start": { "line": 4, "character": 22 }, "end": { "line": 4, "character": 29 } },
+        "severity": 1,
+        "source": "ts",
+        "message": "Relative import paths need explicit file extensions in EcmaScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './bar.js'?",
+        "code": 2835,
+        "tags": []
+    }
+]

packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/node16/expectedv2.json

@@ -0,0 +1,10 @@
+[
+    {
+        "range": { "start": { "line": 4, "character": 22 }, "end": { "line": 4, "character": 29 } },
+        "severity": 1,
+        "source": "ts",
+        "message": "Relative import paths need explicit file extensions in EcmaScript imports when '--moduleResolution' is 'node16' or 'nodenext'. Did you mean './bar.js'?",
+        "code": 2835,
+        "tags": []
+    }
+]

packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/node16/input.svelte

@@ -0,0 +1,8 @@
+<script lang="ts">
+  // valid
+  import { foo } from './bar.js';
+  // invalid
+  import { baz } from './bar';
+
+  foo;baz;
+</script>

packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/node16/package.json

@@ -0,0 +1,3 @@
+{
+    "type": "module"
+}

packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/node16/tsconfig.json

@@ -0,0 +1,12 @@
+{
+    "compilerOptions": {
+        "allowJs": true,
+        "module": "Node16",
+        "moduleResolution": "Node16",
+        /**
+          This is actually not needed, but makes the tests faster
+          because TS does not look up other types.
+        */
+        "types": ["svelte"]
+    }
+}

packages/language-server/test/plugins/typescript/features/diagnostics/fixtures/tsconfig.json

@@ -7,5 +7,5 @@
         */
         "types": ["svelte"]
     },
-    "exclude": ["./svelte-native/**/*"]
+    "exclude": ["./svelte-native/**/*", "./node16/**/*"]
 }

packages/language-server/test/plugins/typescript/module-loader.test.ts

@@ -47,15 +47,21 @@ describe('createSvelteModuleLoader', () => {
         const { resolveStub, moduleResolver, compilerOptions } = setup(resolvedModule);
         const result = moduleResolver.resolveModuleNames(
             ['./normal.ts'],
-            'C:/somerepo/somefile.svelte'
+            'C:/somerepo/somefile.svelte',
+            undefined,
+            undefined,
+            undefined as any
         );
 
         assert.deepStrictEqual(result, [resolvedModule]);
         assert.deepStrictEqual(lastCall(resolveStub).args, [
             './normal.ts',
             'C:/somerepo/somefile.svelte',
             compilerOptions,
-            ts.sys
+            ts.sys,
+            undefined,
+            undefined,
+            undefined
         ]);
     });
 
@@ -67,15 +73,21 @@ describe('createSvelteModuleLoader', () => {
         const { resolveStub, moduleResolver, compilerOptions } = setup(resolvedModule);
         const result = moduleResolver.resolveModuleNames(
             ['/@/normal'],
-            'C:/somerepo/somefile.svelte'
+            'C:/somerepo/somefile.svelte',
+            undefined,
+            undefined,
+            undefined as any
         );
 
         assert.deepStrictEqual(result, [resolvedModule]);
         assert.deepStrictEqual(lastCall(resolveStub).args, [
             '/@/normal',
             'C:/somerepo/somefile.svelte',
             compilerOptions,
-            ts.sys
+            ts.sys,
+            undefined,
+            undefined,
+            undefined
         ]);
     });
 
@@ -87,15 +99,21 @@ describe('createSvelteModuleLoader', () => {
         const { resolveStub, moduleResolver, compilerOptions } = setup(resolvedModule);
         const result = moduleResolver.resolveModuleNames(
             ['./normal.ts'],
-            'C:/somerepo/somefile.svelte'
+            'C:/somerepo/somefile.svelte',
+            undefined,
+            undefined,
+            undefined as any
         );
 
         assert.deepStrictEqual(result, [resolvedModule]);
         assert.deepStrictEqual(lastCall(resolveStub).args, [
             './normal.ts',
             'C:/somerepo/somefile.svelte',
             compilerOptions,
-            ts.sys
+            ts.sys,
+            undefined,
+            undefined,
+            undefined
         ]);
     });
 
@@ -108,7 +126,10 @@ describe('createSvelteModuleLoader', () => {
             setup(resolvedModule);
         const result = moduleResolver.resolveModuleNames(
             ['./svelte.svelte'],
-            'C:/somerepo/somefile.svelte'
+            'C:/somerepo/somefile.svelte',
+            undefined,
+            undefined,
+            undefined as any
         );
 
         assert.deepStrictEqual(result, [
@@ -122,7 +143,10 @@ describe('createSvelteModuleLoader', () => {
             './svelte.svelte',
             'C:/somerepo/somefile.svelte',
             compilerOptions,
-            svelteSys
+            svelteSys,
+            undefined,
+            undefined,
+            undefined
         ]);
         assert.deepStrictEqual(lastCall(getSvelteSnapshotStub).args, ['filename.svelte']);
     });
@@ -136,7 +160,10 @@ describe('createSvelteModuleLoader', () => {
             setup(resolvedModule);
         const result = moduleResolver.resolveModuleNames(
             ['/@/svelte.svelte'],
-            'C:/somerepo/somefile.svelte'
+            'C:/somerepo/somefile.svelte',
+            undefined,
+            undefined,
+            undefined as any
         );
 
         assert.deepStrictEqual(result, [
@@ -150,7 +177,10 @@ describe('createSvelteModuleLoader', () => {
             '/@/svelte.svelte',
             'C:/somerepo/somefile.svelte',
             compilerOptions,
-            svelteSys
+            svelteSys,
+            undefined,
+            undefined,
+            undefined
         ]);
         assert.deepStrictEqual(lastCall(getSvelteSnapshotStub).args, ['filename.svelte']);
     });
@@ -162,11 +192,20 @@ describe('createSvelteModuleLoader', () => {
         };
         const { resolveStub, moduleResolver } = setup(resolvedModule);
         // first call
-        moduleResolver.resolveModuleNames(['./normal.ts'], 'C:/somerepo/somefile.svelte');
+        moduleResolver.resolveModuleNames(
+            ['./normal.ts'],
+            'C:/somerepo/somefile.svelte',
+            undefined,
+            undefined,
+            undefined as any
+        );
         // second call, which should be from cache
         const result = moduleResolver.resolveModuleNames(
             ['./normal.ts'],
-            'C:/somerepo/somefile.svelte'
+            'C:/somerepo/somefile.svelte',
+            undefined,
+            undefined,
+            undefined as any
         );
 
         assert.deepStrictEqual(result, [resolvedModule]);

packages/svelte2tsx/package.json

@@ -37,7 +37,7 @@
         "svelte": "~3.48.0",
         "tiny-glob": "^0.2.6",
         "tslib": "^1.10.0",
-        "typescript": "^4.7.2"
+        "typescript": "^4.7.3"
     },
     "peerDependencies": {
         "svelte": "^3.24",