@volar/typescript 1.7.0 → 1.7.1-patch.1

package/out/documentRegistry.d.ts

@@ -0,0 +1,2 @@
+import type * as ts from 'typescript/lib/tsserverlibrary';
+export declare function getDocumentRegistry(ts: typeof import('typescript/lib/tsserverlibrary'), useCaseSensitiveFileNames: boolean, currentDirectory: string): ts.DocumentRegistry;

package/out/documentRegistry.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getDocumentRegistry = void 0;
+const documentRegistries = [];
+function getDocumentRegistry(ts, useCaseSensitiveFileNames, currentDirectory) {
+    let documentRegistry = documentRegistries.find(item => item[0] === useCaseSensitiveFileNames && item[1] === currentDirectory)?.[2];
+    if (!documentRegistry) {
+        documentRegistry = ts.createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory);
+        documentRegistries.push([useCaseSensitiveFileNames, currentDirectory, documentRegistry]);
+    }
+    return documentRegistry;
+}
+exports.getDocumentRegistry = getDocumentRegistry;
+//# sourceMappingURL=documentRegistry.js.map

package/out/index.d.ts

@@ -1,4 +1,5 @@
+export * from './documentRegistry';
+export * from './dtsHost';
 export * from './languageService';
 export * from './languageServiceHost';
 export * from './sys';
-export * from './dtsHost';

package/out/index.js

@@ -14,8 +14,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./documentRegistry"), exports);
+__exportStar(require("./dtsHost"), exports);
 __exportStar(require("./languageService"), exports);
 __exportStar(require("./languageServiceHost"), exports);
 __exportStar(require("./sys"), exports);
-__exportStar(require("./dtsHost"), exports);
 //# sourceMappingURL=index.js.map

package/out/languageService.js

@@ -4,13 +4,13 @@ exports.createLanguageService = void 0;
 const language_core_1 = require("@volar/language-core");
 const getProgram_1 = require("./getProgram");
 const languageServiceHost_1 = require("./languageServiceHost");
