@volar/typescript 2.4.0-alpha.5 → 2.4.0-alpha.7

package/lib/node/decorateLanguageServiceHost.js

@@ -28,7 +28,7 @@ function decorateLanguageServiceHost(ts, language, languageServiceHost) {
         };
     }
     if (pluginExtensions.length) {
-        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, language.plugins, fileName => language.scripts.get(fileName));
+        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, ts.sys.getFileSize, languageServiceHost, language.plugins, fileName => language.scripts.get(fileName));
         const getCanonicalFileName = languageServiceHost.useCaseSensitiveFileNames?.()
             ? (fileName) => fileName
             : (fileName) => fileName.toLowerCase();

package/lib/node/proxyCreateProgram.js

@@ -144,7 +144,7 @@ function proxyCreateProgram(ts, original, create) {
             };
             if (extensions.length) {
                 options.options.allowArbitraryExtensions = true;
-                const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, originalHost, language.plugins, fileName => language.scripts.get(fileName));
+                const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, ts.sys.getFileSize, originalHost, language.plugins, fileName => language.scripts.get(fileName));
                 const resolveModuleNameLiterals = originalHost.resolveModuleNameLiterals;
                 const resolveModuleNames = originalHost.resolveModuleNames;
                 options.host.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, compilerOptions, ...rest) => {

package/lib/protocol/createProject.js

@@ -9,6 +9,7 @@ function createLanguageServiceHost(ts, sys, language, asScriptId, projectHost) {
     let lastProjectVersion;
     let tsProjectVersion = 0;
     let tsFileRegistry = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
+    let tsFileDirRegistry = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
     let extraScriptRegistry = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
     let lastTsVirtualFileSnapshots = new Set();
     let lastOtherVirtualFileSnapshots = new Set();
@@ -66,6 +67,13 @@ function createLanguageServiceHost(ts, sys, language, asScriptId, projectHost) {
                 return snapshot.getText(0, snapshot.getLength());
             }
         },
+        directoryExists(directoryName) {
+            sync();
+            if (tsFileDirRegistry.has(directoryName)) {
+                return true;
+            }
+            return sys.directoryExists(directoryName);
+        },
         fileExists(fileName) {
             return getScriptVersion(fileName) !== '';
         },
@@ -119,7 +127,7 @@ function createLanguageServiceHost(ts, sys, language, asScriptId, projectHost) {
     if (language.plugins.some(plugin => plugin.typescript?.extraFileExtensions.length)) {
         // TODO: can this share between monorepo packages?
         const moduleCache = ts.createModuleResolutionCache(languageServiceHost.getCurrentDirectory(), languageServiceHost.useCaseSensitiveFileNames?.() ? s => s : s => s.toLowerCase(), languageServiceHost.getCompilationSettings());
-        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, languageServiceHost, language.plugins, fileName => language.scripts.get(asScriptId(fileName)));
+        const resolveModuleName = (0, resolveModuleName_1.createResolveModuleName)(ts, sys.getFileSize, languageServiceHost, language.plugins, fileName => language.scripts.get(asScriptId(fileName)));
         let lastSysVersion = 'version' in sys ? sys.version : undefined;
         languageServiceHost.resolveModuleNameLiterals = (moduleLiterals, containingFile, redirectedReference, options, sourceFile) => {
             if ('version' in sys && lastSysVersion !== sys.version) {
@@ -190,8 +198,14 @@ function createLanguageServiceHost(ts, sys, language, asScriptId, projectHost) {
         lastTsVirtualFileSnapshots = newTsVirtualFileSnapshots;
         lastOtherVirtualFileSnapshots = newOtherVirtualFileSnapshots;
         tsFileRegistry.clear();
+        tsFileDirRegistry.clear();
         for (const fileName of tsFileNamesSet) {
             tsFileRegistry.set(fileName, true);
+            const parts = fileName.split('/');
+            for (let i = 1; i < parts.length; i++) {
+                const dirName = parts.slice(0, i).join('/');
+                tsFileDirRegistry.set(dirName, true);
+            }
         }
     }
     function getScriptSnapshot(fileName) {

package/lib/protocol/createSys.d.ts

@@ -1,7 +1,7 @@
 import type { LanguageServiceEnvironment, Disposable } from '@volar/language-service';
 import type * as ts from 'typescript';
 import { URI } from 'vscode-uri';
-export declare function createSys(sys: ts.System | undefined, env: LanguageServiceEnvironment, getCurrentDirectory: () => string, uriConverter: {
+export declare function createSys(sys: ts.System | undefined, { fs, onDidChangeWatchedFiles }: LanguageServiceEnvironment, getCurrentDirectory: () => string, uriConverter: {
     asUri(fileName: string): URI;
     asFileName(uri: URI): string;
 }): ts.System & {

package/lib/protocol/createSys.js

@@ -5,7 +5,7 @@ const path = require("path-browserify");
 const utilities_1 = require("../typescript/utilities");
 const vscode_uri_1 = require("vscode-uri");
 let currentCwd = '';
-function createSys(sys, env, getCurrentDirectory, uriConverter) {
+function createSys(sys, { fs, onDidChangeWatchedFiles }, getCurrentDirectory, uriConverter) {
     let version = 0;
     const caseSensitive = sys?.useCaseSensitiveFileNames ?? false;
     const root = {
@@ -15,7 +15,7 @@ function createSys(sys, env, getCurrentDirectory, uriConverter) {
         requestedRead: false,
     };
     const promises = new Set();
-    const fileWatcher = env.onDidChangeWatchedFiles?.(({ changes }) => {
+    const fileWatcher = onDidChangeWatchedFiles?.(({ changes }) => {
         version++;
         for (const change of changes) {
             const changeUri = vscode_uri_1.URI.parse(change.uri);
@@ -108,7 +108,7 @@ function createSys(sys, env, getCurrentDirectory, uriConverter) {
         const dir = getDir(dirName);
         if (dir.exists === undefined) {
             dir.exists = false;
-            const result = env.fs?.stat(uriConverter.asUri(dirName));
+            const result = fs?.stat(uriConverter.asUri(dirName));
             if (typeof result === 'object' && 'then' in result) {
                 const promise = result;
                 promises.add(promise);
@@ -149,7 +149,7 @@ function createSys(sys, env, getCurrentDirectory, uriConverter) {
         return exists();
     }
     function handleStat(fileName, file) {
-        const result = env.fs?.stat(uriConverter.asUri(fileName));
+        const result = fs?.stat(uriConverter.asUri(fileName));
         if (typeof result === 'object' && 'then' in result) {
             const promise = result;
             promises.add(promise);
@@ -222,7 +222,7 @@ function createSys(sys, env, getCurrentDirectory, uriConverter) {
         }
         file.requestedText = true;
         const uri = uriConverter.asUri(fileName);
-        const result = env.fs?.readFile(uri, encoding);
+        const result = fs?.readFile(uri, encoding);
         if (typeof result === 'object' && 'then' in result) {
             const promise = result;
             promises.add(promise);
@@ -247,7 +247,7 @@ function createSys(sys, env, getCurrentDirectory, uriConverter) {
             return;
         }
         dir.requestedRead = true;
-        const result = env.fs?.readDirectory(uriConverter.asUri(dirName || '.'));
+        const result = fs?.readDirectory(uriConverter.asUri(dirName || '.'));
         if (typeof result === 'object' && 'then' in result) {
             const promise = result;
             promises.add(promise);
@@ -269,7 +269,7 @@ function createSys(sys, env, getCurrentDirectory, uriConverter) {
         for (const [name, _fileType] of result) {
             let fileType = _fileType;
             if (fileType === 64) {
-                const stat = env.fs?.stat(uriConverter.asUri(dirName + '/' + name));
+                const stat = fs?.stat(uriConverter.asUri(dirName + '/' + name));
                 if (typeof stat === 'object' && 'then' in stat) {
                     const promise = stat;
                     promises.add(promise);

package/lib/resolveModuleName.d.ts

@@ -1,3 +1,3 @@
 import type { LanguagePlugin, SourceScript } from '@volar/language-core';
 import type * as ts from 'typescript';
-export declare function createResolveModuleName<T>(ts: typeof import('typescript'), host: ts.ModuleResolutionHost, languagePlugins: LanguagePlugin<any>[], getSourceScript: (fileName: string) => SourceScript<T> | undefined): (moduleName: string, containingFile: string, compilerOptions: ts.CompilerOptions, cache?: ts.ModuleResolutionCache, redirectedReference?: ts.ResolvedProjectReference, resolutionMode?: ts.ResolutionMode) => ts.ResolvedModuleWithFailedLookupLocations;
+export declare function createResolveModuleName<T>(ts: typeof import('typescript'), getFileSize: ((fileName: string) => number) | undefined, host: ts.ModuleResolutionHost, languagePlugins: LanguagePlugin<any>[], getSourceScript: (fileName: string) => SourceScript<T> | undefined): (moduleName: string, containingFile: string, compilerOptions: ts.CompilerOptions, cache?: ts.ModuleResolutionCache, redirectedReference?: ts.ResolvedProjectReference, resolutionMode?: ts.ResolutionMode) => ts.ResolvedModuleWithFailedLookupLocations;

package/lib/resolveModuleName.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createResolveModuleName = createResolveModuleName;
-function createResolveModuleName(ts, host, languagePlugins, getSourceScript) {
+function createResolveModuleName(ts, getFileSize, host, languagePlugins, getSourceScript) {
     const toSourceFileInfo = new Map();
     const moduleResolutionHost = {
         readFile: host.readFile.bind(host),
@@ -81,7 +81,7 @@ function createResolveModuleName(ts, host, languagePlugins, getSourceScript) {
     // fix https://github.com/vuejs/language-tools/issues/3332
     function fileExists(fileName) {
         if (host.fileExists(fileName)) {
-            const fileSize = ts.sys.getFileSize?.(fileName) ?? host.readFile(fileName)?.length ?? 0;
+            const fileSize = getFileSize?.(fileName) ?? host.readFile(fileName)?.length ?? 0;
             return fileSize < 4 * 1024 * 1024;
         }
         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.4.0-alpha.5",
+	"version": "2.4.0-alpha.7",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,14 +12,14 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.0-alpha.5",
+		"@volar/language-core": "2.4.0-alpha.7",
 		"path-browserify": "^1.0.1",
 		"vscode-uri": "^3.0.8"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.4.0-alpha.5"
+		"@volar/language-service": "2.4.0-alpha.7"
 	},
-	"gitHead": "bef4f4bf123264f3b0ce3da11adf1e0da387ce6d"
+	"gitHead": "890a891306835b992269ef1225f71a42f53d83e8"
 }