@volar/language-core 1.5.4 → 1.6.1

package/out/types.d.ts

@@ -1,4 +1,4 @@
-import { Mapping } from '@volar/source-map';
+import { Mapping, Stack } from '@volar/source-map';
 import type * as ts from 'typescript/lib/tsserverlibrary';
 export interface FileCapabilities {
     diagnostic?: boolean;
@@ -49,6 +49,7 @@ export interface VirtualFile {
     kind: FileKind;
     capabilities: FileCapabilities;
     mappings: Mapping<FileRangeCapabilities>[];
+    codegenStacks: Stack[];
     mirrorBehaviorMappings?: Mapping<[MirrorBehaviorCapabilities, MirrorBehaviorCapabilities]>[];
     embeddedFiles: VirtualFile[];
 }

package/out/virtualFiles.js

@@ -6,7 +6,7 @@ const sourceMaps_1 = require("./sourceMaps");
 function createVirtualFiles(languages) {
     const sourceFiles = new Map();
     const virtualFiles = new Map();
-    const virtualFileToSourceMapsMap = new WeakMap();
+    const virtualFileMaps = new WeakMap();
     const virtualFileToMirrorMap = new WeakMap();
     let sourceFilesDirty = true;
     return {
@@ -53,19 +53,19 @@ function createVirtualFiles(languages) {
         },
         hasSource: (fileName) => sourceFiles.has(normalizePath(fileName)),
         getMirrorMap: getMirrorMap,
-        getMaps: getSourceMaps,
+        getMaps: getMapsByVirtualFile,
         hasVirtualFile(fileName) {
-            return !!getVirtualFilesMap().get(normalizePath(fileName));
+            return !!getVirtualFileToSourceFileMap().get(normalizePath(fileName));
         },
         getVirtualFile(fileName) {
-            const sourceAndVirtual = getVirtualFilesMap().get(normalizePath(fileName));
+            const sourceAndVirtual = getVirtualFileToSourceFileMap().get(normalizePath(fileName));
             if (sourceAndVirtual) {
                 return [sourceAndVirtual.virtualFile, sourceAndVirtual.source];
             }
             return [undefined, undefined];
         },
     };
-    function getVirtualFilesMap() {
+    function getVirtualFileToSourceFileMap() {
         if (sourceFilesDirty) {
             sourceFilesDirty = false;
             virtualFiles.clear();
@@ -77,26 +77,25 @@ function createVirtualFiles(languages) {
         }
         return virtualFiles;
     }
-    function getSourceMaps(virtualFile) {
-        let sourceMapsBySourceFileName = virtualFileToSourceMapsMap.get(virtualFile.snapshot);
-        if (!sourceMapsBySourceFileName) {
-            sourceMapsBySourceFileName = new Map();
-            virtualFileToSourceMapsMap.set(virtualFile.snapshot, sourceMapsBySourceFileName);
+    function getMapsByVirtualFile(virtualFile) {
+        if (!virtualFileMaps.has(virtualFile.snapshot)) {
+            virtualFileMaps.set(virtualFile.snapshot, new Map());
         }
+        const map = virtualFileMaps.get(virtualFile.snapshot);
         const sources = new Set();
-        for (const map of virtualFile.mappings) {
-            sources.add(map.source);
-        }
-        for (const source of sources) {
-            const sourceFileName = source ?? getVirtualFilesMap().get(normalizePath(virtualFile.fileName)).source.fileName;
-            if (!sourceMapsBySourceFileName.has(sourceFileName)) {
-                sourceMapsBySourceFileName.set(sourceFileName, [
-                    sourceFileName,
-                    new source_map_1.SourceMap(virtualFile.mappings.filter(mapping => mapping.source === source)),
-                ]);
+        const result = [];
+        for (const mapping of virtualFile.mappings) {
+            if (sources.has(mapping.source))
+                continue;
+            sources.add(mapping.source);
+            const sourceFileName = mapping.source ?? getVirtualFileToSourceFileMap().get(normalizePath(virtualFile.fileName)).source.fileName;
+            const sourceSnapshot = mapping.source ? sourceFiles.get(normalizePath(mapping.source)).snapshot : getVirtualFileToSourceFileMap().get(normalizePath(virtualFile.fileName)).source.snapshot;
+            if (!map.has(sourceSnapshot)) {
+                map.set(sourceSnapshot, [sourceFileName, new source_map_1.SourceMap(virtualFile.mappings.filter(mapping2 => mapping2.source === mapping.source))]);
             }
+            result.push(map.get(sourceSnapshot));
         }
-        return [...sourceMapsBySourceFileName.values()];
+        return result;
     }
     function getMirrorMap(file) {
         if (!virtualFileToMirrorMap.has(file.snapshot)) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/language-core",
-	"version": "1.5.4",
+	"version": "1.6.1",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,7 +13,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/source-map": "1.5.4"
+		"@volar/source-map": "1.6.1"
 	},
-	"gitHead": "9b96450d7e4d87d1b77af45a5ce796724fc606ce"
+	"gitHead": "1e1e99f43ff39db5432a33c8013eda706e765001"
 }