@volar/typescript 2.3.0-alpha.1 → 2.3.0-alpha.11

package/lib/node/decorateLanguageServiceHost.js

@@ -64,7 +64,7 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost) {
         languageServiceHost.getScriptKind = fileName => {
             const virtualScript = updateVirtualScript(fileName);
             if (virtualScript) {
-                return virtualScript.kind;
+                return virtualScript.scriptKind;
             }
             return getScriptKind(fileName);
         };
@@ -92,14 +92,23 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost) {
             if (sourceScript?.generated) {
                 const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
                 if (serviceScript) {
-                    const sourceContents = sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength());
-                    let virtualContents = sourceContents.split('\n').map(line => ' '.repeat(line.length)).join('\n');
-                    virtualContents += serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
-                    script[1] = {
-                        extension: serviceScript.extension,
-                        kind: serviceScript.scriptKind,
-                        snapshot: ts.ScriptSnapshot.fromString(virtualContents),
-                    };
+                    if (serviceScript.preventLeadingOffset) {
+                        script[1] = {
+                            extension: serviceScript.extension,
+                            scriptKind: serviceScript.scriptKind,
+                            snapshot: serviceScript.code.snapshot,
+                        };
+                    }
+                    else {
+                        const sourceContents = sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength());
+                        const virtualContents = sourceContents.split('\n').map(line => ' '.repeat(line.length)).join('\n')
+                            + serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
+                        script[1] = {
+                            extension: serviceScript.extension,
+                            scriptKind: serviceScript.scriptKind,
+                            snapshot: ts.ScriptSnapshot.fromString(virtualContents),
+                        };
+                    }
                 }
                 if (sourceScript.generated.languagePlugin.typescript?.getExtraServiceScripts) {
                     console.warn('getExtraServiceScripts() is not available in TS plugin.');

package/lib/node/decorateProgram.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decorateProgram = void 0;
-const utils_1 = require("./utils");
 const transform_1 = require("./transform");
+const utils_1 = require("./utils");
 function decorateProgram(language, program) {
     const emit = program.emit;
     // for tsc --noEmit
@@ -18,30 +18,57 @@ function decorateProgram(language, program) {
         return {
             ...result,
             diagnostics: result.diagnostics
-                .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
+                .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
                 .filter(utils_1.notEmpty),
         };
     };
     program.getSyntacticDiagnostics = (sourceFile, cancellationToken) => {
-        return getSyntacticDiagnostics(sourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
-            .filter(utils_1.notEmpty);
+        if (!sourceFile) {
+            return getSyntacticDiagnostics(undefined, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
+                .filter(utils_1.notEmpty);
+        }
+        else {
+            const [_serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+            const actualSourceFile = targetScript ? program.getSourceFile(targetScript.id) : sourceFile;
+            return getSyntacticDiagnostics(actualSourceFile, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, program, true))
+                .filter(utils_1.notEmpty);
+        }
     };
     program.getSemanticDiagnostics = (sourceFile, cancellationToken) => {
-        return getSemanticDiagnostics(sourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
-            .filter(utils_1.notEmpty);
+        if (!sourceFile) {
+            return getSemanticDiagnostics(undefined, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
+                .filter(utils_1.notEmpty);
+        }
+        else {
+            const [_serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+            const actualSourceFile = targetScript ? program.getSourceFile(targetScript.id) : sourceFile;
+            return getSemanticDiagnostics(actualSourceFile, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, program, true))
+                .filter(utils_1.notEmpty);
+        }
     };
     program.getGlobalDiagnostics = cancellationToken => {
         return getGlobalDiagnostics(cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
+            .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
             .filter(utils_1.notEmpty);
     };
     // @ts-ignore
     program.getBindAndCheckDiagnostics = (sourceFile, cancellationToken) => {
-        return getBindAndCheckDiagnostics(sourceFile, cancellationToken)
-            .map(d => (0, transform_1.transformDiagnostic)(language, d, true))
-            .filter(utils_1.notEmpty);
+        if (!sourceFile) {
+            return getBindAndCheckDiagnostics(undefined, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(undefined, language, d, program, true))
+                .filter(utils_1.notEmpty);
+        }
+        else {
+            const [_serviceScript, targetScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+            const actualSourceFile = targetScript ? program.getSourceFile(targetScript.id) : sourceFile;
+            return getBindAndCheckDiagnostics(actualSourceFile, cancellationToken)
+                .map(d => (0, transform_1.transformDiagnostic)(sourceScript, language, d, program, true))
+                .filter(utils_1.notEmpty);
+        }
     };
     // fix https://github.com/vuejs/language-tools/issues/4099 with `incremental`
     program.getSourceFileByPath = path => {

package/lib/node/proxyCreateProgram.js

@@ -50,11 +50,7 @@ function proxyCreateProgram(ts, original, getLanguagePlugins) {
                 languagePlugins = getLanguagePlugins(ts, options);
                 language = (0, language_core_1.createLanguage)([
                     ...languagePlugins,
-                    {
-                        getLanguageId(fileName) {
-                            return (0, common_1.resolveFileLanguageId)(fileName);
-                        },
-                    },
+                    { getLanguageId: common_1.resolveFileLanguageId },
                 ], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
                     if (!sourceFileSnapshots.has(fileName)) {
                         const sourceFileText = originalHost.readFile(fileName);
@@ -116,11 +112,11 @@ function proxyCreateProgram(ts, original, getLanguagePlugins) {
                 if (!parsedSourceFiles.has(originalSourceFile)) {
                     const sourceScript = language.scripts.get(fileName);
                     assert(!!sourceScript, '!!sourceScript');
-                    parsedSourceFiles.set(originalSourceFile, originalSourceFile);
+                    parsedSourceFiles.set(originalSourceFile, undefined);
                     if (sourceScript.generated?.languagePlugin.typescript) {
                         const { getServiceScript, getExtraServiceScripts } = sourceScript.generated.languagePlugin.typescript;
                         const serviceScript = getServiceScript(sourceScript.generated.root);
-                        if (serviceScript) {
+                        if (serviceScript && !serviceScript.preventLeadingOffset) {
                             let patchedText = originalSourceFile.text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
                             let scriptKind = ts.ScriptKind.TS;
                             scriptKind = serviceScript.scriptKind;
@@ -135,7 +131,7 @@ function proxyCreateProgram(ts, original, getLanguagePlugins) {
                         }
                     }
                 }
-                return parsedSourceFiles.get(originalSourceFile);
+                return parsedSourceFiles.get(originalSourceFile) ?? originalSourceFile;
             };
             if (extensions.length) {
                 options.options.allowArbitraryExtensions = true;

package/lib/node/transform.d.ts

@@ -1,17 +1,19 @@
-import type { CodeInformation, SourceMap, SourceScript } from '@volar/language-core';
+import type { CodeInformation, SourceScript, TypeScriptServiceScript } from '@volar/language-core';
 import { Language } from '@volar/language-core';
 import type * as ts from 'typescript';
 export declare function transformCallHierarchyItem(language: Language<string>, item: ts.CallHierarchyItem, filter: (data: CodeInformation) => boolean): ts.CallHierarchyItem;
-export declare function transformDiagnostic<T extends ts.Diagnostic>(language: Language<string>, diagnostic: T, isTsc: boolean): T | undefined;
+export declare function transformDiagnostic<T extends ts.Diagnostic>(sourceScript: SourceScript<string> | undefined, language: Language<string>, diagnostic: T, program: ts.Program | undefined, isTsc: boolean): T | undefined;
 export declare function fillSourceFileText(language: Language<string>, sourceFile: ts.SourceFile): void;
-export declare function transformFileTextChanges(language: Language<string>, changes: ts.FileTextChanges, filter: (data: CodeInformation) => boolean): ts.FileTextChanges | undefined;
+export declare function transformFileTextChanges(language: Language<string>, changes: readonly ts.FileTextChanges[], filter: (data: CodeInformation) => boolean): ts.FileTextChanges[];
 export declare function transformDocumentSpan<T extends ts.DocumentSpan>(language: Language<string>, documentSpan: T, filter: (data: CodeInformation) => boolean, shouldFallback?: boolean): T | undefined;
 export declare function transformSpan(language: Language<string>, fileName: string | undefined, textSpan: ts.TextSpan | undefined, filter: (data: CodeInformation) => boolean): {
     fileName: string;
     textSpan: ts.TextSpan;
 } | undefined;
-export declare function transformTextChange(sourceScript: SourceScript<string>, map: SourceMap<CodeInformation>, textChange: ts.TextChange, filter: (data: CodeInformation) => boolean): ts.TextChange | undefined;
-export declare function transformTextSpan(sourceScript: SourceScript<string>, map: SourceMap<CodeInformation>, textSpan: ts.TextSpan, filter: (data: CodeInformation) => boolean): ts.TextSpan | undefined;
-export declare function toSourceOffset(sourceScript: SourceScript<string>, map: SourceMap, position: number, filter: (data: CodeInformation) => boolean): number | undefined;
-export declare function toGeneratedOffset(sourceScript: SourceScript<string>, map: SourceMap, position: number, filter: (data: CodeInformation) => boolean): number | undefined;
-export declare function toGeneratedOffsets(sourceScript: SourceScript<string>, map: SourceMap<CodeInformation>, position: number): Generator<readonly [number, import("@volar/language-core").Mapping<CodeInformation>], void, unknown>;
+export declare function transformTextChange(sourceScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, textChange: ts.TextChange, filter: (data: CodeInformation) => boolean): [string, ts.TextChange] | undefined;
+export declare function transformTextSpan(sourceScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, textSpan: ts.TextSpan, filter: (data: CodeInformation) => boolean): [string, ts.TextSpan] | undefined;
+export declare function toSourceOffset(sourceScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, position: number, filter: (data: CodeInformation) => boolean): [fileName: string, offset: number] | undefined;
+export declare function toSourceOffsets(sourceScript: SourceScript<string> | undefined, language: Language<string>, serviceScript: TypeScriptServiceScript, position: number, filter: (data: CodeInformation) => boolean): Generator<[fileName: string, offset: number]>;
+export declare function toGeneratedOffset(language: Language, serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, position: number, filter: (data: CodeInformation) => boolean): number | undefined;
+export declare function toGeneratedOffsets(language: Language, serviceScript: TypeScriptServiceScript, sourceScript: SourceScript<string>, position: number, filter: (data: CodeInformation) => boolean): Generator<readonly [number, import("@volar/language-core").Mapping<CodeInformation>], void, unknown>;
+export declare function getMappingOffset(language: Language, serviceScript: TypeScriptServiceScript): number;

package/lib/node/transform.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toGeneratedOffsets = exports.toGeneratedOffset = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.fillSourceFileText = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
+exports.getMappingOffset = exports.toGeneratedOffsets = exports.toGeneratedOffset = exports.toSourceOffsets = exports.toSourceOffset = exports.transformTextSpan = exports.transformTextChange = exports.transformSpan = exports.transformDocumentSpan = exports.transformFileTextChanges = exports.fillSourceFileText = exports.transformDiagnostic = exports.transformCallHierarchyItem = void 0;
 const language_core_1 = require("@volar/language-core");
 const utils_1 = require("./utils");
 const transformedDiagnostics = new WeakMap();
@@ -10,32 +10,42 @@ function transformCallHierarchyItem(language, item, filter) {
     const selectionSpan = transformSpan(language, item.file, item.selectionSpan, filter);
     return {
         ...item,
+        file: span?.fileName ?? item.file,
         span: span?.textSpan ?? { start: 0, length: 0 },
         selectionSpan: selectionSpan?.textSpan ?? { start: 0, length: 0 },
     };
 }
 exports.transformCallHierarchyItem = transformCallHierarchyItem;
-function transformDiagnostic(language, diagnostic, isTsc) {
+function transformDiagnostic(sourceScript, language, diagnostic, program, isTsc) {
     if (!transformedDiagnostics.has(diagnostic)) {
         transformedDiagnostics.set(diagnostic, undefined);
         const { relatedInformation } = diagnostic;
         if (relatedInformation) {
             diagnostic.relatedInformation = relatedInformation
-                .map(d => transformDiagnostic(language, d, isTsc))
+                .map(d => transformDiagnostic(undefined, language, d, program, isTsc))
                 .filter(utils_1.notEmpty);
         }
         if (diagnostic.file !== undefined
             && diagnostic.start !== undefined
             && diagnostic.length !== undefined) {
-            const [serviceScript, sourceScript, map] = (0, utils_1.getServiceScript)(language, diagnostic.file.fileName);
+            const [serviceScript] = (0, utils_1.getServiceScript)(language, diagnostic.file.fileName);
             if (serviceScript) {
-                const sourceSpan = transformTextSpan(sourceScript, map, { start: diagnostic.start, length: diagnostic.length }, language_core_1.shouldReportDiagnostics);
-                if (sourceSpan) {
+                const [sourceSpanFileName, sourceSpan] = transformTextSpan(sourceScript, language, serviceScript, {
+                    start: diagnostic.start,
+                    length: diagnostic.length
+                }, language_core_1.shouldReportDiagnostics) ?? [];
+                const actualDiagnosticFile = sourceSpanFileName
+                    ? diagnostic.file.fileName === sourceSpanFileName
+                        ? diagnostic.file
+                        : program?.getSourceFile(sourceSpanFileName)
+                    : undefined;
+                if (sourceSpan && actualDiagnosticFile) {
                     if (isTsc) {
                         fillSourceFileText(language, diagnostic.file);
                     }
                     transformedDiagnostics.set(diagnostic, {
                         ...diagnostic,
+                        file: actualDiagnosticFile,
                         start: sourceSpan.start,
                         length: sourceSpan.length,
                     });
@@ -58,32 +68,46 @@ function fillSourceFileText(language, sourceFile) {
         return;
     }
     transformedSourceFile.add(sourceFile);
-    const [serviceScript, sourceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
-    if (serviceScript) {
+    const [serviceScript] = (0, utils_1.getServiceScript)(language, sourceFile.fileName);
+    if (serviceScript && !serviceScript.preventLeadingOffset) {
+        const sourceScript = language.scripts.fromVirtualCode(serviceScript.code);
         sourceFile.text = sourceScript.snapshot.getText(0, sourceScript.snapshot.getLength())
             + sourceFile.text.substring(sourceScript.snapshot.getLength());
     }
 }
 exports.fillSourceFileText = fillSourceFileText;
 function transformFileTextChanges(language, changes, filter) {
-    const [_, source] = (0, utils_1.getServiceScript)(language, changes.fileName);
-    if (source) {
-        return {
-            ...changes,
-            textChanges: changes.textChanges.map(c => {
-                const span = transformSpan(language, changes.fileName, c.span, filter);
-                if (span) {
-                    return {
-                        ...c,
-                        span: span.textSpan,
-                    };
+    const changesPerFile = {};
+    const newFiles = new Set();
+    for (const fileChanges of changes) {
+        const [_, source] = (0, utils_1.getServiceScript)(language, fileChanges.fileName);
+        if (source) {
+            fileChanges.textChanges.forEach(c => {
+                const { fileName, textSpan } = transformSpan(language, fileChanges.fileName, c.span, filter) ?? {};
+                if (fileName && textSpan) {
+                    (changesPerFile[fileName] ?? (changesPerFile[fileName] = [])).push({ ...c, span: textSpan });
                 }
-            }).filter(utils_1.notEmpty),
-        };
+            });
+        }
+        else {
+            const list = (changesPerFile[fileChanges.fileName] ?? (changesPerFile[fileChanges.fileName] = []));
+            fileChanges.textChanges.forEach(c => {
+                list.push(c);
+            });
+            if (fileChanges.isNewFile) {
+                newFiles.add(fileChanges.fileName);
+            }
+        }
     }
-    else {
-        return changes;
+    const result = [];
+    for (const fileName in changesPerFile) {
+        result.push({
+            fileName,
+            isNewFile: newFiles.has(fileName),
+            textChanges: changesPerFile[fileName]
+        });
     }
+    return result;
 }
 exports.transformFileTextChanges = transformFileTextChanges;
 function transformDocumentSpan(language, documentSpan, filter, shouldFallback) {
@@ -115,12 +139,12 @@ function transformSpan(language, fileName, textSpan, filter) {
     if (!fileName || !textSpan) {
         return;
     }
-    const [virtualFile, sourceScript, map] = (0, utils_1.getServiceScript)(language, fileName);
-    if (virtualFile) {
-        const sourceSpan = transformTextSpan(sourceScript, map, textSpan, filter);
-        if (sourceSpan) {
+    const [serviceScript] = (0, utils_1.getServiceScript)(language, fileName);
+    if (serviceScript) {
+        const [sourceSpanFileName, sourceSpan] = transformTextSpan(undefined, language, serviceScript, textSpan, filter) ?? [];
+        if (sourceSpan && sourceSpanFileName) {
             return {
-                fileName,
+                fileName: sourceSpanFileName,
                 textSpan: sourceSpan,
             };
         }
@@ -133,49 +157,80 @@ function transformSpan(language, fileName, textSpan, filter) {
     }
 }
 exports.transformSpan = transformSpan;
-function transformTextChange(sourceScript, map, textChange, filter) {
-    const sourceSpan = transformTextSpan(sourceScript, map, textChange.span, filter);
-    if (sourceSpan) {
-        return {
-            newText: textChange.newText,
-            span: sourceSpan,
-        };
+function transformTextChange(sourceScript, language, serviceScript, textChange, filter) {
+    const [sourceSpanFileName, sourceSpan] = transformTextSpan(sourceScript, language, serviceScript, textChange.span, filter) ?? [];
+    if (sourceSpan && sourceSpanFileName) {
+        return [sourceSpanFileName, {
+                newText: textChange.newText,
+                span: sourceSpan,
+            }];
     }
+    return undefined;
 }
 exports.transformTextChange = transformTextChange;
-function transformTextSpan(sourceScript, map, textSpan, filter) {
+function transformTextSpan(sourceScript, language, serviceScript, textSpan, filter) {
     const start = textSpan.start;
     const end = textSpan.start + textSpan.length;
-    const sourceStart = toSourceOffset(sourceScript, map, start, filter);
-    const sourceEnd = toSourceOffset(sourceScript, map, end, filter);
-    if (sourceStart !== undefined && sourceEnd !== undefined && sourceEnd >= sourceStart) {
-        return {
-            start: sourceStart,
-            length: sourceEnd - sourceStart,
-        };
+    for (const sourceStart of toSourceOffsets(sourceScript, language, serviceScript, start, filter)) {
+        for (const sourceEnd of toSourceOffsets(sourceScript, language, serviceScript, end, filter)) {
+            if (sourceStart[0] === sourceEnd[0]
+                && sourceEnd[1] >= sourceStart[1]) {
+                return [sourceStart[0], {
+                        start: sourceStart[1],
+                        length: sourceEnd[1] - sourceStart[1],
+                    }];
+            }
+        }
     }
 }
 exports.transformTextSpan = transformTextSpan;
-function toSourceOffset(sourceScript, map, position, filter) {
-    for (const [sourceOffset, mapping] of map.getSourceOffsets(position - sourceScript.snapshot.getLength())) {
-        if (filter(mapping.data)) {
-            return sourceOffset;
-        }
+function toSourceOffset(sourceScript, language, serviceScript, position, filter) {
+    for (const source of toSourceOffsets(sourceScript, language, serviceScript, position, filter)) {
+        return source;
     }
 }
 exports.toSourceOffset = toSourceOffset;
-function toGeneratedOffset(sourceScript, map, position, filter) {
-    for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-        if (filter(mapping.data)) {
-            return generateOffset + sourceScript.snapshot.getLength();
+function* toSourceOffsets(sourceScript, language, serviceScript, position, filter) {
+    if (sourceScript) {
+        const map = language.maps.get(serviceScript.code, sourceScript);
+        for (const [sourceOffset, mapping] of map.getSourceOffsets(position - getMappingOffset(language, serviceScript))) {
+            if (filter(mapping.data)) {
+                yield [sourceScript.id, sourceOffset];
+            }
+        }
+    }
+    else {
+        for (const [fileName, _snapshot, map] of language.maps.forEach(serviceScript.code)) {
+            for (const [sourceOffset, mapping] of map.getSourceOffsets(position - getMappingOffset(language, serviceScript))) {
+                if (filter(mapping.data)) {
+                    yield [fileName, sourceOffset];
+                }
+            }
         }
     }
 }
+exports.toSourceOffsets = toSourceOffsets;
+function toGeneratedOffset(language, serviceScript, sourceScript, position, filter) {
+    for (const [generateOffset] of toGeneratedOffsets(language, serviceScript, sourceScript, position, filter)) {
+        return generateOffset;
+    }
+}
 exports.toGeneratedOffset = toGeneratedOffset;
-function* toGeneratedOffsets(sourceScript, map, position) {
+function* toGeneratedOffsets(language, serviceScript, sourceScript, position, filter) {
+    const map = language.maps.get(serviceScript.code, sourceScript);
     for (const [generateOffset, mapping] of map.getGeneratedOffsets(position)) {
-        yield [generateOffset + sourceScript.snapshot.getLength(), mapping];
+        if (filter(mapping.data)) {
+            yield [generateOffset + getMappingOffset(language, serviceScript), mapping];
+        }
     }
 }
 exports.toGeneratedOffsets = toGeneratedOffsets;
+function getMappingOffset(language, serviceScript) {
+    if (serviceScript.preventLeadingOffset) {
+        return 0;
+    }
+    const sourceScript = language.scripts.fromVirtualCode(serviceScript.code);
+    return sourceScript.snapshot.getLength();
+}
+exports.getMappingOffset = getMappingOffset;
 //# sourceMappingURL=transform.js.map

package/lib/node/utils.d.ts

@@ -1,3 +1,3 @@
-import type { Language } from '@volar/language-core';
+import type { Language, SourceScript, TypeScriptServiceScript } from '@volar/language-core';
 export declare function notEmpty<T>(value: T | null | undefined): value is T;
-export declare function getServiceScript(language: Language<string>, fileName: string): readonly [import("@volar/language-core").TypeScriptServiceScript, import("@volar/language-core").SourceScript<string>, import("@volar/language-core").SourceMap<import("@volar/language-core").CodeInformation>] | readonly [undefined, undefined, undefined];
+export declare function getServiceScript(language: Language<string>, fileName: string): [serviceScript: TypeScriptServiceScript, targetScript: SourceScript<string>, sourceScript: SourceScript<string>] | [serviceScript: undefined, sourceScript: SourceScript<string>, sourceScript: SourceScript<string>] | [serviceScript: undefined, sourceScript: undefined, targetScript: undefined];

package/lib/node/utils.js

@@ -7,13 +7,24 @@ function notEmpty(value) {
 exports.notEmpty = notEmpty;
 function getServiceScript(language, fileName) {
     const sourceScript = language.scripts.get(fileName);
+    if (sourceScript?.targetIds.size) {
+        for (const targetId of sourceScript.targetIds) {
+            const targetScript = language.scripts.get(targetId);
+            if (targetScript?.generated) {
+                const serviceScript = targetScript.generated.languagePlugin.typescript?.getServiceScript(targetScript.generated.root);
+                if (serviceScript) {
+                    return [serviceScript, sourceScript, targetScript];
+                }
+            }
+        }
+    }
+    if (sourceScript?.associatedOnly) {
+        return [undefined, sourceScript, sourceScript];
+    }
     if (sourceScript?.generated) {
         const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
         if (serviceScript) {
-            const map = language.maps.get(serviceScript.code, sourceScript.id);
-            if (map) {
-                return [serviceScript, sourceScript, map];
-            }
+            return [serviceScript, sourceScript, sourceScript];
         }
     }
     return [undefined, undefined, undefined];

package/lib/protocol/createProject.d.ts

@@ -1,9 +1,9 @@
-import { Language, SourceScript, TypeScriptExtraServiceScript } from '@volar/language-core';
+import { Language, TypeScriptExtraServiceScript } from '@volar/language-core';
 import type * as ts from 'typescript';
 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): {
     languageServiceHost: ts.LanguageServiceHost;
-    getExtraServiceScript: (fileName: string) => [SourceScript<T>, TypeScriptExtraServiceScript] | undefined;
+    getExtraServiceScript: (fileName: string) => TypeScriptExtraServiceScript | undefined;
 };

package/lib/protocol/createProject.js

@@ -80,7 +80,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
         getScriptKind(fileName) {
             sync();
             if (extraScriptRegistry.has(fileName)) {
-                return extraScriptRegistry.get(fileName)[1].scriptKind;
+                return extraScriptRegistry.get(fileName).scriptKind;
             }
             const sourceScript = language.scripts.get(asScrpitId(fileName));
             if (sourceScript?.generated) {
@@ -170,7 +170,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
                 for (const extraServiceScript of sourceScript.generated.languagePlugin.typescript?.getExtraServiceScripts?.(fileName, sourceScript.generated.root) ?? []) {
                     newTsVirtualFileSnapshots.add(extraServiceScript.code.snapshot);
                     tsFileNamesSet.add(extraServiceScript.fileName);
-                    extraScriptRegistry.set(extraServiceScript.fileName, [sourceScript, extraServiceScript]);
+                    extraScriptRegistry.set(extraServiceScript.fileName, extraServiceScript);
                 }
                 for (const code of (0, language_core_1.forEachEmbeddedCode)(sourceScript.generated.root)) {
                     newOtherVirtualFileSnapshots.add(code.snapshot);
@@ -197,7 +197,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
     function getScriptSnapshot(fileName) {
         sync();
         if (extraScriptRegistry.has(fileName)) {
-            return extraScriptRegistry.get(fileName)[1].code.snapshot;
+            return extraScriptRegistry.get(fileName).code.snapshot;
         }
         const sourceScript = language.scripts.get(asScrpitId(fileName));
         if (sourceScript?.generated) {
@@ -217,7 +217,7 @@ function createLanguageServiceHost(ts, sys, language, asScrpitId, projectHost) {
         }
         const version = scriptVersions.get(fileName);
         if (extraScriptRegistry.has(fileName)) {
-            const snapshot = extraScriptRegistry.get(fileName)[1].code.snapshot;
+            const snapshot = extraScriptRegistry.get(fileName).code.snapshot;
             if (!version.map.has(snapshot)) {
                 version.map.set(snapshot, version.lastVersion++);
             }

package/lib/quickstart/createAsyncLanguageServicePlugin.js

@@ -56,11 +56,7 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePl
                         const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
                         const language = (0, language_core_1.createLanguage)([
                             ...languagePlugins,
-                            {
-                                getLanguageId(fileName) {
-                                    return (0, common_1.resolveFileLanguageId)(fileName);
-                                },
-                            },
+                            { getLanguageId: common_1.resolveFileLanguageId },
                         ], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
                             const version = getScriptVersion(fileName);
                             if (syncedScriptVersions.get(fileName) === version) {
@@ -87,7 +83,7 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, loadLanguagePl
                 if (updateLevel >= (1)
                     || !externalFiles.has(project)) {
                     const oldFiles = externalFiles.get(project);
-                    const newFiles = (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions);
+                    const newFiles = extensions.length ? (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions) : [];
                     externalFiles.set(project, newFiles);
                     if (oldFiles && !(0, createLanguageServicePlugin_1.arrayItemsEqual)(oldFiles, newFiles)) {
                         project.refreshDiagnostics();

package/lib/quickstart/createLanguageServicePlugin.js

@@ -28,11 +28,7 @@ function createLanguageServicePlugin(loadLanguagePlugins) {
                     const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
                     const language = (0, language_core_1.createLanguage)([
                         ...languagePlugins,
-                        {
-                            getLanguageId(fileName) {
-                                return (0, common_1.resolveFileLanguageId)(fileName);
-                            },
-                        },
+                        { getLanguageId: common_1.resolveFileLanguageId },
                     ], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
                         const version = getScriptVersion(fileName);
                         if (syncedScriptVersions.get(fileName) === version) {
@@ -56,7 +52,8 @@ function createLanguageServicePlugin(loadLanguagePlugins) {
                 if (updateLevel >= (1)
                     || !externalFiles.has(project)) {
                     const oldFiles = externalFiles.get(project);
-                    const newFiles = (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, projectExternalFileExtensions.get(project));
+                    const extensions = projectExternalFileExtensions.get(project);
+                    const newFiles = extensions?.length ? (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions) : [];
                     externalFiles.set(project, newFiles);
                     if (oldFiles && !arrayItemsEqual(oldFiles, newFiles)) {
                         project.refreshDiagnostics();

package/lib/resolveModuleName.js

@@ -44,6 +44,24 @@ function createResolveModuleName(ts, host, languagePlugins, getSourceScript) {
                         }
                     }
                 }
+                if (typescript.resolveHiddenExtensions && fileName.endsWith(`.d.ts`)) {
+                    for (const { extension } of typescript.extraFileExtensions) {
+                        const sourceFileName = fileName.slice(0, -`.d.ts`.length) + `.${extension}`;
+                        if (fileExists(sourceFileName)) {
+                            const sourceScript = getSourceScript(sourceFileName);
+                            if (sourceScript?.generated) {
+                                const serviceScript = sourceScript.generated.languagePlugin.typescript?.getServiceScript(sourceScript.generated.root);
+                                if (serviceScript) {
+                                    toSourceFileInfo.set(fileName, {
+                                        sourceFileName,
+                                        extension: serviceScript.extension,
+                                    });
+                                    return true;
+                                }
+                            }
+                        }
+                    }
+                }
             }
             return host.fileExists(fileName);
         },

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.3.0-alpha.1",
+	"version": "2.3.0-alpha.11",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.3.0-alpha.1",
+		"@volar/language-core": "2.3.0-alpha.11",
 		"path-browserify": "^1.0.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.3.0-alpha.1"
+		"@volar/language-service": "2.3.0-alpha.11"
 	},
-	"gitHead": "173be13e1d51c62cfe5ddc9926933d30a7aa1d11"
+	"gitHead": "c83f835629496d3a4cc38f4b789bb676d07a2118"
 }