@volar/typescript 2.0.0-alpha.13 → 2.0.0-alpha.14

package/lib/node/decorateLanguageService.d.ts

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

package/lib/node/decorateLanguageService.js

@@ -8,9 +8,9 @@ const transform_1 = require("./transform");
 function decorateLanguageService(files, languageService) {
     // ignored methods
     const { getNavigationTree, getOutliningSpans, } = languageService;
-    languageService.getNavigationTree = (fileName) => {
-        const [virtualFile] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+    languageService.getNavigationTree = fileName => {
+        const [virtualCode] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             const tree = getNavigationTree(fileName);
             tree.childItems = undefined;
             return tree;
@@ -19,9 +19,9 @@ function decorateLanguageService(files, languageService) {
             return getNavigationTree(fileName);
         }
     };
-    languageService.getOutliningSpans = (fileName) => {
-        const [virtualFile] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+    languageService.getOutliningSpans = fileName => {
+        const [virtualCode] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             return [];
         }
         else {
@@ -31,8 +31,8 @@ function decorateLanguageService(files, languageService) {
     // methods
     const { findReferences, findRenameLocations, getCompletionEntryDetails, getCompletionsAtPosition, getDefinitionAndBoundSpan, getDefinitionAtPosition, getFileReferences, getImplementationAtPosition, getQuickInfoAtPosition, getReferencesAtPosition, getSemanticDiagnostics, getSyntacticDiagnostics, getSuggestionDiagnostics, getTypeDefinitionAtPosition, getEncodedSemanticClassifications, getDocumentHighlights, getApplicableRefactors, getEditsForRefactor, getRenameInfo, getCodeFixesAtPosition, prepareCallHierarchy, provideCallHierarchyIncomingCalls, provideCallHierarchyOutgoingCalls, provideInlayHints, organizeImports, } = languageService;
     languageService.prepareCallHierarchy = (fileName, position) => {
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
                     const item = prepareCallHierarchy(fileName, generateOffset + sourceFile.snapshot.getLength());
@@ -51,8 +51,8 @@ function decorateLanguageService(files, languageService) {
     };
     languageService.provideCallHierarchyIncomingCalls = (fileName, position) => {
         let calls = [];
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
                     calls = provideCallHierarchyIncomingCalls(fileName, generateOffset + sourceFile.snapshot.getLength());
@@ -76,8 +76,8 @@ function decorateLanguageService(files, languageService) {
     };
     languageService.provideCallHierarchyOutgoingCalls = (fileName, position) => {
         let calls = [];
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCallHierarchyEnabled)(mapping.data)) {
                     calls = provideCallHierarchyOutgoingCalls(fileName, generateOffset + sourceFile.snapshot.getLength());
@@ -107,8 +107,8 @@ function decorateLanguageService(files, languageService) {
         return resolved;
     };
     languageService.getQuickInfoAtPosition = (fileName, position) => {
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isHoverEnabled)(mapping.data)) {
                     const result = getQuickInfoAtPosition(fileName, generateOffset + sourceFile.snapshot.getLength());
@@ -158,8 +158,8 @@ function decorateLanguageService(files, languageService) {
         return resolved;
     };
     languageService.getApplicableRefactors = (fileName, positionOrRange, preferences, triggerReason, kind, includeInteractiveActions) => {
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos)) {
                 if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
                     const por = typeof positionOrRange === 'number'
@@ -179,8 +179,8 @@ function decorateLanguageService(files, languageService) {
     };
     languageService.getEditsForRefactor = (fileName, formatOptions, positionOrRange, refactorName, actionName, preferences) => {
         let edits;
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(typeof positionOrRange === 'number' ? positionOrRange : positionOrRange.pos)) {
                 if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
                     const por = typeof positionOrRange === 'number'
@@ -204,8 +204,8 @@ function decorateLanguageService(files, languageService) {
         }
     };
     languageService.getRenameInfo = (fileName, position, options) => {
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isRenameEnabled)(mapping.data)) {
                     const info = getRenameInfo(fileName, generateOffset + sourceFile.snapshot.getLength(), options);
@@ -232,8 +232,8 @@ function decorateLanguageService(files, languageService) {
     };
     languageService.getCodeFixesAtPosition = (fileName, start, end, errorCodes, formatOptions, preferences) => {
         let fixes = [];
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             for (const [generateStart, mapping] of map.getGeneratedOffsets(start)) {
                 if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
                     for (const [generateEnd, mapping] of map.getGeneratedOffsets(end)) {
@@ -256,8 +256,8 @@ function decorateLanguageService(files, languageService) {
         return fixes;
     };
     languageService.getEncodedSemanticClassifications = (fileName, span, format) => {
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             let start;
             let end;
             for (const mapping of map.mappings) {
@@ -296,17 +296,17 @@ function decorateLanguageService(files, languageService) {
             return getEncodedSemanticClassifications(fileName, span);
         }
     };
-    languageService.getSyntacticDiagnostics = (fileName) => {
+    languageService.getSyntacticDiagnostics = fileName => {
         return getSyntacticDiagnostics(fileName)
             .map(d => (0, transform_1.transformDiagnostic)(files, d))
             .filter(utils_1.notEmpty);
     };
-    languageService.getSemanticDiagnostics = (fileName) => {
+    languageService.getSemanticDiagnostics = fileName => {
         return getSemanticDiagnostics(fileName)
             .map(d => (0, transform_1.transformDiagnostic)(files, d))
             .filter(utils_1.notEmpty);
     };
-    languageService.getSuggestionDiagnostics = (fileName) => {
+    languageService.getSuggestionDiagnostics = fileName => {
         return getSuggestionDiagnostics(fileName)
             .map(d => (0, transform_1.transformDiagnostic)(files, d))
             .filter(utils_1.notEmpty);
@@ -320,8 +320,9 @@ function decorateLanguageService(files, languageService) {
         const textSpan = unresolved
             .map(s => (0, transform_1.transformSpan)(files, fileName, s.textSpan, language_core_1.isDefinitionEnabled)?.textSpan)
             .filter(utils_1.notEmpty)[0];
-        if (!textSpan)
+        if (!textSpan) {
             return;
+        }
         const definitions = unresolved
             .map(s => s.definitions
             ?.map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isDefinitionEnabled, s.fileName !== fileName))
@@ -418,8 +419,8 @@ function decorateLanguageService(files, languageService) {
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
     languageService.getCompletionsAtPosition = (fileName, position, options, formattingSettings) => {
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
                     const result = getCompletionsAtPosition(fileName, generateOffset + sourceFile.snapshot.getLength(), options, formattingSettings);
@@ -439,8 +440,8 @@ function decorateLanguageService(files, languageService) {
     };
     languageService.getCompletionEntryDetails = (fileName, position, entryName, formatOptions, source, preferences, data) => {
         let details;
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
                     details = getCompletionEntryDetails(fileName, generateOffset + sourceFile.snapshot.getLength(), entryName, formatOptions, source, preferences, data);
@@ -459,8 +460,8 @@ function decorateLanguageService(files, languageService) {
         return details;
     };
     languageService.provideInlayHints = (fileName, span, preferences) => {
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             let start;
             let end;
             for (const mapping of map.mappings) {
@@ -496,7 +497,7 @@ function decorateLanguageService(files, languageService) {
             return provideInlayHints(fileName, span, preferences);
         }
     };
-    languageService.getFileReferences = (fileName) => {
+    languageService.getFileReferences = fileName => {
         const unresolved = getFileReferences(fileName);
         const resolved = unresolved
             .map(s => (0, transform_1.transformDocumentSpan)(files, s, language_core_1.isReferencesEnabled))
@@ -506,8 +507,8 @@ function decorateLanguageService(files, languageService) {
     function linkedCodeFeatureWorker(fileName, position, filter, worker, getLinkedCodes) {
         let results = [];
         const processedFilePositions = new Set();
-        const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
-        if (virtualFile) {
+        const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
+        if (virtualCode) {
             for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
                 if (filter(mapping.data)) {
                     process(fileName, generateOffset + sourceFile.snapshot.getLength());
@@ -519,21 +520,25 @@ function decorateLanguageService(files, languageService) {
         }
         return results;
         function process(fileName, position) {
-            if (processedFilePositions.has(fileName + ':' + position))
+            if (processedFilePositions.has(fileName + ':' + position)) {
                 return;
+            }
             processedFilePositions.add(fileName + ':' + position);
             const result = worker(position);
-            if (!result)
+            if (!result) {
                 return;
+            }
             results = results.concat(result);
             for (const ref of getLinkedCodes(result)) {
                 processedFilePositions.add(ref[0] + ':' + ref[1]);
                 const [virtualFile, sourceFile] = (0, utils_1.getVirtualFileAndMap)(files, ref[0]);
-                if (!virtualFile)
+                if (!virtualFile) {
                     continue;
-                const linkedCodeMap = files.getLinkedCodeMap(virtualFile);
-                if (!linkedCodeMap)
+                }
+                const linkedCodeMap = files.getLinkedCodeMap(virtualFile.code);
+                if (!linkedCodeMap) {
                     continue;
+                }
                 for (const linkedCodeOffset of linkedCodeMap.getLinkedOffsets(ref[1] - sourceFile.snapshot.getLength())) {
                     process(ref[0], linkedCodeOffset + sourceFile.snapshot.getLength());
                 }

package/lib/node/decorateLanguageServiceHost.d.ts

@@ -1,4 +1,4 @@
-import { FileProvider } from '@volar/language-core';
+import type { FileRegistry } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function decorateLanguageServiceHost(virtualFiles: FileProvider, languageServiceHost: ts.LanguageServiceHost, ts: typeof import('typescript'), exts: string[]): void;
+export declare function decorateLanguageServiceHost(virtualFiles: FileRegistry, languageServiceHost: ts.LanguageServiceHost, ts: typeof import('typescript')): void;
 export declare function searchExternalFiles(ts: typeof import('typescript'), project: ts.server.Project, exts: string[]): string[];

package/lib/node/decorateLanguageServiceHost.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchExternalFiles = exports.decorateLanguageServiceHost = void 0;
-const language_core_1 = require("@volar/language-core");
 const language_service_1 = require("@volar/language-service");
-function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts) {
+function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
     let extraProjectVersion = 0;
+    const exts = virtualFiles.languagePlugins
+        .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
+        .flat();
     const scripts = new Map();
     const readDirectory = languageServiceHost.readDirectory?.bind(languageServiceHost);
     const resolveModuleNameLiterals = languageServiceHost.resolveModuleNameLiterals?.bind(languageServiceHost);
@@ -58,7 +60,7 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts
             return getProjectVersion() + ':' + extraProjectVersion;
         };
     }
-    languageServiceHost.getScriptSnapshot = (fileName) => {
+    languageServiceHost.getScriptSnapshot = fileName => {
         if (exts.some(ext => fileName.endsWith(ext))) {
             updateScript(fileName);
             return scripts.get(fileName)?.snapshot;
@@ -66,7 +68,7 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts
         return getScriptSnapshot(fileName);
     };
     if (getScriptKind) {
-        languageServiceHost.getScriptKind = (fileName) => {
+        languageServiceHost.getScriptKind = fileName => {
             if (exts.some(ext => fileName.endsWith(ext))) {
                 updateScript(fileName);
                 const script = scripts.get(fileName);
@@ -116,24 +118,22 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts
             const snapshot = getScriptSnapshot(fileName);
             if (snapshot) {
                 extraProjectVersion++;
-                const sourceFile = virtualFiles.updateSourceFile(fileName, (0, language_service_1.resolveCommonLanguageId)(fileName), snapshot);
-                if (sourceFile.virtualFile) {
+                const sourceFile = virtualFiles.set(fileName, (0, language_service_1.resolveCommonLanguageId)(fileName), snapshot);
+                if (sourceFile.generated) {
                     const text = snapshot.getText(0, snapshot.getLength());
                     let patchedText = text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
-                    for (const file of (0, language_core_1.forEachEmbeddedFile)(sourceFile.virtualFile[0])) {
-                        const ext = file.fileName.substring(fileName.length);
-                        if (file.typescript && (ext === '.d.ts' || ext.match(/^\.(js|ts)x?$/))) {
-                            extension = ext;
-                            scriptKind = file.typescript.scriptKind;
-                            patchedText += file.snapshot.getText(0, file.snapshot.getLength());
-                        }
+                    const script = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
+                    if (script) {
+                        extension = script.extension;
+                        scriptKind = script.scriptKind;
+                        patchedText += script.code.snapshot.getText(0, script.code.snapshot.getLength());
                     }
                     snapshotSnapshot = ts.ScriptSnapshot.fromString(patchedText);
                 }
             }
-            else if (virtualFiles.getSourceFile(fileName)) {
+            else if (virtualFiles.get(fileName)) {
                 extraProjectVersion++;
-                virtualFiles.deleteSourceFile(fileName);
+                virtualFiles.delete(fileName);
             }
             scripts.set(fileName, {
                 version,

package/lib/node/decorateProgram.d.ts

@@ -1,3 +1,3 @@
-import type { FileProvider } from '@volar/language-core';
+import type { FileRegistry } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function decorateProgram(files: FileProvider, program: ts.Program): void;
+export declare function decorateProgram(files: FileRegistry, program: ts.Program): void;

package/lib/node/decorateProgram.js

@@ -32,7 +32,7 @@ function decorateProgram(files, program) {
             .map(d => (0, transform_1.transformDiagnostic)(files, d))
             .filter(utils_1.notEmpty);
     };
-    program.getGlobalDiagnostics = (cancellationToken) => {
+    program.getGlobalDiagnostics = cancellationToken => {
         return getGlobalDiagnostics(cancellationToken)
             .map(d => (0, transform_1.transformDiagnostic)(files, d))
             .filter(utils_1.notEmpty);

package/lib/node/proxyCreateProgram.js

@@ -9,7 +9,7 @@ function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
             const options = args[0];
             assert(!!options.host, '!!options.host');
             const sourceFileToSnapshotMap = new WeakMap();
-            const files = (0, language_core_1.createFileProvider)(getLanguagePlugins(ts, options), ts.sys.useCaseSensitiveFileNames, fileName => {
+            const files = (0, language_core_1.createFileRegistry)(getLanguagePlugins(ts, options), ts.sys.useCaseSensitiveFileNames, fileName => {
                 let snapshot;
                 assert(originalSourceFiles.has(fileName), `originalSourceFiles.has(${fileName})`);
                 const sourceFile = originalSourceFiles.get(fileName);
@@ -31,10 +31,10 @@ function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
                     }
                 }
                 if (snapshot) {
-                    files.updateSourceFile(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
+                    files.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
                 }
                 else {
-                    files.deleteSourceFile(fileName);
+                    files.delete(fileName);
                 }
             });
             const originalSourceFiles = new Map();
@@ -60,21 +60,18 @@ function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
                 if (originalSourceFile && extensions.some(ext => fileName.endsWith(ext))) {
                     let sourceFile2 = parsedSourceFiles.get(originalSourceFile);
                     if (!sourceFile2) {
-                        const sourceFile = files.getSourceFile(fileName);
+                        const sourceFile = files.get(fileName);
                         assert(!!sourceFile, '!!sourceFile');
                         let patchedText = originalSourceFile.text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
                         let scriptKind = ts.ScriptKind.TS;
-                        const virtualFile = sourceFile.virtualFile?.[0];
-                        if (virtualFile) {
-                            for (const file of (0, language_core_1.forEachEmbeddedFile)(virtualFile)) {
-                                if (file.typescript) {
-                                    scriptKind = file.typescript.scriptKind;
-                                    patchedText += file.snapshot.getText(0, file.snapshot.getLength());
-                                    break;
-                                }
+                        if (sourceFile.generated) {
+                            const script = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
+                            if (script) {
+                                scriptKind = script.scriptKind;
+                                patchedText += script.code.snapshot.getText(0, script.code.snapshot.getLength());
                             }
                         }
-                        sourceFile2 = ts.createSourceFile(sourceFile.fileName, patchedText, 99, true, scriptKind);
+                        sourceFile2 = ts.createSourceFile(fileName, patchedText, 99, true, scriptKind);
                         // @ts-expect-error
                         sourceFile2.version = originalSourceFile.version;
                         parsedSourceFiles.set(originalSourceFile, sourceFile2);

package/lib/node/transform.d.ts

@@ -1,10 +1,10 @@
-import { FileProvider, CodeInformation } from '@volar/language-core';
+import { FileRegistry, CodeInformation } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function transformCallHierarchyItem(files: FileProvider, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
-export declare function transformDiagnostic<T extends ts.Diagnostic>(files: FileProvider, diagnostic: T): T | undefined;
-export declare function transformFileTextChanges(files: FileProvider, changes: ts.FileTextChanges, filter: (data: CodeInformation) => boolean): ts.FileTextChanges | undefined;
-export declare function transformDocumentSpan<T extends ts.DocumentSpan>(files: FileProvider, documentSpan: T, filter: (data: CodeInformation) => boolean, shouldFallback?: boolean): T | undefined;
-export declare function transformSpan(files: FileProvider, fileName: string | undefined, textSpan: ts.TextSpan | undefined, filter: (data: CodeInformation) => boolean): {
+export declare function transformCallHierarchyItem(files: FileRegistry, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
+export declare function transformDiagnostic<T extends ts.Diagnostic>(files: FileRegistry, diagnostic: T): T | undefined;
+export declare function transformFileTextChanges(files: FileRegistry, changes: ts.FileTextChanges, filter: (data: CodeInformation) => boolean): ts.FileTextChanges | undefined;
+export declare function transformDocumentSpan<T extends ts.DocumentSpan>(files: FileRegistry, documentSpan: T, filter: (data: CodeInformation) => boolean, shouldFallback?: boolean): T | undefined;
+export declare function transformSpan(files: FileRegistry, fileName: string | undefined, textSpan: ts.TextSpan | undefined, filter: (data: CodeInformation) => boolean): {
     fileName: string;
     textSpan: ts.TextSpan;
 } | undefined;

package/lib/node/transform.js

@@ -26,8 +26,8 @@ function transformDiagnostic(files, diagnostic) {
         if (diagnostic.file !== undefined
             && diagnostic.start !== undefined
             && diagnostic.length !== undefined) {
-            const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, diagnostic.file.fileName);
-            if (virtualFile) {
+            const [virtualCode, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, diagnostic.file.fileName);
+            if (virtualCode) {
                 const sourceRange = transformRange(sourceFile, map, diagnostic.start, diagnostic.start + diagnostic.length, language_core_1.shouldReportDiagnostics);
                 if (sourceRange) {
                     transformedDiagnostics.set(diagnostic, {
@@ -53,7 +53,6 @@ function transformFileTextChanges(files, changes, filter) {
     if (source) {
         return {
             ...changes,
-            fileName: source.fileName,
             textChanges: changes.textChanges.map(c => {
                 const span = transformSpan(files, changes.fileName, c.span, filter);
                 if (span) {
@@ -73,16 +72,17 @@ exports.transformFileTextChanges = transformFileTextChanges;
 function transformDocumentSpan(files, documentSpan, filter, shouldFallback) {
     let textSpan = transformSpan(files, documentSpan.fileName, documentSpan.textSpan, filter);
     if (!textSpan && shouldFallback) {
-        const [virtualFile, source] = (0, utils_1.getVirtualFileAndMap)(files, documentSpan.fileName);
-        if (virtualFile) {
+        const [virtualCode] = (0, utils_1.getVirtualFileAndMap)(files, documentSpan.fileName);
+        if (virtualCode) {
             textSpan = {
-                fileName: source.fileName,
+                fileName: documentSpan.fileName,
                 textSpan: { start: 0, length: 0 },
             };
         }
     }
-    if (!textSpan)
+    if (!textSpan) {
         return;
+    }
     const contextSpan = transformSpan(files, documentSpan.fileName, documentSpan.contextSpan, filter);
     const originalTextSpan = transformSpan(files, documentSpan.originalFileName, documentSpan.originalTextSpan, filter);
     const originalContextSpan = transformSpan(files, documentSpan.originalFileName, documentSpan.originalContextSpan, filter);
@@ -98,16 +98,18 @@ function transformDocumentSpan(files, documentSpan, filter, shouldFallback) {
 }
 exports.transformDocumentSpan = transformDocumentSpan;
 function transformSpan(files, fileName, textSpan, filter) {
-    if (!fileName)
+    if (!fileName) {
         return;
-    if (!textSpan)
+    }
+    if (!textSpan) {
         return;
+    }
     const [virtualFile, sourceFile, map] = (0, utils_1.getVirtualFileAndMap)(files, fileName);
     if (virtualFile) {
         const sourceRange = transformRange(sourceFile, map, textSpan.start, textSpan.start + textSpan.length, filter);
         if (sourceRange) {
             return {
-                fileName: sourceFile.fileName,
+                fileName,
                 textSpan: {
                     start: sourceRange[0],
                     length: sourceRange[1] - sourceRange[0],

package/lib/node/utils.d.ts

@@ -1,3 +1,7 @@
-import { FileProvider } from '@volar/language-core';
+import type { FileRegistry } from '@volar/language-core';
 export declare function notEmpty<T>(value: T | null | undefined): value is T;
-export declare function getVirtualFileAndMap(files: FileProvider, fileName: string): readonly [import("@volar/language-core").VirtualFile, import("@volar/language-core").SourceFile, import("@volar/language-core").SourceMap<import("@volar/language-core").CodeInformation>] | readonly [undefined, undefined, undefined];
+export declare function getVirtualFileAndMap(files: FileRegistry, fileName: string): readonly [{
+    code: import("@volar/language-core").VirtualCode<string>;
+    extension: string;
+    scriptKind: import("typescript").ScriptKind;
+}, import("@volar/language-core").SourceFile, import("@volar/language-core").SourceMap<import("@volar/language-core").CodeInformation>] | readonly [undefined, undefined, undefined];

package/lib/node/utils.js

@@ -1,21 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getVirtualFileAndMap = exports.notEmpty = void 0;
-const language_core_1 = require("@volar/language-core");
 function notEmpty(value) {
     return value !== null && value !== undefined;
 }
 exports.notEmpty = notEmpty;
 function getVirtualFileAndMap(files, fileName) {
-    const sourceFile = files.getSourceFile(fileName);
-    if (sourceFile?.virtualFile) {
-        for (const virtualFile of (0, language_core_1.forEachEmbeddedFile)(sourceFile.virtualFile[0])) {
-            const ext = virtualFile.fileName.substring(fileName.length);
-            if (virtualFile.typescript && (ext === '.d.ts' || ext.match(/^\.(js|ts)x?$/))) {
-                for (const map of files.getMaps(virtualFile)) {
-                    if (map[1][0] === sourceFile.snapshot) {
-                        return [virtualFile, sourceFile, map[1][1]];
-                    }
+    const sourceFile = files.get(fileName);
+    if (sourceFile?.generated) {
+        const script = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
+        if (script) {
+            for (const map of files.getMaps(script.code)) {
+                if (map[1][0] === sourceFile.snapshot) {
+                    return [script, sourceFile, map[1][1]];
                 }
             }
         }

package/lib/protocol/createProject.d.ts

@@ -1,4 +1,7 @@
-import { LanguagePlugin, Language, TypeScriptProjectHost } from '@volar/language-core';
+import { LanguagePlugin, LanguageContext, TypeScriptProjectHost } from '@volar/language-core';
 import type * as ts from 'typescript';
 import type { createSys } from './createSys';
-export declare function createLanguage(ts: typeof import('typescript'), sys: ReturnType<typeof createSys> | ts.System, languages: LanguagePlugin<any>[], configFileName: string | undefined, projectHost: TypeScriptProjectHost): Language;
+export declare function createLanguage(ts: typeof import('typescript'), sys: ReturnType<typeof createSys> | ts.System, languagePlugins: LanguagePlugin<any>[], configFileName: string | undefined, projectHost: TypeScriptProjectHost, { fileIdToFileName, fileNameToFileId }: {
+    fileIdToFileName: (uri: string) => string;
+    fileNameToFileId: (fileName: string) => string;
+}): LanguageContext;