-let documentRegistry;
+const documentRegistry_1 = require("./documentRegistry");
 function createLanguageService(core, ts, sys) {
     if (!ts) {
         throw new Error('TypeScript module not provided.');
     }
     const lsHost = (0, languageServiceHost_1.createLanguageServiceHost)(core, ts, sys);
-    const ls = ts.createLanguageService(lsHost, documentRegistry ??= ts.createDocumentRegistry());
+    const ls = ts.createLanguageService(lsHost, (0, documentRegistry_1.getDocumentRegistry)(ts, sys.useCaseSensitiveFileNames, core.host.getCurrentDirectory()));
     return new Proxy({
         organizeImports,
         // only support for .ts for now, not support for .vue
@@ -93,6 +93,7 @@ function createLanguageService(core, ts, sys) {
                 : mode === 'typeDefinition' ? ls.getTypeDefinitionAtPosition(fileName, position)
                     : mode === 'references' ? ls.getReferencesAtPosition(fileName, position)
                         : mode === 'implementation' ? ls.getImplementationAtPosition(fileName, position)
+                            // @ts-expect-error
                             : mode === 'rename' && preferences ? ls.findRenameLocations(fileName, position, findInStrings, findInComments, preferences)
                                 : undefined;
             if (!_symbols)

package/out/languageServiceHost.js

@@ -21,8 +21,8 @@ function createLanguageServiceHost(ctx, ts, sys) {
                 return `/node_modules/typescript/lib/${ts.getDefaultLibFileName(options)}`;
             }
         },
-        useCaseSensitiveFileNames: sys ? () => sys.useCaseSensitiveFileNames : undefined,
-        getNewLine: sys ? () => sys.newLine : undefined,
+        useCaseSensitiveFileNames: () => sys.useCaseSensitiveFileNames,
+        getNewLine: () => sys.newLine,
         readFile: fileName => {
             const snapshot = getScriptSnapshot(fileName);
             if (snapshot) {
@@ -140,27 +140,19 @@ function createLanguageServiceHost(ctx, ts, sys) {
         return fsFileSnapshots.get(fileName)?.[1];
     }
     function getScriptVersion(fileName) {
-        // virtual files
+        // virtual files / root files / opened files
         const [virtualFile] = ctx.virtualFiles.getVirtualFile(fileName);
         const snapshot = virtualFile?.snapshot ?? ctx.host.getScriptSnapshot(fileName);
         if (snapshot) {
-            let version = fileVersions.get(fileName);
-            if (!version) {
-                version = {
-                    value: 0,
-                    versions: new WeakMap(),
-                };
-                fileVersions.set(fileName, version);
+            if (!fileVersions.has(fileName)) {
+                fileVersions.set(fileName, { value: 0, snapshot });
             }
-            if (!version.versions.has(snapshot)) {
-                version.versions.set(snapshot, version.value++);
+            const version = fileVersions.get(fileName);
+            if (version.snapshot !== snapshot) {
+                version.value++;
+                version.snapshot = snapshot;
             }
-            return version.versions.get(snapshot).toString();
-        }
-        // root files / opened files
-        const version = ctx.host.getScriptVersion(fileName);
-        if (version !== undefined) {
-            return version;
+            return version.value.toString();
         }
         // fs files
         return sys.getModifiedTime?.(fileName)?.valueOf().toString() ?? '';

package/out/sys.js

@@ -82,9 +82,9 @@ function createSys(ctx, ts, env, dtsHost) {
                     catch { }
                 }
             }
-            return sys.resolvePath(fsPath);
+            return sys.resolvePath(fsPath).replace(/\\/g, '/');
         }
-        return path_1.posix.resolve(fsPath);
+        return path_1.posix.resolve(fsPath).replace(/\\/g, '/');
     }
     function getModifiedTime(fileName) {
         fileName = resolvePath(fileName);
@@ -244,7 +244,6 @@ function createSys(ctx, ts, env, dtsHost) {
             file.text = result;
             const time = Date.now();
             file.modifiedTime = time !== file.modifiedTime ? time : time + 1;
-            version++;
         }
         else {
             file.exists = false;
@@ -265,7 +264,9 @@ function createSys(ctx, ts, env, dtsHost) {
             promises.add(promise);
             result.then((result) => {
                 promises.delete(promise);
-                onReadDirectoryResult(dir, result);
+                if (onReadDirectoryResult(dir, result)) {
+                    version++;
+                }
             });
         }
         else {
@@ -273,28 +274,32 @@ function createSys(ctx, ts, env, dtsHost) {
         }
     }
     function onReadDirectoryResult(dir, result) {
+        let updated = false;
         for (const [name, fileType] of result) {
             if (fileType === 1 || fileType === 64) {
                 dir.files[name] ??= {};
                 if (!dir.files[name].exists) {
                     dir.files[name].exists = true;
-                    version++;
+                    updated = true;
                 }
             }
             else if (fileType === 2) {
                 const childDir = getDirFromDir(dir, name);
                 if (!childDir.exists) {
                     childDir.exists = true;
-                    version++;
+                    updated = true;
                 }
             }
         }
+        return updated;
     }
     function getDir(dirName) {
         const dirNames = [];
         let currentDirPath = dirName;
         let currentDirName = path_1.posix.basename(currentDirPath);
-        while (currentDirName !== '') {
+        let lastDirName;
+        while (lastDirName !== currentDirName) {
+            lastDirName = currentDirName;
             dirNames.push(currentDirName);
             currentDirPath = path_1.posix.dirname(currentDirPath);
             currentDirName = path_1.posix.basename(currentDirPath);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "1.7.0",
+	"version": "1.7.1-patch.1",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,10 +13,9 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.7.0"
+		"@volar/language-core": "1.7.1"
 	},
 	"devDependencies": {
-		"@volar/language-service": "1.7.0"
-	},
-	"gitHead": "38ec4f727b32dbf2cf3284ab02695e3a8effacc5"
+		"@volar/language-service": "1.7.1"
+	}
 }