@volar/typescript 1.7.6 → 1.7.8

package/out/dtsHost.d.ts

@@ -4,23 +4,5 @@ export interface IDtsHost {
     readFile(fileName: string): Promise<string | undefined>;
     readDirectory(dirName: string): Promise<[string, FileType][]>;
 }
-export declare function createJsDelivrDtsHost(versions?: Record<string, string>, onFetch?: (fileName: string, text: string) => void): DtsHost;
-declare class DtsHost implements IDtsHost {
-    private fetchText;
-    private flat;
-    fetchResults: Map<string, Promise<string | undefined>>;
-    flatResults: Map<string, Promise<string[]>>;
-    constructor(fetchText: (path: string) => Promise<string | undefined>, flat: (pkg: string) => Promise<string[]>);
-    stat(fileName: string): Promise<{
-        type: number;
-        ctime: number;
-        mtime: number;
-        size: number;
-    } | undefined>;
-    readDirectory(dirName: string): Promise<[string, FileType][]>;
-    readFile(fileName: string): Promise<string | undefined>;
-    fetchFile(fileName: string): Promise<string | undefined>;
-    valid(fileName: string): Promise<boolean>;
-}
+export declare function createJsDelivrDtsHost(versions?: Record<string, string>, onFetch?: (fileName: string, text: string) => void): IDtsHost;
 export declare function getPackageNameOfDtsPath(path: string): string | undefined;
-export {};

package/out/getProgram.d.ts

@@ -1,3 +1,3 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import type * as embedded from '@volar/language-core';
-export declare function getProgram(ts: typeof import('typescript/lib/tsserverlibrary'), core: embedded.LanguageContext, ls: ts.LanguageService, lsHost: ts.LanguageServiceHost): any;
+export declare function getProgram(ts: typeof import('typescript/lib/tsserverlibrary'), core: embedded.LanguageContext, ls: ts.LanguageService, sys: ts.System): ts.Program;

