@volar/typescript 1.7.8 → 1.7.9

package/out/languageServiceHost.js

@@ -6,6 +6,7 @@ const utilities_1 = require("./typescript/utilities");
 function createLanguageServiceHost(ctx, ts, sys) {
     let lastProjectVersion;
     let tsProjectVersion = 0;
+    let tsFileNames = [];
     const _tsHost = {
         ...sys,
         getCurrentDirectory: () => ctx.host.getCurrentDirectory(),
@@ -34,7 +35,7 @@ function createLanguageServiceHost(ctx, ts, sys) {
         },
         readDirectory,
         getDirectories,
-        directoryExists,
+        directoryExists: undefined,
         fileExists,
         getProjectVersion: () => {
             return tsProjectVersion + ':' + sys.version;
@@ -42,7 +43,7 @@ function createLanguageServiceHost(ctx, ts, sys) {
         getTypeRootsVersion: () => {
             return sys.version ?? -1; // TODO: only update for /node_modules changes?
         },
-        getScriptFileNames,
+        getScriptFileNames: () => tsFileNames,
         getScriptVersion,
         getScriptSnapshot,
         getScriptKind(fileName) {
@@ -102,11 +103,25 @@ function createLanguageServiceHost(ctx, ts, sys) {
         }
         oldTsVirtualFileSnapshots = newTsVirtualFileSnapshots;
         oldOtherVirtualFileSnapshots = newOtherVirtualFileSnapshots;
+        const tsFileNamesSet = new Set();
+        for (const { root } of ctx.virtualFiles.allSources()) {
+            forEachEmbeddedFile(root, embedded => {
+                if (embedded.kind === 1) {
+                    tsFileNamesSet.add(embedded.fileName); // virtual .ts
+                }
+            });
+        }
+        for (const fileName of ctx.host.getScriptFileNames()) {
+            if (!ctx.virtualFiles.hasSource(fileName)) {
+                tsFileNamesSet.add(fileName); // .ts
+            }
+        }
+        tsFileNames = [...tsFileNamesSet];
     }
     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()) {
+            for (const fileName of tsFileNames) {
                 if (fileName.toLowerCase().startsWith(dirPath.toLowerCase())) {
                     const baseName = fileName.substring(dirPath.length);
                     if (baseName.indexOf('/') === -1) {
@@ -141,7 +156,7 @@ function createLanguageServiceHost(ctx, ts, sys) {
     }
     function getVirtualFileDirectories(dirName) {
         const names = new Set();
-        for (const fileName of getScriptFileNames()) {
+        for (const fileName of tsFileNames) {
             if (fileName.toLowerCase().startsWith(dirName.toLowerCase())) {
                 const path = fileName.substring(dirName.length);
                 if (path.indexOf('/') >= 0) {
@@ -151,22 +166,6 @@ function createLanguageServiceHost(ctx, ts, sys) {
         }
         return [...names];
     }
-    function getScriptFileNames() {
-        const tsFileNames = new Set();
-        for (const { root } of ctx.virtualFiles.allSources()) {
-            forEachEmbeddedFile(root, embedded => {
-                if (embedded.kind === 1) {
-                    tsFileNames.add(embedded.fileName); // virtual .ts
-                }
-            });
-        }
-        for (const fileName of ctx.host.getScriptFileNames()) {
-            if (!ctx.virtualFiles.hasSource(fileName)) {
-                tsFileNames.add(fileName); // .ts
-            }
-        }
-        return [...tsFileNames];
-    }
     function getScriptSnapshot(fileName) {
         // virtual files
         const [virtualFile] = ctx.virtualFiles.getVirtualFile(fileName);
@@ -211,34 +210,7 @@ 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('.'));
-        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/serverPlugin.js

@@ -3,9 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.decorateLanguageServiceHost = void 0;
 const language_core_1 = require("@volar/language-core");
 function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts) {
+    let extraProjectVersion = 0;
     const scripts = new Map();
     const resolveModuleNameLiterals = languageServiceHost.resolveModuleNameLiterals?.bind(languageServiceHost);
     const resolveModuleNames = languageServiceHost.resolveModuleNames?.bind(languageServiceHost);
+    const getProjectVersion = languageServiceHost.getProjectVersion?.bind(languageServiceHost);
+    const getScriptFileNames = languageServiceHost.getScriptFileNames.bind(languageServiceHost);
     const getScriptSnapshot = languageServiceHost.getScriptSnapshot.bind(languageServiceHost);
     if (resolveModuleNameLiterals) {
         languageServiceHost.resolveModuleNameLiterals = (moduleNames, containingFile, redirectedReference, options, ...rest) => {
@@ -29,6 +32,22 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts
             });
         };
     }
+    if (getProjectVersion) {
+        languageServiceHost.getProjectVersion = () => {
+            return getProjectVersion() + ':' + extraProjectVersion;
+        };
+    }
+    languageServiceHost.getScriptFileNames = () => {
+        if (languageServiceHost.getCompilationSettings().composite) {
+            return [
+                ...getScriptFileNames(),
+                ...virtualFiles.allSources().map(source => source.fileName),
+            ];
+        }
+        else {
+            return getScriptFileNames();
+        }
+    };
     languageServiceHost.getScriptSnapshot = (fileName) => {
         if (scripts.has(fileName)) {
             updateScript(fileName);
@@ -63,6 +82,7 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts
             let snapshot;
             let extension = '.ts';
             if (text !== undefined) {
+                extraProjectVersion++;
                 const virtualFile = virtualFiles.updateSource(fileName, ts.ScriptSnapshot.fromString(text), undefined);
                 if (virtualFile) {
                     let patchedText = text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
@@ -76,7 +96,8 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts
                     snapshot = ts.ScriptSnapshot.fromString(patchedText);
                 }
             }
-            else {
+            else if (virtualFiles.hasSource(fileName)) {
+                extraProjectVersion++;
                 virtualFiles.deleteSource(fileName);
             }
             scripts.set(fileName, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "1.7.8",
+	"version": "1.7.9",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,10 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.7.8"
+		"@volar/language-core": "1.7.9"
 	},
 	"devDependencies": {
-		"@volar/language-service": "1.7.8"
+		"@volar/language-service": "1.7.9"
 	},
-	"gitHead": "e7c1b16e5c78702de6986eafa17ae96000ffe0cb"
+	"gitHead": "c28b1b3fc725f38d335f4341179678c78828528f"
 }