@volar/language-core 1.0.13 → 1.0.16

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

@@ -21,16 +21,17 @@ function createEmbeddedLanguageServiceHost(host, languageModules) {
     let tsProjectVersion = 0;
     const documentRegistry = (0, documentRegistry_1.createDocumentRegistry)();
     const ts = host.getTypeScriptModule();
-    const tsFileVersions = new Map();
     const scriptSnapshots = new Map();
-    const fileVersions = new Map();
+    const sourceTsFileVersions = new Map();
+    const sourceVueFileVersions = new Map();
+    const virtualFileVersions = new Map();
     const _tsHost = {
         fileExists: host.fileExists
             ? fileName => {
                 var _a;
                 // .vue.js -> .vue
                 // .vue.ts -> .vue
-                // .vue.d.ts (never)
+                // .vue.d.ts -> [ignored]
                 const vueFileName = fileName.substring(0, fileName.lastIndexOf('.'));
                 if (!documentRegistry.get(vueFileName)) {
                     // create virtual files
@@ -104,82 +105,80 @@ function createEmbeddedLanguageServiceHost(host, languageModules) {
     function update() {
         var _a;
         const newProjectVersion = (_a = host.getProjectVersion) === null || _a === void 0 ? void 0 : _a.call(host);
-        const sholdUpdate = newProjectVersion === undefined || newProjectVersion !== lastProjectVersion;
+        const shouldUpdate = newProjectVersion === undefined || newProjectVersion !== lastProjectVersion;
         lastProjectVersion = newProjectVersion;
-        if (!sholdUpdate)
+        if (!shouldUpdate)
             return;
         let tsFileUpdated = false;
-        const remainFileNames = new Set(host.getScriptFileNames());
-        const sourceFilesToUpdate = [];
+        const checkRemains = new Set(host.getScriptFileNames());
+        const sourceFilesShouldUpdate = [];
         // .vue
         for (const [sourceFile, languageModule] of documentRegistry.getAll()) {
-            remainFileNames.delete(sourceFile.fileName);
+            checkRemains.delete(sourceFile.fileName);
+            const snapshot = host.getScriptSnapshot(sourceFile.fileName);
+            if (!snapshot) {
+                // delete
+                documentRegistry.delete(sourceFile.fileName);
+                tsFileUpdated = true;
+                continue;
+            }
             const newVersion = host.getScriptVersion(sourceFile.fileName);
-            if (fileVersions.get(sourceFile.fileName) !== newVersion) {
-                fileVersions.set(sourceFile.fileName, newVersion);
-                const snapshot = host.getScriptSnapshot(sourceFile.fileName);
-                if (snapshot) {
-                    // update
-                    sourceFilesToUpdate.push([sourceFile, languageModule, snapshot]);
-                }
-                else {
-                    // delete
-                    if (documentRegistry.delete(sourceFile.fileName)) {
-                        tsFileUpdated = true;
-                    }
-                }
+            if (sourceVueFileVersions.get(sourceFile.fileName) !== newVersion) {
+                // update
+                sourceVueFileVersions.set(sourceFile.fileName, newVersion);
+                sourceFilesShouldUpdate.push([sourceFile, languageModule, snapshot]);
             }
         }
         // no any vue file version change, it mean project version was update by ts file change at this time
-        if (!sourceFilesToUpdate.length) {
+        if (!sourceFilesShouldUpdate.length) {
             tsFileUpdated = true;
         }
         // add
-        for (const fileName of [...remainFileNames]) {
+        for (const fileName of [...checkRemains]) {
             const snapshot = host.getScriptSnapshot(fileName);
             if (snapshot) {
                 for (const languageModule of languageModules) {
                     const sourceFile = languageModule.createSourceFile(fileName, snapshot);
                     if (sourceFile) {
-                        fileVersions.set(sourceFile.fileName, host.getScriptVersion(fileName));
+                        sourceVueFileVersions.set(sourceFile.fileName, host.getScriptVersion(fileName));
                         documentRegistry.set(fileName, (0, reactivity_1.shallowReactive)(sourceFile), languageModule);
-                        remainFileNames.delete(fileName);
+                        checkRemains.delete(fileName);
                         break;
                     }
                 }
             }
         }
         // .ts / .js / .d.ts / .json ...
-        for (const [oldTsFileName, oldTsFileVersion] of [...tsFileVersions]) {
+        for (const [oldTsFileName, oldTsFileVersion] of [...sourceTsFileVersions]) {
             const newVersion = host.getScriptVersion(oldTsFileName);
             if (oldTsFileVersion !== newVersion) {
-                if (!remainFileNames.has(oldTsFileName) && !host.getScriptSnapshot(oldTsFileName)) {
+                if (!checkRemains.has(oldTsFileName) && !host.getScriptSnapshot(oldTsFileName)) {
                     // delete
-                    tsFileVersions.delete(oldTsFileName);
+                    sourceTsFileVersions.delete(oldTsFileName);
                 }
                 else {
                     // update
-                    tsFileVersions.set(oldTsFileName, newVersion);
+                    sourceTsFileVersions.set(oldTsFileName, newVersion);
                 }
                 tsFileUpdated = true;
             }
         }
-        for (const nowFileName of remainFileNames) {
-            if (!tsFileVersions.has(nowFileName)) {
+        for (const nowFileName of checkRemains) {
+            if (!sourceTsFileVersions.has(nowFileName)) {
                 // add
                 const newVersion = host.getScriptVersion(nowFileName);
-                tsFileVersions.set(nowFileName, newVersion);
+                sourceTsFileVersions.set(nowFileName, newVersion);
                 tsFileUpdated = true;
             }
         }
-        for (const [sourceFile, languageModule, snapshot] of sourceFilesToUpdate) {
-            (0, documentRegistry_1.forEachEmbeddeds)(sourceFile.embeddeds, embedded => {
-                fileVersions.delete(embedded.fileName);
+        for (const [sourceFile, languageModule, snapshot] of sourceFilesShouldUpdate) {
+            (0, documentRegistry_1.forEachEmbeddeds)(sourceFile, embedded => {
+                virtualFileVersions.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 +187,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;
                     }
@@ -212,10 +211,7 @@ function createEmbeddedLanguageServiceHost(host, languageModules) {
             }
         }
         for (const fileName of host.getScriptFileNames()) {
-            if (host.isTsPlugin) {
-                tsFileNames.add(fileName); // .vue + .ts
-            }
-            else if (!documentRegistry.has(fileName)) {
+            if (!documentRegistry.has(fileName)) {
                 tsFileNames.add(fileName); // .ts
             }
         }
@@ -225,8 +221,8 @@ function createEmbeddedLanguageServiceHost(host, languageModules) {
         var _a, _b, _c;
         let mapped = documentRegistry.fromEmbeddedFileName(fileName);
         if (mapped) {
-            if (fileVersions.has(mapped.embedded.fileName)) {
-                return fileVersions.get(mapped.embedded.fileName);
+            if (virtualFileVersions.has(mapped.embedded.fileName)) {
+                return virtualFileVersions.get(mapped.embedded.fileName);
             }
             else {
                 let version = (_c = (_b = (_a = ts.sys) === null || _a === void 0 ? void 0 : _a.createHash) === null || _b === void 0 ? void 0 : _b.call(_a, mapped.embedded.text)) !== null && _c !== void 0 ? _c : mapped.embedded.text;
@@ -234,7 +230,7 @@ function createEmbeddedLanguageServiceHost(host, languageModules) {
                     // fix https://github.com/johnsoncodehk/volar/issues/1082
                     version = host.getScriptVersion(mapped.sourceFile.fileName) + ':' + version;
                 }
-                fileVersions.set(mapped.embedded.fileName, version);
+                virtualFileVersions.set(mapped.embedded.fileName, version);
                 return version;
             }
         }

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,
@@ -65,6 +62,5 @@ export interface LanguageModule<T extends SourceFile = SourceFile> {
 }
 export type LanguageServiceHost = ts.LanguageServiceHost & {
     getTypeScriptModule(): typeof import('typescript/lib/tsserverlibrary');
-    isTsPlugin?: boolean;
     isTsc?: boolean;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/language-core",
-	"version": "1.0.13",
+	"version": "1.0.16",
 	"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.16",
 		"@vue/reactivity": "^3.2.45",
 		"muggle-string": "^0.1.0"
 	},
-	"gitHead": "cba2eba187b2d82e1d45dd86b3edeab0ca7caad6"
+	"gitHead": "af476047d8859652254ed36f8aee184f1972a97a"
 }