package/out/getProgram.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getProgram = void 0;
-function getProgram(ts, core, ls, lsHost) {
+function getProgram(ts, core, ls, sys) {
     const proxy = {
         getRootFileNames,
         emit,
@@ -34,7 +34,7 @@ function getProgram(ts, core, ls, lsHost) {
         return ls.getProgram();
     }
     function getRootFileNames() {
-        return getProgram().getRootFileNames().filter(fileName => lsHost.fileExists?.(fileName));
+        return getProgram().getRootFileNames().filter(fileName => sys.fileExists?.(fileName));
     }
     // for vue-tsc --noEmit --watch
     function getBindAndCheckDiagnostics(sourceFile, cancellationToken) {
@@ -63,7 +63,7 @@ function getProgram(ts, core, ls, lsHost) {
         return transformDiagnostics(getProgram().getGlobalDiagnostics(cancellationToken) ?? []);
     }
     function emit(targetSourceFile, _writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
-        const scriptResult = getProgram().emit(targetSourceFile, (lsHost.writeFile ?? ts.sys.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
+        const scriptResult = getProgram().emit(targetSourceFile, (sys.writeFile ?? ts.sys.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         return {
             emitSkipped: scriptResult.emitSkipped,
             emittedFiles: scriptResult.emittedFiles,
@@ -79,7 +79,7 @@ function getProgram(ts, core, ls, lsHost) {
                 && diagnostic.length !== undefined) {
                 const [virtualFile, source] = core.virtualFiles.getVirtualFile(diagnostic.file.fileName);
                 if (virtualFile && source) {
-                    if (lsHost.fileExists?.(source.fileName) === false)
+                    if (sys.fileExists?.(source.fileName) === false)
                         continue;
                     for (const [_, [sourceSnapshot, map]] of core.virtualFiles.getMaps(virtualFile)) {
                         if (sourceSnapshot !== source.snapshot)
@@ -100,7 +100,7 @@ function getProgram(ts, core, ls, lsHost) {
                     }
                 }
                 else {
-                    if (lsHost.fileExists?.(diagnostic.file.fileName) === false)
+                    if (sys.fileExists?.(diagnostic.file.fileName) === false)
                         continue;
                     onMapping(diagnostic, diagnostic.file.fileName, diagnostic.start, diagnostic.start + diagnostic.length, diagnostic.file.text);
                 }
@@ -116,7 +116,7 @@ function getProgram(ts, core, ls, lsHost) {
                 : undefined;
             if (!file) {
                 if (docText === undefined) {
-                    const snapshot = lsHost.getScriptSnapshot(fileName);
+                    const snapshot = core.host.getScriptSnapshot(fileName);
                     if (snapshot) {
                         docText = snapshot.getText(0, snapshot.getLength());
                     }

package/out/index.d.ts

@@ -3,3 +3,5 @@ export * from './dtsHost';
 export * from './languageService';
 export * from './languageServiceHost';
 export * from './sys';
+export * from './getProgram';
+export * from './serverPlugin';

package/out/index.js

@@ -19,4 +19,6 @@ __exportStar(require("./dtsHost"), exports);
 __exportStar(require("./languageService"), exports);
 __exportStar(require("./languageServiceHost"), exports);
 __exportStar(require("./sys"), exports);
+__exportStar(require("./getProgram"), exports);
+__exportStar(require("./serverPlugin"), exports);
 //# sourceMappingURL=index.js.map

package/out/languageService.d.ts

@@ -1,9 +1,3 @@
-import { LanguageContext } from '@volar/language-core';
+import { VirtualFiles } from '@volar/language-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
-export declare function createLanguageService(core: LanguageContext, ts: typeof import('typescript/lib/tsserverlibrary'), sys: ts.System): {
-    __internal__: {
-        languageServiceHost: ts.LanguageServiceHost;
-        languageService: ts.LanguageService;
-        context: LanguageContext;
-    };
-} & ts.LanguageService;
+export declare function decorateLanguageService(virtualFiles: VirtualFiles, languageService: ts.LanguageService, isTsPlugin: boolean): void;

package/out/languageService.js

@@ -1,59 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLanguageService = void 0;
+exports.decorateLanguageService = void 0;
 const language_core_1 = require("@volar/language-core");
-const getProgram_1 = require("./getProgram");
-const languageServiceHost_1 = require("./languageServiceHost");
-const documentRegistry_1 = require("./documentRegistry");
-function createLanguageService(core, ts, sys) {
-    if (!ts) {
-        throw new Error('TypeScript module not provided.');
-    }
-    const lsHost = (0, languageServiceHost_1.createLanguageServiceHost)(core, ts, sys);
-    const ls = ts.createLanguageService(lsHost, (0, documentRegistry_1.getDocumentRegistry)(ts, sys.useCaseSensitiveFileNames, core.host.getCurrentDirectory()));
-    return new Proxy({
-        organizeImports,
-        // only support for .ts for now, not support for .vue
-        getDefinitionAtPosition,
-        getDefinitionAndBoundSpan,
-        getTypeDefinitionAtPosition,
-        getImplementationAtPosition,
-        findRenameLocations,
-        getReferencesAtPosition,
-        findReferences,
-        // TODO: now is handled by vue server
-        // prepareCallHierarchy: tsLanguageService.rawLs.prepareCallHierarchy,
-        // provideCallHierarchyIncomingCalls: tsLanguageService.rawLs.provideCallHierarchyIncomingCalls,
-        // provideCallHierarchyOutgoingCalls: tsLanguageService.rawLs.provideCallHierarchyOutgoingCalls,
-        // getEditsForFileRename: tsLanguageService.rawLs.getEditsForFileRename,
-        // TODO
-        // getCodeFixesAtPosition: tsLanguageService.rawLs.getCodeFixesAtPosition,
-        // getCombinedCodeFix: tsLanguageService.rawLs.getCombinedCodeFix,
-        // applyCodeActionCommand: tsLanguageService.rawLs.applyCodeActionCommand,
-        // getApplicableRefactors: tsLanguageService.rawLs.getApplicableRefactors,
-        // getEditsForRefactor: tsLanguageService.rawLs.getEditsForRefactor,
-        getProgram: () => (0, getProgram_1.getProgram)(ts, core, ls, lsHost),
-        __internal__: {
-            context: core,
-            languageService: ls,
-            languageServiceHost: lsHost,
-        },
-    }, {
-        get: (target, property) => {
-            if (property in target) {
-                return target[property];
-            }
-            return ls[property];
-        },
-    });
+function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
+    const _organizeImports = languageService.organizeImports.bind(languageService);
+    const _getDefinitionAtPosition = languageService.getDefinitionAtPosition.bind(languageService);
+    const _getDefinitionAndBoundSpan = languageService.getDefinitionAndBoundSpan.bind(languageService);
+    const _getTypeDefinitionAtPosition = languageService.getTypeDefinitionAtPosition.bind(languageService);
+    const _getImplementationAtPosition = languageService.getImplementationAtPosition.bind(languageService);
+    const _findRenameLocations = languageService.findRenameLocations.bind(languageService);
+    const _getReferencesAtPosition = languageService.getReferencesAtPosition.bind(languageService);
+    const _findReferences = languageService.findReferences.bind(languageService);
+    languageService.organizeImports = organizeImports;
+    languageService.getDefinitionAtPosition = getDefinitionAtPosition;
+    languageService.getDefinitionAndBoundSpan = getDefinitionAndBoundSpan;
+    languageService.getTypeDefinitionAtPosition = getTypeDefinitionAtPosition;
+    languageService.getImplementationAtPosition = getImplementationAtPosition;
+    languageService.findRenameLocations = findRenameLocations;
+    languageService.getReferencesAtPosition = getReferencesAtPosition;
+    languageService.findReferences = findReferences;
     // apis
     function organizeImports(args, formatOptions, preferences) {
         let edits = [];
-        const file = core.virtualFiles.getSource(args.fileName)?.root;
+        const file = virtualFiles.getSource(args.fileName)?.root;
         if (file) {
             (0, language_core_1.forEachEmbeddedFile)(file, embeddedFile => {
                 if (embeddedFile.kind === language_core_1.FileKind.TypeScriptHostFile && embeddedFile.capabilities.codeAction) {
-                    edits = edits.concat(ls.organizeImports({
+                    edits = edits.concat(_organizeImports({
                         ...args,
                         fileName: embeddedFile.fileName,
                     }, formatOptions, preferences));
@@ -61,7 +34,7 @@ function createLanguageService(core, ts, sys) {
             });
         }
         else {
-            return ls.organizeImports(args, formatOptions, preferences);
+            return _organizeImports(args, formatOptions, preferences);
         }
         return edits.map(transformFileTextChanges).filter(notEmpty);
     }
@@ -84,26 +57,26 @@ function createLanguageService(core, ts, sys) {
         const loopChecker = new Set();
         let symbols = [];
         withMirrors(fileName, position);
-        return symbols.map(s => transformDocumentSpanLike(s)).filter(notEmpty);
+        return symbols.map(s => transformDocumentSpanLike(s, mode === 'definition')).filter(notEmpty);
         function withMirrors(fileName, position) {
             if (loopChecker.has(fileName + ':' + position))
                 return;
             loopChecker.add(fileName + ':' + position);
-            const _symbols = mode === 'definition' ? ls.getDefinitionAtPosition(fileName, position)
-                : mode === 'typeDefinition' ? ls.getTypeDefinitionAtPosition(fileName, position)
-                    : mode === 'references' ? ls.getReferencesAtPosition(fileName, position)
-                        : mode === 'implementation' ? ls.getImplementationAtPosition(fileName, position)
-                            : mode === 'rename' && preferences ? ls.findRenameLocations(fileName, position, findInStrings, findInComments, preferences)
+            const _symbols = mode === 'definition' ? _getDefinitionAtPosition(fileName, position)
+                : mode === 'typeDefinition' ? _getTypeDefinitionAtPosition(fileName, position)
+                    : mode === 'references' ? _getReferencesAtPosition(fileName, position)
+                        : mode === 'implementation' ? _getImplementationAtPosition(fileName, position)
+                            : mode === 'rename' && preferences ? _findRenameLocations(fileName, position, findInStrings, findInComments, preferences)
                                 : undefined;
             if (!_symbols)
                 return;
             symbols = symbols.concat(_symbols);
             for (const ref of _symbols) {
                 loopChecker.add(ref.fileName + ':' + ref.textSpan.start);
-                const [virtualFile] = core.virtualFiles.getVirtualFile(ref.fileName);
+                const [virtualFile] = getVirtualFile(ref.fileName);
                 if (!virtualFile)
                     continue;
-                const mirrorMap = core.virtualFiles.getMirrorMap(virtualFile);
+                const mirrorMap = virtualFiles.getMirrorMap(virtualFile);
                 if (!mirrorMap)
                     continue;
                 for (const [mirrorOffset, data] of mirrorMap.findMirrorOffsets(ref.textSpan.start)) {
@@ -129,13 +102,13 @@ function createLanguageService(core, ts, sys) {
             return;
         return {
             textSpan: textSpan,
-            definitions: symbols?.map(s => transformDocumentSpanLike(s)).filter(notEmpty),
+            definitions: symbols?.map(s => transformDocumentSpanLike(s, true)).filter(notEmpty),
         };
         function withMirrors(fileName, position) {
             if (loopChecker.has(fileName + ':' + position))
                 return;
             loopChecker.add(fileName + ':' + position);
-            const _symbols = ls.getDefinitionAndBoundSpan(fileName, position);
+            const _symbols = _getDefinitionAndBoundSpan(fileName, position);
             if (!_symbols)
                 return;
             if (!textSpan) {
@@ -146,10 +119,10 @@ function createLanguageService(core, ts, sys) {
             symbols = symbols.concat(_symbols.definitions);
             for (const ref of _symbols.definitions) {
                 loopChecker.add(ref.fileName + ':' + ref.textSpan.start);
-                const [virtualFile] = core.virtualFiles.getVirtualFile(ref.fileName);
+                const [virtualFile] = getVirtualFile(ref.fileName);
                 if (!virtualFile)
                     continue;
-                const mirrorMap = core.virtualFiles.getMirrorMap(virtualFile);
+                const mirrorMap = virtualFiles.getMirrorMap(virtualFile);
                 if (!mirrorMap)
                     continue;
                 for (const [mirrorOffset, data] of mirrorMap.findMirrorOffsets(ref.textSpan.start)) {
@@ -171,17 +144,17 @@ function createLanguageService(core, ts, sys) {
             if (loopChecker.has(fileName + ':' + position))
                 return;
             loopChecker.add(fileName + ':' + position);
-            const _symbols = ls.findReferences(fileName, position);
+            const _symbols = _findReferences(fileName, position);
             if (!_symbols)
                 return;
             symbols = symbols.concat(_symbols);
             for (const symbol of _symbols) {
                 for (const ref of symbol.references) {
                     loopChecker.add(ref.fileName + ':' + ref.textSpan.start);
-                    const [virtualFile] = core.virtualFiles.getVirtualFile(ref.fileName);
+                    const [virtualFile] = getVirtualFile(ref.fileName);
                     if (!virtualFile)
                         continue;
-                    const mirrorMap = core.virtualFiles.getMirrorMap(virtualFile);
+                    const mirrorMap = virtualFiles.getMirrorMap(virtualFile);
                     if (!mirrorMap)
                         continue;
                     for (const [mirrorOffset, data] of mirrorMap.findMirrorOffsets(ref.textSpan.start)) {
@@ -197,7 +170,7 @@ function createLanguageService(core, ts, sys) {
     }
     // transforms
     function transformFileTextChanges(changes) {
-        const [_, source] = core.virtualFiles.getVirtualFile(changes.fileName);
+        const [_, source] = getVirtualFile(changes.fileName);
         if (source) {
             return {
                 ...changes,
@@ -218,8 +191,8 @@ function createLanguageService(core, ts, sys) {
         }
     }
     function transformReferencedSymbol(symbol) {
-        const definition = transformDocumentSpanLike(symbol.definition);
-        const references = symbol.references.map(r => transformDocumentSpanLike(r)).filter(notEmpty);
+        const definition = transformDocumentSpanLike(symbol.definition, false);
+        const references = symbol.references.map(r => transformDocumentSpanLike(r, false)).filter(notEmpty);
         if (definition) {
             return {
                 definition,
@@ -237,8 +210,17 @@ function createLanguageService(core, ts, sys) {
             };
         }
     }
-    function transformDocumentSpanLike(documentSpan) {
-        const textSpan = transformSpan(documentSpan.fileName, documentSpan.textSpan);
+    function transformDocumentSpanLike(documentSpan, isDefinition) {
+        let textSpan = transformSpan(documentSpan.fileName, documentSpan.textSpan);
+        if (isDefinition && !textSpan) {
+            const [virtualFile, source] = getVirtualFile(documentSpan.fileName);
+            if (virtualFile && source) {
+                textSpan = {
+                    fileName: source.fileName,
+                    textSpan: { start: 0, length: 0 },
+                };
+            }
+        }
         if (!textSpan)
             return;
         const contextSpan = transformSpan(documentSpan.fileName, documentSpan.contextSpan);
@@ -259,9 +241,15 @@ function createLanguageService(core, ts, sys) {
             return;
         if (!textSpan)
             return;
-        const [virtualFile, source] = core.virtualFiles.getVirtualFile(fileName);
+        const [virtualFile, source] = getVirtualFile(fileName);
         if (virtualFile && source) {
-            for (const [_, [sourceSnapshot, map]] of core.virtualFiles.getMaps(virtualFile)) {
+            if (isTsPlugin) {
+                textSpan = {
+                    start: textSpan.start - source.snapshot.getLength(),
+                    length: textSpan.length,
+                };
+            }
+            for (const [_, [sourceSnapshot, map]] of virtualFiles.getMaps(virtualFile)) {
                 if (source.snapshot !== sourceSnapshot)
                     continue;
                 const sourceLoc = map.toSourceOffset(textSpan.start);
@@ -283,8 +271,26 @@ function createLanguageService(core, ts, sys) {
             };
         }
     }
+    function getVirtualFile(fileName) {
+        if (isTsPlugin) {
+            let result;
+            const source = virtualFiles.getSource(fileName);
+            if (source) {
+                (0, language_core_1.forEachEmbeddedFile)(source.root, file => {
+                    const ext = file.fileName.replace(fileName, '');
+                    if (file.kind === language_core_1.FileKind.TypeScriptHostFile && (ext === '.d.ts' || ext.match(/^\.(js|ts)x?$/))) {
+                        result = file;
+                    }
+                });
+            }
+            return [result, source];
+        }
+        else {
+            return virtualFiles.getVirtualFile(fileName);
+        }
+    }
 }
-exports.createLanguageService = createLanguageService;
+exports.decorateLanguageService = decorateLanguageService;
 function notEmpty(value) {
     return value !== null && value !== undefined;
 }

package/out/languageServiceHost.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLanguageServiceHost = void 0;
 const path_1 = require("path");
+const utilities_1 = require("./typescript/utilities");
 function createLanguageServiceHost(ctx, ts, sys) {
     let lastProjectVersion;
     let tsProjectVersion = 0;
@@ -31,9 +32,12 @@ function createLanguageServiceHost(ctx, ts, sys) {
                 return snapshot.getText(0, snapshot.getLength());
             }
         },
+        readDirectory,
+        getDirectories,
+        directoryExists,
         fileExists,
         getProjectVersion: () => {
-            return tsProjectVersion.toString() + ':' + sys.version;
+            return tsProjectVersion + ':' + sys.version;
         },
         getTypeRootsVersion: () => {
             return sys.version ?? -1; // TODO: only update for /node_modules changes?
@@ -99,6 +103,54 @@ function createLanguageServiceHost(ctx, ts, sys) {
         oldTsVirtualFileSnapshots = newTsVirtualFileSnapshots;
         oldOtherVirtualFileSnapshots = newOtherVirtualFileSnapshots;
     }
+    function readDirectory(dirName, extensions, excludes, includes, depth) {
+        let matches = (0, utilities_1.matchFiles)(dirName, extensions, excludes, includes, sys?.useCaseSensitiveFileNames ?? false, ctx.host.getCurrentDirectory(), depth, (dirPath) => {
+            const files = [];
+            for (const fileName of getScriptFileNames()) {
+                if (fileName.toLowerCase().startsWith(dirPath.toLowerCase())) {
+                    const baseName = fileName.substring(dirPath.length);
+                    if (baseName.indexOf('/') === -1) {
+                        files.push(baseName);
+                    }
+                }
+            }
+            return {
+                files,
+                directories: getVirtualFileDirectories(dirPath),
+            };
+        }, sys?.realpath ? (path => sys.realpath(path)) : (path => path));
+        if (ctx) {
+            matches = matches.map(match => {
+                const [_, source] = ctx.virtualFiles.getVirtualFile(match);
+                if (source) {
+                    return source.fileName;
+                }
+                return match;
+            });
+        }
+        return [...new Set([
+                ...matches,
+                ...sys.readDirectory(dirName, extensions, excludes, includes, depth),
+            ])];
+    }
+    function getDirectories(dirName) {
+        return [...new Set([
+                ...getVirtualFileDirectories(dirName),
+                ...sys.getDirectories(dirName),
+            ])];
+    }
+    function getVirtualFileDirectories(dirName) {
+        const names = new Set();
+        for (const fileName of getScriptFileNames()) {
+            if (fileName.toLowerCase().startsWith(dirName.toLowerCase())) {
+                const path = fileName.substring(dirName.length);
+                if (path.indexOf('/') >= 0) {
+                    names.add(path.split('/')[0]);
+                }
+            }
+        }
+        return [...names];
+    }
     function getScriptFileNames() {
         const tsFileNames = new Set();
         for (const { root } of ctx.virtualFiles.allSources()) {
@@ -159,6 +211,12 @@ function createLanguageServiceHost(ctx, ts, sys) {
         // fs files
         return sys.getModifiedTime?.(fileName)?.valueOf().toString() ?? '';
     }
+    function directoryExists(dirName) {
+        if (getScriptFileNames().some(fileName => fileName.toLowerCase().startsWith(dirName.toLowerCase()))) {
+            return true;
+        }
+        return sys.directoryExists(dirName);
+    }
     function fileExists(fileName) {
         // fill external virtual files
         const ext = fileName.substring(fileName.lastIndexOf('.'));

package/out/serverPlugin.d.ts

@@ -0,0 +1,3 @@
+import { VirtualFiles } from '@volar/language-core';
+import type * as ts from 'typescript/lib/tsserverlibrary';
+export declare function decorateLanguageServiceHost(virtualFiles: VirtualFiles, languageServiceHost: ts.LanguageServiceHost, ts: typeof import('typescript/lib/tsserverlibrary'), exts: string[]): void;

package/out/serverPlugin.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decorateLanguageServiceHost = void 0;
+const language_core_1 = require("@volar/language-core");
+function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts) {
+    const scripts = new Map();
+    const resolveModuleNameLiterals = languageServiceHost.resolveModuleNameLiterals?.bind(languageServiceHost);
+    const resolveModuleNames = languageServiceHost.resolveModuleNames?.bind(languageServiceHost);
+    const getScriptSnapshot = languageServiceHost.getScriptSnapshot.bind(languageServiceHost);
+    if (resolveModuleNameLiterals) {
+        languageServiceHost.resolveModuleNameLiterals = (moduleNames, containingFile, redirectedReference, options, ...rest) => {
+            const resolvedModules = resolveModuleNameLiterals(moduleNames, containingFile, redirectedReference, options, ...rest);
+            return moduleNames.map((name, i) => {
+                if (exts.some(ext => name.text.endsWith(ext))) {
+                    return resolveModuleName(name.text, containingFile, options, redirectedReference);
+                }
+                return resolvedModules[i];
+            });
+        };
+    }
+    else if (resolveModuleNames) {
+        languageServiceHost.resolveModuleNames = (moduleNames, containingFile, reusedNames, redirectedReference, options, containingSourceFile) => {
+            const resolvedModules = resolveModuleNames(moduleNames, containingFile, reusedNames, redirectedReference, options, containingSourceFile);
+            return moduleNames.map((name, i) => {
+                if (exts.some(ext => name.endsWith(ext))) {
+                    return resolveModuleName(name, containingFile, options, redirectedReference).resolvedModule;
+                }
+                return resolvedModules[i];
+            });
+        };
+    }
+    languageServiceHost.getScriptSnapshot = (fileName) => {
+        if (scripts.has(fileName)) {
+            updateScript(fileName);
+        }
+        return scripts.get(fileName)?.snapshot ?? getScriptSnapshot(fileName);
+    };
+    function resolveModuleName(name, containingFile, options, redirectedReference) {
+        const resolved = ts.resolveModuleName(name, containingFile, options, {
+            readFile(fileName) {
+                return languageServiceHost.readFile(fileName);
+            },
+            fileExists(fileName) {
+                if (exts.some(ext => fileName.endsWith(ext + '.d.ts'))) {
+                    return languageServiceHost.fileExists(fileName.slice(0, -'.d.ts'.length));
+                }
+                return languageServiceHost.fileExists(fileName);
+            },
+        }, undefined, redirectedReference);
+        if (resolved.resolvedModule) {
+            resolved.resolvedModule.resolvedFileName = resolved.resolvedModule.resolvedFileName.slice(0, -'.d.ts'.length);
+            const script = updateScript(resolved.resolvedModule.resolvedFileName);
+            if (script) {
+                resolved.resolvedModule.extension = script.extension;
+            }
+        }
+        return resolved;
+    }
+    function updateScript(fileName) {
+        const version = languageServiceHost.getScriptVersion(fileName);
+        if (version !== scripts.get(fileName)?.version) {
+            const text = languageServiceHost.readFile(fileName);
+            let snapshot;
+            let extension = '.ts';
+            if (text !== undefined) {
+                const virtualFile = virtualFiles.updateSource(fileName, ts.ScriptSnapshot.fromString(text), undefined);
+                if (virtualFile) {
+                    let patchedText = text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
+                    (0, language_core_1.forEachEmbeddedFile)(virtualFile, file => {
+                        const ext = file.fileName.replace(fileName, '');
+                        if (file.kind === language_core_1.FileKind.TypeScriptHostFile && (ext === '.d.ts' || ext.match(/^\.(js|ts)x?$/))) {
+                            extension = ext;
+                            patchedText += file.snapshot.getText(0, file.snapshot.getLength());
+                        }
+                    });
+                    snapshot = ts.ScriptSnapshot.fromString(patchedText);
+                }
+            }
+            else {
+                virtualFiles.deleteSource(fileName);
+            }
+            scripts.set(fileName, {
+                version,
+                snapshot,
+                extension,
+            });
+        }
+        return scripts.get(fileName);
+    }
+}
+exports.decorateLanguageServiceHost = decorateLanguageServiceHost;
+//# sourceMappingURL=serverPlugin.js.map

package/out/sys.d.ts

@@ -1,7 +1,7 @@
-import type { ServiceEnvironment, Disposable, LanguageContext } from '@volar/language-service';
+import type { ServiceEnvironment, Disposable } from '@volar/language-service';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import { IDtsHost } from './dtsHost';
-export declare function createSys(ctx: LanguageContext | undefined, ts: typeof import('typescript/lib/tsserverlibrary'), env: ServiceEnvironment, dtsHost?: IDtsHost): ts.System & {
+export declare function createSys(ts: typeof import('typescript/lib/tsserverlibrary'), env: ServiceEnvironment, dtsHost?: IDtsHost): ts.System & {
     version: number;
     sync(): Promise<number>;
 } & Disposable;

package/out/sys.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSys = void 0;
-const language_core_1 = require("@volar/language-core");
 const path_1 = require("path");
 const utilities_1 = require("./typescript/utilities");
 const dtsHost_1 = require("./dtsHost");
 let currentCwd = '';
-function createSys(ctx, ts, env, dtsHost) {
+function createSys(ts, env, dtsHost) {
     let version = 0;
     const rootPath = env.uriToFileName(env.rootUri.toString());
     const sys = ts.sys;
@@ -150,16 +149,16 @@ function createSys(ctx, ts, env, dtsHost) {
                 promises.add(promise);
                 result.then(result => {
                     promises.delete(promise);
-                    file.exists = result?.type === 1 || result?.type === 64;
+                    file.exists = result?.type === 1;
                     if (file.exists) {
                         const time = Date.now();
-                        file.modifiedTime = time !== file.modifiedTime ? time : time + 1;
+                        file.modifiedTime = time !== file.modifiedTime ? time : file.modifiedTime + 1;
                         version++;
                     }
                 });
             }
             else {
-                file.exists = result?.type === 1 || result?.type === 64;
+                file.exists = result?.type === 1;
             }
         }
         return file.exists;
@@ -173,40 +172,15 @@ function createSys(ctx, ts, env, dtsHost) {
     }
     function readDirectory(dirName, extensions, excludes, includes, depth) {
         dirName = resolvePath(dirName);
-        let matches = (0, utilities_1.matchFiles)(dirName, extensions, excludes, includes, sys?.useCaseSensitiveFileNames ?? false, rootPath, depth, (dirPath) => {
+        const matches = (0, utilities_1.matchFiles)(dirName, extensions, excludes, includes, sys?.useCaseSensitiveFileNames ?? false, rootPath, depth, (dirPath) => {
             dirPath = resolvePath(dirPath);
             readDirectoryWorker(dirPath);
             const dir = getDir(dirPath);
-            const virtualFiles = [];
-            if (ctx) {
-                for (const { root } of ctx.virtualFiles.allSources()) {
-                    (0, language_core_1.forEachEmbeddedFile)(root, file => {
-                        if (file.kind === language_core_1.FileKind.TypeScriptHostFile) {
-                            const fileDirName = path_1.posix.dirname(file.fileName);
-                            if (fileDirName.toLowerCase() === dirPath.toLowerCase()) {
-                                virtualFiles.push(path_1.posix.basename(file.fileName));
-                            }
-                        }
-                    });
-                }
-            }
             return {
-                files: [
-                    ...[...Object.entries(dir.files)].filter(([_, file]) => file.exists).map(([name]) => name),
-                    ...virtualFiles,
-                ],
+                files: [...Object.entries(dir.files)].filter(([_, file]) => file.exists).map(([name]) => name),
                 directories: [...Object.entries(dir.dirs)].filter(([_, dir]) => dir.exists).map(([name]) => name),
             };
         }, sys?.realpath ? (path => sys.realpath(path)) : (path => path));
-        if (ctx) {
-            matches = matches.map(match => {
-                const [_, source] = ctx.virtualFiles.getVirtualFile(match);
-                if (source) {
-                    return source.fileName;
-                }
-                return match;
-            });
-        }
         return [...new Set(matches)];
     }
     function readFileWorker(fileName, encoding, dir) {
@@ -254,30 +228,57 @@ function createSys(ctx, ts, env, dtsHost) {
             return;
         }
         dir.requested = true;
-        const uri = env.fileNameToUri(dirName);
         const result = dirName.startsWith('/node_modules/') && dtsHost
             ? dtsHost.readDirectory(dirName)
-            : env.fs?.readDirectory(uri);
+            : env.fs?.readDirectory(env.fileNameToUri(dirName || '.'));
         if (typeof result === 'object' && 'then' in result) {
             const promise = result;
             promises.add(promise);
             result.then((result) => {
                 promises.delete(promise);
-                if (onReadDirectoryResult(dir, result)) {
+                if (onReadDirectoryResult(dirName, dir, result)) {
                     version++;
                 }
             });
         }
         else {
-            onReadDirectoryResult(dir, result ?? []);
+            onReadDirectoryResult(dirName, dir, result ?? []);
         }
     }
-    function onReadDirectoryResult(dir, result) {
+    function onReadDirectoryResult(dirName, dir, result) {
         // See https://github.com/microsoft/TypeScript/blob/e1a9290051a3b0cbdfbadc3adbcc155a4641522a/src/compiler/sys.ts#L1853-L1857
         result = result.filter(([name]) => name !== '.' && name !== '..');
         let updated = false;
-        for (const [name, fileType] of result) {
-            if (fileType === 1 || fileType === 64) {
+        for (const [name, _fileType] of result) {
+            let fileType = _fileType;
+            if (fileType === 64) {
+                const stat = env.fs?.stat(env.fileNameToUri(dirName + '/' + name));
+                if (typeof stat === 'object' && 'then' in stat) {
+                    const promise = stat;
+                    promises.add(promise);
+                    stat.then((stat) => {
+                        promises.delete(promise);
+                        if (stat?.type === 1) {
+                            dir.files[name] ??= {};
+                            if (!dir.files[name].exists) {
+                                dir.files[name].exists = true;
+                                version++;
+                            }
+                        }
+                        else if (stat?.type === 2) {
+                            const childDir = getDirFromDir(dir, name);
+                            if (!childDir.exists) {
+                                childDir.exists = true;
+                                version++;
+                            }
+                        }
+                    });
+                }
+                else if (stat) {
+                    fileType = stat.type;
+                }
+            }
+            if (fileType === 1) {
                 dir.files[name] ??= {};
                 if (!dir.files[name].exists) {
                     dir.files[name].exists = true;
@@ -298,9 +299,9 @@ function createSys(ctx, ts, env, dtsHost) {
         const dirNames = [];
         let currentDirPath = dirName;
         let currentDirName = path_1.posix.basename(currentDirPath);
-        let lastDirName;
-        while (lastDirName !== currentDirName) {
-            lastDirName = currentDirName;
+        let lastDirPath;
+        while (lastDirPath !== currentDirPath) {
+            lastDirPath = currentDirPath;
             dirNames.push(currentDirName);
             currentDirPath = path_1.posix.dirname(currentDirPath);
             currentDirName = path_1.posix.basename(currentDirPath);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "1.7.6",
+	"version": "1.7.8",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,10 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.7.6"
+		"@volar/language-core": "1.7.8"
 	},
 	"devDependencies": {
-		"@volar/language-service": "1.7.6"
+		"@volar/language-service": "1.7.8"
 	},
-	"gitHead": "b2dbe05318c06658ae97a65f9bc6d1badc55a81b"
+	"gitHead": "e7c1b16e5c78702de6986eafa17ae96000ffe0cb"
 }