@volar/typescript 2.1.3 → 2.1.5-patch.1

package/lib/node/decorateLanguageServiceHost.js

@@ -58,28 +58,24 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
         };
     }
     languageServiceHost.getScriptSnapshot = fileName => {
-        if (exts.some(ext => fileName.endsWith(ext))) {
-            updateScript(fileName);
-            return scripts.get(fileName)?.snapshot;
+        const virtualScript = updateVirtualScript(fileName);
+        if (virtualScript) {
+            return virtualScript.snapshot;
         }
         return getScriptSnapshot(fileName);
     };
     if (getScriptKind) {
         languageServiceHost.getScriptKind = fileName => {
-            if (exts.some(ext => fileName.endsWith(ext))) {
-                updateScript(fileName);
-                const script = scripts.get(fileName);
-                if (script) {
-                    return script.kind;
-                }
-                return ts.ScriptKind.Deferred;
+            const virtualScript = updateVirtualScript(fileName);
+            if (virtualScript) {
+                return virtualScript.kind;
             }
             return getScriptKind(fileName);
         };
     }
-    function updateScript(fileName) {
+    function updateVirtualScript(fileName) {
         const version = languageServiceHost.getScriptVersion(fileName);
-        if (version !== scripts.get(fileName)?.version) {
+        if (version !== scripts.get(fileName)?.[0]) {
             let extension = '.ts';
             let snapshotSnapshot;
             let scriptKind = ts.ScriptKind.TS;
@@ -106,14 +102,18 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts) {
                 extraProjectVersion++;
                 virtualFiles.delete(fileName);
             }
-            scripts.set(fileName, {
-                version,
-                extension,
-                snapshot: snapshotSnapshot,
-                kind: scriptKind,
-            });
+            if (snapshotSnapshot) {
+                scripts.set(fileName, [
+                    version,
+                    {
+                        extension,
+                        snapshot: snapshotSnapshot,
+                        kind: scriptKind,
+                    }
+                ]);
+            }
         }
-        return scripts.get(fileName);
+        return scripts.get(fileName)?.[1];
     }
 }
 exports.decorateLanguageServiceHost = decorateLanguageServiceHost;

package/lib/protocol/createSys.js

@@ -6,41 +6,42 @@ const utilities_1 = require("../typescript/utilities");
 let currentCwd = '';
 function createSys(ts, env, currentDirectory) {
     let version = 0;
+    // sys is undefined in browser
     const sys = ts.sys;
+    const caseSensitive = sys?.useCaseSensitiveFileNames ?? false;
     const root = {
+        name: '',
         dirs: new Map(),
         files: new Map(),
         requestedRead: false,
     };
     const promises = new Set();
     const fileWatcher = env.onDidChangeWatchedFiles?.(({ changes }) => {
+        version++;
         for (const change of changes) {
             const fileName = env.typescript.uriToFileName(change.uri);
             const dirName = path.dirname(fileName);
             const baseName = path.basename(fileName);
-            const dir = getDir(dirName);
-            if (dir.files.has(baseName)) { // is requested file
-                version++;
-                if (change.type === 1 || change.type === 2) {
-                    dir.files.set(baseName, {
-                        stat: {
-                            type: 1,
-                            ctime: Date.now(),
-                            mtime: Date.now(),
-                            size: -1,
-                        },
-                        requestedStat: false,
-                    });
-                }
-                else if (change.type === 3) {
-                    dir.files.set(baseName, {
-                        stat: undefined,
-                        text: undefined,
-                        requestedStat: true,
-                        requestedText: true,
-                    });
-                }
-            }
+            const fileExists = change.type === 1
+                || change.type === 2;
+            const dir = getDir(dirName, fileExists);
+            dir.files.set(normalizeFileId(baseName), fileExists ? {
+                name: baseName,
+                stat: {
+                    type: 1,
+                    ctime: Date.now(),
+                    mtime: Date.now(),
+                    size: -1,
+                },
+                requestedStat: false,
+                requestedText: false,
+            } : {
+                name: baseName,
+                stat: undefined,
+                text: undefined,
+                requestedStat: true,
+                requestedText: true,
+            });
         }
     });
     return {
@@ -49,7 +50,7 @@ function createSys(ts, env, currentDirectory) {
         },
         args: sys?.args ?? [],
         newLine: sys?.newLine ?? '\n',
-        useCaseSensitiveFileNames: sys?.useCaseSensitiveFileNames ?? false,
+        useCaseSensitiveFileNames: caseSensitive,
         realpath: sys?.realpath,
         write: sys?.write ?? (() => { }),
         writeFile: sys?.writeFile ?? (() => { }),
@@ -99,7 +100,7 @@ function createSys(ts, env, currentDirectory) {
         const dir = getDir(dirPath);
         const name = path.basename(fileName);
         readFileWorker(fileName, encoding, dir);
-        return dir.files.get(name)?.text;
+        return dir.files.get(normalizeFileId(name))?.text;
     }
     function directoryExists(dirName) {
         dirName = resolvePath(dirName);
@@ -168,9 +169,13 @@ function createSys(ts, env, currentDirectory) {
         const dirPath = path.dirname(fileName);
         const baseName = path.basename(fileName);
         const dir = getDir(dirPath);
-        let file = dir.files.get(baseName);
+        let file = dir.files.get(normalizeFileId(baseName));
         if (!file) {
-            dir.files.set(baseName, file = {});
+            dir.files.set(normalizeFileId(baseName), file = {
+                name: baseName,
+                requestedStat: false,
+                requestedText: false,
+            });
         }
         return file;
     }
@@ -179,26 +184,36 @@ function createSys(ts, env, currentDirectory) {
         dirName = resolvePath(dirName);
         readDirectoryWorker(dirName);
         const dir = getDir(dirName);
-        return [...dir.dirs.entries()].filter(([_, dir]) => dir.exists).map(([name]) => name);
+        return [...dir.dirs.values()]
+            .filter(dir => dir.exists)
+            .map(dir => dir.name);
     }
     function readDirectory(dirName, extensions, excludes, includes, depth) {
         dirName = resolvePath(dirName);
-        const matches = (0, utilities_1.matchFiles)(dirName, extensions, excludes, includes, sys?.useCaseSensitiveFileNames ?? false, currentDirectory, depth, dirPath => {
+        const matches = (0, utilities_1.matchFiles)(dirName, extensions, excludes, includes, caseSensitive, currentDirectory, depth, dirPath => {
             dirPath = resolvePath(dirPath);
             readDirectoryWorker(dirPath);
             const dir = getDir(dirPath);
             return {
-                files: [...dir.files.entries()].filter(([_, file]) => file.stat?.type === 1).map(([name]) => name),
-                directories: [...dir.dirs.entries()].filter(([_, dir]) => dir.exists).map(([name]) => name),
+                files: [...dir.files.values()]
+                    .filter(file => file.stat?.type === 1)
+                    .map(file => file.name),
+                directories: [...dir.dirs.values()]
+                    .filter(dir => dir.exists)
+                    .map(dir => dir.name),
             };
         }, sys?.realpath ? (path => sys.realpath(path)) : (path => path));
         return [...new Set(matches)];
     }
     function readFileWorker(fileName, encoding, dir) {
         const name = path.basename(fileName);
-        let file = dir.files.get(name);
+        let file = dir.files.get(normalizeFileId(name));
         if (!file) {
-            dir.files.set(name, file = {});
+            dir.files.set(normalizeFileId(name), file = {
+                name,
+                requestedStat: false,
+                requestedText: false,
+            });
         }
         if (file.requestedText) {
             return;
@@ -259,9 +274,13 @@ function createSys(ts, env, currentDirectory) {
                     stat.then(stat => {
                         promises.delete(promise);
                         if (stat?.type === 1) {
-                            let file = dir.files.get(name);
+                            let file = dir.files.get(normalizeFileId(name));
                             if (!file) {
-                                dir.files.set(name, file = {});
+                                dir.files.set(normalizeFileId(name), file = {
+                                    name,
+                                    requestedStat: false,
+                                    requestedText: false,
+                                });
                             }
                             if (stat.type !== file.stat?.type || stat.mtime !== file.stat?.mtime) {
                                 version++;
@@ -283,9 +302,13 @@ function createSys(ts, env, currentDirectory) {
                 }
             }
             if (fileType === 1) {
-                let file = dir.files.get(name);
+                let file = dir.files.get(normalizeFileId(name));
                 if (!file) {
-                    dir.files.set(name, file = {});
+                    dir.files.set(normalizeFileId(name), file = {
+                        name,
+                        requestedStat: false,
+                        requestedText: false,
+                    });
                 }
                 if (!file.stat) {
                     file.stat = {
@@ -307,7 +330,7 @@ function createSys(ts, env, currentDirectory) {
         }
         return updated;
     }
-    function getDir(dirName) {
+    function getDir(dirName, markExists = false) {
         const dirNames = [];
         let currentDirPath = dirName;
         let currentDirName = path.basename(currentDirPath);
@@ -322,19 +345,27 @@ function createSys(ts, env, currentDirectory) {
         for (let i = dirNames.length - 1; i >= 0; i--) {
             const nextDirName = dirNames[i];
             currentDir = getDirFromDir(currentDir, nextDirName);
+            if (markExists && !currentDir.exists) {
+                currentDir.exists = true;
+                version++;
+            }
         }
         return currentDir;
     }
     function getDirFromDir(dir, name) {
-        let target = dir.dirs.get(name);
+        let target = dir.dirs.get(normalizeFileId(name));
         if (!target) {
-            dir.dirs.set(name, target = {
+            dir.dirs.set(normalizeFileId(name), target = {
+                name,
                 dirs: new Map(),
                 files: new Map(),
             });
         }
         return target;
     }
+    function normalizeFileId(fileName) {
+        return caseSensitive ? fileName : fileName.toLowerCase();
+    }
 }
 exports.createSys = createSys;
 //# sourceMappingURL=createSys.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "2.1.3",
+	"version": "2.1.5-patch.1",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,13 +12,12 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.1.3",
+		"@volar/language-core": "2.1.5",
 		"path-browserify": "^1.0.1"
 	},
 	"devDependencies": {
 		"@types/node": "latest",
 		"@types/path-browserify": "latest",
-		"@volar/language-service": "2.1.3"
-	},
-	"gitHead": "0f861d59faa19cbeadef182ee079be88f9629fc7"
+		"@volar/language-service": "2.1.5"
+	}
 }