@volar/typescript 1.9.1 → 1.10.0

package/out/languageServiceHost.d.ts

@@ -1,5 +1,6 @@
 import type { LanguageContext } from '@volar/language-core';
 import type * as ts from 'typescript/lib/tsserverlibrary';
+import { ServiceEnvironment } from '@volar/language-service';
 export declare function createLanguageServiceHost(ctx: LanguageContext, ts: typeof import('typescript/lib/tsserverlibrary'), sys: ts.System & {
     version?: number;
-}): ts.LanguageServiceHost;
+}, env: ServiceEnvironment | undefined): ts.LanguageServiceHost;

package/out/languageServiceHost.js

@@ -4,7 +4,7 @@ exports.createLanguageServiceHost = void 0;
 const path_1 = require("path");
 const utilities_1 = require("./typescript/utilities");
 const fileVersions = new Map();
-function createLanguageServiceHost(ctx, ts, sys) {
+function createLanguageServiceHost(ctx, ts, sys, env) {
     let lastProjectVersion;
     let tsProjectVersion = 0;
     let tsFileNames = [];
@@ -15,8 +15,6 @@ function createLanguageServiceHost(ctx, ts, sys) {
         getCancellationToken: ctx.host.getCancellationToken ? () => ctx.host.getCancellationToken() : undefined,
         getLocalizedDiagnosticMessages: ctx.host.getLocalizedDiagnosticMessages ? () => ctx.host.getLocalizedDiagnosticMessages() : undefined,
         getProjectReferences: ctx.host.getProjectReferences ? () => ctx.host.getProjectReferences() : undefined,
-        resolveModuleNames: ctx.host.resolveModuleNames ? (...args) => ctx.host.resolveModuleNames(...args) : undefined,
-        resolveModuleNameLiterals: ctx.host.resolveModuleNameLiterals ? (...args) => ctx.host.resolveModuleNameLiterals(...args) : undefined,
         getDefaultLibFileName: (options) => {
             try {
                 return ts.getDefaultLibFilePath(options);
@@ -68,6 +66,35 @@ function createLanguageServiceHost(ctx, ts, sys) {
         },
     };
     const fsFileSnapshots = new Map();
+    if (ctx.host.resolveModuleName) {
+        // TODO: can this share between monorepo packages?
+        const moduleCache = ts.createModuleResolutionCache(_tsHost.getCurrentDirectory(), _tsHost.useCaseSensitiveFileNames ? s => s : s => s.toLowerCase(), _tsHost.getCompilationSettings());
+        const watching = !!env?.onDidChangeWatchedFiles?.(() => {
+            moduleCache.clear();
+        });
+        let lastProjectVersion = ctx.host.getProjectVersion();
+        _tsHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, sourceFile) => {
+            if (!watching && lastProjectVersion !== ctx.host.getProjectVersion()) {
+                lastProjectVersion = ctx.host.getProjectVersion();
+                moduleCache.clear();
+            }
+            return moduleLiterals.map((moduleLiteral) => {
+                let moduleName = moduleLiteral.text;
+                moduleName = ctx.host.resolveModuleName(moduleName, sourceFile.impliedNodeFormat);
+                return ts.resolveModuleName(moduleName, containingFile, options, _tsHost, moduleCache, redirectedReference, sourceFile.impliedNodeFormat);
+            });
+        };
+        _tsHost.resolveModuleNames = (moduleNames, containingFile, _reusedNames, redirectedReference, options, sourceFile) => {
+            if (!watching && lastProjectVersion !== ctx.host.getProjectVersion()) {
+                lastProjectVersion = ctx.host.getProjectVersion();
+                moduleCache.clear();
+            }
+            return moduleNames.map((moduleName) => {
+                moduleName = ctx.host.resolveModuleName(moduleName, sourceFile?.impliedNodeFormat);
+                return ts.resolveModuleName(moduleName, containingFile, options, _tsHost, moduleCache, redirectedReference, sourceFile?.impliedNodeFormat).resolvedModule;
+            });
+        };
+    }
     let oldTsVirtualFileSnapshots = new Set();
     let oldOtherVirtualFileSnapshots = new Set();
     return new Proxy(_tsHost, {
@@ -212,6 +239,27 @@ function createLanguageServiceHost(ctx, ts, sys) {
             || tsFileNames.some(fileName => fileName.toLowerCase().startsWith(dirName.toLowerCase()));
     }
     function fileExists(fileName) {
+        // fill external virtual files
+        const ext = fileName.substring(fileName.lastIndexOf('.'));
+        if (ext === '.js'
+            || ext === '.ts'
+            || ext === '.jsx'
+            || ext === '.tsx') {
+            /**
+             * If try to access a external .vue file that outside of the project,
+             * the file will not process by language service host,
+             * so virtual file will not be created.
+             *
+             * We try to create virtual file here.
+             */
+            const sourceFileName = fileName.substring(0, fileName.lastIndexOf('.'));
+            if (!ctx.virtualFiles.hasSource(sourceFileName)) {
+                const scriptSnapshot = getScriptSnapshot(sourceFileName);
+                if (scriptSnapshot) {
+                    ctx.virtualFiles.updateSource(sourceFileName, scriptSnapshot, ctx.host.getLanguageId?.(sourceFileName));
+                }
+            }
+        }
         // virtual files
         if (ctx.virtualFiles.hasVirtualFile(fileName)) {
             return true;

package/out/sys.js

@@ -6,12 +6,12 @@ const utilities_1 = require("./typescript/utilities");
 let currentCwd = '';
 function createSys(ts, env) {
     let version = 0;
-    const rootPath = env.uriToFileName(env.rootUri.toString());
+    const rootPath = env.uriToFileName(env.workspaceUri.toString());
     const sys = ts.sys;
     const root = {
         dirs: {},
         files: {},
-        requested: false,
+        requestedRead: false,
     };
     const promises = new Set();
     const fileWatcher = env.onDidChangeWatchedFiles?.(({ changes }) => {
@@ -22,14 +22,24 @@ function createSys(ts, env) {
             const dir = getDir(dirName);
             if (dir.files[baseName]) { // is requested file
                 version++;
-                if (change.type === 1) {
-                    dir.files[baseName] = { exists: true };
-                }
-                else if (change.type === 2) {
-                    dir.files[baseName] = { exists: true };
+                if (change.type === 1 || change.type === 2) {
+                    dir.files[baseName] = {
+                        stat: {
+                            type: 1,
+                            ctime: Date.now(),
+                            mtime: Date.now(),
+                            size: -1,
+                        },
+                        requestedStat: false,
+                    };
                 }
                 else if (change.type === 3) {
-                    dir.files[baseName] = { exists: false };
+                    dir.files[baseName] = {
+                        stat: undefined,
+                        text: undefined,
+                        requestedStat: true,
+                        requestedText: true,
+                    };
                 }
             }
         }
@@ -117,20 +127,24 @@ function createSys(ts, env) {
     function getModifiedTime(fileName) {
         fileName = resolvePath(fileName);
         const file = getFile(fileName);
-        if (file.modifiedTime === undefined) {
-            file.modifiedTime = new Date(0);
+        if (!file.requestedStat) {
+            file.requestedStat = true;
             handleStat(fileName, file);
         }
-        return file.modifiedTime;
+        return file.stat ? new Date(file.stat.mtime) : new Date(0);
     }
     function fileExists(fileName) {
         fileName = resolvePath(fileName);
         const file = getFile(fileName);
-        if (file.exists === undefined) {
-            file.exists = false;
+        const exists = () => file.text !== undefined || file.stat?.type === 1;
+        if (exists()) {
+            return true;
+        }
+        if (!file.requestedStat) {
+            file.requestedStat = true;
             handleStat(fileName, file);
         }
-        return file.exists;
+        return exists();
     }
     function handleStat(fileName, file) {
         const result = env.fs?.stat(env.fileNameToUri(fileName));
@@ -139,21 +153,14 @@ function createSys(ts, env) {
             promises.add(promise);
             result.then(result => {
                 promises.delete(promise);
-                file.exists = result?.type === 1;
-                if (result) {
-                    file.modifiedTime = new Date(result.mtime);
-                }
-                if (file.exists) {
-                    file.requested = false;
+                if (file.stat?.type !== result?.type || file.stat?.mtime !== result?.mtime) {
                     version++;
                 }
+                file.stat = result;
             });
         }
         else {
-            file.exists = result?.type === 1;
-            if (result) {
-                file.modifiedTime = new Date(result.mtime);
-            }
+            file.stat = result;
         }
     }
     function getFile(fileName) {
@@ -178,7 +185,7 @@ function createSys(ts, env) {
             readDirectoryWorker(dirPath);
             const dir = getDir(dirPath);
             return {
-                files: [...Object.entries(dir.files)].filter(([_, file]) => file.exists).map(([name]) => name),
+                files: [...Object.entries(dir.files)].filter(([_, file]) => file.stat?.type === 1).map(([name]) => name),
                 directories: [...Object.entries(dir.dirs)].filter(([_, dir]) => dir.exists).map(([name]) => name),
             };
         }, sys?.realpath ? (path => sys.realpath(path)) : (path => path));
@@ -188,10 +195,10 @@ function createSys(ts, env) {
         const name = path_1.posix.basename(fileName);
         dir.files[name] ??= {};
         const file = dir.files[name];
-        if (file.exists === false || file.requested) {
+        if (file.requestedText) {
             return;
         }
-        file.requested = true;
+        file.requestedText = true;
         const uri = env.fileNameToUri(fileName);
         const result = env.fs?.readFile(uri, encoding);
         if (typeof result === 'object' && 'then' in result) {
@@ -200,29 +207,24 @@ function createSys(ts, env) {
             result.then(result => {
                 promises.delete(promise);
                 if (result !== undefined) {
-                    file.exists = true;
                     file.text = result;
+                    if (file.stat) {
+                        file.stat.mtime++;
+                    }
                     version++;
                 }
-                else {
-                    file.exists = false;
-                }
             });
         }
         else if (result !== undefined) {
-            file.exists = true;
             file.text = result;
         }
-        else {
-            file.exists = false;
-        }
     }
     function readDirectoryWorker(dirName) {
         const dir = getDir(dirName);
-        if (dir.requested) {
+        if (dir.requestedRead) {
             return;
         }
-        dir.requested = true;
+        dir.requestedRead = true;
         const result = env.fs?.readDirectory(env.fileNameToUri(dirName || '.'));
         if (typeof result === 'object' && 'then' in result) {
             const promise = result;
@@ -253,10 +255,12 @@ function createSys(ts, env) {
                         promises.delete(promise);
                         if (stat?.type === 1) {
                             dir.files[name] ??= {};
-                            if (!dir.files[name].exists) {
-                                dir.files[name].exists = true;
+                            const file = dir.files[name];
+                            if (stat.type !== file.stat?.type || stat.mtime !== file.stat.mtime) {
                                 version++;
                             }
+                            file.stat = stat;
+                            file.requestedStat = true;
                         }
                         else if (stat?.type === 2) {
                             const childDir = getDirFromDir(dir, name);
@@ -273,8 +277,13 @@ function createSys(ts, env) {
             }
             if (fileType === 1) {
                 dir.files[name] ??= {};
-                if (!dir.files[name].exists) {
-                    dir.files[name].exists = true;
+                if (!dir.files[name].stat) {
+                    dir.files[name].stat = {
+                        type: 1,
+                        mtime: 0,
+                        ctime: 0,
+                        size: 0,
+                    };
                     updated = true;
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "1.9.1",
+	"version": "1.10.0",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,10 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.9.1"
+		"@volar/language-core": "1.10.0"
 	},
 	"devDependencies": {
-		"@volar/language-service": "1.9.1"
+		"@volar/language-service": "1.10.0"
 	},
-	"gitHead": "68f064d587ef230b2f8a90157b1f7133b33f1d33"
+	"gitHead": "c25bdec20ee11d278049a738743c694431f08796"
 }