@volar/typescript 2.1.1 → 2.1.3

package/lib/node/decorateLanguageServiceHost.d.ts

@@ -1,4 +1,4 @@
-import type { FileRegistry } from '@volar/language-core';
+import { type FileRegistry } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function decorateLanguageServiceHost(files: FileRegistry, languageServiceHost: ts.LanguageServiceHost, ts: typeof import('typescript')): 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,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchExternalFiles = exports.decorateLanguageServiceHost = void 0;
+const language_core_1 = require("@volar/language-core");
 const resolveModuleName_1 = require("../resolveModuleName");
-function decorateLanguageServiceHost(files, languageServiceHost, ts) {
+function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
     let extraProjectVersion = 0;
-    const { languagePlugins } = files;
+    const { languagePlugins } = virtualFiles;
     const exts = languagePlugins
         .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
         .flat();
@@ -14,7 +15,6 @@ function decorateLanguageServiceHost(files, languageServiceHost, ts) {
     const resolveModuleNames = languageServiceHost.resolveModuleNames?.bind(languageServiceHost);
     const getProjectVersion = languageServiceHost.getProjectVersion?.bind(languageServiceHost);
     const getScriptSnapshot = languageServiceHost.getScriptSnapshot.bind(languageServiceHost);
-    const getScriptVersion = languageServiceHost.getScriptVersion.bind(languageServiceHost);
     const getScriptKind = languageServiceHost.getScriptKind?.bind(languageServiceHost);
     // path completion
     if (readDirectory) {
@@ -30,7 +30,7 @@ function decorateLanguageServiceHost(files, languageServiceHost, ts) {
         };
     }
     if (languagePlugins.some(language => language.typescript?.extraFileExtensions.length)) {
-        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, languagePlugins, fileName => files.get(fileName));
+        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, languagePlugins, fileName => virtualFiles.get(fileName));
         if (resolveModuleNameLiterals) {
             languageServiceHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, ...rest) => {
                 if (moduleLiterals.every(name => !exts.some(ext => name.text.endsWith(ext)))) {
@@ -64,13 +64,6 @@ function decorateLanguageServiceHost(files, languageServiceHost, ts) {
         }
         return getScriptSnapshot(fileName);
     };
-    languageServiceHost.getScriptVersion = fileName => {
-        if (exts.some(ext => fileName.endsWith(ext))) {
-            updateScript(fileName);
-            return scripts.get(fileName)?.version.toString() ?? '';
-        }
-        return getScriptVersion(fileName);
-    };
     if (getScriptKind) {
         languageServiceHost.getScriptKind = fileName => {
             if (exts.some(ext => fileName.endsWith(ext))) {
@@ -85,52 +78,40 @@ function decorateLanguageServiceHost(files, languageServiceHost, ts) {
         };
     }
     function updateScript(fileName) {
-        const version = getProjectVersion?.();
-        const cache = scripts.get(fileName);
-        if (version === undefined || version !== cache?.projectVersion) {
-            const file = files.get(fileName);
-            const script = file?.generated?.languagePlugin.typescript?.getScript(file.generated.code);
-            if (script?.code.snapshot !== cache?.snapshot) {
-                let extension = '.ts';
-                let snapshotSnapshot;
-                let scriptKind = ts.ScriptKind.TS;
+        const version = languageServiceHost.getScriptVersion(fileName);
+        if (version !== scripts.get(fileName)?.version) {
+            let extension = '.ts';
+            let snapshotSnapshot;
+            let scriptKind = ts.ScriptKind.TS;
+            const snapshot = getScriptSnapshot(fileName);
+            if (snapshot) {
                 extraProjectVersion++;
-                if (script) {
-                    if (file?.generated) {
-                        const text = file.snapshot.getText(0, file.snapshot.getLength());
-                        let patchedText = text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
+                const sourceFile = virtualFiles.set(fileName, (0, language_core_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');
+                    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);
-                        if (file.generated.languagePlugin.typescript?.getExtraScripts) {
-                            console.warn('getExtraScripts() is not available in this use case.');
-                        }
                     }
-                }
-                else if (files.get(fileName)) {
-                    files.delete(fileName);
-                }
-                if (!cache) {
-                    scripts.set(fileName, {
-                        projectVersion: version,
-                        version: 0,
-                        extension,
-                        snapshot: snapshotSnapshot,
-                        kind: scriptKind,
-                    });
-                }
-                else {
-                    cache.projectVersion = version;
-                    cache.version++;
-                    cache.extension = extension;
-                    cache.snapshot = snapshotSnapshot;
-                    cache.kind = scriptKind;
+                    snapshotSnapshot = ts.ScriptSnapshot.fromString(patchedText);
+                    if (sourceFile.generated.languagePlugin.typescript?.getExtraScripts) {
+                        console.warn('getExtraScripts() is not available in this use case.');
+                    }
                 }
             }
-            else if (cache) {
-                cache.projectVersion = version;
+            else if (virtualFiles.get(fileName)) {
+                extraProjectVersion++;
+                virtualFiles.delete(fileName);
             }
+            scripts.set(fileName, {
+                version,
+                extension,
+                snapshot: snapshotSnapshot,
+                kind: scriptKind,
+            });
         }
         return scripts.get(fileName);
     }

package/lib/node/decorateProgram.js

@@ -12,11 +12,10 @@ function decorateProgram(files, program) {
     // for tsc --noEmit --watch
     // @ts-ignore
     const getBindAndCheckDiagnostics = program.getBindAndCheckDiagnostics;
-    program.emit = (targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) => {
-        const result = emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+    program.emit = (...args) => {
+        const result = emit(...args);
         return {
-            emitSkipped: result.emitSkipped,
-            emittedFiles: result.emittedFiles,
+            ...result,
             diagnostics: result.diagnostics
                 .map(d => (0, transform_1.transformDiagnostic)(files, d))
                 .filter(utils_1.notEmpty),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.1.1",
+	"version": "2.1.3",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,13 +12,13 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.1.1",
+		"@volar/language-core": "2.1.3",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.1.1"
+		"@volar/language-service": "2.1.3"
 	},
-	"gitHead": "e56916097fe7be2920aab6592a564a8e2ceafd14"
+	"gitHead": "0f861d59faa19cbeadef182ee079be88f9629fc7"
 }