@volar/typescript 2.0.0 → 2.0.1

package/lib/node/decorateLanguageServiceHost.js

@@ -129,6 +129,9 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
                         patchedText += script.code.snapshot.getText(0, script.code.snapshot.getLength());
                     }
                     snapshotSnapshot = ts.ScriptSnapshot.fromString(patchedText);
+                    if (sourceFile.generated.languagePlugin.typescript?.getExtraScripts) {
+                        console.warn('getExtraScripts() is not available in this use case.');
+                    }
                 }
             }
             else if (virtualFiles.get(fileName)) {

package/lib/node/proxyCreateProgram.js

@@ -64,12 +64,16 @@ function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
                         assert(!!sourceFile, '!!sourceFile');
                         let patchedText = originalSourceFile.text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
                         let scriptKind = ts.ScriptKind.TS;
-                        if (sourceFile.generated) {
-                            const script = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
+                        if (sourceFile.generated?.languagePlugin.typescript) {
+                            const { getScript, getExtraScripts } = sourceFile.generated.languagePlugin.typescript;
+                            const script = getScript(sourceFile.generated.code);
                             if (script) {
                                 scriptKind = script.scriptKind;
                                 patchedText += script.code.snapshot.getText(0, script.code.snapshot.getLength());
                             }
+                            if (getExtraScripts) {
+                                console.warn('getExtraScripts() is not available in this use case.');
+                            }
                         }
                         sourceFile2 = ts.createSourceFile(fileName, patchedText, 99, true, scriptKind);
                         // @ts-expect-error
@@ -92,6 +96,7 @@ function proxyCreateProgram(ts, original, extensions, getLanguagePlugins) {
             };
             const program = Reflect.apply(target, thisArg, [options]);
             (0, decorateProgram_1.decorateProgram)(files, program);
+            program.__volar__ = { files };
             return program;
             function resolveModuleName(name, containingFile, options, redirectedReference) {
                 const resolved = ts.resolveModuleName(name, containingFile, options, moduleResolutionHost, originalHost.getModuleResolutionCache?.(), redirectedReference);

package/lib/node/utils.d.ts

@@ -1,7 +1,3 @@
 import type { FileRegistry } from '@volar/language-core';
 export declare function notEmpty<T>(value: T | null | undefined): value is T;
-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];
+export declare function getVirtualFileAndMap(files: FileRegistry, fileName: string): readonly [import("@volar/language-core").ServiceScript, import("@volar/language-core").SourceFile, import("@volar/language-core").SourceMap<import("@volar/language-core").CodeInformation>] | readonly [undefined, undefined, undefined];

package/lib/protocol/createProject.js

@@ -34,7 +34,7 @@ function createLanguage(ts, sys, languagePlugins, configFileName, projectHost, {
             files.delete(fileId);
         }
     });
-    let languageServiceHost = createLanguageServiceHost();
+    let { languageServiceHost, getExtraScript } = createLanguageServiceHost();
     for (const language of languagePlugins) {
         if (language.typescript?.resolveLanguageServiceHost) {
             languageServiceHost = language.typescript.resolveLanguageServiceHost(languageServiceHost);
@@ -93,12 +93,14 @@ function createLanguage(ts, sys, languagePlugins, configFileName, projectHost, {
             sys,
             projectHost,
             languageServiceHost,
+            getExtraScript,
         },
     };
     function createLanguageServiceHost() {
         let lastProjectVersion;
         let tsProjectVersion = 0;
         let tsFileRegistry = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
+        let extraScriptRegistry = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
         let lastTsVirtualFileSnapshots = new Set();
         let lastOtherVirtualFileSnapshots = new Set();
         const languageServiceHost = {
@@ -156,14 +158,18 @@ function createLanguage(ts, sys, languagePlugins, configFileName, projectHost, {
                 return getScriptVersion(fileName) !== '';
             },
             getProjectVersion() {
-                syncProject();
+                sync();
                 return tsProjectVersion + ('version' in sys ? `:${sys.version}` : '');
             },
             getScriptFileNames() {
-                syncProject();
+                sync();
                 return [...tsFileRegistry.keys()];
             },
             getScriptKind(fileName) {
+                sync();
+                if (extraScriptRegistry.has(fileName)) {
+                    return extraScriptRegistry.get(fileName).scriptKind;
+                }
                 const sourceFile = files.get(fileNameToFileId(fileName));
                 if (sourceFile?.generated) {
                     const tsCode = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
@@ -193,14 +199,22 @@ function createLanguage(ts, sys, languagePlugins, configFileName, projectHost, {
             getScriptVersion,
             getScriptSnapshot,
         };
-        return languageServiceHost;
-        function syncProject() {
+        return {
+            languageServiceHost,
+            getExtraScript,
+        };
+        function getExtraScript(fileName) {
+            sync();
+            return extraScriptRegistry.get(fileName);
+        }
+        function sync() {
             const newProjectVersion = projectHost.getProjectVersion?.();
             const shouldUpdate = newProjectVersion === undefined || newProjectVersion !== lastProjectVersion;
             if (!shouldUpdate) {
                 return;
             }
             lastProjectVersion = newProjectVersion;
+            extraScriptRegistry.clear();
             const newTsVirtualFileSnapshots = new Set();
             const newOtherVirtualFileSnapshots = new Set();
             const tsFileNamesSet = new Set();
@@ -210,10 +224,15 @@ function createLanguage(ts, sys, languagePlugins, configFileName, projectHost, {
                     const script = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
                     if (script) {
                         newTsVirtualFileSnapshots.add(script.code.snapshot);
-                        tsFileNamesSet.add(fileName); // virtual .ts
+                        tsFileNamesSet.add(fileName);
                     }
-                    for (const file of (0, language_core_2.forEachEmbeddedCode)(sourceFile.generated.code)) {
-                        newOtherVirtualFileSnapshots.add(file.snapshot);
+                    for (const extraScript of sourceFile.generated.languagePlugin.typescript?.getExtraScripts?.(fileName, sourceFile.generated.code) ?? []) {
+                        newTsVirtualFileSnapshots.add(extraScript.code.snapshot);
+                        tsFileNamesSet.add(extraScript.fileName);
+                        extraScriptRegistry.set(extraScript.fileName, extraScript);
+                    }
+                    for (const code of (0, language_core_2.forEachEmbeddedCode)(sourceFile.generated.code)) {
+                        newOtherVirtualFileSnapshots.add(code.snapshot);
                     }
                 }
                 else {
@@ -235,6 +254,10 @@ function createLanguage(ts, sys, languagePlugins, configFileName, projectHost, {
             }
         }
         function getScriptSnapshot(fileName) {
+            sync();
+            if (extraScriptRegistry.has(fileName)) {
+                return extraScriptRegistry.get(fileName).code.snapshot;
+            }
             const sourceFile = files.get(fileNameToFileId(fileName));
             if (sourceFile?.generated) {
                 const script = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);
@@ -247,10 +270,18 @@ function createLanguage(ts, sys, languagePlugins, configFileName, projectHost, {
             }
         }
         function getScriptVersion(fileName) {
+            sync();
             if (!scriptVersions.has(fileName)) {
                 scriptVersions.set(fileName, { lastVersion: 0, map: new WeakMap() });
             }
             const version = scriptVersions.get(fileName);
+            if (extraScriptRegistry.has(fileName)) {
+                const snapshot = extraScriptRegistry.get(fileName).code.snapshot;
+                if (!version.map.has(snapshot)) {
+                    version.map.set(snapshot, version.lastVersion++);
+                }
+                return version.map.get(snapshot).toString();
+            }
             const sourceFile = files.get(fileNameToFileId(fileName));
             if (sourceFile?.generated) {
                 const script = sourceFile.generated.languagePlugin.typescript?.getScript(sourceFile.generated.code);

package/lib/quickstart/runTsc.js

@@ -18,7 +18,7 @@ function runTsc(tscPath, extensions, _getLanguagePlugins) {
             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); } } ), `
+                + `new Proxy({}, { get(_target, p, _receiver) { return eval(p); } } ), `
                 + `_createProgram, `
                 + `[${extsText}], `
                 + `require(${JSON.stringify(__filename)}).getLanguagePlugins`

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.0.0",
+	"version": "2.0.1",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,13 +12,13 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.0.0",
+		"@volar/language-core": "2.0.1",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.0.0"
+		"@volar/language-service": "2.0.1"
 	},
-	"gitHead": "95217136d2727bb7304443d91cfde3dbe711369c"
+	"gitHead": "b1fbf6eed522624ccccfb17a8999edfbc1d8d9bb"
 }

package/lib/quickstart/createAsyncTSServerPlugin.d.ts

@@ -1,3 +0,0 @@
-import type * as ts from 'typescript';
-import { LanguagePlugin } from '@volar/language-core';
-export declare function createAsyncTSServerPlugin(extensions: string[], scriptKind: ts.ScriptKind, loadLanguagePlugins: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => Promise<LanguagePlugin[]>): ts.server.PluginModuleFactory;

package/lib/quickstart/createAsyncTSServerPlugin.js

@@ -1,89 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAsyncTSServerPlugin = void 0;
-const decorateLanguageService_1 = require("../node/decorateLanguageService");
-const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
-const language_core_1 = require("@volar/language-core");
-const createTSServerPlugin_1 = require("./createTSServerPlugin");
-const externalFiles = new WeakMap();
-const decoratedLanguageServices = new WeakSet();
-const decoratedLanguageServiceHosts = new WeakSet();
-function createAsyncTSServerPlugin(extensions, scriptKind, loadLanguagePlugins) {
-    return modules => {
-        const { typescript: ts } = modules;
-        const pluginModule = {
-            create(info) {
-                if (!decoratedLanguageServices.has(info.languageService)
-                    && !decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
-                    decoratedLanguageServices.add(info.languageService);
-                    decoratedLanguageServiceHosts.add(info.languageServiceHost);
-                    const emptySnapshot = ts.ScriptSnapshot.fromString('');
-                    const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
-                    const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
-                    const getScriptKind = info.languageServiceHost.getScriptKind?.bind(info.languageServiceHost);
-                    const getProjectVersion = info.languageServiceHost.getProjectVersion?.bind(info.languageServiceHost);
-                    let initialized = false;
-                    info.languageServiceHost.getScriptSnapshot = fileName => {
-                        if (!initialized && extensions.some(ext => fileName.endsWith(ext))) {
-                            return emptySnapshot;
-                        }
-                        return getScriptSnapshot(fileName);
-                    };
-                    info.languageServiceHost.getScriptVersion = fileName => {
-                        if (!initialized && extensions.some(ext => fileName.endsWith(ext))) {
-                            return 'initializing...';
-                        }
-                        return getScriptVersion(fileName);
-                    };
-                    if (getScriptKind) {
-                        info.languageServiceHost.getScriptKind = fileName => {
-                            if (!initialized && extensions.some(ext => fileName.endsWith(ext))) {
-                                return scriptKind; // TODO: bypass upstream bug
-                            }
-                            return getScriptKind(fileName);
-                        };
-                    }
-                    if (getProjectVersion) {
-                        info.languageServiceHost.getProjectVersion = () => {
-                            if (!initialized) {
-                                return getProjectVersion() + ',initializing...';
-                            }
-                            return getProjectVersion();
-                        };
-                    }
-                    loadLanguagePlugins(ts, info).then(languagePlugins => {
-                        const files = (0, language_core_1.createFileRegistry)(languagePlugins, ts.sys.useCaseSensitiveFileNames, fileName => {
-                            const snapshot = getScriptSnapshot(fileName);
-                            if (snapshot) {
-                                files.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
-                            }
-                            else {
-                                files.delete(fileName);
-                            }
-                        });
-                        (0, decorateLanguageService_1.decorateLanguageService)(files, info.languageService);
-                        (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(files, info.languageServiceHost, ts);
-                        info.project.markAsDirty();
-                        initialized = true;
-                    });
-                }
-                return info.languageService;
-            },
-            getExternalFiles(project, updateLevel = 0) {
-                if (updateLevel >= (1)
-                    || !externalFiles.has(project)) {
-                    const oldFiles = externalFiles.get(project);
-                    const newFiles = (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, extensions);
-                    externalFiles.set(project, newFiles);
-                    if (oldFiles && !(0, createTSServerPlugin_1.arrayItemsEqual)(oldFiles, newFiles)) {
-                        project.refreshDiagnostics();
-                    }
-                }
-                return externalFiles.get(project);
-            },
-        };
-        return pluginModule;
-    };
-}
-exports.createAsyncTSServerPlugin = createAsyncTSServerPlugin;
-//# sourceMappingURL=createAsyncTSServerPlugin.js.map

package/lib/quickstart/createTSServerPlugin.d.ts

@@ -1,4 +0,0 @@
-import type * as ts from 'typescript';
-import { LanguagePlugin } from '@volar/language-core';
-export declare function createTSServerPlugin(init: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => LanguagePlugin[]): ts.server.PluginModuleFactory;
-export declare function arrayItemsEqual(a: string[], b: string[]): boolean;

package/lib/quickstart/createTSServerPlugin.js

@@ -1,70 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.arrayItemsEqual = exports.createTSServerPlugin = void 0;
-const decorateLanguageService_1 = require("../node/decorateLanguageService");
-const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
-const language_core_1 = require("@volar/language-core");
-const externalFiles = new WeakMap();
-const projectExternalFileExtensions = new WeakMap();
-const decoratedLanguageServices = new WeakSet();
-const decoratedLanguageServiceHosts = new WeakSet();
-function createTSServerPlugin(init) {
-    return modules => {
-        const { typescript: ts } = modules;
-        const pluginModule = {
-            create(info) {
-                if (!decoratedLanguageServices.has(info.languageService)
-                    && !decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
-                    decoratedLanguageServices.add(info.languageService);
-                    decoratedLanguageServiceHosts.add(info.languageServiceHost);
-                    const languagePlugins = init(ts, info);
-                    const extensions = languagePlugins
-                        .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
-                        .flat();
-                    projectExternalFileExtensions.set(info.project, extensions);
-                    const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
-                    const files = (0, language_core_1.createFileRegistry)(languagePlugins, ts.sys.useCaseSensitiveFileNames, fileName => {
-                        const snapshot = getScriptSnapshot(fileName);
-                        if (snapshot) {
-                            files.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
-                        }
-                        else {
-                            files.delete(fileName);
-                        }
-                    });
-                    (0, decorateLanguageService_1.decorateLanguageService)(files, info.languageService);
-                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(files, info.languageServiceHost, ts);
-                }
-                return info.languageService;
-            },
-            getExternalFiles(project, updateLevel = 0) {
-                if (updateLevel >= (1)
-                    || !externalFiles.has(project)) {
-                    const oldFiles = externalFiles.get(project);
-                    const newFiles = (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, projectExternalFileExtensions.get(project));
-                    externalFiles.set(project, newFiles);
-                    if (oldFiles && !arrayItemsEqual(oldFiles, newFiles)) {
-                        project.refreshDiagnostics();
-                    }
-                }
-                return externalFiles.get(project);
-            },
-        };
-        return pluginModule;
-    };
-}
-exports.createTSServerPlugin = createTSServerPlugin;
-function arrayItemsEqual(a, b) {
-    if (a.length !== b.length) {
-        return false;
-    }
-    const set = new Set(a);
-    for (const file of b) {
-        if (!set.has(file)) {
-            return false;
-        }
-    }
-    return true;
-}
-exports.arrayItemsEqual = arrayItemsEqual;
-//# sourceMappingURL=createTSServerPlugin.js.map

package/lib/utils/resolveModuleName.d.ts

@@ -1,3 +0,0 @@
-import type * as ts from 'typescript';
-import type { FileRegistry } from '@volar/language-core';
-export declare function resolveModuleName(ts: typeof import('typescript'), files: FileRegistry, fileNameToFileId: (fileName: string) => string, languageServiceHost: ts.LanguageServiceHost, moduleName: string, containingFile: string, options: ts.CompilerOptions, cache?: ts.ModuleResolutionCache, redirectedReference?: ts.ResolvedProjectReference, resolutionMode?: ts.ResolutionMode): ts.ResolvedModuleWithFailedLookupLocations;

package/lib/utils/resolveModuleName.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveModuleName = void 0;
-function resolveModuleName(ts, files, fileNameToFileId, languageServiceHost, moduleName, containingFile, options, cache, redirectedReference, resolutionMode) {
-    let extraFileExtension;
-    let isPatchResult = false;
-    for (const language of files.languagePlugins) {
-        extraFileExtension = language.typescript?.extraFileExtensions.find(ext => moduleName.endsWith('.' + ext.extension))?.extension;
-        if (extraFileExtension) {
-            break;
-        }
-    }
-    const result = ts.resolveModuleName(moduleName, containingFile, options, {
-        ...languageServiceHost,
-        fileExists(fileName) {
-            if (extraFileExtension && fileName.endsWith('.d.ts')) {
-                const patchResult = fileExists(fileName.slice(0, -5));
-                if (patchResult) {
-                    isPatchResult = true;
-                    return true;
-                }
-            }
-            return fileExists(fileName);
-        },
-    }, cache, redirectedReference, resolutionMode);
-    if (isPatchResult && result.resolvedModule) {
-        result.resolvedModule.resolvedFileName = result.resolvedModule.resolvedFileName.slice(0, -5);
-        const sourceFile = files.get(fileNameToFileId(result.resolvedModule.resolvedFileName));
-        if (sourceFile?.generated) {
-            const tsCode = sourceFile.generated.languagePlugin.typescript?.getLanguageServiceCode(sourceFile.generated.code);
-            if (tsCode) {
-                result.resolvedModule.extension = tsCode.extension;
-            }
-        }
-    }
-    return result;
-    // fix https://github.com/vuejs/language-tools/issues/3332
-    function fileExists(fileName) {
-        if (languageServiceHost.fileExists(fileName)) {
-            const fileSize = ts.sys.getFileSize?.(fileName) ?? languageServiceHost.readFile(fileName)?.length ?? 0;
-            return fileSize < 4 * 1024 * 1024;
-        }
-        return false;
-    }
-}
-exports.resolveModuleName = resolveModuleName;
-//# sourceMappingURL=resolveModuleName.js.map