@volar/typescript 1.0.16 → 1.0.18

package/out/getProgram.d.ts

@@ -1,3 +1,3 @@
 import type * as ts from 'typescript/lib/tsserverlibrary';
 import type * as embedded from '@volar/language-core';
-export declare function getProgram(ts: typeof import('typescript/lib/tsserverlibrary'), core: embedded.EmbeddedLanguageContext, ls: ts.LanguageService): any;
+export declare function getProgram(ts: typeof import('typescript/lib/tsserverlibrary'), core: embedded.LanguageContext, ls: ts.LanguageService): any;

package/out/getProgram.js

@@ -26,7 +26,7 @@ function getProgram(ts, core, ls) {
         return ls.getProgram();
     }
     function getRootFileNames() {
-        return getProgram().getRootFileNames().filter(fileName => { var _a, _b; return (_b = (_a = core.typescriptLanguageServiceHost).fileExists) === null || _b === void 0 ? void 0 : _b.call(_a, fileName); });
+        return getProgram().getRootFileNames().filter(fileName => { var _a, _b; return (_b = (_a = core.typescript.languageServiceHost).fileExists) === null || _b === void 0 ? void 0 : _b.call(_a, fileName); });
     }
     // for vue-tsc --noEmit --watch
     function getBindAndCheckDiagnostics(sourceFile, cancellationToken) {
@@ -42,9 +42,9 @@ function getProgram(ts, core, ls) {
     function getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, api) {
         var _a, _b, _c;
         if (sourceFile) {
-            const mapped = core.mapper.fromEmbeddedFileName(sourceFile.fileName);
-            if (mapped) {
-                if (!mapped.embedded.capabilities.diagnostic)
+            const source = core.virtualFiles.getSourceByVirtualFileName(sourceFile.fileName);
+            if (source) {
+                if (!source[2].capabilities.diagnostic)
                     return [];
                 const errors = transformDiagnostics((_b = (_a = ls.getProgram()) === null || _a === void 0 ? void 0 : _a[api](sourceFile, cancellationToken)) !== null && _b !== void 0 ? _b : []);
                 return errors;
@@ -58,7 +58,7 @@ function getProgram(ts, core, ls) {
     }
     function emit(targetSourceFile, _writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
         var _a;
-        const scriptResult = getProgram().emit(targetSourceFile, ((_a = core.typescriptLanguageServiceHost.writeFile) !== null && _a !== void 0 ? _a : ts.sys.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
+        const scriptResult = getProgram().emit(targetSourceFile, ((_a = core.typescript.languageServiceHost.writeFile) !== null && _a !== void 0 ? _a : ts.sys.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         return {
             emitSkipped: scriptResult.emitSkipped,
             emittedFiles: scriptResult.emittedFiles,
@@ -67,24 +67,36 @@ function getProgram(ts, core, ls) {
     }
     // transform
     function transformDiagnostics(diagnostics) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const result = [];
         for (const diagnostic of diagnostics) {
             if (diagnostic.file !== undefined
                 && diagnostic.start !== undefined
                 && diagnostic.length !== undefined) {
-                for (const start of core.mapper.fromEmbeddedLocation(diagnostic.file.fileName, diagnostic.start)) {
-                    if (start.mapping && !start.mapping.data.diagnostic)
-                        continue;
-                    if (!((_b = (_a = core.typescriptLanguageServiceHost).fileExists) === null || _b === void 0 ? void 0 : _b.call(_a, start.fileName)))
+                const source = core.virtualFiles.getSourceByVirtualFileName(diagnostic.file.fileName);
+                if (source) {
+                    if (((_b = (_a = core.typescript.languageServiceHost).fileExists) === null || _b === void 0 ? void 0 : _b.call(_a, source[0])) === false)
                         continue;
-                    for (const end of core.mapper.fromEmbeddedLocation(diagnostic.file.fileName, diagnostic.start + diagnostic.length, true)) {
-                        if (end.mapping && !end.mapping.data.diagnostic)
+                    for (const [sourceFileName, map] of core.virtualFiles.getMaps(source[2])) {
+                        if (sourceFileName !== source[0])
                             continue;
-                        onMapping(diagnostic, start.fileName, start.offset, end.offset, (_c = core.mapper.get(start.fileName)) === null || _c === void 0 ? void 0 : _c[0].text);
-                        break;
+                        for (const start of map.toSourceOffsets(diagnostic.start)) {
+                            if (!start[1].data.diagnostic)
+                                continue;
+                            for (const end of map.toSourceOffsets(diagnostic.start + diagnostic.length, true)) {
+                                if (!end[1].data.diagnostic)
+                                    continue;
+                                onMapping(diagnostic, source[0], start[0], end[0], source[1].getText(0, source[1].getLength()));
+                                break;
+                            }
+                            break;
+                        }
                     }
-                    break;
+                }
+                else {
+                    if (((_d = (_c = core.typescript.languageServiceHost).fileExists) === null || _d === void 0 ? void 0 : _d.call(_c, diagnostic.file.fileName)) === false)
+                        continue;
+                    onMapping(diagnostic, diagnostic.file.fileName, diagnostic.start, diagnostic.start + diagnostic.length, diagnostic.file.text);
                 }
             }
             else if (diagnostic.file === undefined) {
@@ -99,7 +111,7 @@ function getProgram(ts, core, ls) {
                 : undefined;
             if (!file) {
                 if (docText === undefined) {
-                    const snapshot = core.typescriptLanguageServiceHost.getScriptSnapshot(fileName);
+                    const snapshot = core.typescript.languageServiceHost.getScriptSnapshot(fileName);
                     if (snapshot) {
                         docText = snapshot.getText(0, snapshot.getLength());
                     }

package/out/index.d.ts

@@ -3,6 +3,6 @@ import * as embedded from '@volar/language-core';
 export declare function createLanguageService(host: embedded.LanguageServiceHost, mods: embedded.LanguageModule[]): {
     __internal__: {
         languageService: ts.LanguageService;
-        context: embedded.EmbeddedLanguageContext;
+        context: embedded.LanguageContext;
     };
 } & ts.LanguageService;

package/out/index.js

@@ -3,9 +3,9 @@ exports.createLanguageService = void 0;
 const getProgram_1 = require("./getProgram");
 const embedded = require("@volar/language-core");
 function createLanguageService(host, mods) {
-    const core = embedded.createEmbeddedLanguageServiceHost(host, mods);
+    const core = embedded.createLanguageContext(host, mods);
     const ts = host.getTypeScriptModule();
-    const ls = ts.createLanguageService(core.typescriptLanguageServiceHost);
+    const ls = ts.createLanguageService(core.typescript.languageServiceHost);
     return new Proxy({
         organizeImports,
         // only support for .ts for now, not support for .vue
@@ -43,10 +43,11 @@ function createLanguageService(host, mods) {
     });
     // apis
     function organizeImports(args, formatOptions, preferences) {
-        const file = core.mapper.get(args.fileName);
+        var _a;
         let edits = [];
+        const file = (_a = core.virtualFiles.get(args.fileName)) === null || _a === void 0 ? void 0 : _a[1];
         if (file) {
-            embedded.forEachEmbeddeds(file[0], embedded => {
+            embedded.forEachEmbeddedFile(file, embedded => {
                 if (embedded.kind && embedded.capabilities.codeAction) {
                     edits = edits.concat(ls.organizeImports(Object.assign(Object.assign({}, args), { fileName: embedded.fileName }), formatOptions, preferences));
                 }
@@ -82,9 +83,10 @@ function createLanguageService(host, mods) {
     function findLocations(fileName, position, mode, findInStrings = false, findInComments = false, providePrefixAndSuffixTextForRename) {
         const loopChecker = new Set();
         let symbols = [];
-        withTeleports(fileName, position);
+        withMirrors(fileName, position);
         return symbols.map(s => transformDocumentSpanLike(s)).filter(notEmpty);
-        function withTeleports(fileName, position) {
+        function withMirrors(fileName, position) {
+            var _a;
             if (loopChecker.has(fileName + ':' + position))
                 return;
             loopChecker.add(fileName + ':' + position);
@@ -99,21 +101,22 @@ function createLanguageService(host, mods) {
             symbols = symbols.concat(_symbols);
             for (const ref of _symbols) {
                 loopChecker.add(ref.fileName + ':' + ref.textSpan.start);
-                const teleport = core.mapper.getTeleport(ref.fileName);
-                if (!teleport)
+                const virtualFile = (_a = core.virtualFiles.getSourceByVirtualFileName(ref.fileName)) === null || _a === void 0 ? void 0 : _a[2];
+                if (!virtualFile)
                     continue;
-                for (const teleOffset of teleport.findTeleports(ref.textSpan.start, data => {
+                const mirrorMap = core.virtualFiles.getMirrorMap(virtualFile);
+                if (!mirrorMap)
+                    continue;
+                for (const [mirrorOffset, data] of mirrorMap.findMirrorOffsets(ref.textSpan.start)) {
                     if ((mode === 'definition' || mode === 'typeDefinition' || mode === 'implementation') && !data.definition)
-                        return false;
+                        continue;
                     if ((mode === 'references') && !data.references)
-                        return false;
+                        continue;
                     if ((mode === 'rename') && !data.rename)
-                        return false;
-                    return true;
-                })) {
-                    if (loopChecker.has(ref.fileName + ':' + teleOffset))
                         continue;
-                    withTeleports(ref.fileName, teleOffset);
+                    if (loopChecker.has(ref.fileName + ':' + mirrorOffset))
+                        continue;
+                    withMirrors(ref.fileName, mirrorOffset);
                 }
             }
         }
@@ -122,14 +125,15 @@ function createLanguageService(host, mods) {
         const loopChecker = new Set();
         let textSpan;
         let symbols = [];
-        withTeleports(fileName, position);
+        withMirrors(fileName, position);
         if (!textSpan)
             return;
         return {
             textSpan: textSpan,
             definitions: symbols === null || symbols === void 0 ? void 0 : symbols.map(s => transformDocumentSpanLike(s)).filter(notEmpty),
         };
-        function withTeleports(fileName, position) {
+        function withMirrors(fileName, position) {
+            var _a;
             if (loopChecker.has(fileName + ':' + position))
                 return;
             loopChecker.add(fileName + ':' + position);
@@ -144,13 +148,18 @@ function createLanguageService(host, mods) {
             symbols = symbols.concat(_symbols.definitions);
             for (const ref of _symbols.definitions) {
                 loopChecker.add(ref.fileName + ':' + ref.textSpan.start);
-                const teleport = core.mapper.getTeleport(ref.fileName);
-                if (!teleport)
+                const virtualFile = (_a = core.virtualFiles.getSourceByVirtualFileName(ref.fileName)) === null || _a === void 0 ? void 0 : _a[2];
+                if (!virtualFile)
                     continue;
-                for (const teleOffset of teleport.findTeleports(ref.textSpan.start, data => !!data.definition)) {
-                    if (loopChecker.has(ref.fileName + ':' + teleOffset))
+                const mirrorMap = core.virtualFiles.getMirrorMap(virtualFile);
+                if (!mirrorMap)
+                    continue;
+                for (const [mirrorOffset, data] of mirrorMap.findMirrorOffsets(ref.textSpan.start)) {
+                    if (!data.definition)
+                        continue;
+                    if (loopChecker.has(ref.fileName + ':' + mirrorOffset))
                         continue;
-                    withTeleports(ref.fileName, teleOffset);
+                    withMirrors(ref.fileName, mirrorOffset);
                 }
             }
         }
@@ -158,9 +167,10 @@ function createLanguageService(host, mods) {
     function findReferences(fileName, position) {
         const loopChecker = new Set();
         let symbols = [];
-        withTeleports(fileName, position);
+        withMirrors(fileName, position);
         return symbols.map(s => transformReferencedSymbol(s)).filter(notEmpty);
-        function withTeleports(fileName, position) {
+        function withMirrors(fileName, position) {
+            var _a;
             if (loopChecker.has(fileName + ':' + position))
                 return;
             loopChecker.add(fileName + ':' + position);
@@ -171,13 +181,18 @@ function createLanguageService(host, mods) {
             for (const symbol of _symbols) {
                 for (const ref of symbol.references) {
                     loopChecker.add(ref.fileName + ':' + ref.textSpan.start);
-                    const teleport = core.mapper.getTeleport(ref.fileName);
-                    if (!teleport)
+                    const virtualFile = (_a = core.virtualFiles.getSourceByVirtualFileName(ref.fileName)) === null || _a === void 0 ? void 0 : _a[2];
+                    if (!virtualFile)
+                        continue;
+                    const mirrorMap = core.virtualFiles.getMirrorMap(virtualFile);
+                    if (!mirrorMap)
                         continue;
-                    for (const telePos of teleport.findTeleports(ref.textSpan.start, data => !!data.references)) {
-                        if (loopChecker.has(ref.fileName + ':' + telePos))
+                    for (const [mirrorOffset, data] of mirrorMap.findMirrorOffsets(ref.textSpan.start)) {
+                        if (!data.references)
                             continue;
-                        withTeleports(ref.fileName, telePos);
+                        if (loopChecker.has(ref.fileName + ':' + mirrorOffset))
+                            continue;
+                        withMirrors(ref.fileName, mirrorOffset);
                     }
                 }
             }
@@ -185,9 +200,9 @@ function createLanguageService(host, mods) {
     }
     // transforms
     function transformFileTextChanges(changes) {
-        const sourceFile = core.mapper.fromEmbeddedFileName(changes.fileName);
-        if (sourceFile) {
-            return Object.assign(Object.assign({}, changes), { fileName: sourceFile.sourceFile.fileName, textChanges: changes.textChanges.map(c => {
+        const source = core.virtualFiles.getSourceByVirtualFileName(changes.fileName);
+        if (source) {
+            return Object.assign(Object.assign({}, changes), { fileName: source[0], textChanges: changes.textChanges.map(c => {
                     const span = transformSpan(changes.fileName, c.span);
                     if (span) {
                         return Object.assign(Object.assign({}, c), { span: span.textSpan });
@@ -228,13 +243,27 @@ function createLanguageService(host, mods) {
             return;
         if (!textSpan)
             return;
-        for (const sourceLoc of core.mapper.fromEmbeddedLocation(fileName, textSpan.start)) {
+        const source = core.virtualFiles.getSourceByVirtualFileName(fileName);
+        if (source) {
+            for (const [sourceFileName, map] of core.virtualFiles.getMaps(source[2])) {
+                if (source[0] !== sourceFileName)
+                    continue;
+                const sourceLoc = map.toSourceOffset(textSpan.start);
+                if (sourceLoc) {
+                    return {
+                        fileName: source[0],
+                        textSpan: {
+                            start: sourceLoc[0],
+                            length: textSpan.length,
+                        },
+                    };
+                }
+            }
+        }
+        else {
             return {
-                fileName: sourceLoc.fileName,
-                textSpan: {
-                    start: sourceLoc.offset,
-                    length: textSpan.length,
-                },
+                fileName,
+                textSpan,
             };
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@volar/typescript",
-	"version": "1.0.16",
+	"version": "1.0.18",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,7 +13,7 @@
 		"directory": "packages/typescript"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.0.16"
+		"@volar/language-core": "1.0.18"
 	},
-	"gitHead": "af476047d8859652254ed36f8aee184f1972a97a"
+	"gitHead": "f102ee7bfc96792c63746a5dcb9742e3346d5cc7"
 }