@volar/typescript 2.4.0-alpha.0 → 2.4.0-alpha.10

package/index.d.ts

@@ -1,5 +1,5 @@
 export * from './lib/common';
-export * from './lib/node/decorateLanguageService';
+export * from './lib/node/proxyLanguageService';
 export * from './lib/node/decorateLanguageServiceHost';
 export * from './lib/node/decorateProgram';
 export * from './lib/node/proxyCreateProgram';
@@ -7,8 +7,9 @@ export * from './lib/protocol/createProject';
 export * from './lib/protocol/createSys';
 import type { VirtualCode } from '@volar/language-core';
 import type * as ts from 'typescript';
-declare module '@volar/language-core' {
-    interface Language<T> {
+import { URI } from 'vscode-uri';
+declare module '@volar/language-service' {
+    interface ProjectContext {
         typescript?: {
             configFileName: string | undefined;
             sys: ts.System & {
@@ -17,27 +18,29 @@ declare module '@volar/language-core' {
             };
             languageServiceHost: ts.LanguageServiceHost;
             getExtraServiceScript(fileName: string): TypeScriptExtraServiceScript | undefined;
-            asScriptId(fileName: string): T;
-            asFileName(scriptId: T): string;
+            asUri(fileName: string): URI;
+            asFileName(uri: URI): string;
         };
     }
-    interface LanguagePlugin<T = unknown, K extends VirtualCode = VirtualCode> {
-        typescript?: TypeScriptGenericOptions<K> & TypeScriptNonTSPluginOptions<K>;
+}
+declare module '@volar/language-core' {
+    interface LanguagePlugin {
+        typescript?: TypeScriptGenericOptions & TypeScriptNonTSPluginOptions;
     }
 }
 /**
  * The following options available to all situations.
  */
-interface TypeScriptGenericOptions<K> {
+interface TypeScriptGenericOptions {
     extraFileExtensions: ts.FileExtensionInfo[];
     resolveHiddenExtensions?: boolean;
-    getServiceScript(root: K): TypeScriptServiceScript | undefined;
+    getServiceScript(root: VirtualCode): TypeScriptServiceScript | undefined;
 }
 /**
  * The following options will not be available in TS plugin.
  */
-interface TypeScriptNonTSPluginOptions<K> {
-    getExtraServiceScripts?(fileName: string, rootVirtualCode: K): TypeScriptExtraServiceScript[];
+interface TypeScriptNonTSPluginOptions {
+    getExtraServiceScripts?(fileName: string, root: VirtualCode): TypeScriptExtraServiceScript[];
     resolveLanguageServiceHost?(host: ts.LanguageServiceHost): ts.LanguageServiceHost;
 }
 export interface TypeScriptServiceScript {

package/index.js

@@ -15,7 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./lib/common"), exports);
-__exportStar(require("./lib/node/decorateLanguageService"), exports);
+__exportStar(require("./lib/node/proxyLanguageService"), exports);
 __exportStar(require("./lib/node/decorateLanguageServiceHost"), exports);
 __exportStar(require("./lib/node/decorateProgram"), exports);
 __exportStar(require("./lib/node/proxyCreateProgram"), exports);

package/lib/node/decorateLanguageServiceHost.js

@@ -28,7 +28,7 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost) {
         };
     }
     if (pluginExtensions.length) {
-        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, language.plugins, fileName => language.scripts.get(fileName));
+        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, ts.sys.getFileSize, languageServiceHost, language.plugins, fileName => language.scripts.get(fileName));
         const getCanonicalFileName = languageServiceHost.useCaseSensitiveFileNames?.()
             ? (fileName) => fileName
             : (fileName) => fileName.toLowerCase();

package/lib/node/proxyCreateProgram.js

@@ -144,7 +144,7 @@ function proxyCreateProgram(ts, original, create) {
             };
             if (extensions.length) {
                 options.options.allowArbitraryExtensions = true;
-                const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, originalHost, language.plugins, fileName => language.scripts.get(fileName));
+                const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, ts.sys.getFileSize, originalHost, language.plugins, fileName => language.scripts.get(fileName));
                 const resolveModuleNameLiterals = originalHost.resolveModuleNameLiterals;
                 const resolveModuleNames = originalHost.resolveModuleNames;
                 options.host.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, compilerOptions, ...rest) => {

package/lib/node/proxyLanguageService.d.ts

@@ -0,0 +1,6 @@
+import { Language } from '@volar/language-core';
+import type * as ts from 'typescript';
+export declare function createProxyLanguageService(languageService: ts.LanguageService): {
+    initialize(language: Language<string>): void;
+    proxy: ts.LanguageService;
+};

package/lib/node/{decorateLanguageService.js → proxyLanguageService.js}

@@ -1,15 +1,76 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decorateLanguageService = decorateLanguageService;
+exports.createProxyLanguageService = createProxyLanguageService;
 const language_core_1 = require("@volar/language-core");
 const dedupe_1 = require("./dedupe");
 const transform_1 = require("./transform");
 const utils_1 = require("./utils");
 const windowsPathReg = /\\/g;
-function decorateLanguageService(language, languageService) {
-    // ignored methods
-    const { getNavigationTree, getOutliningSpans, } = languageService;
-    languageService.getNavigationTree = filePath => {
+function createProxyLanguageService(languageService) {
+    const proxyCache = new Map();
+    let getProxyMethod;
+    return {
+        initialize(language) {
+            getProxyMethod = (target, p) => {
+                switch (p) {
+                    case 'getNavigationTree': return getNavigationTree(language, target[p]);
+                    case 'getOutliningSpans': return getOutliningSpans(language, target[p]);
+                    case 'getFormattingEditsForDocument': return getFormattingEditsForDocument(language, target[p]);
+                    case 'getFormattingEditsForRange': return getFormattingEditsForRange(language, target[p]);
+                    case 'getFormattingEditsAfterKeystroke': return getFormattingEditsAfterKeystroke(language, target[p]);
+                    case 'getEditsForFileRename': return getEditsForFileRename(language, target[p]);
+                    case 'getLinkedEditingRangeAtPosition': return getLinkedEditingRangeAtPosition(language, target[p]);
+                    case 'prepareCallHierarchy': return prepareCallHierarchy(language, target[p]);
+                    case 'provideCallHierarchyIncomingCalls': return provideCallHierarchyIncomingCalls(language, target[p]);
+                    case 'provideCallHierarchyOutgoingCalls': return provideCallHierarchyOutgoingCalls(language, target[p]);
+                    case 'organizeImports': return organizeImports(language, target[p]);
+                    case 'getQuickInfoAtPosition': return getQuickInfoAtPosition(language, target[p]);
+                    case 'getSignatureHelpItems': return getSignatureHelpItems(language, target[p]);
+                    case 'getDocumentHighlights': return getDocumentHighlights(language, target[p]);
+                    case 'getApplicableRefactors': return getApplicableRefactors(language, target[p]);
+                    case 'getEditsForRefactor': return getEditsForRefactor(language, target[p]);
+                    case 'getRenameInfo': return getRenameInfo(language, target[p]);
+                    case 'getCodeFixesAtPosition': return getCodeFixesAtPosition(language, target[p]);
+                    case 'getEncodedSemanticClassifications': return getEncodedSemanticClassifications(language, target[p]);
+                    case 'getSyntacticDiagnostics': return getSyntacticDiagnostics(language, languageService, target[p]);
+                    case 'getSemanticDiagnostics': return getSemanticDiagnostics(language, languageService, target[p]);
+                    case 'getSuggestionDiagnostics': return getSuggestionDiagnostics(language, languageService, target[p]);
+                    case 'getDefinitionAndBoundSpan': return getDefinitionAndBoundSpan(language, target[p]);
+                    case 'findReferences': return findReferences(language, target[p]);
+                    case 'getDefinitionAtPosition': return getDefinitionAtPosition(language, target[p]);
+                    case 'getTypeDefinitionAtPosition': return getTypeDefinitionAtPosition(language, target[p]);
+                    case 'getImplementationAtPosition': return getImplementationAtPosition(language, target[p]);
+                    case 'findRenameLocations': return findRenameLocations(language, target[p]);
+                    case 'getReferencesAtPosition': return getReferencesAtPosition(language, target[p]);
+                    case 'getCompletionsAtPosition': return getCompletionsAtPosition(language, target[p]);
+                    case 'getCompletionEntryDetails': return getCompletionEntryDetails(language, target[p]);
+                    case 'provideInlayHints': return provideInlayHints(language, target[p]);
+                    case 'getFileReferences': return getFileReferences(language, target[p]);
+                }
+            };
+        },
+        proxy: new Proxy(languageService, {
+            get(target, p, receiver) {
+                if (getProxyMethod) {
+                    if (!proxyCache.has(p)) {
+                        proxyCache.set(p, getProxyMethod(target, p));
+                    }
+                    const proxyMethod = proxyCache.get(p);
+                    if (proxyMethod) {
+                        return proxyMethod;
+                    }
+                }
+                return Reflect.get(target, p, receiver);
+            },
+            set(target, p, value, receiver) {
+                return Reflect.set(target, p, value, receiver);
+            },
+        }),
+    };
+}
+// ignored methods
+function getNavigationTree(language, getNavigationTree) {
+    return filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript || targetScript?.associatedOnly) {
@@ -21,7 +82,9 @@ function decorateLanguageService(language, languageService) {
             return getNavigationTree(fileName);
         }
     };
-    languageService.getOutliningSpans = filePath => {
+}
+function getOutliningSpans(language, getOutliningSpans) {
+    return filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (serviceScript || targetScript?.associatedOnly) {
@@ -31,9 +94,10 @@ function decorateLanguageService(language, languageService) {
             return getOutliningSpans(fileName);
         }
     };
-    // methods
-    const { findReferences, findRenameLocations, getCompletionEntryDetails, getCompletionsAtPosition, getDefinitionAndBoundSpan, getDefinitionAtPosition, getFileReferences, getFormattingEditsForDocument, getFormattingEditsForRange, getFormattingEditsAfterKeystroke, getImplementationAtPosition, getLinkedEditingRangeAtPosition, getQuickInfoAtPosition, getSignatureHelpItems, getReferencesAtPosition, getSemanticDiagnostics, getSyntacticDiagnostics, getSuggestionDiagnostics, getTypeDefinitionAtPosition, getEncodedSemanticClassifications, getDocumentHighlights, getApplicableRefactors, getEditsForFileRename, getEditsForRefactor, getRenameInfo, getCodeFixesAtPosition, prepareCallHierarchy, provideCallHierarchyIncomingCalls, provideCallHierarchyOutgoingCalls, provideInlayHints, organizeImports, } = languageService;
-    languageService.getFormattingEditsForDocument = (filePath, options) => {
+}
+// proxy methods
+function getFormattingEditsForDocument(language, getFormattingEditsForDocument) {
+    return (filePath, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -53,7 +117,9 @@ function decorateLanguageService(language, languageService) {
             return getFormattingEditsForDocument(fileName, options);
         }
     };
-    languageService.getFormattingEditsForRange = (filePath, start, end, options) => {
+}
+function getFormattingEditsForRange(language, getFormattingEditsForRange) {
+    return (filePath, start, end, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -74,7 +140,9 @@ function decorateLanguageService(language, languageService) {
             return getFormattingEditsForRange(fileName, start, end, options);
         }
     };
-    languageService.getFormattingEditsAfterKeystroke = (filePath, position, key, options) => {
+}
+function getFormattingEditsAfterKeystroke(language, getFormattingEditsAfterKeystroke) {
+    return (filePath, position, key, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -94,11 +162,15 @@ function decorateLanguageService(language, languageService) {
             return getFormattingEditsAfterKeystroke(fileName, position, key, options);
         }
     };
-    languageService.getEditsForFileRename = (oldFilePath, newFilePath, formatOptions, preferences) => {
+}
+function getEditsForFileRename(language, getEditsForFileRename) {
+    return (oldFilePath, newFilePath, formatOptions, preferences) => {
         const edits = getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences);
         return (0, transform_1.transformFileTextChanges)(language, edits, language_core_1.isRenameEnabled);
     };
-    languageService.getLinkedEditingRangeAtPosition = (filePath, position) => {
+}
+function getLinkedEditingRangeAtPosition(language, getLinkedEditingRangeAtPosition) {
+    return (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -122,7 +194,9 @@ function decorateLanguageService(language, languageService) {
             return getLinkedEditingRangeAtPosition(fileName, position);
         }
     };
-    languageService.prepareCallHierarchy = (filePath, position) => {
+}
+function prepareCallHierarchy(language, prepareCallHierarchy) {
+    return (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -144,7 +218,9 @@ function decorateLanguageService(language, languageService) {
             return prepareCallHierarchy(fileName, position);
         }
     };
-    languageService.provideCallHierarchyIncomingCalls = (filePath, position) => {
+}
+function provideCallHierarchyIncomingCalls(language, provideCallHierarchyIncomingCalls) {
+    return (filePath, position) => {
         let calls = [];
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
@@ -172,7 +248,9 @@ function decorateLanguageService(language, languageService) {
             };
         });
     };
-    languageService.provideCallHierarchyOutgoingCalls = (filePath, position) => {
+}
+function provideCallHierarchyOutgoingCalls(language, provideCallHierarchyOutgoingCalls) {
+    return (filePath, position) => {
         let calls = [];
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
@@ -202,11 +280,15 @@ function decorateLanguageService(language, languageService) {
             };
         });
     };
-    languageService.organizeImports = (args, formatOptions, preferences) => {
+}
+function organizeImports(language, organizeImports) {
+    return (args, formatOptions, preferences) => {
         const unresolved = organizeImports(args, formatOptions, preferences);
         return (0, transform_1.transformFileTextChanges)(language, unresolved, language_core_1.isCodeActionsEnabled);
     };
-    languageService.getQuickInfoAtPosition = (filePath, position) => {
+}
+function getQuickInfoAtPosition(language, getQuickInfoAtPosition) {
+    return (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -269,7 +351,9 @@ function decorateLanguageService(language, languageService) {
             return getQuickInfoAtPosition(fileName, position);
         }
     };
-    languageService.getSignatureHelpItems = (filePath, position, options) => {
+}
+function getSignatureHelpItems(language, getSignatureHelpItems) {
+    return (filePath, position, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -294,9 +378,11 @@ function decorateLanguageService(language, languageService) {
             return getSignatureHelpItems(fileName, position, options);
         }
     };
-    languageService.getDocumentHighlights = (filePath, position, filesToSearch) => {
+}
+function getDocumentHighlights(language, getDocumentHighlights) {
+    return (filePath, position, filesToSearch) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isHighlightEnabled, (fileName, position) => getDocumentHighlights(fileName, position, filesToSearch), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(language, fileName, position, language_core_1.isHighlightEnabled, (fileName, position) => getDocumentHighlights(fileName, position, filesToSearch), function* (result) {
             for (const ref of result) {
                 for (const reference of ref.highlightSpans) {
                     yield [reference.fileName ?? ref.fileName, reference.textSpan.start];
@@ -324,7 +410,9 @@ function decorateLanguageService(language, languageService) {
         });
         return resolved;
     };
-    languageService.getApplicableRefactors = (filePath, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions) => {
+}
+function getApplicableRefactors(language, getApplicableRefactors) {
+    return (filePath, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -348,7 +436,9 @@ function decorateLanguageService(language, languageService) {
             return getApplicableRefactors(fileName, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions);
         }
     };
-    languageService.getEditsForRefactor = (filePath, formatOptions, positionOrRange, refactorName, actionName, preferences) => {
+}
+function getEditsForRefactor(language, getEditsForRefactor) {
+    return (filePath, formatOptions, positionOrRange, refactorName, actionName, preferences) => {
         let edits;
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
@@ -376,7 +466,9 @@ function decorateLanguageService(language, languageService) {
             return edits;
         }
     };
-    languageService.getRenameInfo = (filePath, position, options) => {
+}
+function getRenameInfo(language, getRenameInfo) {
+    return (filePath, position, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -412,7 +504,9 @@ function decorateLanguageService(language, languageService) {
             return getRenameInfo(fileName, position, options);
         }
     };
-    languageService.getCodeFixesAtPosition = (filePath, start, end, errorCodes, formatOptions, preferences) => {
+}
+function getCodeFixesAtPosition(language, getCodeFixesAtPosition) {
+    return (filePath, start, end, errorCodes, formatOptions, preferences) => {
         let fixes = [];
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
@@ -435,7 +529,9 @@ function decorateLanguageService(language, languageService) {
         });
         return fixes;
     };
-    languageService.getEncodedSemanticClassifications = (filePath, span, format) => {
+}
+function getEncodedSemanticClassifications(language, getEncodedSemanticClassifications) {
+    return (filePath, span, format) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -477,7 +573,9 @@ function decorateLanguageService(language, languageService) {
             return getEncodedSemanticClassifications(fileName, span, format);
         }
     };
-    languageService.getSyntacticDiagnostics = filePath => {
+}
+function getSyntacticDiagnostics(language, languageService, getSyntacticDiagnostics) {
+    return filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -488,7 +586,9 @@ function decorateLanguageService(language, languageService) {
             .filter(d => !!d)
             .filter(d => !serviceScript || language.scripts.get(d.file.fileName) === sourceScript);
     };
-    languageService.getSemanticDiagnostics = filePath => {
+}
+function getSemanticDiagnostics(language, languageService, getSemanticDiagnostics) {
+    return filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -499,7 +599,9 @@ function decorateLanguageService(language, languageService) {
             .filter(d => !!d)
             .filter(d => !serviceScript || !d.file || language.scripts.get(d.file.fileName) === sourceScript);
     };
-    languageService.getSuggestionDiagnostics = filePath => {
+}
+function getSuggestionDiagnostics(language, languageService, getSuggestionDiagnostics) {
+    return filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -510,9 +612,11 @@ function decorateLanguageService(language, languageService) {
             .filter(d => !!d)
             .filter(d => !serviceScript || !d.file || language.scripts.get(d.file.fileName) === sourceScript);
     };
-    languageService.getDefinitionAndBoundSpan = (filePath, position) => {
+}
+function getDefinitionAndBoundSpan(language, getDefinitionAndBoundSpan) {
+    return (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isDefinitionEnabled, (fileName, position) => getDefinitionAndBoundSpan(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(language, fileName, position, language_core_1.isDefinitionEnabled, (fileName, position) => getDefinitionAndBoundSpan(fileName, position), function* (result) {
             for (const ref of result.definitions ?? []) {
                 yield [ref.fileName, ref.textSpan.start];
             }
@@ -534,9 +638,11 @@ function decorateLanguageService(language, languageService) {
             definitions: (0, dedupe_1.dedupeDocumentSpans)(definitions),
         };
     };
-    languageService.findReferences = (filePath, position) => {
+}
+function findReferences(language, findReferences) {
+    return (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isReferencesEnabled, (fileName, position) => findReferences(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(language, fileName, position, language_core_1.isReferencesEnabled, (fileName, position) => findReferences(fileName, position), function* (result) {
             for (const ref of result) {
                 for (const reference of ref.references) {
                     yield [reference.fileName, reference.textSpan.start];
@@ -556,9 +662,11 @@ function decorateLanguageService(language, languageService) {
         });
         return resolved;
     };
-    languageService.getDefinitionAtPosition = (filePath, position) => {
+}
+function getDefinitionAtPosition(language, getDefinitionAtPosition) {
+    return (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isDefinitionEnabled, (fileName, position) => getDefinitionAtPosition(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(language, fileName, position, language_core_1.isDefinitionEnabled, (fileName, position) => getDefinitionAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
             }
@@ -569,9 +677,11 @@ function decorateLanguageService(language, languageService) {
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
-    languageService.getTypeDefinitionAtPosition = (filePath, position) => {
+}
+function getTypeDefinitionAtPosition(language, getTypeDefinitionAtPosition) {
+    return (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isTypeDefinitionEnabled, (fileName, position) => getTypeDefinitionAtPosition(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(language, fileName, position, language_core_1.isTypeDefinitionEnabled, (fileName, position) => getTypeDefinitionAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
             }
@@ -582,9 +692,11 @@ function decorateLanguageService(language, languageService) {
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
-    languageService.getImplementationAtPosition = (filePath, position) => {
+}
+function getImplementationAtPosition(language, getImplementationAtPosition) {
+    return (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isImplementationEnabled, (fileName, position) => getImplementationAtPosition(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(language, fileName, position, language_core_1.isImplementationEnabled, (fileName, position) => getImplementationAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
             }
@@ -595,9 +707,11 @@ function decorateLanguageService(language, languageService) {
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
-    languageService.findRenameLocations = (filePath, position, findInStrings, findInComments, preferences) => {
+}
+function findRenameLocations(language, findRenameLocations) {
+    return (filePath, position, findInStrings, findInComments, preferences) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isRenameEnabled, (fileName, position) => findRenameLocations(fileName, position, findInStrings, findInComments, preferences), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(language, fileName, position, language_core_1.isRenameEnabled, (fileName, position) => findRenameLocations(fileName, position, findInStrings, findInComments, preferences), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
             }
@@ -608,9 +722,11 @@ function decorateLanguageService(language, languageService) {
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
-    languageService.getReferencesAtPosition = (filePath, position) => {
+}
+function getReferencesAtPosition(language, getReferencesAtPosition) {
+    return (filePath, position) => {
         const fileName = filePath.replace(windowsPathReg, '/');
-        const unresolved = linkedCodeFeatureWorker(fileName, position, language_core_1.isReferencesEnabled, (fileName, position) => getReferencesAtPosition(fileName, position), function* (result) {
+        const unresolved = linkedCodeFeatureWorker(language, fileName, position, language_core_1.isReferencesEnabled, (fileName, position) => getReferencesAtPosition(fileName, position), function* (result) {
             for (const ref of result) {
                 yield [ref.fileName, ref.textSpan.start];
             }
@@ -621,7 +737,9 @@ function decorateLanguageService(language, languageService) {
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
-    languageService.getCompletionsAtPosition = (filePath, position, options, formattingSettings) => {
+}
+function getCompletionsAtPosition(language, getCompletionsAtPosition) {
+    return (filePath, position, options, formattingSettings) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -663,7 +781,9 @@ function decorateLanguageService(language, languageService) {
             return getCompletionsAtPosition(fileName, position, options, formattingSettings);
         }
     };
-    languageService.getCompletionEntryDetails = (filePath, position, entryName, formatOptions, source, preferences, data) => {
+}
+function getCompletionEntryDetails(language, getCompletionEntryDetails) {
+    return (filePath, position, entryName, formatOptions, source, preferences, data) => {
         let details;
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
@@ -686,7 +806,9 @@ function decorateLanguageService(language, languageService) {
         }
         return details;
     };
-    languageService.provideInlayHints = (filePath, span, preferences) => {
+}
+function provideInlayHints(language, provideInlayHints) {
+    return (filePath, span, preferences) => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
         if (targetScript?.associatedOnly) {
@@ -728,7 +850,9 @@ function decorateLanguageService(language, languageService) {
             return provideInlayHints(fileName, span, preferences);
         }
     };
-    languageService.getFileReferences = filePath => {
+}
+function getFileReferences(language, getFileReferences) {
+    return filePath => {
         const fileName = filePath.replace(windowsPathReg, '/');
         const unresolved = getFileReferences(fileName);
         const resolved = unresolved
@@ -736,43 +860,43 @@ function decorateLanguageService(language, languageService) {
             .filter(s => !!s);
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
-    function linkedCodeFeatureWorker(fileName, position, filter, worker, getLinkedCodes) {
-        const results = [];
-        const processedFilePositions = new Set();
-        const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
-        if (serviceScript) {
-            for (const [generatedOffset] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, sourceScript, position, filter)) {
-                process(targetScript.id, generatedOffset);
-            }
+}
+function linkedCodeFeatureWorker(language, fileName, position, filter, worker, getLinkedCodes) {
+    const results = [];
+    const processedFilePositions = new Set();
+    const [serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, fileName);
+    if (serviceScript) {
+        for (const [generatedOffset] of (0, transform_1.toGeneratedOffsets)(language, serviceScript, sourceScript, position, filter)) {
+            process(targetScript.id, generatedOffset);
         }
-        else {
-            process(fileName, position);
-        }
-        return results;
-        function process(fileName, position) {
-            if (processedFilePositions.has(fileName + ':' + position)) {
-                return;
-            }
-            processedFilePositions.add(fileName + ':' + position);
-            const result = worker(fileName, position);
-            if (!result) {
-                return;
-            }
-            results.push(result);
-            for (const ref of getLinkedCodes(result)) {
-                processedFilePositions.add(ref[0] + ':' + ref[1]);
-                const [serviceScript] = (0, utils_1.getServiceScript)(language, ref[0]);
-                if (!serviceScript) {
-                    continue;
-                }
-                const linkedCodeMap = language.linkedCodeMaps.get(serviceScript.code);
-                if (!linkedCodeMap) {
-                    continue;
-                }
-                const mappingOffset = (0, transform_1.getMappingOffset)(language, serviceScript);
-                for (const linkedCodeOffset of linkedCodeMap.getLinkedOffsets(ref[1] - mappingOffset)) {
-                    process(ref[0], linkedCodeOffset + mappingOffset);
-                }
+    }
+    else {
+        process(fileName, position);
+    }
+    return results;
+    function process(fileName, position) {
+        if (processedFilePositions.has(fileName + ':' + position)) {
+            return;
+        }
+        processedFilePositions.add(fileName + ':' + position);
+        const result = worker(fileName, position);
+        if (!result) {
+            return;
+        }
+        results.push(result);
+        for (const ref of getLinkedCodes(result)) {
+            processedFilePositions.add(ref[0] + ':' + ref[1]);
+            const [serviceScript] = (0, utils_1.getServiceScript)(language, ref[0]);
+            if (!serviceScript) {
+                continue;
+            }
+            const linkedCodeMap = language.linkedCodeMaps.get(serviceScript.code);
+            if (!linkedCodeMap) {
+                continue;
+            }
+            const mappingOffset = (0, transform_1.getMappingOffset)(language, serviceScript);
+            for (const linkedCodeOffset of linkedCodeMap.getLinkedOffsets(ref[1] - mappingOffset)) {
+                process(ref[0], linkedCodeOffset + mappingOffset);
             }
         }
     }
@@ -783,4 +907,4 @@ function displayPartsToString(displayParts) {
     }
     return '';
 }
-//# sourceMappingURL=decorateLanguageService.js.map
+//# sourceMappingURL=proxyLanguageService.js.map

package/lib/protocol/createProject.d.ts

@@ -4,7 +4,7 @@ import type { TypeScriptExtraServiceScript } from '../..';
 import type { createSys } from './createSys';
 export interface TypeScriptProjectHost extends Pick<ts.LanguageServiceHost, 'getLocalizedDiagnosticMessages' | 'getCurrentDirectory' | 'getCompilationSettings' | 'getProjectReferences' | 'getScriptFileNames' | 'getProjectVersion' | 'getScriptSnapshot'> {
 }
-export declare function createLanguageServiceHost<T>(ts: typeof import('typescript'), sys: ReturnType<typeof createSys> | ts.System, language: Language<T>, asScrpitId: (fileName: string) => T, projectHost: TypeScriptProjectHost): {
+export declare function createLanguageServiceHost<T>(ts: typeof import('typescript'), sys: ReturnType<typeof createSys> | ts.System, language: Language<T>, asScriptId: (fileName: string) => T, projectHost: TypeScriptProjectHost): {
     languageServiceHost: ts.LanguageServiceHost;
     getExtraServiceScript: (fileName: string) => TypeScriptExtraServiceScript | undefined;
 };

package/lib/protocol/createProject.js

@@ -4,11 +4,12 @@ exports.createLanguageServiceHost = createLanguageServiceHost;
 const language_core_1 = require("@volar/language-core");
 const path = require("path-browserify");
 const resolveModuleName_1 = require("../resolveModuleName");
-function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
+function createLanguageServiceHost(ts, sys, language, asScriptId, projectHost) {
     const scriptVersions = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
     let lastProjectVersion;
     let tsProjectVersion = 0;
     let tsFileRegistry = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
+    let tsFileDirRegistry = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
     let extraScriptRegistry = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
     let lastTsVirtualFileSnapshots = new Set();
     let lastOtherVirtualFileSnapshots = new Set();
@@ -66,6 +67,13 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
                 return snapshot.getText(0, snapshot.getLength());
             }
         },
+        directoryExists(directoryName) {
+            sync();
+            if (tsFileDirRegistry.has(directoryName)) {
+                return true;
+            }
+            return sys.directoryExists(directoryName);
+        },
         fileExists(fileName) {
             return getScriptVersion(fileName) !== '';
         },
@@ -82,7 +90,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
             if (extraScriptRegistry.has(fileName)) {
                 return extraScriptRegistry.get(fileName).scriptKind;
             }
-            const sourceScript = language.scripts.get(asScrpitId(fileName));
+            const sourceScript = language.scripts.get(asScriptId(fileName));
             if (sourceScript?.generated) {
                 const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
                 if (serviceScript) {
@@ -116,10 +124,10 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
             languageServiceHost = plugin.typescript.resolveLanguageServiceHost(languageServiceHost);
         }
     }
-    if (language.plugins.some(language => language.typescript?.extraFileExtensions.length)) {
+    if (language.plugins.some(plugin => plugin.typescript?.extraFileExtensions.length)) {
         // TODO: can this share between monorepo packages?
         const moduleCache = ts.createModuleResolutionCache(languageServiceHost.getCurrentDirectory(), languageServiceHost.useCaseSensitiveFileNames?.() ? s => s : s => s.toLowerCase(), languageServiceHost.getCompilationSettings());
-        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, language.plugins, fileName => language.scripts.get(asScrpitId(fileName)));
+        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, sys.getFileSize, languageServiceHost, language.plugins, fileName => language.scripts.get(asScriptId(fileName)));
         let lastSysVersion = 'version' in sys ? sys.version : undefined;
         languageServiceHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, sourceFile) => {
             if ('version' in sys && lastSysVersion !== sys.version) {
@@ -160,7 +168,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
         const newOtherVirtualFileSnapshots = new Set();
         const tsFileNamesSet = new Set();
         for (const fileName of projectHost.getScriptFileNames()) {
-            const sourceScript = language.scripts.get(asScrpitId(fileName));
+            const sourceScript = language.scripts.get(asScriptId(fileName));
             if (sourceScript?.generated) {
                 const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
                 if (serviceScript) {
@@ -190,8 +198,14 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
         lastTsVirtualFileSnapshots = newTsVirtualFileSnapshots;
         lastOtherVirtualFileSnapshots = newOtherVirtualFileSnapshots;
         tsFileRegistry.clear();
+        tsFileDirRegistry.clear();
         for (const fileName of tsFileNamesSet) {
             tsFileRegistry.set(fileName, true);
+            const parts = fileName.split('/');
+            for (let i = 1; i < parts.length; i++) {
+                const dirName = parts.slice(0, i).join('/');
+                tsFileDirRegistry.set(dirName, true);
+            }
         }
     }
     function getScriptSnapshot(fileName) {
@@ -199,7 +213,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
         if (extraScriptRegistry.has(fileName)) {
             return extraScriptRegistry.get(fileName).code.snapshot;
         }
-        const sourceScript = language.scripts.get(asScrpitId(fileName));
+        const sourceScript = language.scripts.get(asScriptId(fileName));
         if (sourceScript?.generated) {
             const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
             if (serviceScript) {
@@ -223,7 +237,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
             }
             return version.map.get(snapshot).toString();
         }
-        const sourceScript = language.scripts.get(asScrpitId(fileName));
+        const sourceScript = language.scripts.get(asScriptId(fileName));
         if (sourceScript?.generated) {
             const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
             if (serviceScript) {
@@ -235,7 +249,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
         }
         const isOpenedFile = !!projectHost.getScriptSnapshot(fileName);
         if (isOpenedFile) {
-            const sourceScript = language.scripts.get(asScrpitId(fileName));
+            const sourceScript = language.scripts.get(asScriptId(fileName));
             if (sourceScript && !sourceScript.generated) {
                 if (!version.map.has(sourceScript.snapshot)) {
                     version.map.set(sourceScript.snapshot, version.lastVersion++);

package/lib/quickstart/createAsyncLanguageServicePlugin.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAsyncLanguageServicePlugin = createAsyncLanguageServicePlugin;
 const language_core_1 = require("@volar/language-core");
 const common_1 = require("../common");
-const decorateLanguageService_1 = require("../node/decorateLanguageService");
+const proxyLanguageService_1 = require("../node/proxyLanguageService");
 const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
 const createLanguageServicePlugin_1 = require("./createLanguageServicePlugin");
 function createAsyncLanguageServicePlugin(extensions, scriptKind, create) {
@@ -49,6 +49,8 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, create) {
                             return getProjectVersion();
                         };
                     }
+                    const { proxy, initialize } = (0, proxyLanguageService_1.createProxyLanguageService)(info.languageService);
+                    info.languageService = proxy;
                     create(ts, info).then(({ languagePlugins, setup }) => {
                         const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
                         const language = (0, language_core_1.createLanguage)([
@@ -68,7 +70,7 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, create) {
                                 language.scripts.delete(fileName);
                             }
                         });
-                        (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
+                        initialize(language);
                         (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
                         setup?.(language);
                         if ('markAsDirty' in info.project && typeof info.project.markAsDirty === 'function') {

package/lib/quickstart/createLanguageServicePlugin.js

@@ -5,7 +5,7 @@ exports.createLanguageServicePlugin = createLanguageServicePlugin;
 exports.arrayItemsEqual = arrayItemsEqual;
 const language_core_1 = require("@volar/language-core");
 const common_1 = require("../common");
-const decorateLanguageService_1 = require("../node/decorateLanguageService");
+const proxyLanguageService_1 = require("../node/proxyLanguageService");
 const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
 exports.externalFiles = new WeakMap();
 exports.projectExternalFileExtensions = new WeakMap();
@@ -45,7 +45,9 @@ function createLanguageServicePlugin(create) {
                             language.scripts.delete(fileName);
                         }
                     });
-                    (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
+                    const { proxy, initialize } = (0, proxyLanguageService_1.createProxyLanguageService)(info.languageService);
+                    info.languageService = proxy;
+                    initialize(language);
                     (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
                     setup?.(language);
                 }

package/lib/quickstart/runTsc.d.ts

@@ -1,7 +1,7 @@
 import type * as ts from 'typescript';
 import type { Language, LanguagePlugin } from '@volar/language-core';
 export declare let getLanguagePlugins: (ts: typeof import('typescript'), options: ts.CreateProgramOptions) => LanguagePlugin<string>[] | {
-    plugins: LanguagePlugin<string>[];
+    languagePlugins: LanguagePlugin<string>[];
     setup?(language: Language<string>): void;
 };
 export declare function runTsc(tscPath: string, extensions: string[], _getLanguagePlugins: typeof getLanguagePlugins): void;

package/lib/resolveModuleName.d.ts

@@ -1,3 +1,3 @@
 import type { LanguagePlugin, SourceScript } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function createResolveModuleName<T>(ts: typeof import('typescript'), host: ts.ModuleResolutionHost, languagePlugins: LanguagePlugin<any>[], getSourceScript: (fileName: string) => SourceScript<T> | undefined): (moduleName: string, containingFile: string, compilerOptions: ts.CompilerOptions, cache?: ts.ModuleResolutionCache, redirectedReference?: ts.ResolvedProjectReference, resolutionMode?: ts.ResolutionMode) => ts.ResolvedModuleWithFailedLookupLocations;
+export declare function createResolveModuleName<T>(ts: typeof import('typescript'), getFileSize: ((fileName: string) => number) | undefined, host: ts.ModuleResolutionHost, languagePlugins: LanguagePlugin<any>[], getSourceScript: (fileName: string) => SourceScript<T> | undefined): (moduleName: string, containingFile: string, compilerOptions: ts.CompilerOptions, cache?: ts.ModuleResolutionCache, redirectedReference?: ts.ResolvedProjectReference, resolutionMode?: ts.ResolutionMode) => ts.ResolvedModuleWithFailedLookupLocations;

package/lib/resolveModuleName.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createResolveModuleName = createResolveModuleName;
-function createResolveModuleName(ts, host, languagePlugins, getSourceScript) {
+function createResolveModuleName(ts, getFileSize, host, languagePlugins, getSourceScript) {
     const toSourceFileInfo = new Map();
     const moduleResolutionHost = {
         readFile: host.readFile.bind(host),
@@ -81,7 +81,7 @@ function createResolveModuleName(ts, host, languagePlugins, getSourceScript) {
     // fix https://github.com/vuejs/language-tools/issues/3332
     function fileExists(fileName) {
         if (host.fileExists(fileName)) {
-            const fileSize = ts.sys.getFileSize?.(fileName) ?? host.readFile(fileName)?.length ?? 0;
+            const fileSize = getFileSize?.(fileName) ?? host.readFile(fileName)?.length ?? 0;
             return fileSize < 4 * 1024 * 1024;
         }
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.4.0-alpha.0",
+	"version": "2.4.0-alpha.10",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.0-alpha.0",
+		"@volar/language-core": "2.4.0-alpha.10",
 		"path-browserify": "^1.0.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.4.0-alpha.0"
+		"@volar/language-service": "2.4.0-alpha.10"
 	},
-	"gitHead": "007fc74c461e2fd3fb269bf4f3924cc23c35ba56"
+	"gitHead": "9f0cb9f2e41167baeb503e8f0eca88e9bea06269"
 }

package/lib/node/decorateLanguageService.d.ts

@@ -1,3 +0,0 @@
-import { Language } from '@volar/language-core';
-import type * as ts from 'typescript';
-export declare function decorateLanguageService(language: Language<string>, languageService: ts.LanguageService): void;