@volar/typescript 1.10.3 → 1.10.5

package/out/languageServiceHost.js

@@ -73,10 +73,10 @@ function createLanguageServiceHost(ctx, ts, sys, env) {
         const watching = !!env?.onDidChangeWatchedFiles?.(() => {
             moduleCache.clear();
         });
-        let lastProjectVersion = ctx.host.getProjectVersion();
+        let lastSysVersion = sys.version;
         _tsHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, sourceFile) => {
-            if (!watching && lastProjectVersion !== ctx.host.getProjectVersion()) {
-                lastProjectVersion = ctx.host.getProjectVersion();
+            if (!watching && lastSysVersion !== sys.version) {
+                lastSysVersion = sys.version;
                 moduleCache.clear();
             }
             return moduleLiterals.map((moduleLiteral) => {
@@ -86,8 +86,8 @@ function createLanguageServiceHost(ctx, ts, sys, env) {
             });
         };
         _tsHost.resolveModuleNames = (moduleNames, containingFile, _reusedNames, redirectedReference, options, sourceFile) => {
-            if (!watching && lastProjectVersion !== ctx.host.getProjectVersion()) {
-                lastProjectVersion = ctx.host.getProjectVersion();
+            if (!watching && lastSysVersion !== sys.version) {
+                lastSysVersion = sys.version;
                 moduleCache.clear();
             }
             return moduleNames.map((moduleName) => {

package/out/program.d.ts

@@ -0,0 +1,4 @@
+import type * as ts from 'typescript/lib/tsserverlibrary';
+import type * as embedded from '@volar/language-core';
+export declare function decorateProgram({ createSourceFile }: Pick<typeof import('typescript/lib/tsserverlibrary'), 'createSourceFile'>, options: ts.CreateProgramOptions, core: embedded.LanguageContext, program: ts.Program): void;
+//# sourceMappingURL=program.d.ts.map

package/out/program.js

@@ -0,0 +1,131 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decorateProgram = void 0;
+function decorateProgram({ createSourceFile }, options, core, program) {
+    const _getRootFileNames = program.getRootFileNames.bind(program);
+    const _getSyntacticDiagnostics = program.getSyntacticDiagnostics.bind(program);
+    const _getSemanticDiagnostics = program.getSemanticDiagnostics.bind(program);
+    const _getGlobalDiagnostics = program.getGlobalDiagnostics.bind(program);
+    const _emit = program.emit.bind(program);
+    // @ts-expect-error
+    const _getBindAndCheckDiagnostics = program.getBindAndCheckDiagnostics.bind(program);
+    program.getRootFileNames = getRootFileNames;
+    program.getSyntacticDiagnostics = getSyntacticDiagnostics;
+    program.getSemanticDiagnostics = getSemanticDiagnostics;
+    program.getGlobalDiagnostics = getGlobalDiagnostics;
+    program.emit = emit;
+    // @ts-expect-error
+    program.getBindAndCheckDiagnostics = getBindAndCheckDiagnostics;
+    // TODO
+    function getRootFileNames() {
+        return _getRootFileNames().filter(fileName => options.host?.fileExists?.(fileName));
+    }
+    // for vue-tsc --noEmit --watch
+    function getBindAndCheckDiagnostics(sourceFile, cancellationToken) {
+        return getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, _getBindAndCheckDiagnostics);
+    }
+    // for vue-tsc --noEmit
+    function getSyntacticDiagnostics(sourceFile, cancellationToken) {
+        return getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, _getSyntacticDiagnostics);
+    }
+    function getSemanticDiagnostics(sourceFile, cancellationToken) {
+        return getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, _getSemanticDiagnostics);
+    }
+    function getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, api) {
+        if (sourceFile) {
+            const [virtualFile, source] = core.virtualFiles.getVirtualFile(sourceFile.fileName);
+            if (virtualFile && source) {
+                if (!virtualFile.capabilities.diagnostic)
+                    return [];
+                const errors = transformDiagnostics(api(sourceFile, cancellationToken) ?? []);
+                return errors;
+            }
+        }
+        return transformDiagnostics(api(sourceFile, cancellationToken) ?? []);
+    }
+    function getGlobalDiagnostics(cancellationToken) {
+        return transformDiagnostics(_getGlobalDiagnostics(cancellationToken) ?? []);
+    }
+    function emit(targetSourceFile, _writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
+        const scriptResult = _emit(targetSourceFile, options.host?.writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers);
+        return {
+            emitSkipped: scriptResult.emitSkipped,
+            emittedFiles: scriptResult.emittedFiles,
+            diagnostics: transformDiagnostics(scriptResult.diagnostics),
+        };
+    }
+    // transform
+    function transformDiagnostics(diagnostics) {
+        const result = [];
+        for (const diagnostic of diagnostics) {
+            if (diagnostic.file !== undefined
+                && diagnostic.start !== undefined
+                && diagnostic.length !== undefined) {
+                const [virtualFile, source] = core.virtualFiles.getVirtualFile(diagnostic.file.fileName);
+                if (virtualFile && source) {
+                    if (options.host?.fileExists?.(source.fileName) === false)
+                        continue;
+                    for (const [_, [sourceSnapshot, map]] of core.virtualFiles.getMaps(virtualFile)) {
+                        if (sourceSnapshot !== source.snapshot)
+                            continue;
+                        for (const start of map.toSourceOffsets(diagnostic.start)) {
+                            const reportStart = typeof start[1].data.diagnostic === 'object' ? start[1].data.diagnostic.shouldReport() : !!start[1].data.diagnostic;
+                            if (!reportStart)
+                                continue;
+                            for (const end of map.toSourceOffsets(diagnostic.start + diagnostic.length, true)) {
+                                const reportEnd = typeof end[1].data.diagnostic === 'object' ? end[1].data.diagnostic.shouldReport() : !!end[1].data.diagnostic;
+                                if (!reportEnd)
+                                    continue;
+                                onMapping(diagnostic, source.fileName, start[0], end[0], source.snapshot.getText(0, source.snapshot.getLength()));
+                                break;
+                            }
+                            break;
+                        }
+                    }
+                }
+                else {
+                    if (options.host?.fileExists?.(diagnostic.file.fileName) === false)
+                        continue;
+                    onMapping(diagnostic, diagnostic.file.fileName, diagnostic.start, diagnostic.start + diagnostic.length, diagnostic.file.text);
+                }
+            }
+            else if (diagnostic.file === undefined) {
+                result.push(diagnostic);
+            }
+        }
+        return result;
+        function onMapping(diagnostic, fileName, start, end, docText) {
+            let file = fileName === diagnostic.file?.fileName
+                ? diagnostic.file
+                : undefined;
+            if (!file) {
+                if (docText === undefined) {
+                    const snapshot = core.host.getScriptSnapshot(fileName);
+                    if (snapshot) {
+                        docText = snapshot.getText(0, snapshot.getLength());
+                    }
+                }
+                else {
+                    file = createSourceFile(fileName, docText, 99, undefined, 7);
+                    // fix https://github.com/vuejs/language-tools/issues/2622 for TS 5.0
+                    file.originalFileName = fileName;
+                    file.path = fileName.toLowerCase();
+                    file.resolvedPath = fileName.toLowerCase();
+                }
+            }
+            const newDiagnostic = {
+                ...diagnostic,
+                file,
+                start: start,
+                length: end - start,
+            };
+            const relatedInformation = diagnostic.relatedInformation;
+            if (relatedInformation) {
+                newDiagnostic.relatedInformation = transformDiagnostics(relatedInformation);
+            }
+            result.push(newDiagnostic);
+        }
+    }
+}
+exports.decorateProgram = decorateProgram;
+//# sourceMappingURL=program.js.map

package/out/serverPlugin.d.ts

@@ -1,5 +1,9 @@
 import { VirtualFiles } from '@volar/language-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 export declare function decorateLanguageServiceHost(virtualFiles: VirtualFiles, languageServiceHost: ts.LanguageServiceHost, ts: typeof import('typescript/lib/tsserverlibrary'), exts: string[]): void;
-export declare function getExternalFiles(ts: typeof import('typescript/lib/tsserverlibrary'), project: ts.server.Project, exts: string[]): string[];
+export declare function searchExternalFiles(ts: typeof import('typescript/lib/tsserverlibrary'), project: ts.server.Project, exts: string[]): string[];
+/**
+ * @deprecated use `searchExternalFiles` instead
+ */
+export declare const getExternalFiles: typeof searchExternalFiles;
 //# sourceMappingURL=serverPlugin.d.ts.map

package/out/serverPlugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getExternalFiles = exports.decorateLanguageServiceHost = void 0;
+exports.getExternalFiles = exports.searchExternalFiles = exports.decorateLanguageServiceHost = void 0;
 const language_core_1 = require("@volar/language-core");
 function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts) {
     let extraProjectVersion = 0;
@@ -129,7 +129,7 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts
                 if (virtualFile) {
                     let patchedText = text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
                     (0, language_core_1.forEachEmbeddedFile)(virtualFile, file => {
-                        const ext = file.fileName.replace(fileName, '');
+                        const ext = file.fileName.substring(fileName.length);
                         if (file.kind === language_core_1.FileKind.TypeScriptHostFile && (ext === '.d.ts' || ext.match(/^\.(js|ts)x?$/))) {
                             extension = ext;
                             patchedText += file.snapshot.getText(0, file.snapshot.getLength());
@@ -152,7 +152,7 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts
     }
 }
 exports.decorateLanguageServiceHost = decorateLanguageServiceHost;
-function getExternalFiles(ts, project, exts) {
+function searchExternalFiles(ts, project, exts) {
     if (project.projectKind !== ts.server.ProjectKind.Configured) {
         return [];
     }
@@ -170,5 +170,9 @@ function getExternalFiles(ts, project, exts) {
     const parsed = ts.parseJsonSourceFileConfigFileContent(config, parseHost, project.getCurrentDirectory());
     return parsed.fileNames;
 }
-exports.getExternalFiles = getExternalFiles;
+exports.searchExternalFiles = searchExternalFiles;
+/**
+ * @deprecated use `searchExternalFiles` instead
+ */
+exports.getExternalFiles = searchExternalFiles;
 //# sourceMappingURL=serverPlugin.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "1.10.3",
+	"version": "1.10.5",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,10 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.10.3"
+		"@volar/language-core": "1.10.5"
 	},
 	"devDependencies": {
-		"@volar/language-service": "1.10.3"
+		"@volar/language-service": "1.10.5"
 	},
-	"gitHead": "5dd492d94d3e5aa620448e0b951dead341676dac"
+	"gitHead": "f087b2cb990108e71ed66727588b3e19c421b4c2"
 }