@vue/typescript-plugin 2.0.7 → 2.0.11

package/index.js

@@ -20,40 +20,29 @@ function createLanguageServicePlugin() {
                     decoratedLanguageServices.add(info.languageService);
                     decoratedLanguageServiceHosts.add(info.languageServiceHost);
                     const vueOptions = getVueCompilerOptions();
-                    const languagePlugin = vue.createVueLanguagePlugin(ts, id => id, fileName => {
-                        if (info.languageServiceHost.useCaseSensitiveFileNames?.() ?? false) {
-                            return externalFiles.get(info.project)?.has(fileName) ?? false;
-                        }
-                        else {
-                            const lowerFileName = fileName.toLowerCase();
-                            for (const externalFile of externalFiles.get(info.project) ?? []) {
-                                if (externalFile.toLowerCase() === lowerFileName) {
-                                    return true;
-                                }
-                            }
-                            return false;
-                        }
-                    }, info.languageServiceHost.getCompilationSettings(), vueOptions);
+                    const languagePlugin = vue.createVueLanguagePlugin(ts, id => id, info.languageServiceHost.useCaseSensitiveFileNames?.() ?? false, () => info.languageServiceHost.getProjectVersion?.() ?? '', () => externalFiles.get(info.project) ?? [], info.languageServiceHost.getCompilationSettings(), vueOptions);
                     const extensions = languagePlugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [];
                     const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
-                    const files = (0, language_core_1.createFileRegistry)([languagePlugin], ts.sys.useCaseSensitiveFileNames, fileName => {
+                    const getLanguageId = (fileName) => {
+                        if (extensions.some(ext => fileName.endsWith(ext))) {
+                            return 'vue';
+                        }
+                        return (0, language_core_1.resolveCommonLanguageId)(fileName);
+                    };
+                    const language = (0, language_core_1.createLanguage)([languagePlugin], ts.sys.useCaseSensitiveFileNames, fileName => {
                         const snapshot = getScriptSnapshot(fileName);
                         if (snapshot) {
-                            let languageId = (0, language_core_1.resolveCommonLanguageId)(fileName);
-                            if (extensions.some(ext => fileName.endsWith(ext))) {
-                                languageId = 'vue';
-                            }
-                            files.set(fileName, languageId, snapshot);
+                            language.scripts.set(fileName, getLanguageId(fileName), snapshot);
                         }
                         else {
-                            files.delete(fileName);
+                            language.scripts.delete(fileName);
                         }
                     });
                     projectExternalFileExtensions.set(info.project, extensions);
-                    server_1.projects.set(info.project, { info, files, vueOptions });
-                    (0, decorateLanguageService_1.decorateLanguageService)(files, info.languageService);
-                    (0, common_1.decorateLanguageServiceForVue)(files, info.languageService, vueOptions, ts, true);
-                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(files, info.languageServiceHost, ts);
+                    server_1.projects.set(info.project, { info, language, vueOptions });
+                    (0, decorateLanguageService_1.decorateLanguageService)(language, info.languageService);
+                    (0, common_1.decorateLanguageServiceForVue)(language, info.languageService, vueOptions, ts, true);
+                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
                     (0, server_1.startNamedPipeServer)(ts, info.project.projectKind, info.project.getCurrentDirectory());
                 }
                 return info.languageService;
@@ -76,7 +65,7 @@ function createLanguageServicePlugin() {
                     if (oldFiles && !twoSetsEqual(oldFiles, newFiles)) {
                         for (const oldFile of oldFiles) {
                             if (!newFiles.has(oldFile)) {
-                                server_1.projects.get(project)?.files.delete(oldFile);
+                                server_1.projects.get(project)?.language.scripts.delete(oldFile);
                             }
                         }
                         project.refreshDiagnostics();

package/lib/client.d.ts

@@ -3,6 +3,7 @@ export declare function collectExtractProps(...args: Parameters<typeof import('.
     type: string;
     model: boolean;
 }[] | null | undefined>;
+export declare function getImportPathForFile(...args: Parameters<typeof import('./requests/getImportPathForFile.js')['getImportPathForFile']>): Promise<string | null | undefined>;
 export declare function getPropertiesAtLocation(...args: Parameters<typeof import('./requests/getPropertiesAtLocation.js')['getPropertiesAtLocation']>): Promise<string[] | null | undefined>;
 export declare function getQuickInfoAtPosition(...args: Parameters<typeof import('./requests/getQuickInfoAtPosition.js')['getQuickInfoAtPosition']>): Promise<import("typescript").QuickInfo | null | undefined>;
 export declare function getComponentProps(...args: Parameters<typeof import('./requests/componentInfos.js')['getComponentProps']>): Promise<string[] | null | undefined>;

package/lib/client.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getElementAttrs = exports.getComponentNames = exports.getTemplateContextProps = exports.getComponentEvents = exports.getComponentProps = exports.getQuickInfoAtPosition = exports.getPropertiesAtLocation = exports.collectExtractProps = void 0;
+exports.getElementAttrs = exports.getComponentNames = exports.getTemplateContextProps = exports.getComponentEvents = exports.getComponentProps = exports.getQuickInfoAtPosition = exports.getPropertiesAtLocation = exports.getImportPathForFile = exports.collectExtractProps = void 0;
 const utils_1 = require("./utils");
 function collectExtractProps(...args) {
     return sendRequest({
@@ -9,6 +9,13 @@ function collectExtractProps(...args) {
     });
 }
 exports.collectExtractProps = collectExtractProps;
+async function getImportPathForFile(...args) {
+    return await sendRequest({
+        type: 'getImportPathForFile',
+        args,
+    });
+}
+exports.getImportPathForFile = getImportPathForFile;
 async function getPropertiesAtLocation(...args) {
     return await sendRequest({
         type: 'getPropertiesAtLocation',
@@ -60,7 +67,7 @@ function getElementAttrs(...args) {
 }
 exports.getElementAttrs = getElementAttrs;
 async function sendRequest(request) {
-    const server = await (0, utils_1.searchNamedPipeServerForFile)(request.args[0]);
+    const server = (await (0, utils_1.searchNamedPipeServerForFile)(request.args[0]))?.server;
     if (!server) {
         console.warn('[Vue Named Pipe Client] No server found for', request.args[0]);
         return;

package/lib/common.d.ts

@@ -1,6 +1,6 @@
 import * as vue from '@vue/language-core';
 import type * as ts from 'typescript';
-export declare function decorateLanguageServiceForVue(files: vue.FileRegistry, languageService: ts.LanguageService, vueOptions: vue.VueCompilerOptions, ts: typeof import('typescript'), isTsPlugin: boolean): void;
+export declare function decorateLanguageServiceForVue(language: vue.Language, languageService: ts.LanguageService, vueOptions: vue.VueCompilerOptions, ts: typeof import('typescript'), isTsPlugin: boolean): void;
 export declare function getComponentSpans(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;

package/lib/common.js

@@ -4,10 +4,10 @@ exports.getComponentSpans = exports.decorateLanguageServiceForVue = void 0;
 const vue = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
 const componentInfos_1 = require("./requests/componentInfos");
-function decorateLanguageServiceForVue(files, languageService, vueOptions, ts, isTsPlugin) {
+function decorateLanguageServiceForVue(language, languageService, vueOptions, ts, isTsPlugin) {
     const { getCompletionsAtPosition, getCompletionEntryDetails, getCodeFixesAtPosition, getEncodedSemanticClassifications, } = languageService;
-    languageService.getCompletionsAtPosition = (fileName, position, options) => {
-        const result = getCompletionsAtPosition(fileName, position, options);
+    languageService.getCompletionsAtPosition = (fileName, position, options, formattingSettings) => {
+        const result = getCompletionsAtPosition(fileName, position, options, formattingSettings);
         if (result) {
             // filter __VLS_
             result.entries = result.entries.filter(entry => entry.name.indexOf('__VLS_') === -1
@@ -67,11 +67,11 @@ function decorateLanguageServiceForVue(files, languageService, vueOptions, ts, i
     if (isTsPlugin) {
         languageService.getEncodedSemanticClassifications = (fileName, span, format) => {
             const result = getEncodedSemanticClassifications(fileName, span, format);
-            const file = files.get(fileName);
-            if (file?.generated?.code instanceof vue.VueGeneratedCode) {
-                const { template } = file.generated.code.sfc;
+            const file = language.scripts.get(fileName);
+            if (file?.generated?.root instanceof vue.VueGeneratedCode) {
+                const { template } = file.generated.root.sfc;
                 if (template) {
-                    for (const componentSpan of getComponentSpans.call({ typescript: ts, languageService, vueOptions }, file.generated.code, template, {
+                    for (const componentSpan of getComponentSpans.call({ typescript: ts, languageService, vueOptions }, file.generated.root, template, {
                         start: span.start - template.startTagEnd,
                         length: span.length,
                     })) {
@@ -92,11 +92,11 @@ function getComponentSpans(vueCode, template, spanTemplateRange) {
         ...validComponentNames,
         ...validComponentNames.map(vue.hyphenateTag),
     ]);
-    template.ast?.children.forEach(function visit(node) {
-        if (node.loc.end.offset <= spanTemplateRange.start || node.loc.start.offset >= (spanTemplateRange.start + spanTemplateRange.length)) {
-            return;
-        }
-        if (node.type === 1) {
+    if (template.ast) {
+        for (const node of vue.forEachElementNode(template.ast)) {
+            if (node.loc.end.offset <= spanTemplateRange.start || node.loc.start.offset >= (spanTemplateRange.start + spanTemplateRange.length)) {
+                continue;
+            }
             if (components.has(node.tag)) {
                 let start = node.loc.start.offset;
                 if (template.lang === 'html') {
@@ -113,23 +113,8 @@ function getComponentSpans(vueCode, template, spanTemplateRange) {
                     });
                 }
             }
-            for (const child of node.children) {
-                visit(child);
-            }
         }
-        else if (node.type === 9) {
-            for (const branch of node.branches) {
-                for (const child of branch.children) {
-                    visit(child);
-                }
-            }
-        }
-        else if (node.type === 11) {
-            for (const child of node.children) {
-                visit(child);
-            }
-        }
-    });
+    }
     return result;
 }
 exports.getComponentSpans = getComponentSpans;

package/lib/requests/collectExtractProps.d.ts

@@ -1,9 +1,9 @@
-import { FileRegistry } from '@vue/language-core';
+import { Language } from '@vue/language-core';
 import type * as ts from 'typescript';
 export declare function collectExtractProps(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;
-    files: FileRegistry;
+    language: Language;
     isTsPlugin: boolean;
     getFileId: (fileName: string) => string;
 }, fileName: string, templateCodeRange: [number, number]): {

package/lib/requests/collectExtractProps.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectExtractProps = void 0;
 const language_core_1 = require("@vue/language-core");
 function collectExtractProps(fileName, templateCodeRange) {
-    const { typescript: ts, languageService, files, isTsPlugin, getFileId } = this;
-    const volarFile = files.get(getFileId(fileName));
-    if (!(volarFile?.generated?.code instanceof language_core_1.VueGeneratedCode)) {
+    const { typescript: ts, languageService, language, isTsPlugin, getFileId } = this;
+    const volarFile = language.scripts.get(getFileId(fileName));
+    if (!(volarFile?.generated?.root instanceof language_core_1.VueGeneratedCode)) {
         return;
     }
     const result = new Map();
@@ -15,9 +15,9 @@ function collectExtractProps(fileName, templateCodeRange) {
     }
     const sourceFile = program.getSourceFile(fileName);
     const checker = program.getTypeChecker();
-    const script = volarFile.generated?.languagePlugin.typescript?.getScript(volarFile.generated.code);
-    const maps = script ? [...files.getMaps(script.code).values()] : [];
-    const sfc = volarFile.generated.code.sfc;
+    const script = volarFile.generated?.languagePlugin.typescript?.getServiceScript(volarFile.generated.root);
+    const maps = script ? [...language.maps.forEach(script.code).values()] : [];
+    const sfc = volarFile.generated.root.sfc;
     sourceFile.forEachChild(function visit(node) {
         if (ts.isPropertyAccessExpression(node)
             && ts.isIdentifier(node.expression)

package/lib/requests/componentInfos.d.ts

@@ -3,27 +3,27 @@ import type * as ts from 'typescript';
 export declare function getComponentProps(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;
-    files: vue.FileRegistry;
+    language: vue.Language;
     vueOptions: vue.VueCompilerOptions;
     getFileId: (fileName: string) => string;
 }, fileName: string, tag: string, requiredOnly?: boolean): string[] | undefined;
 export declare function getComponentEvents(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;
-    files: vue.FileRegistry;
+    language: vue.Language;
     vueOptions: vue.VueCompilerOptions;
     getFileId: (fileName: string) => string;
 }, fileName: string, tag: string): string[] | undefined;
 export declare function getTemplateContextProps(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;
-    files: vue.FileRegistry;
+    language: vue.Language;
     getFileId: (fileName: string) => string;
 }, fileName: string): string[] | undefined;
 export declare function getComponentNames(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;
-    files: vue.FileRegistry;
+    language: vue.Language;
     vueOptions: vue.VueCompilerOptions;
     getFileId: (fileName: string) => string;
 }, fileName: string): string[] | undefined;
@@ -31,6 +31,6 @@ export declare function _getComponentNames(ts: typeof import('typescript'), tsLs
 export declare function getElementAttrs(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;
-    files: vue.FileRegistry;
+    language: vue.Language;
     getFileId: (fileName: string) => string;
 }, fileName: string, tagName: string): string[] | undefined;

package/lib/requests/componentInfos.js

@@ -4,12 +4,12 @@ exports.getElementAttrs = exports._getComponentNames = exports.getComponentNames
 const vue = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
 function getComponentProps(fileName, tag, requiredOnly = false) {
-    const { typescript: ts, files, vueOptions, languageService, getFileId } = this;
-    const volarFile = files.get(getFileId(fileName));
-    if (!(volarFile?.generated?.code instanceof vue.VueGeneratedCode)) {
+    const { typescript: ts, language, vueOptions, languageService, getFileId } = this;
+    const volarFile = language.scripts.get(getFileId(fileName));
+    if (!(volarFile?.generated?.root instanceof vue.VueGeneratedCode)) {
         return;
     }
-    const vueCode = volarFile.generated.code;
+    const vueCode = volarFile.generated.root;
     const program = languageService.getCurrentProgram();
     if (!program) {
         return;
@@ -71,12 +71,12 @@ function getComponentProps(fileName, tag, requiredOnly = false) {
 }
 exports.getComponentProps = getComponentProps;
 function getComponentEvents(fileName, tag) {
-    const { typescript: ts, files, vueOptions, languageService, getFileId } = this;
-    const volarFile = files.get(getFileId(fileName));
-    if (!(volarFile?.generated?.code instanceof vue.VueGeneratedCode)) {
+    const { typescript: ts, language, vueOptions, languageService, getFileId } = this;
+    const volarFile = language.scripts.get(getFileId(fileName));
+    if (!(volarFile?.generated?.root instanceof vue.VueGeneratedCode)) {
         return;
     }
-    const vueCode = volarFile.generated.code;
+    const vueCode = volarFile.generated.root;
     const program = languageService.getCurrentProgram();
     if (!program) {
         return;
@@ -132,12 +132,12 @@ function getComponentEvents(fileName, tag) {
 }
 exports.getComponentEvents = getComponentEvents;
 function getTemplateContextProps(fileName) {
-    const { typescript: ts, files, languageService, getFileId } = this;
-    const volarFile = files.get(getFileId(fileName));
-    if (!(volarFile?.generated?.code instanceof vue.VueGeneratedCode)) {
+    const { typescript: ts, language, languageService, getFileId } = this;
+    const volarFile = language.scripts.get(getFileId(fileName));
+    if (!(volarFile?.generated?.root instanceof vue.VueGeneratedCode)) {
         return;
     }
-    const vueCode = volarFile.generated.code;
+    const vueCode = volarFile.generated.root;
     return getVariableType(ts, languageService, vueCode, '__VLS_ctx')
         ?.type
         ?.getProperties()
@@ -145,12 +145,12 @@ function getTemplateContextProps(fileName) {
 }
 exports.getTemplateContextProps = getTemplateContextProps;
 function getComponentNames(fileName) {
-    const { typescript: ts, files, vueOptions, languageService, getFileId } = this;
-    const volarFile = files.get(getFileId(fileName));
-    if (!(volarFile?.generated?.code instanceof vue.VueGeneratedCode)) {
+    const { typescript: ts, language, vueOptions, languageService, getFileId } = this;
+    const volarFile = language.scripts.get(getFileId(fileName));
+    if (!(volarFile?.generated?.root instanceof vue.VueGeneratedCode)) {
         return;
     }
-    const vueCode = volarFile.generated.code;
+    const vueCode = volarFile.generated.root;
     return getVariableType(ts, languageService, vueCode, '__VLS_components')
         ?.type
         ?.getProperties()
@@ -171,9 +171,9 @@ function _getComponentNames(ts, tsLs, vueCode, vueOptions) {
 }
 exports._getComponentNames = _getComponentNames;
 function getElementAttrs(fileName, tagName) {
-    const { typescript: ts, files, languageService, getFileId } = this;
-    const volarFile = files.get(getFileId(fileName));
-    if (!(volarFile?.generated?.code instanceof vue.VueGeneratedCode)) {
+    const { typescript: ts, language, languageService, getFileId } = this;
+    const volarFile = language.scripts.get(getFileId(fileName));
+    if (!(volarFile?.generated?.root instanceof vue.VueGeneratedCode)) {
         return;
     }
     const program = languageService.getCurrentProgram();

package/lib/requests/getImportPathForFile.d.ts

@@ -0,0 +1,6 @@
+import type * as ts from 'typescript';
+export declare function getImportPathForFile(this: {
+    typescript: typeof import('typescript');
+    languageService: ts.LanguageService;
+    languageServiceHost: ts.LanguageServiceHost;
+}, fileName: string, incomingFileName: string, preferences: ts.UserPreferences): string | undefined;

package/lib/requests/getImportPathForFile.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getImportPathForFile = void 0;
+function getImportPathForFile(fileName, incomingFileName, preferences) {
+    const { typescript: ts, languageService, languageServiceHost } = this;
+    const program = languageService.getProgram();
+    const incomingFile = program?.getSourceFile(incomingFileName);
+    const sourceFile = program?.getSourceFile(fileName);
+    if (!program || !sourceFile || !incomingFile) {
+        return;
+    }
+    const getModuleSpecifiersWithCacheInfo = ts.moduleSpecifiers.getModuleSpecifiersWithCacheInfo;
+    const resolutionHost = ts.createModuleSpecifierResolutionHost(program, languageServiceHost);
+    const moduleSpecifiers = getModuleSpecifiersWithCacheInfo(incomingFile.symbol, program.getTypeChecker(), languageServiceHost.getCompilationSettings(), sourceFile, resolutionHost, preferences);
+    for (const moduleSpecifier of moduleSpecifiers.moduleSpecifiers) {
+        return moduleSpecifier;
+    }
+}
+exports.getImportPathForFile = getImportPathForFile;
+//# sourceMappingURL=getImportPathForFile.js.map

package/lib/requests/getPropertiesAtLocation.d.ts

@@ -1,9 +1,9 @@
-import { FileRegistry } from '@vue/language-core';
+import { Language } from '@vue/language-core';
 import type * as ts from 'typescript';
 export declare function getPropertiesAtLocation(this: {
     typescript: typeof import('typescript');
     languageService: ts.LanguageService;
-    files: FileRegistry;
+    language: Language;
     isTsPlugin: boolean;
     getFileId: (fileName: string) => string;
 }, fileName: string, position: number): string[] | undefined;

package/lib/requests/getPropertiesAtLocation.js

@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPropertiesAtLocation = void 0;
 const language_core_1 = require("@vue/language-core");
 function getPropertiesAtLocation(fileName, position) {
-    const { languageService, files, typescript: ts, isTsPlugin, getFileId } = this;
+    const { languageService, language, typescript: ts, isTsPlugin, getFileId } = this;
     // mapping
-    const file = files.get(getFileId(fileName));
+    const file = language.scripts.get(getFileId(fileName));
     if (file?.generated) {
-        const virtualScript = file.generated.languagePlugin.typescript?.getScript(file.generated.code);
+        const virtualScript = file.generated.languagePlugin.typescript?.getServiceScript(file.generated.root);
         if (!virtualScript) {
             return;
         }
         let mapped = false;
-        for (const [_1, [_2, map]] of files.getMaps(virtualScript.code)) {
+        for (const [_1, [_2, map]] of language.maps.forEach(virtualScript.code)) {
             for (const [position2, mapping] of map.getGeneratedOffsets(position)) {
                 if ((0, language_core_1.isCompletionEnabled)(mapping.data)) {
                     position = position2;

package/lib/server.d.ts

@@ -1,12 +1,12 @@
 import type * as ts from 'typescript';
-import type { FileRegistry, VueCompilerOptions } from '@vue/language-core';
+import type { Language, VueCompilerOptions } from '@vue/language-core';
 export interface Request {
-    type: 'containsFile' | 'collectExtractProps' | 'getPropertiesAtLocation' | 'getQuickInfoAtPosition' | 'getComponentProps' | 'getComponentEvents' | 'getTemplateContextProps' | 'getComponentNames' | 'getElementAttrs';
+    type: 'projectInfoForFile' | 'collectExtractProps' | 'getImportPathForFile' | 'getPropertiesAtLocation' | 'getQuickInfoAtPosition' | 'getComponentProps' | 'getComponentEvents' | 'getTemplateContextProps' | 'getComponentNames' | 'getElementAttrs';
     args: [fileName: string, ...rest: any];
 }
 export declare function startNamedPipeServer(ts: typeof import('typescript'), serverKind: ts.server.ProjectKind, currentDirectory: string): void;
 export declare const projects: Map<ts.server.Project, {
     info: ts.server.PluginCreateInfo;
-    files: FileRegistry;
+    language: Language;
     vueOptions: VueCompilerOptions;
 }>;

package/lib/server.js

@@ -5,6 +5,7 @@ const fs = require("fs");
 const net = require("net");
 const collectExtractProps_1 = require("./requests/collectExtractProps");
 const componentInfos_1 = require("./requests/componentInfos");
+const getImportPathForFile_1 = require("./requests/getImportPathForFile");
 const getPropertiesAtLocation_1 = require("./requests/getPropertiesAtLocation");
 const getQuickInfoAtPosition_1 = require("./requests/getQuickInfoAtPosition");
 const utils_1 = require("./utils");
@@ -23,21 +24,30 @@ function startNamedPipeServer(ts, serverKind, currentDirectory) {
             const request = JSON.parse(text);
             const fileName = request.args[0];
             const project = getProject(fileName);
-            if (project) {
+            if (request.type === 'projectInfoForFile') {
+                connection.write(JSON.stringify(project
+                    ? {
+                        name: project.info.project.getProjectName(),
+                        kind: project.info.project.projectKind,
+                    }
+                    : undefined));
+            }
+            else if (project) {
                 const requestContext = {
                     typescript: ts,
                     languageService: project.info.languageService,
-                    files: project.files,
+                    languageServiceHost: project.info.languageServiceHost,
+                    language: project.language,
                     vueOptions: project.vueOptions,
                     isTsPlugin: true,
                     getFileId: (fileName) => fileName,
                 };
-                if (request.type === 'containsFile') {
-                    const result = !!getProject(fileName);
+                if (request.type === 'collectExtractProps') {
+                    const result = collectExtractProps_1.collectExtractProps.apply(requestContext, request.args);
                     connection.write(JSON.stringify(result ?? null));
                 }
-                else if (request.type === 'collectExtractProps') {
-                    const result = collectExtractProps_1.collectExtractProps.apply(requestContext, request.args);
+                else if (request.type === 'getImportPathForFile') {
+                    const result = getImportPathForFile_1.getImportPathForFile.apply(requestContext, request.args);
                     connection.write(JSON.stringify(result ?? null));
                 }
                 else if (request.type === 'getPropertiesAtLocation') {

package/lib/utils.d.ts

@@ -10,5 +10,14 @@ export interface NamedPipeServer {
 export declare function readPipeTable(): NamedPipeServer[];
 export declare function updatePipeTable(servers: NamedPipeServer[]): void;
 export declare function connect(path: string): Promise<net.Socket | undefined>;
-export declare function searchNamedPipeServerForFile(fileName: string): Promise<NamedPipeServer | undefined>;
+export declare function searchNamedPipeServerForFile(fileName: string): Promise<{
+    server: NamedPipeServer;
+    projectInfo: {
+        name: string;
+        kind: ts.server.ProjectKind;
+    };
+} | {
+    server: NamedPipeServer;
+    projectInfo: undefined;
+} | undefined>;
 export declare function sendRequestWorker<T>(request: Request, client: net.Socket): Promise<T | null | undefined>;

package/lib/utils.js

@@ -52,9 +52,12 @@ async function searchNamedPipeServerForFile(fileName) {
     for (const server of configuredServers) {
         const client = await connect(server.path);
         if (client) {
-            const response = await sendRequestWorker({ type: 'containsFile', args: [fileName] }, client);
-            if (response) {
-                return server;
+            const projectInfo = await sendRequestWorker({ type: 'projectInfoForFile', args: [fileName] }, client);
+            if (projectInfo) {
+                return {
+                    server,
+                    projectInfo,
+                };
             }
         }
     }
@@ -62,7 +65,10 @@ async function searchNamedPipeServerForFile(fileName) {
         if (!path.relative(server.currentDirectory, fileName).startsWith('..')) {
             const client = await connect(server.path);
             if (client) {
-                return server;
+                return {
+                    server,
+                    projectInfo: undefined,
+                };
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "2.0.7",
+	"version": "2.0.11",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,12 +12,12 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.1.3",
-		"@vue/language-core": "2.0.7",
+		"@volar/typescript": "~2.2.0-alpha.6",
+		"@vue/language-core": "2.0.11",
 		"@vue/shared": "^3.4.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "4a37e8f3ebcf31ecfd2ea627f7611d5990ec5df6"
+	"gitHead": "c89f25ffc32c760130adeeac796b9a5d20585bf7"
 }