@volar/language-core 2.3.0-alpha.8 → 2.3.0

package/index.js

@@ -142,30 +142,33 @@ function createLanguage(plugins, scriptRegistry, sync) {
             },
         },
         maps: {
-            get(virtualCode) {
-                for (const map of this.forEach(virtualCode)) {
-                    return map[2];
-                }
-                throw `no map found for ${virtualCode.id}`;
-            },
-            *forEach(virtualCode) {
+            get(virtualCode, sourceScript) {
                 let mapCache = virtualCodeToSourceMap.get(virtualCode.snapshot);
                 if (!mapCache) {
                     virtualCodeToSourceMap.set(virtualCode.snapshot, mapCache = new WeakMap());
                 }
-                const sourceScript = virtualCodeToSourceScriptMap.get(virtualCode);
                 if (!mapCache.has(sourceScript.snapshot)) {
-                    mapCache.set(sourceScript.snapshot, new source_map_1.SourceMap(virtualCode.mappings));
+                    const mappings = virtualCode.associatedScriptMappings?.get(sourceScript.id) ?? virtualCode.mappings;
+                    mapCache.set(sourceScript.snapshot, new source_map_1.SourceMap(mappings));
                 }
-                yield [sourceScript.id, sourceScript.snapshot, mapCache.get(sourceScript.snapshot)];
+                return mapCache.get(sourceScript.snapshot);
+            },
+            *forEach(virtualCode) {
+                const sourceScript = virtualCodeToSourceScriptMap.get(virtualCode);
+                yield [
+                    sourceScript.id,
+                    sourceScript.snapshot,
+                    this.get(virtualCode, sourceScript),
+                ];
                 if (virtualCode.associatedScriptMappings) {
-                    for (const [relatedScriptId, relatedMappings] of virtualCode.associatedScriptMappings) {
+                    for (const [relatedScriptId] of virtualCode.associatedScriptMappings) {
                         const relatedSourceScript = scriptRegistry.get(relatedScriptId);
                         if (relatedSourceScript) {
-                            if (!mapCache.has(relatedSourceScript.snapshot)) {
-                                mapCache.set(relatedSourceScript.snapshot, new source_map_1.SourceMap(relatedMappings));
-                            }
-                            yield [relatedSourceScript.id, relatedSourceScript.snapshot, mapCache.get(relatedSourceScript.snapshot)];
+                            yield [
+                                relatedSourceScript.id,
+                                relatedSourceScript.snapshot,
+                                this.get(virtualCode, relatedSourceScript),
+                            ];
                         }
                     }
                 }

package/lib/types.d.ts

@@ -10,7 +10,7 @@ export interface Language<T = unknown> {
         fromVirtualCode(virtualCode: VirtualCode): SourceScript<T>;
     };
     maps: {
-        get(virtualCode: VirtualCode): SourceMap<CodeInformation>;
+        get(virtualCode: VirtualCode, sourceScript: SourceScript<T>): SourceMap<CodeInformation>;
         forEach(virtualCode: VirtualCode): Generator<[id: T, snapshot: ts.IScriptSnapshot, map: SourceMap<CodeInformation>]>;
     };
     linkedCodeMaps: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/language-core",
-	"version": "2.3.0-alpha.8",
+	"version": "2.3.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,7 +12,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/source-map": "2.3.0-alpha.8"
+		"@volar/source-map": "2.3.0"
 	},
-	"gitHead": "377a0083ac697a476509805a6777a2339391dcaf"
+	"gitHead": "4f6488605e22e0f76ea877460848a443fd3e8762"
 }