@volar/language-core 1.0.18 → 1.0.20

package/out/documentRegistry.d.ts

@@ -2,18 +2,18 @@ import { SourceMap } from '@volar/source-map';
 import { MirrorMap } from './sourceMaps';
 import type { LanguageModule, FileRangeCapabilities, VirtualFile } from './types';
 export type VirtualFiles = ReturnType<typeof createVirtualFiles>;
-type Row = [
+type Source = [
     string,
     ts.IScriptSnapshot,
     VirtualFile,
     LanguageModule
 ];
 export declare function createVirtualFiles(languageModules: LanguageModule[]): {
+    all: Map<string, Source>;
     update(fileName: string, snapshot: ts.IScriptSnapshot): VirtualFile | undefined;
     delete(fileName: string): void;
     get(fileName: string): readonly [import("typescript/lib/tsserverlibrary").IScriptSnapshot, VirtualFile] | undefined;
     hasSourceFile: (fileName: string) => boolean;
-    all: () => Row[];
     getMirrorMap: (file: VirtualFile) => MirrorMap | undefined;
     getMaps: (virtualFile: VirtualFile) => [string, SourceMap<FileRangeCapabilities>][];
     getSourceByVirtualFileName(fileName: string): readonly [string, import("typescript/lib/tsserverlibrary").IScriptSnapshot, VirtualFile] | undefined;

package/out/documentRegistry.js

@@ -1,35 +1,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.forEachEmbeddedFile = exports.createVirtualFiles = void 0;
 const source_map_1 = require("@volar/source-map");
-const reactivity_1 = require("@vue/reactivity");
 const sourceMaps_1 = require("./sourceMaps");
 function createVirtualFiles(languageModules) {
-    const sourceFileToRootVirtualFileMap = (0, reactivity_1.shallowReactive)({});
-    const all = (0, reactivity_1.computed)(() => Object.values(sourceFileToRootVirtualFileMap));
-    const virtualFileNameToSource = (0, reactivity_1.computed)(() => {
-        const map = new Map();
-        for (const row of all.value) {
-            forEachEmbeddedFile(row[2], file => {
-                map.set(normalizePath(file.fileName), [file, row]);
-            });
-        }
-        return map;
-    });
+    const sourceFiles = new Map();
+    const virtualFiles = new Map();
     const virtualFileToSourceMapsMap = new WeakMap();
     const virtualFileToMirrorMap = new WeakMap();
+    let sourceFilesDirty = true;
     return {
+        all: sourceFiles,
         update(fileName, snapshot) {
             const key = normalizePath(fileName);
-            if (sourceFileToRootVirtualFileMap[key]) {
-                const virtualFile = sourceFileToRootVirtualFileMap[key][2];
-                sourceFileToRootVirtualFileMap[key][1] = snapshot;
-                sourceFileToRootVirtualFileMap[key][3].updateFile(virtualFile, snapshot);
+            const value = sourceFiles.get(key);
+            if (value) {
+                const virtualFile = value[2];
+                value[1] = snapshot;
+                value[3].updateFile(virtualFile, snapshot);
+                sourceFilesDirty = true;
                 return virtualFile; // updated
             }
             for (const languageModule of languageModules) {
                 const virtualFile = languageModule.createFile(fileName, snapshot);
                 if (virtualFile) {
-                    sourceFileToRootVirtualFileMap[key] = [fileName, snapshot, (0, reactivity_1.shallowReactive)(virtualFile), languageModule];
+                    sourceFiles.set(key, [fileName, snapshot, virtualFile, languageModule]);
+                    sourceFilesDirty = true;
                     return virtualFile; // created
                 }
             }
@@ -37,27 +32,29 @@ function createVirtualFiles(languageModules) {
         delete(fileName) {
             var _a, _b;
             const key = normalizePath(fileName);
-            if (sourceFileToRootVirtualFileMap[key]) {
-                const virtualFile = sourceFileToRootVirtualFileMap[key][2];
-                (_b = (_a = sourceFileToRootVirtualFileMap[key][3]).deleteFile) === null || _b === void 0 ? void 0 : _b.call(_a, virtualFile);
-                delete sourceFileToRootVirtualFileMap[key]; // deleted
+            const value = sourceFiles.get(key);
+            if (value) {
+                const virtualFile = value[2];
+                (_b = (_a = value[3]).deleteFile) === null || _b === void 0 ? void 0 : _b.call(_a, virtualFile);
+                sourceFiles.delete(key); // deleted
+                sourceFilesDirty = true;
             }
         },
         get(fileName) {
             const key = normalizePath(fileName);
-            if (sourceFileToRootVirtualFileMap[key]) {
+            const value = sourceFiles.get(key);
+            if (value) {
                 return [
-                    sourceFileToRootVirtualFileMap[key][1],
-                    sourceFileToRootVirtualFileMap[key][2],
+                    value[1],
+                    value[2],
                 ];
             }
         },
-        hasSourceFile: (fileName) => !!sourceFileToRootVirtualFileMap[normalizePath(fileName)],
-        all: () => all.value,
+        hasSourceFile: (fileName) => sourceFiles.has(normalizePath(fileName)),
         getMirrorMap: getMirrorMap,
         getMaps: getSourceMaps,
         getSourceByVirtualFileName(fileName) {
-            const source = virtualFileNameToSource.value.get(normalizePath(fileName));
+            const source = getVirtualFilesMap().get(normalizePath(fileName));
             if (source) {
                 return [
                     source[1][0],
@@ -67,6 +64,18 @@ function createVirtualFiles(languageModules) {
             }
         },
     };
+    function getVirtualFilesMap() {
+        if (sourceFilesDirty) {
+            sourceFilesDirty = false;
+            virtualFiles.clear();
+            for (const [_, row] of sourceFiles) {
+                forEachEmbeddedFile(row[2], file => {
+                    virtualFiles.set(normalizePath(file.fileName), [file, row]);
+                });
+            }
+        }
+        return virtualFiles;
+    }
     function getSourceMaps(virtualFile) {
         let sourceMapsBySourceFileName = virtualFileToSourceMapsMap.get(virtualFile.snapshot);
         if (!sourceMapsBySourceFileName) {
@@ -78,7 +87,7 @@ function createVirtualFiles(languageModules) {
             sources.add(map.source);
         }
         for (const source of sources) {
-            const sourceFileName = source !== null && source !== void 0 ? source : virtualFileNameToSource.value.get(normalizePath(virtualFile.fileName))[1][0];
+            const sourceFileName = source !== null && source !== void 0 ? source : getVirtualFilesMap().get(normalizePath(virtualFile.fileName))[1][0];
             if (!sourceMapsBySourceFileName.has(sourceFileName)) {
                 sourceMapsBySourceFileName.set(sourceFileName, [
                     sourceFileName,

package/out/languageContext.d.ts

@@ -6,11 +6,11 @@ export declare function createLanguageContext(host: LanguageServiceHost, languag
         languageServiceHost: ts.LanguageServiceHost;
     };
     virtualFiles: {
+        all: Map<string, [string, ts.IScriptSnapshot, import("./types").VirtualFile, LanguageModule<import("./types").VirtualFile>]>;
         update(fileName: string, snapshot: ts.IScriptSnapshot): import("./types").VirtualFile | undefined;
         delete(fileName: string): void;
         get(fileName: string): readonly [ts.IScriptSnapshot, import("./types").VirtualFile] | undefined;
         hasSourceFile: (fileName: string) => boolean;
-        all: () => [string, ts.IScriptSnapshot, import("./types").VirtualFile, LanguageModule<import("./types").VirtualFile>][];
         getMirrorMap: (file: import("./types").VirtualFile) => import("./sourceMaps").MirrorMap | undefined;
         getMaps: (virtualFile: import("./types").VirtualFile) => [string, import("@volar/source-map").SourceMap<import("./types").FileRangeCapabilities>][];
         getSourceByVirtualFileName(fileName: string): readonly [string, ts.IScriptSnapshot, import("./types").VirtualFile] | undefined;

package/out/languageContext.js

@@ -55,7 +55,7 @@ function createLanguageContext(host, languageModules) {
         readDirectory: (_path, extensions, exclude, include, depth) => {
             var _a, _b;
             const result = (_b = (_a = host.readDirectory) === null || _a === void 0 ? void 0 : _a.call(host, _path, extensions, exclude, include, depth)) !== null && _b !== void 0 ? _b : [];
-            for (const [fileName] of virtualFiles.all()) {
+            for (const [, [fileName]] of virtualFiles.all) {
                 const vuePath2 = path_1.posix.join(_path, path_1.posix.basename(fileName));
                 if (path_1.posix.relative(_path.toLowerCase(), fileName.toLowerCase()).startsWith('..')) {
                     continue;
@@ -70,16 +70,19 @@ function createLanguageContext(host, languageModules) {
             return result;
         },
         getScriptKind(fileName) {
-            if (virtualFiles.hasSourceFile(fileName))
-                return ts.ScriptKind.Deferred;
-            switch (path_1.posix.extname(fileName)) {
-                case '.js': return ts.ScriptKind.JS;
-                case '.jsx': return ts.ScriptKind.JSX;
-                case '.ts': return ts.ScriptKind.TS;
-                case '.tsx': return ts.ScriptKind.TSX;
-                case '.json': return ts.ScriptKind.JSON;
-                default: return ts.ScriptKind.Unknown;
+            if (ts) {
+                if (virtualFiles.hasSourceFile(fileName))
+                    return ts.ScriptKind.Deferred;
+                switch (path_1.posix.extname(fileName)) {
+                    case '.js': return ts.ScriptKind.JS;
+                    case '.jsx': return ts.ScriptKind.JSX;
+                    case '.ts': return ts.ScriptKind.TS;
+                    case '.tsx': return ts.ScriptKind.TSX;
+                    case '.json': return ts.ScriptKind.JSON;
+                    default: return ts.ScriptKind.Unknown;
+                }
             }
+            return 0;
         },
     };
     return {
@@ -109,13 +112,14 @@ function createLanguageContext(host, languageModules) {
         let virtualFilesUpdatedNum = 0;
         const remainRootFiles = new Set(host.getScriptFileNames());
         // .vue
-        for (const [fileName] of virtualFiles.all()) {
+        for (const [_, [fileName]] of virtualFiles.all) {
             remainRootFiles.delete(fileName);
             const snapshot = host.getScriptSnapshot(fileName);
             if (!snapshot) {
                 // delete
                 virtualFiles.delete(fileName);
                 shouldUpdateTsProject = true;
+                virtualFilesUpdatedNum++;
                 continue;
             }
             const newVersion = host.getScriptVersion(fileName);
@@ -163,7 +167,7 @@ function createLanguageContext(host, languageModules) {
                 shouldUpdateTsProject = true;
             }
         }
-        for (const [_1, _2, virtualFile] of virtualFiles.all()) {
+        for (const [_, [_1, _2, virtualFile]] of virtualFiles.all) {
             if (!shouldUpdateTsProject) {
                 (0, documentRegistry_1.forEachEmbeddedFile)(virtualFile, embedded => {
                     var _a;
@@ -181,7 +185,7 @@ function createLanguageContext(host, languageModules) {
     }
     function getScriptFileNames() {
         const tsFileNames = new Set();
-        for (const [_1, _2, sourceFile] of virtualFiles.all()) {
+        for (const [_, [_1, _2, sourceFile]] of virtualFiles.all) {
             (0, documentRegistry_1.forEachEmbeddedFile)(sourceFile, embedded => {
                 if (embedded.kind === types_1.FileKind.TypeScriptHostFile) {
                     tsFileNames.add(embedded.fileName); // virtual .ts

package/out/types.d.ts

@@ -52,6 +52,6 @@ export interface LanguageModule<T extends VirtualFile = VirtualFile> {
     proxyLanguageServiceHost?(host: LanguageServiceHost): Partial<LanguageServiceHost>;
 }
 export interface LanguageServiceHost extends ts.LanguageServiceHost {
-    getTypeScriptModule(): typeof import('typescript/lib/tsserverlibrary');
+    getTypeScriptModule(): typeof import('typescript/lib/tsserverlibrary') | undefined;
     isTsc?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/language-core",
-	"version": "1.0.18",
+	"version": "1.0.20",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,9 +13,8 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/source-map": "1.0.18",
-		"@vue/reactivity": "^3.2.45",
+		"@volar/source-map": "1.0.20",
 		"muggle-string": "^0.1.0"
 	},
-	"gitHead": "f102ee7bfc96792c63746a5dcb9742e3346d5cc7"
+	"gitHead": "e00f068e812677791c93efe9cf20995764350ec6"
 }