@volar/language-core 1.0.13 → 1.0.14

package/out/documentRegistry.d.ts

@@ -1,7 +1,7 @@
 import { Mapping, SourceMapBase } from '@volar/source-map';
 import { Teleport } from './sourceMaps';
 import type { EmbeddedFile, LanguageModule, SourceFile } from './types';
-export declare function forEachEmbeddeds(input: EmbeddedFile[], cb: (embedded: EmbeddedFile) => void): void;
+export declare function forEachEmbeddeds(file: EmbeddedFile, cb: (embedded: EmbeddedFile) => void): void;
 export type DocumentRegistry = ReturnType<typeof createDocumentRegistry>;
 export declare function createDocumentRegistry(): {
     get: (fileName: string) => [SourceFile, LanguageModule] | undefined;
@@ -15,7 +15,7 @@ export declare function createDocumentRegistry(): {
         sourceFile: SourceFile;
         embedded: EmbeddedFile;
     }, void, unknown>;
-    fromEmbeddedLocation: (fileName: string, offset: number) => Generator<{
+    fromEmbeddedLocation: (fileName: string, offset: number, baseOnRight?: boolean) => Generator<{
         fileName: string;
         offset: number;
         mapping: Mapping<any>;

package/out/documentRegistry.js

@@ -3,12 +3,10 @@ exports.createDocumentRegistry = exports.forEachEmbeddeds = void 0;
 const source_map_1 = require("@volar/source-map");
 const reactivity_1 = require("@vue/reactivity");
 const sourceMaps_1 = require("./sourceMaps");
-function forEachEmbeddeds(input, cb) {
-    for (const child of input) {
-        if (child) {
-            cb(child);
-        }
-        forEachEmbeddeds(child.embeddeds, cb);
+function forEachEmbeddeds(file, cb) {
+    cb(file);
+    for (const child of file.embeddeds) {
+        forEachEmbeddeds(child, cb);
     }
 }
 exports.forEachEmbeddeds = forEachEmbeddeds;
@@ -19,7 +17,7 @@ function createDocumentRegistry() {
     const embeddedDocumentsMap = (0, reactivity_1.computed)(() => {
         const map = new WeakMap();
         for (const [sourceFile] of all.value) {
-            forEachEmbeddeds(sourceFile.embeddeds, embedded => {
+            forEachEmbeddeds(sourceFile, embedded => {
                 map.set(embedded, sourceFile);
             });
         }
@@ -28,7 +26,7 @@ function createDocumentRegistry() {
     const sourceMapsByFileName = (0, reactivity_1.computed)(() => {
         const map = new Map();
         for (const [sourceFile] of all.value) {
-            forEachEmbeddeds(sourceFile.embeddeds, embedded => {
+            forEachEmbeddeds(sourceFile, embedded => {
                 map.set(normalizePath(embedded.fileName), { sourceFile, embedded });
             });
         }
@@ -38,7 +36,7 @@ function createDocumentRegistry() {
         const map = new Map();
         for (const key in files) {
             const [sourceFile] = files[key];
-            forEachEmbeddeds(sourceFile.embeddeds, embedded => {
+            forEachEmbeddeds(sourceFile, embedded => {
                 if (embedded.teleportMappings) {
                     map.set(normalizePath(embedded.fileName), getTeleport(sourceFile, embedded.teleportMappings));
                 }
@@ -61,14 +59,14 @@ function createDocumentRegistry() {
                 yield sourceMap[1];
             }
         },
-        fromEmbeddedLocation: function* (fileName, offset) {
+        fromEmbeddedLocation: function* (fileName, offset, baseOnRight = false) {
             if (fileName.endsWith('/__VLS_types.ts')) { // TODO: monkey fix
                 return;
             }
             const mapped = sourceMapsByFileName.value.get(normalizePath(fileName));
             if (mapped) {
                 const sourceMap = getSourceMap(mapped.sourceFile, mapped.embedded.mappings);
-                for (const vueRange of sourceMap.toSourceOffsets(offset)) {
+                for (const vueRange of sourceMap.toSourceOffsets(offset, baseOnRight)) {
                     yield {
                         fileName: mapped.sourceFile.fileName,
                         offset: vueRange[0],

package/out/languageContext.d.ts

@@ -15,7 +15,7 @@ export declare function createEmbeddedLanguageServiceHost(host: LanguageServiceH
             sourceFile: SourceFile;
             embedded: import("./types").EmbeddedFile;
         }, void, unknown>;
-        fromEmbeddedLocation: (fileName: string, offset: number) => Generator<{
+        fromEmbeddedLocation: (fileName: string, offset: number, baseOnRight?: boolean) => Generator<{
             fileName: string;
             offset: number;
             mapping: import("@volar/source-map").Mapping<any>;

package/out/languageContext.js

@@ -173,13 +173,13 @@ function createEmbeddedLanguageServiceHost(host, languageModules) {
             }
         }
         for (const [sourceFile, languageModule, snapshot] of sourceFilesToUpdate) {
-            (0, documentRegistry_1.forEachEmbeddeds)(sourceFile.embeddeds, embedded => {
+            (0, documentRegistry_1.forEachEmbeddeds)(sourceFile, embedded => {
                 fileVersions.delete(embedded.fileName);
             });
             const oldScripts = {};
             const newScripts = {};
             if (!tsFileUpdated) {
-                (0, documentRegistry_1.forEachEmbeddeds)(sourceFile.embeddeds, embedded => {
+                (0, documentRegistry_1.forEachEmbeddeds)(sourceFile, embedded => {
                     if (embedded.kind) {
                         oldScripts[embedded.fileName] = embedded.text;
                     }
@@ -188,7 +188,7 @@ function createEmbeddedLanguageServiceHost(host, languageModules) {
             languageModule.updateSourceFile(sourceFile, snapshot);
             documentRegistry.onSourceFileUpdated(sourceFile);
             if (!tsFileUpdated) {
-                (0, documentRegistry_1.forEachEmbeddeds)(sourceFile.embeddeds, embedded => {
+                (0, documentRegistry_1.forEachEmbeddeds)(sourceFile, embedded => {
                     if (embedded.kind) {
                         newScripts[embedded.fileName] = embedded.text;
                     }

package/out/types.d.ts

@@ -40,10 +40,7 @@ export interface TextRange {
     start: number;
     end: number;
 }
-export interface SourceFile {
-    fileName: string;
-    text: string;
-    embeddeds: EmbeddedFile[];
+export interface SourceFile extends EmbeddedFile {
 }
 export declare enum EmbeddedFileKind {
     TextFile = 0,

package/package.json

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