@volar/typescript 2.4.0-alpha.9 → 2.4.1

package/index.d.ts

@@ -18,8 +18,10 @@ declare module '@volar/language-service' {
             };
             languageServiceHost: ts.LanguageServiceHost;
             getExtraServiceScript(fileName: string): TypeScriptExtraServiceScript | undefined;
-            asUri(fileName: string): URI;
-            asFileName(uri: URI): string;
+            uriConverter: {
+                asUri(fileName: string): URI;
+                asFileName(uri: URI): string;
+            };
         };
     }
 }

package/lib/node/proxyCreateProgram.js

@@ -57,8 +57,8 @@ function proxyCreateProgram(ts, original, create) {
                 language = (0, language_core_1.createLanguage)([
                     ...languagePlugins,
                     { getLanguageId: common_1.resolveFileLanguageId },
-                ], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
-                    if (!sourceFileSnapshots.has(fileName)) {
+                ], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), (fileName, includeFsFiles) => {
+                    if (includeFsFiles && !sourceFileSnapshots.has(fileName)) {
                         const sourceFileText = originalHost.readFile(fileName);
                         if (sourceFileText !== undefined) {
                             sourceFileSnapshots.set(fileName, [undefined, {
@@ -125,12 +125,16 @@ function proxyCreateProgram(ts, original, create) {
                     if (sourceScript.generated?.languagePlugin.typescript) {
                         const { getServiceScript, getExtraServiceScripts } = sourceScript.generated.languagePlugin.typescript;
                         const serviceScript = getServiceScript(sourceScript.generated.root);
-                        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;
-                            patchedText += serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
-                            const parsedSourceFile = ts.createSourceFile(fileName, patchedText, languageVersionOrOptions, undefined, scriptKind);
+                        if (serviceScript) {
+                            let virtualContents;
+                            if (!serviceScript.preventLeadingOffset) {
+                                virtualContents = originalSourceFile.text.split('\n').map(line => ' '.repeat(line.length)).join('\n')
+                                    + serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
+                            }
+                            else {
+                                virtualContents = serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
+                            }
+                            const parsedSourceFile = ts.createSourceFile(fileName, virtualContents, languageVersionOrOptions, undefined, serviceScript.scriptKind);
                             // @ts-expect-error
                             parsedSourceFile.version = originalSourceFile.version;
                             parsedSourceFiles.set(originalSourceFile, parsedSourceFile);

package/lib/node/proxyLanguageService.js

@@ -29,6 +29,7 @@ function createProxyLanguageService(languageService) {
                     case 'getDocumentHighlights': return getDocumentHighlights(language, target[p]);
                     case 'getApplicableRefactors': return getApplicableRefactors(language, target[p]);
                     case 'getEditsForRefactor': return getEditsForRefactor(language, target[p]);
+                    case 'getCombinedCodeFix': return getCombinedCodeFix(language, target[p]);
                     case 'getRenameInfo': return getRenameInfo(language, target[p]);
                     case 'getCodeFixesAtPosition': return getCodeFixesAtPosition(language, target[p]);
                     case 'getEncodedSemanticClassifications': return getEncodedSemanticClassifications(language, target[p]);
@@ -46,6 +47,7 @@ function createProxyLanguageService(languageService) {
                     case 'getCompletionEntryDetails': return getCompletionEntryDetails(language, target[p]);
                     case 'provideInlayHints': return provideInlayHints(language, target[p]);
                     case 'getFileReferences': return getFileReferences(language, target[p]);
+                    case 'getNavigateToItems': return getNavigateToItems(language, target[p]);
                 }
             };
         },
@@ -467,6 +469,13 @@ function getEditsForRefactor(language, getEditsForRefactor) {
         }
     };
 }
+function getCombinedCodeFix(language, getCombinedCodeFix) {
+    return (...args) => {
+        const codeActions = getCombinedCodeFix(...args);
+        codeActions.changes = (0, transform_1.transformFileTextChanges)(language, codeActions.changes, language_core_1.isCodeActionsEnabled);
+        return codeActions;
+    };
+}
 function getRenameInfo(language, getRenameInfo) {
     return (filePath, position, options) => {
         const fileName = filePath.replace(windowsPathReg, '/');
@@ -861,6 +870,15 @@ function getFileReferences(language, getFileReferences) {
         return (0, dedupe_1.dedupeDocumentSpans)(resolved);
     };
 }
+function getNavigateToItems(language, getNavigateToItems) {
+    return (...args) => {
+        const unresolved = getNavigateToItems(...args);
+        const resolved = unresolved
+            .map(s => (0, transform_1.transformDocumentSpan)(language, s, language_core_1.isReferencesEnabled))
+            .filter(s => !!s);
+        return (0, dedupe_1.dedupeDocumentSpans)(resolved);
+    };
+}
 function linkedCodeFeatureWorker(language, fileName, position, filter, worker, getLinkedCodes) {
     const results = [];
     const processedFilePositions = new Set();

package/lib/node/transform.js

@@ -46,7 +46,7 @@ function transformDiagnostic(language, diagnostic, program, isTsc) {
                 const [sourceSpanFileName, sourceSpan] = transformTextSpan(undefined, language, serviceScript, {
                     start: diagnostic.start,
                     length: diagnostic.length
-                }, language_core_1.shouldReportDiagnostics) ?? [];
+                }, data => (0, language_core_1.shouldReportDiagnostics)(data, String(diagnostic.source), String(diagnostic.code))) ?? [];
                 const actualDiagnosticFile = sourceSpanFileName
                     ? diagnostic.file.fileName === sourceSpanFileName
                         ? diagnostic.file

package/lib/protocol/createProject.d.ts

@@ -2,7 +2,7 @@ import { Language } from '@volar/language-core';
 import type * as ts from 'typescript';
 import type { TypeScriptExtraServiceScript } from '../..';
 import type { createSys } from './createSys';
-export interface TypeScriptProjectHost extends Pick<ts.LanguageServiceHost, 'getLocalizedDiagnosticMessages' | 'getCurrentDirectory' | 'getCompilationSettings' | 'getProjectReferences' | 'getScriptFileNames' | 'getProjectVersion' | 'getScriptSnapshot'> {
+export interface TypeScriptProjectHost extends Pick<ts.LanguageServiceHost, 'getLocalizedDiagnosticMessages' | 'getCurrentDirectory' | 'getCompilationSettings' | 'getProjectReferences' | 'getScriptFileNames' | 'getProjectVersion'> {
 }
 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;

package/lib/protocol/createProject.js

@@ -247,15 +247,12 @@ function createLanguageServiceHost(ts, sys, language, asScriptId, projectHost) {
                 return version.map.get(serviceScript.code.snapshot).toString();
             }
         }
-        const isOpenedFile = !!projectHost.getScriptSnapshot(fileName);
-        if (isOpenedFile) {
-            const sourceScript = language.scripts.get(asScriptId(fileName));
-            if (sourceScript && !sourceScript.generated) {
-                if (!version.map.has(sourceScript.snapshot)) {
-                    version.map.set(sourceScript.snapshot, version.lastVersion++);
-                }
-                return version.map.get(sourceScript.snapshot).toString();
+        const openedFile = language.scripts.get(asScriptId(fileName), false);
+        if (openedFile && !openedFile.generated) {
+            if (!version.map.has(openedFile.snapshot)) {
+                version.map.set(openedFile.snapshot, version.lastVersion++);
             }
+            return version.map.get(openedFile.snapshot).toString();
         }
         if (sys.fileExists(fileName)) {
             return sys.getModifiedTime?.(fileName)?.valueOf().toString() ?? '0';

package/lib/protocol/createSys.d.ts

@@ -1,7 +1,7 @@
 import type { LanguageServiceEnvironment, Disposable } from '@volar/language-service';
 import type * as ts from 'typescript';
 import { URI } from 'vscode-uri';
-export declare function createSys(sys: ts.System | undefined, env: LanguageServiceEnvironment, getCurrentDirectory: () => string, uriConverter: {
+export declare function createSys(sys: ts.System | undefined, env: Pick<LanguageServiceEnvironment, 'onDidChangeWatchedFiles' | 'fs'>, getCurrentDirectory: () => string, uriConverter: {
     asUri(fileName: string): URI;
     asFileName(uri: URI): string;
 }): ts.System & {

package/lib/quickstart/createAsyncLanguageServicePlugin.d.ts

@@ -1,6 +1,6 @@
 import { Language, LanguagePlugin } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function createAsyncLanguageServicePlugin(extensions: string[], scriptKind: ts.ScriptKind, create: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => Promise<{
+export declare function createAsyncLanguageServicePlugin(extensions: string[], getScriptKindForExtraExtensions: ts.ScriptKind | ((fileName: string) => ts.ScriptKind), create: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => Promise<{
     languagePlugins: LanguagePlugin<string>[];
     setup?: (language: Language<string>) => void;
 }>): ts.server.PluginModuleFactory;

package/lib/quickstart/createAsyncLanguageServicePlugin.js

@@ -6,7 +6,7 @@ const common_1 = require("../common");
 const proxyLanguageService_1 = require("../node/proxyLanguageService");
 const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
 const createLanguageServicePlugin_1 = require("./createLanguageServicePlugin");
-function createAsyncLanguageServicePlugin(extensions, scriptKind, create) {
+function createAsyncLanguageServicePlugin(extensions, getScriptKindForExtraExtensions, create) {
     return modules => {
         const { typescript: ts } = modules;
         const pluginModule = {
@@ -36,7 +36,14 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, create) {
                     if (getScriptKind) {
                         info.languageServiceHost.getScriptKind = fileName => {
                             if (!initialized && extensions.some(ext => fileName.endsWith(ext))) {
-                                return scriptKind; // TODO: bypass upstream bug
+                                // bypass upstream bug https://github.com/microsoft/TypeScript/issues/57631
+                                // TODO: check if the bug is fixed in 5.5
+                                if (typeof getScriptKindForExtraExtensions === 'function') {
+                                    return getScriptKindForExtraExtensions(fileName);
+                                }
+                                else {
+                                    return getScriptKindForExtraExtensions;
+                                }
                             }
                             return getScriptKind(fileName);
                         };
@@ -52,17 +59,16 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, create) {
                     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)([
                             ...languagePlugins,
                             { getLanguageId: common_1.resolveFileLanguageId },
                         ], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
-                            const version = getScriptVersion(fileName);
-                            if (syncedScriptVersions.get(fileName) === version) {
-                                return;
+                            let snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
+                            if (!snapshot) {
+                                // trigger projectService.getOrCreateScriptInfoNotOpenedByClient
+                                info.project.getScriptVersion(fileName);
+                                snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
                             }
-                            syncedScriptVersions.set(fileName, version);
-                            const snapshot = getScriptSnapshot(fileName);
                             if (snapshot) {
                                 language.scripts.set(fileName, snapshot);
                             }

package/lib/quickstart/createLanguageServicePlugin.js

@@ -25,19 +25,16 @@ function createLanguageServicePlugin(create) {
                         .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
                         .flat();
                     exports.projectExternalFileExtensions.set(info.project, extensions);
-                    const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
-                    const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
-                    const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
                     const language = (0, language_core_1.createLanguage)([
                         ...languagePlugins,
                         { getLanguageId: common_1.resolveFileLanguageId },
                     ], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
-                        const version = getScriptVersion(fileName);
-                        if (syncedScriptVersions.get(fileName) === version) {
-                            return;
+                        let snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
+                        if (!snapshot) {
+                            // trigger projectService.getOrCreateScriptInfoNotOpenedByClient
+                            info.project.getScriptVersion(fileName);
+                            snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
                         }
-                        syncedScriptVersions.set(fileName, version);
-                        const snapshot = getScriptSnapshot(fileName);
                         if (snapshot) {
                             language.scripts.set(fileName, snapshot);
                         }

package/lib/quickstart/runTsc.d.ts

@@ -4,4 +4,18 @@ export declare let getLanguagePlugins: (ts: typeof import('typescript'), options
     languagePlugins: LanguagePlugin<string>[];
     setup?(language: Language<string>): void;
 };
-export declare function runTsc(tscPath: string, extensions: string[], _getLanguagePlugins: typeof getLanguagePlugins): void;
+export declare function runTsc(tscPath: string, options: string[] | {
+    extraSupportedExtensions: string[];
+    extraExtensionsToRemove: string[];
+}, _getLanguagePlugins: typeof getLanguagePlugins): void;
+/**
+ * Replaces the code of typescript to add support for additional extensions and language plugins.
+ *
+ * @param tsc - The original code of typescript.
+ * @param proxyApiPath - The path to the proxy API.
+ * @param extraSupportedExtensions - An array of additional supported extensions.
+ * @param extraExtensionsToRemove - An array of extensions to remove.
+ * @param getLanguagePluginsFile - The file to get language plugins from.
+ * @returns The modified typescript code.
+ */
+export declare function transformTscContent(tsc: string, proxyApiPath: string, extraSupportedExtensions: string[], extraExtensionsToRemove: string[], getLanguagePluginsFile?: string): string;

package/lib/quickstart/runTsc.js

@@ -2,31 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLanguagePlugins = void 0;
 exports.runTsc = runTsc;
+exports.transformTscContent = transformTscContent;
 const fs = require("fs");
 let getLanguagePlugins = () => [];
 exports.getLanguagePlugins = getLanguagePlugins;
-function runTsc(tscPath, extensions, _getLanguagePlugins) {
+function runTsc(tscPath, options, _getLanguagePlugins) {
     exports.getLanguagePlugins = _getLanguagePlugins;
     const proxyApiPath = require.resolve('../node/proxyCreateProgram');
     const readFileSync = fs.readFileSync;
     fs.readFileSync = (...args) => {
         if (args[0] === tscPath) {
             let tsc = readFileSync(...args);
-            // add allow extensions
-            const extsText = extensions.map(ext => `"${ext}"`).join(', ');
-            tsc = replace(tsc, /supportedTSExtensions = .*(?=;)/, s => s + `.concat([[${extsText}]])`);
-            tsc = replace(tsc, /supportedJSExtensions = .*(?=;)/, s => s + `.concat([[${extsText}]])`);
-            tsc = replace(tsc, /allSupportedExtensions = .*(?=;)/, s => s + `.concat([[${extsText}]])`);
-            // proxy createProgram
-            tsc = replace(tsc, /function createProgram\(.+\) {/, s => `var createProgram = require(${JSON.stringify(proxyApiPath)}).proxyCreateProgram(`
-                + [
-                    `new Proxy({}, { get(_target, p, _receiver) { return eval(p); } } )`,
-                    `_createProgram`,
-                    `require(${JSON.stringify(__filename)}).getLanguagePlugins`,
-                ].join(', ')
-                + `);\n`
-                + s.replace('createProgram', '_createProgram'));
-            return tsc;
+            let extraSupportedExtensions;
+            let extraExtensionsToRemove;
+            if (Array.isArray(options)) {
+                extraSupportedExtensions = options;
+                extraExtensionsToRemove = [];
+            }
+            else {
+                extraSupportedExtensions = options.extraSupportedExtensions;
+                extraExtensionsToRemove = options.extraExtensionsToRemove;
+            }
+            return transformTscContent(tsc, proxyApiPath, extraSupportedExtensions, extraExtensionsToRemove);
         }
         return readFileSync(...args);
     };
@@ -38,6 +35,50 @@ function runTsc(tscPath, extensions, _getLanguagePlugins) {
         delete require.cache[tscPath];
     }
 }
+/**
+ * Replaces the code of typescript to add support for additional extensions and language plugins.
+ *
+ * @param tsc - The original code of typescript.
+ * @param proxyApiPath - The path to the proxy API.
+ * @param extraSupportedExtensions - An array of additional supported extensions.
+ * @param extraExtensionsToRemove - An array of extensions to remove.
+ * @param getLanguagePluginsFile - The file to get language plugins from.
+ * @returns The modified typescript code.
+ */
+function transformTscContent(tsc, proxyApiPath, extraSupportedExtensions, extraExtensionsToRemove, getLanguagePluginsFile = __filename) {
+    const neededPatchExtenstions = extraSupportedExtensions.filter(ext => !extraExtensionsToRemove.includes(ext));
+    // Add allow extensions
+    if (extraSupportedExtensions.length) {
+        const extsText = extraSupportedExtensions.map(ext => `"${ext}"`).join(', ');
+        tsc = replace(tsc, /supportedTSExtensions = .*(?=;)/, s => s + `.map((group, i) => i === 0 ? group.splice(0, 0, ${extsText}) && group : group)`);
+        tsc = replace(tsc, /supportedJSExtensions = .*(?=;)/, s => s + `.map((group, i) => i === 0 ? group.splice(0, 0, ${extsText}) && group : group)`);
+        tsc = replace(tsc, /allSupportedExtensions = .*(?=;)/, s => s + `.map((group, i) => i === 0 ? group.splice(0, 0, ${extsText}) && group : group)`);
+    }
+    // Use to emit basename.xxx to basename.d.ts instead of basename.xxx.d.ts
+    if (extraExtensionsToRemove.length) {
+        const extsText = extraExtensionsToRemove.map(ext => `"${ext}"`).join(', ');
+        tsc = replace(tsc, /extensionsToRemove = .*(?=;)/, s => s + `.concat([${extsText}])`);
+    }
+    // Support for basename.xxx to basename.xxx.d.ts
+    if (neededPatchExtenstions.length) {
+        const extsText = neededPatchExtenstions.map(ext => `"${ext}"`).join(', ');
+        tsc = replace(tsc, /function changeExtension\(/, s => `function changeExtension(path, newExtension) {
+			return [${extsText}].some(ext => path.endsWith(ext))
+				? path + newExtension
+				: _changeExtension(path, newExtension)
+			}\n` + s.replace('changeExtension', '_changeExtension'));
+    }
+    // proxy createProgram
+    tsc = replace(tsc, /function createProgram\(.+\) {/, s => `var createProgram = require(${JSON.stringify(proxyApiPath)}).proxyCreateProgram(`
+        + [
+            `new Proxy({}, { get(_target, p, _receiver) { return eval(p); } } )`,
+            `_createProgram`,
+            `require(${JSON.stringify(getLanguagePluginsFile)}).getLanguagePlugins`,
+        ].join(', ')
+        + `);\n`
+        + s.replace('createProgram', '_createProgram'));
+    return tsc;
+}
 function replace(text, ...[search, replace]) {
     const before = text;
     text = text.replace(search, replace);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.4.0-alpha.9",
+	"version": "2.4.1",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.0-alpha.9",
+		"@volar/language-core": "2.4.1",
 		"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.9"
+		"@volar/language-service": "2.4.1"
 	},
-	"gitHead": "4a3fc1bf36eb12ccd58bc8cb25f11f1a9f7b2300"
+	"gitHead": "b920b6c4a3e4b2d8f46c676ea414e94c437cb5b7"
 }