@volar/typescript 1.7.5 → 1.7.7

package/out/languageServiceHost.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLanguageServiceHost = void 0;
 const path_1 = require("path");
+const utilities_1 = require("./typescript/utilities");
 function createLanguageServiceHost(ctx, ts, sys) {
     let lastProjectVersion;
     let tsProjectVersion = 0;
@@ -31,9 +32,12 @@ function createLanguageServiceHost(ctx, ts, sys) {
                 return snapshot.getText(0, snapshot.getLength());
             }
         },
+        readDirectory,
+        getDirectories,
+        directoryExists,
         fileExists,
         getProjectVersion: () => {
-            return tsProjectVersion.toString() + ':' + sys.version;
+            return tsProjectVersion + ':' + sys.version;
         },
         getTypeRootsVersion: () => {
             return sys.version ?? -1; // TODO: only update for /node_modules changes?
@@ -99,6 +103,57 @@ function createLanguageServiceHost(ctx, ts, sys) {
         oldTsVirtualFileSnapshots = newTsVirtualFileSnapshots;
         oldOtherVirtualFileSnapshots = newOtherVirtualFileSnapshots;
     }
+    function readDirectory(dirName, extensions, excludes, includes, depth) {
+        let matches = (0, utilities_1.matchFiles)(dirName, extensions, excludes, includes, sys?.useCaseSensitiveFileNames ?? false, ctx.host.getCurrentDirectory(), depth, (dirPath) => {
+            const files = [];
+            for (const fileName of getScriptFileNames()) {
+                if (fileName.toLowerCase().startsWith(dirPath.toLowerCase())) {
+                    const baseName = fileName.substring(dirPath.length);
+                    if (baseName.indexOf('/') === -1) {
+                        files.push(baseName);
+                    }
+                }
+            }
+            return {
+                files,
+                directories: getVirtualFileDirectories(dirPath),
+            };
+        }, sys?.realpath ? (path => sys.realpath(path)) : (path => path));
+        if (ctx) {
+            matches = matches.map(match => {
+                const [_, source] = ctx.virtualFiles.getVirtualFile(match);
+                if (source) {
+                    return source.fileName;
+                }
+                return match;
+            });
+        }
+        return [...new Set([
+                ...matches,
+                ...sys.readDirectory(dirName, extensions, excludes, includes, depth),
+            ])];
+    }
+    function getDirectories(dirName) {
+        return [...new Set([
+                ...getVirtualFileDirectories(dirName),
+                ...sys.getDirectories(dirName),
+            ])];
+    }
+    function getVirtualFileDirectories(dirName) {
+        const names = new Set();
+        for (const fileName of getScriptFileNames()) {
+            if (fileName.toLowerCase().startsWith(dirName.toLowerCase())) {
+                const path = fileName.substring(dirName.length);
+                if (path.indexOf('/') >= 0) {
+                    names.add(path.split('/')[0]);
+                }
+            }
+        }
+        for (const name of sys.getDirectories(dirName)) {
+            names.add(name);
+        }
+        return [...names];
+    }
     function getScriptFileNames() {
         const tsFileNames = new Set();
         for (const { root } of ctx.virtualFiles.allSources()) {
@@ -159,6 +214,12 @@ function createLanguageServiceHost(ctx, ts, sys) {
         // fs files
         return sys.getModifiedTime?.(fileName)?.valueOf().toString() ?? '';
     }
+    function directoryExists(dirName) {
+        if (getScriptFileNames().some(fileName => fileName.toLowerCase().startsWith(dirName.toLowerCase()))) {
+            return true;
+        }
+        return sys.directoryExists(dirName);
+    }
     function fileExists(fileName) {
         // fill external virtual files
         const ext = fileName.substring(fileName.lastIndexOf('.'));

package/out/sys.d.ts

@@ -1,7 +1,7 @@
-import type { ServiceEnvironment, Disposable, LanguageContext } from '@volar/language-service';
+import type { ServiceEnvironment, Disposable } from '@volar/language-service';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import { IDtsHost } from './dtsHost';
-export declare function createSys(ctx: LanguageContext | undefined, ts: typeof import('typescript/lib/tsserverlibrary'), env: ServiceEnvironment, dtsHost?: IDtsHost): ts.System & {
+export declare function createSys(ts: typeof import('typescript/lib/tsserverlibrary'), env: ServiceEnvironment, dtsHost?: IDtsHost): ts.System & {
     version: number;
     sync(): Promise<number>;
 } & Disposable;

package/out/sys.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSys = void 0;
-const language_core_1 = require("@volar/language-core");
 const path_1 = require("path");
 const utilities_1 = require("./typescript/utilities");
 const dtsHost_1 = require("./dtsHost");
 let currentCwd = '';
-function createSys(ctx, ts, env, dtsHost) {
+function createSys(ts, env, dtsHost) {
     let version = 0;
     const rootPath = env.uriToFileName(env.rootUri.toString());
     const sys = ts.sys;
@@ -153,7 +152,7 @@ function createSys(ctx, ts, env, dtsHost) {
                     file.exists = result?.type === 1 || result?.type === 64;
                     if (file.exists) {
                         const time = Date.now();
-                        file.modifiedTime = time !== file.modifiedTime ? time : time + 1;
+                        file.modifiedTime = time !== file.modifiedTime ? time : file.modifiedTime + 1;
                         version++;
                     }
                 });
@@ -173,40 +172,15 @@ function createSys(ctx, ts, env, dtsHost) {
     }
     function readDirectory(dirName, extensions, excludes, includes, depth) {
         dirName = resolvePath(dirName);
-        let matches = (0, utilities_1.matchFiles)(dirName, extensions, excludes, includes, sys?.useCaseSensitiveFileNames ?? false, rootPath, depth, (dirPath) => {
+        const matches = (0, utilities_1.matchFiles)(dirName, extensions, excludes, includes, sys?.useCaseSensitiveFileNames ?? false, rootPath, depth, (dirPath) => {
             dirPath = resolvePath(dirPath);
             readDirectoryWorker(dirPath);
             const dir = getDir(dirPath);
-            const virtualFiles = [];
-            if (ctx) {
-                for (const { root } of ctx.virtualFiles.allSources()) {
-                    (0, language_core_1.forEachEmbeddedFile)(root, file => {
-                        if (file.kind === language_core_1.FileKind.TypeScriptHostFile) {
-                            const fileDirName = path_1.posix.dirname(file.fileName);
-                            if (fileDirName.toLowerCase() === dirPath.toLowerCase()) {
-                                virtualFiles.push(path_1.posix.basename(file.fileName));
-                            }
-                        }
-                    });
-                }
-            }
             return {
-                files: [
-                    ...[...Object.entries(dir.files)].filter(([_, file]) => file.exists).map(([name]) => name),
-                    ...virtualFiles,
-                ],
+                files: [...Object.entries(dir.files)].filter(([_, file]) => file.exists).map(([name]) => name),
                 directories: [...Object.entries(dir.dirs)].filter(([_, dir]) => dir.exists).map(([name]) => name),
             };
         }, sys?.realpath ? (path => sys.realpath(path)) : (path => path));
-        if (ctx) {
-            matches = matches.map(match => {
-                const [_, source] = ctx.virtualFiles.getVirtualFile(match);
-                if (source) {
-                    return source.fileName;
-                }
-                return match;
-            });
-        }
         return [...new Set(matches)];
     }
     function readFileWorker(fileName, encoding, dir) {
@@ -254,10 +228,9 @@ function createSys(ctx, ts, env, dtsHost) {
             return;
         }
         dir.requested = true;
-        const uri = env.fileNameToUri(dirName);
         const result = dirName.startsWith('/node_modules/') && dtsHost
             ? dtsHost.readDirectory(dirName)
-            : env.fs?.readDirectory(uri);
+            : env.fs?.readDirectory(env.fileNameToUri(dirName || '.'));
         if (typeof result === 'object' && 'then' in result) {
             const promise = result;
             promises.add(promise);
@@ -273,6 +246,8 @@ function createSys(ctx, ts, env, dtsHost) {
         }
     }
     function onReadDirectoryResult(dir, result) {
+        // See https://github.com/microsoft/TypeScript/blob/e1a9290051a3b0cbdfbadc3adbcc155a4641522a/src/compiler/sys.ts#L1853-L1857
+        result = result.filter(([name]) => name !== '.' && name !== '..');
         let updated = false;
         for (const [name, fileType] of result) {
             if (fileType === 1 || fileType === 64) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "1.7.5",
+	"version": "1.7.7",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,10 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.7.5"
+		"@volar/language-core": "1.7.7"
 	},
 	"devDependencies": {
-		"@volar/language-service": "1.7.5"
+		"@volar/language-service": "1.7.7"
 	},
-	"gitHead": "57fa4f05df4c593aa4a7b15c159f864d407bd1ac"
+	"gitHead": "ad13290da9f223f6d198d858faf5349933112200"
 }