@vue/typescript-plugin 2.0.6 → 2.0.7

package/README.md

@@ -1,12 +1,8 @@
 # typescript plugin
 
-This is a plug-in for `tsserver` or `typescript-language-server`. It must be
-installed in a file-system location accessible by the language server or in the
-`node_modules` directory of projects being edited.
+This is a plug-in for `tsserver` or `typescript-language-server`. It must be installed in a file-system location accessible by the language server or in the `node_modules` directory of projects being edited.
 
-The LSP client must be configured to explicitly enable this plug-in. This is
-done by passing `initializationOptions` with the appropriate [`plugins`]
-configuration to the language server:
+The LSP client must be configured to explicitly enable this plug-in. This is done by passing `initializationOptions` with the appropriate [`plugins`] configuration to the language server:
 
 [`plugins`]: https://github.com/typescript-language-server/typescript-language-server/blob/b224b878652438bcdd639137a6b1d1a6630129e4/docs/configuration.md?plain=1#L27-L31
 
@@ -15,16 +11,14 @@ configuration to the language server:
     "plugins": [
         {
           "name": "@vue/typescript-plugin",
-          "location": "/usr/local/lib/node_modules/@vue/typescript-plugin",
-          "languages": ["javascript", "typescript", "vue"],
+          "location": "/usr/local/lib/node_modules/@vue/language-server",
+          "languages": ["vue"],
         },
     ],
   },
 ```
 
-The `languages` field must specify file-types for which the plug-in will be
-enabled. If the plug-in package is installed in the local `node_modules`, the
-`location` field may contain any arbitrary string, but MUST be present.
+The `languages` field must specify file-types for which the plug-in will be enabled. If the plug-in package is installed in the local `node_modules`, the `location` field may contain any arbitrary string, but MUST be present.
 
 ## Client-specific configuration
 

package/index.js

@@ -1,12 +1,10 @@
 "use strict";
 const decorateLanguageService_1 = require("@volar/typescript/lib/node/decorateLanguageService");
 const decorateLanguageServiceHost_1 = require("@volar/typescript/lib/node/decorateLanguageServiceHost");
-const language_core_1 = require("@vue/language-core");
-const utils_1 = require("./lib/utils");
 const vue = require("@vue/language-core");
+const language_core_1 = require("@vue/language-core");
+const common_1 = require("./lib/common");
 const server_1 = require("./lib/server");
-const componentInfos_1 = require("./lib/requests/componentInfos");
-const shared_1 = require("@vue/shared");
 const windowsPathReg = /\\/g;
 const externalFiles = new WeakMap();
 const projectExternalFileExtensions = new WeakMap();
@@ -21,7 +19,7 @@ function createLanguageServicePlugin() {
                     && !decoratedLanguageServiceHosts.has(info.languageServiceHost)) {
                     decoratedLanguageServices.add(info.languageService);
                     decoratedLanguageServiceHosts.add(info.languageServiceHost);
-                    const vueOptions = vue.resolveVueCompilerOptions(getVueCompilerOptions());
+                    const vueOptions = getVueCompilerOptions();
                     const languagePlugin = vue.createVueLanguagePlugin(ts, id => id, fileName => {
                         if (info.languageServiceHost.useCaseSensitiveFileNames?.() ?? false) {
                             return externalFiles.get(info.project)?.has(fileName) ?? false;
@@ -52,123 +50,11 @@ function createLanguageServicePlugin() {
                         }
                     });
                     projectExternalFileExtensions.set(info.project, extensions);
-                    utils_1.projects.set(info.project, {
-                        info,
-                        files,
-                        ts,
-                        vueOptions,
-                    });
+                    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);
-                    (0, server_1.startNamedPipeServer)(info.project.projectKind, info.project.getCurrentDirectory());
-                    const getCompletionsAtPosition = info.languageService.getCompletionsAtPosition;
-                    const getCompletionEntryDetails = info.languageService.getCompletionEntryDetails;
-                    const getCodeFixesAtPosition = info.languageService.getCodeFixesAtPosition;
-                    const getEncodedSemanticClassifications = info.languageService.getEncodedSemanticClassifications;
-                    info.languageService.getCompletionsAtPosition = (fileName, position, options) => {
-                        const result = getCompletionsAtPosition(fileName, position, options);
-                        if (result) {
-                            // filter __VLS_
-                            result.entries = result.entries.filter(entry => entry.name.indexOf('__VLS_') === -1
-                                && (!entry.labelDetails?.description || entry.labelDetails.description.indexOf('__VLS_') === -1));
-                            // modify label
-                            for (const item of result.entries) {
-                                if (item.source) {
-                                    const originalName = item.name;
-                                    for (const ext of vueOptions.extensions) {
-                                        const suffix = (0, shared_1.capitalize)(ext.substring('.'.length)); // .vue -> Vue
-                                        if (item.source.endsWith(ext) && item.name.endsWith(suffix)) {
-                                            item.name = item.name.slice(0, -suffix.length);
-                                            if (item.insertText) {
-                                                // #2286
-                                                item.insertText = item.insertText.replace(`${suffix}$1`, '$1');
-                                            }
-                                            if (item.data) {
-                                                // @ts-expect-error
-                                                item.data.__isComponentAutoImport = {
-                                                    ext,
-                                                    suffix,
-                                                    originalName,
-                                                    newName: item.insertText,
-                                                };
-                                            }
-                                            break;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                        return result;
-                    };
-                    info.languageService.getCompletionEntryDetails = (...args) => {
-                        const details = getCompletionEntryDetails(...args);
-                        // modify import statement
-                        // @ts-expect-error
-                        if (args[6]?.__isComponentAutoImport) {
-                            // @ts-expect-error
-                            const { ext, suffix, originalName, newName } = args[6]?.__isComponentAutoImport;
-                            for (const codeAction of details?.codeActions ?? []) {
-                                for (const change of codeAction.changes) {
-                                    for (const textChange of change.textChanges) {
-                                        textChange.newText = textChange.newText.replace('import ' + originalName + ' from ', 'import ' + newName + ' from ');
-                                    }
-                                }
-                            }
-                        }
-                        return details;
-                    };
-                    info.languageService.getCodeFixesAtPosition = (...args) => {
-                        let result = getCodeFixesAtPosition(...args);
-                        // filter __VLS_
-                        result = result.filter(entry => entry.description.indexOf('__VLS_') === -1);
-                        return result;
-                    };
-                    info.languageService.getEncodedSemanticClassifications = (fileName, span, format) => {
-                        const result = getEncodedSemanticClassifications(fileName, span, format);
-                        const file = files.get(fileName);
-                        if (file?.generated?.code instanceof vue.VueGeneratedCode
-                            && file.generated.code.sfc.template) {
-                            const validComponentNames = (0, componentInfos_1._getComponentNames)(ts, info.languageService, file.generated.code, vueOptions);
-                            const components = new Set([
-                                ...validComponentNames,
-                                ...validComponentNames.map(vue.hyphenateTag),
-                            ]);
-                            const { template } = file.generated.code.sfc;
-                            const spanTemplateRange = [
-                                span.start - template.startTagEnd,
-                                span.start + span.length - template.startTagEnd,
-                            ];
-                            template.ast?.children.forEach(function visit(node) {
-                                if (node.loc.end.offset <= spanTemplateRange[0] || node.loc.start.offset >= spanTemplateRange[1]) {
-                                    return;
-                                }
-                                if (node.type === 1) {
-                                    if (components.has(node.tag)) {
-                                        result.spans.push(node.loc.start.offset + node.loc.source.indexOf(node.tag) + template.startTagEnd, node.tag.length, 256);
-                                        if (template.lang === 'html' && !node.isSelfClosing) {
-                                            result.spans.push(node.loc.start.offset + node.loc.source.lastIndexOf(node.tag) + template.startTagEnd, node.tag.length, 256);
-                                        }
-                                    }
-                                    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;
-                    };
+                    (0, server_1.startNamedPipeServer)(ts, info.project.projectKind, info.project.getCurrentDirectory());
                 }
                 return info.languageService;
                 function getVueCompilerOptions() {
@@ -190,7 +76,7 @@ function createLanguageServicePlugin() {
                     if (oldFiles && !twoSetsEqual(oldFiles, newFiles)) {
                         for (const oldFile of oldFiles) {
                             if (!newFiles.has(oldFile)) {
-                                utils_1.projects.get(project)?.files.delete(oldFile);
+                                server_1.projects.get(project)?.files.delete(oldFile);
                             }
                         }
                         project.refreshDiagnostics();

package/lib/client.d.ts

@@ -1,15 +1,12 @@
-import type * as ts from 'typescript';
-import type { NamedPipeServer } from './utils';
 export declare function collectExtractProps(...args: Parameters<typeof import('./requests/collectExtractProps.js')['collectExtractProps']>): Promise<{
     name: string;
     type: string;
     model: boolean;
 }[] | 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<ts.QuickInfo | 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>;
 export declare function getComponentEvents(...args: Parameters<typeof import('./requests/componentInfos.js')['getComponentEvents']>): Promise<string[] | null | undefined>;
 export declare function getTemplateContextProps(...args: Parameters<typeof import('./requests/componentInfos.js')['getTemplateContextProps']>): Promise<string[] | null | undefined>;
 export declare function getComponentNames(...args: Parameters<typeof import('./requests/componentInfos.js')['getComponentNames']>): Promise<string[] | null | undefined>;
 export declare function getElementAttrs(...args: Parameters<typeof import('./requests/componentInfos.js')['getElementAttrs']>): Promise<string[] | null | undefined>;
-export declare function searchNamedPipeServerForFile(fileName: string): Promise<NamedPipeServer | undefined>;

package/lib/client.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.searchNamedPipeServerForFile = exports.getElementAttrs = exports.getComponentNames = exports.getTemplateContextProps = exports.getComponentEvents = exports.getComponentProps = exports.getQuickInfoAtPosition = exports.getPropertiesAtLocation = exports.collectExtractProps = void 0;
-const fs = require("fs");
-const path = require("path");
+exports.getElementAttrs = exports.getComponentNames = exports.getTemplateContextProps = exports.getComponentEvents = exports.getComponentProps = exports.getQuickInfoAtPosition = exports.getPropertiesAtLocation = exports.collectExtractProps = void 0;
 const utils_1 = require("./utils");
 function collectExtractProps(...args) {
     return sendRequest({
@@ -62,7 +60,7 @@ function getElementAttrs(...args) {
 }
 exports.getElementAttrs = getElementAttrs;
 async function sendRequest(request) {
-    const server = await searchNamedPipeServerForFile(request.args[0]);
+    const server = await (0, utils_1.searchNamedPipeServerForFile)(request.args[0]);
     if (!server) {
         console.warn('[Vue Named Pipe Client] No server found for', request.args[0]);
         return;
@@ -72,63 +70,6 @@ async function sendRequest(request) {
         console.warn('[Vue Named Pipe Client] Failed to connect to', server.path);
         return;
     }
-    return await sendRequestWorker(request, client);
-}
-async function searchNamedPipeServerForFile(fileName) {
-    if (!fs.existsSync(utils_1.pipeTable)) {
-        return;
-    }
-    const servers = JSON.parse(fs.readFileSync(utils_1.pipeTable, 'utf8'));
-    const configuredServers = servers
-        .filter(item => item.serverKind === 1);
-    const inferredServers = servers
-        .filter(item => item.serverKind === 0)
-        .sort((a, b) => b.currentDirectory.length - a.currentDirectory.length);
-    for (const server of configuredServers) {
-        const client = await (0, utils_1.connect)(server.path);
-        if (client) {
-            const response = await sendRequestWorker({ type: 'containsFile', args: [fileName] }, client);
-            if (response) {
-                return server;
-            }
-        }
-    }
-    for (const server of inferredServers) {
-        if (!path.relative(server.currentDirectory, fileName).startsWith('..')) {
-            const client = await (0, utils_1.connect)(server.path);
-            if (client) {
-                return server;
-            }
-        }
-    }
-}
-exports.searchNamedPipeServerForFile = searchNamedPipeServerForFile;
-function sendRequestWorker(request, client) {
-    return new Promise(resolve => {
-        let dataChunks = [];
-        client.on('data', chunk => {
-            dataChunks.push(chunk);
-        });
-        client.on('end', () => {
-            if (!dataChunks.length) {
-                console.warn('[Vue Named Pipe Client] No response from server for request:', request.type);
-                resolve(undefined);
-                return;
-            }
-            const data = Buffer.concat(dataChunks);
-            const text = data.toString();
-            let json = null;
-            try {
-                json = JSON.parse(text);
-            }
-            catch (e) {
-                console.error('[Vue Named Pipe Client] Failed to parse response:', text);
-                resolve(undefined);
-                return;
-            }
-            resolve(json);
-        });
-        client.write(JSON.stringify(request));
-    });
+    return await (0, utils_1.sendRequestWorker)(request, client);
 }
 //# sourceMappingURL=client.js.map

package/lib/common.d.ts

@@ -0,0 +1,8 @@
+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 getComponentSpans(this: {
+    typescript: typeof import('typescript');
+    languageService: ts.LanguageService;
+    vueOptions: vue.VueCompilerOptions;
+}, vueCode: vue.VueGeneratedCode, template: NonNullable<vue.VueGeneratedCode['sfc']['template']>, spanTemplateRange: ts.TextSpan): ts.TextSpan[];

package/lib/common.js

@@ -0,0 +1,136 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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) {
+    const { getCompletionsAtPosition, getCompletionEntryDetails, getCodeFixesAtPosition, getEncodedSemanticClassifications, } = languageService;
+    languageService.getCompletionsAtPosition = (fileName, position, options) => {
+        const result = getCompletionsAtPosition(fileName, position, options);
+        if (result) {
+            // filter __VLS_
+            result.entries = result.entries.filter(entry => entry.name.indexOf('__VLS_') === -1
+                && (!entry.labelDetails?.description || entry.labelDetails.description.indexOf('__VLS_') === -1));
+            // modify label
+            for (const item of result.entries) {
+                if (item.source) {
+                    const originalName = item.name;
+                    for (const ext of vueOptions.extensions) {
+                        const suffix = (0, shared_1.capitalize)(ext.substring('.'.length)); // .vue -> Vue
+                        if (item.source.endsWith(ext) && item.name.endsWith(suffix)) {
+                            item.name = (0, shared_1.capitalize)(item.name.slice(0, -suffix.length));
+                            if (item.insertText) {
+                                // #2286
+                                item.insertText = item.insertText.replace(`${suffix}$1`, '$1');
+                            }
+                            if (item.data) {
+                                // @ts-expect-error
+                                item.data.__isComponentAutoImport = {
+                                    ext,
+                                    suffix,
+                                    originalName,
+                                    newName: item.insertText,
+                                };
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        return result;
+    };
+    languageService.getCompletionEntryDetails = (...args) => {
+        const details = getCompletionEntryDetails(...args);
+        // modify import statement
+        // @ts-expect-error
+        if (args[6]?.__isComponentAutoImport) {
+            // @ts-expect-error
+            const { ext, suffix, originalName, newName } = args[6]?.__isComponentAutoImport;
+            for (const codeAction of details?.codeActions ?? []) {
+                for (const change of codeAction.changes) {
+                    for (const textChange of change.textChanges) {
+                        textChange.newText = textChange.newText.replace('import ' + originalName + ' from ', 'import ' + newName + ' from ');
+                    }
+                }
+            }
+        }
+        return details;
+    };
+    languageService.getCodeFixesAtPosition = (...args) => {
+        let result = getCodeFixesAtPosition(...args);
+        // filter __VLS_
+        result = result.filter(entry => entry.description.indexOf('__VLS_') === -1);
+        return result;
+    };
+    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;
+                if (template) {
+                    for (const componentSpan of getComponentSpans.call({ typescript: ts, languageService, vueOptions }, file.generated.code, template, {
+                        start: span.start - template.startTagEnd,
+                        length: span.length,
+                    })) {
+                        result.spans.push(componentSpan.start + template.startTagEnd, componentSpan.length, 256);
+                    }
+                }
+            }
+            return result;
+        };
+    }
+}
+exports.decorateLanguageServiceForVue = decorateLanguageServiceForVue;
+function getComponentSpans(vueCode, template, spanTemplateRange) {
+    const { typescript: ts, languageService, vueOptions } = this;
+    const result = [];
+    const validComponentNames = (0, componentInfos_1._getComponentNames)(ts, languageService, vueCode, vueOptions);
+    const components = new Set([
+        ...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 (components.has(node.tag)) {
+                let start = node.loc.start.offset;
+                if (template.lang === 'html') {
+                    start += '<'.length;
+                }
+                result.push({
+                    start,
+                    length: node.tag.length,
+                });
+                if (template.lang === 'html' && !node.isSelfClosing) {
+                    result.push({
+                        start: node.loc.start.offset + node.loc.source.lastIndexOf(node.tag),
+                        length: node.tag.length,
+                    });
+                }
+            }
+            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;
+//# sourceMappingURL=common.js.map

package/lib/requests/collectExtractProps.d.ts

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

package/lib/requests/collectExtractProps.js

@@ -2,19 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.collectExtractProps = void 0;
 const language_core_1 = require("@vue/language-core");
-const utils_1 = require("../utils");
-function collectExtractProps(fileName, templateCodeRange, isTsPlugin = true) {
-    const match = (0, utils_1.getProject)(fileName);
-    if (!match) {
-        return;
-    }
-    const { info, files, ts } = match;
-    const volarFile = files.get(fileName);
+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)) {
         return;
     }
     const result = new Map();
-    const languageService = info.languageService;
     const program = languageService.getCurrentProgram();
     if (!program) {
         return;

package/lib/requests/componentInfos.d.ts

@@ -1,8 +1,36 @@
 import * as vue from '@vue/language-core';
 import type * as ts from 'typescript';
-export declare function getComponentProps(fileName: string, tag: string, requiredOnly?: boolean): string[] | undefined;
-export declare function getComponentEvents(fileName: string, tag: string): string[] | undefined;
-export declare function getTemplateContextProps(fileName: string): string[] | undefined;
-export declare function getComponentNames(fileName: string): string[] | undefined;
+export declare function getComponentProps(this: {
+    typescript: typeof import('typescript');
+    languageService: ts.LanguageService;
+    files: vue.FileRegistry;
+    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;
+    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;
+    getFileId: (fileName: string) => string;
+}, fileName: string): string[] | undefined;
+export declare function getComponentNames(this: {
+    typescript: typeof import('typescript');
+    languageService: ts.LanguageService;
+    files: vue.FileRegistry;
+    vueOptions: vue.VueCompilerOptions;
+    getFileId: (fileName: string) => string;
+}, fileName: string): string[] | undefined;
 export declare function _getComponentNames(ts: typeof import('typescript'), tsLs: ts.LanguageService, vueCode: vue.VueGeneratedCode, vueOptions: vue.VueCompilerOptions): string[];
-export declare function getElementAttrs(fileName: string, tagName: string): string[] | undefined;
+export declare function getElementAttrs(this: {
+    typescript: typeof import('typescript');
+    languageService: ts.LanguageService;
+    files: vue.FileRegistry;
+    getFileId: (fileName: string) => string;
+}, fileName: string, tagName: string): string[] | undefined;

package/lib/requests/componentInfos.js

@@ -3,35 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getElementAttrs = exports._getComponentNames = exports.getComponentNames = exports.getTemplateContextProps = exports.getComponentEvents = exports.getComponentProps = void 0;
 const vue = require("@vue/language-core");
 const shared_1 = require("@vue/shared");
-const utils_1 = require("../utils");
 function getComponentProps(fileName, tag, requiredOnly = false) {
-    const match = (0, utils_1.getProject)(fileName);
-    if (!match) {
-        return;
-    }
-    const { ts, files, vueOptions } = match;
-    const volarFile = files.get(fileName);
+    const { typescript: ts, files, vueOptions, languageService, getFileId } = this;
+    const volarFile = files.get(getFileId(fileName));
     if (!(volarFile?.generated?.code instanceof vue.VueGeneratedCode)) {
         return;
     }
     const vueCode = volarFile.generated.code;
-    const tsLs = match.info.languageService;
-    const program = tsLs.getCurrentProgram();
+    const program = languageService.getCurrentProgram();
     if (!program) {
         return;
     }
     const checker = program.getTypeChecker();
-    const components = getVariableType(ts, tsLs, vueCode, '__VLS_components');
-    if (!components)
+    const components = getVariableType(ts, languageService, vueCode, '__VLS_components');
+    if (!components) {
         return [];
+    }
     const name = tag.split('.');
     let componentSymbol = components.type.getProperty(name[0]);
     if (!componentSymbol && !vueOptions.nativeTags.includes(name[0])) {
         componentSymbol = components.type.getProperty((0, shared_1.camelize)(name[0]))
             ?? components.type.getProperty((0, shared_1.capitalize)((0, shared_1.camelize)(name[0])));
     }
-    if (!componentSymbol)
+    if (!componentSymbol) {
         return [];
+    }
     let componentType = checker.getTypeOfSymbolAtLocation(componentSymbol, components.node);
     for (let i = 1; i < name.length; i++) {
         componentSymbol = componentType.getProperty(name[i]);
@@ -75,33 +71,30 @@ function getComponentProps(fileName, tag, requiredOnly = false) {
 }
 exports.getComponentProps = getComponentProps;
 function getComponentEvents(fileName, tag) {
-    const match = (0, utils_1.getProject)(fileName);
-    if (!match) {
-        return;
-    }
-    const { ts, files, vueOptions } = match;
-    const volarFile = files.get(fileName);
+    const { typescript: ts, files, vueOptions, languageService, getFileId } = this;
+    const volarFile = files.get(getFileId(fileName));
     if (!(volarFile?.generated?.code instanceof vue.VueGeneratedCode)) {
         return;
     }
-    const tsLs = match.info.languageService;
     const vueCode = volarFile.generated.code;
-    const program = tsLs.getCurrentProgram();
+    const program = languageService.getCurrentProgram();
     if (!program) {
         return;
     }
     const checker = program.getTypeChecker();
-    const components = getVariableType(ts, tsLs, vueCode, '__VLS_components');
-    if (!components)
+    const components = getVariableType(ts, languageService, vueCode, '__VLS_components');
+    if (!components) {
         return [];
+    }
     const name = tag.split('.');
     let componentSymbol = components.type.getProperty(name[0]);
     if (!componentSymbol && !vueOptions.nativeTags.includes(name[0])) {
         componentSymbol = components.type.getProperty((0, shared_1.camelize)(name[0]))
             ?? components.type.getProperty((0, shared_1.capitalize)((0, shared_1.camelize)(name[0])));
     }
-    if (!componentSymbol)
+    if (!componentSymbol) {
         return [];
+    }
     let componentType = checker.getTypeOfSymbolAtLocation(componentSymbol, components.node);
     for (let i = 1; i < name.length; i++) {
         componentSymbol = componentType.getProperty(name[i]);
@@ -139,36 +132,26 @@ function getComponentEvents(fileName, tag) {
 }
 exports.getComponentEvents = getComponentEvents;
 function getTemplateContextProps(fileName) {
-    const match = (0, utils_1.getProject)(fileName);
-    if (!match) {
-        return;
-    }
-    const { ts, files } = match;
-    const volarFile = files.get(fileName);
+    const { typescript: ts, files, languageService, getFileId } = this;
+    const volarFile = files.get(getFileId(fileName));
     if (!(volarFile?.generated?.code instanceof vue.VueGeneratedCode)) {
         return;
     }
-    const tsLs = match.info.languageService;
     const vueCode = volarFile.generated.code;
-    return getVariableType(ts, tsLs, vueCode, '__VLS_ctx')
+    return getVariableType(ts, languageService, vueCode, '__VLS_ctx')
         ?.type
         ?.getProperties()
         .map(c => c.name);
 }
 exports.getTemplateContextProps = getTemplateContextProps;
 function getComponentNames(fileName) {
-    const match = (0, utils_1.getProject)(fileName);
-    if (!match) {
-        return;
-    }
-    const { ts, files, vueOptions } = match;
-    const volarFile = files.get(fileName);
+    const { typescript: ts, files, vueOptions, languageService, getFileId } = this;
+    const volarFile = files.get(getFileId(fileName));
     if (!(volarFile?.generated?.code instanceof vue.VueGeneratedCode)) {
         return;
     }
-    const tsLs = match.info.languageService;
     const vueCode = volarFile.generated.code;
-    return getVariableType(ts, tsLs, vueCode, '__VLS_components')
+    return getVariableType(ts, languageService, vueCode, '__VLS_components')
         ?.type
         ?.getProperties()
         .map(c => c.name)
@@ -188,17 +171,12 @@ function _getComponentNames(ts, tsLs, vueCode, vueOptions) {
 }
 exports._getComponentNames = _getComponentNames;
 function getElementAttrs(fileName, tagName) {
-    const match = (0, utils_1.getProject)(fileName);
-    if (!match) {
-        return;
-    }
-    const { ts, files } = match;
-    const volarFile = files.get(fileName);
+    const { typescript: ts, files, languageService, getFileId } = this;
+    const volarFile = files.get(getFileId(fileName));
     if (!(volarFile?.generated?.code instanceof vue.VueGeneratedCode)) {
         return;
     }
-    const tsLs = match.info.languageService;
-    const program = tsLs.getCurrentProgram();
+    const program = languageService.getCurrentProgram();
     if (!program) {
         return;
     }

package/lib/requests/getPropertiesAtLocation.d.ts

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

package/lib/requests/getPropertiesAtLocation.js

@@ -2,16 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPropertiesAtLocation = void 0;
 const language_core_1 = require("@vue/language-core");
-const utils_1 = require("../utils");
-function getPropertiesAtLocation(fileName, position, isTsPlugin = true) {
-    const match = (0, utils_1.getProject)(fileName);
-    if (!match) {
-        return;
-    }
-    const { info, files, ts } = match;
-    const languageService = info.languageService;
+function getPropertiesAtLocation(fileName, position) {
+    const { languageService, files, typescript: ts, isTsPlugin, getFileId } = this;
     // mapping
-    const file = files.get(fileName);
+    const file = files.get(getFileId(fileName));
     if (file?.generated) {
         const virtualScript = file.generated.languagePlugin.typescript?.getScript(file.generated.code);
         if (!virtualScript) {

package/lib/requests/getQuickInfoAtPosition.d.ts

@@ -1 +1,4 @@
-export declare function getQuickInfoAtPosition(fileName: string, position: number): import("typescript").QuickInfo | undefined;
+import type * as ts from 'typescript';
+export declare function getQuickInfoAtPosition(this: {
+    languageService: ts.LanguageService;
+}, fileName: string, position: number): ts.QuickInfo | undefined;

package/lib/requests/getQuickInfoAtPosition.js

@@ -1,14 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getQuickInfoAtPosition = void 0;
-const utils_1 = require("../utils");
 function getQuickInfoAtPosition(fileName, position) {
-    const match = (0, utils_1.getProject)(fileName);
-    if (!match) {
-        return;
-    }
-    const { info } = match;
-    const languageService = info.languageService;
+    const { languageService } = this;
     return languageService.getQuickInfoAtPosition(fileName, position);
 }
 exports.getQuickInfoAtPosition = getQuickInfoAtPosition;

package/lib/server.d.ts

@@ -1,6 +1,12 @@
 import type * as ts from 'typescript';
+import type { FileRegistry, VueCompilerOptions } from '@vue/language-core';
 export interface Request {
     type: 'containsFile' | 'collectExtractProps' | 'getPropertiesAtLocation' | 'getQuickInfoAtPosition' | 'getComponentProps' | 'getComponentEvents' | 'getTemplateContextProps' | 'getComponentNames' | 'getElementAttrs';
-    args: any;
+    args: [fileName: string, ...rest: any];
 }
-export declare function startNamedPipeServer(serverKind: ts.server.ProjectKind, currentDirectory: string): void;
+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;
+    vueOptions: VueCompilerOptions;
+}>;

package/lib/server.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.startNamedPipeServer = void 0;
+exports.projects = exports.startNamedPipeServer = void 0;
 const fs = require("fs");
 const net = require("net");
 const collectExtractProps_1 = require("./requests/collectExtractProps");
 const componentInfos_1 = require("./requests/componentInfos");
-const containsFile_1 = require("./requests/containsFile");
 const getPropertiesAtLocation_1 = require("./requests/getPropertiesAtLocation");
 const getQuickInfoAtPosition_1 = require("./requests/getQuickInfoAtPosition");
 const utils_1 = require("./utils");
 let started = false;
-function startNamedPipeServer(serverKind, currentDirectory) {
-    if (started)
+function startNamedPipeServer(ts, serverKind, currentDirectory) {
+    if (started) {
         return;
+    }
     started = true;
     const pipeFile = process.platform === 'win32'
         ? `\\\\.\\pipe\\vue-tsp-${process.pid}`
@@ -21,61 +21,73 @@ function startNamedPipeServer(serverKind, currentDirectory) {
         connection.on('data', data => {
             const text = data.toString();
             const request = JSON.parse(text);
-            if (request.type === 'containsFile') {
-                const result = containsFile_1.containsFile.apply(null, request.args);
-                connection.write(JSON.stringify(result ?? null));
-            }
-            else if (request.type === 'collectExtractProps') {
-                const result = collectExtractProps_1.collectExtractProps.apply(null, request.args);
-                connection.write(JSON.stringify(result ?? null));
-            }
-            else if (request.type === 'getPropertiesAtLocation') {
-                const result = getPropertiesAtLocation_1.getPropertiesAtLocation.apply(null, request.args);
-                connection.write(JSON.stringify(result ?? null));
-            }
-            else if (request.type === 'getQuickInfoAtPosition') {
-                const result = getQuickInfoAtPosition_1.getQuickInfoAtPosition.apply(null, request.args);
-                connection.write(JSON.stringify(result ?? null));
-            }
-            // Component Infos
-            else if (request.type === 'getComponentProps') {
-                const result = componentInfos_1.getComponentProps.apply(null, request.args);
-                connection.write(JSON.stringify(result ?? null));
-            }
-            else if (request.type === 'getComponentEvents') {
-                const result = componentInfos_1.getComponentEvents.apply(null, request.args);
-                connection.write(JSON.stringify(result ?? null));
-            }
-            else if (request.type === 'getTemplateContextProps') {
-                const result = componentInfos_1.getTemplateContextProps.apply(null, request.args);
-                connection.write(JSON.stringify(result ?? null));
-            }
-            else if (request.type === 'getComponentNames') {
-                const result = componentInfos_1.getComponentNames.apply(null, request.args);
-                connection.write(JSON.stringify(result ?? null));
-            }
-            else if (request.type === 'getElementAttrs') {
-                const result = componentInfos_1.getElementAttrs.apply(null, request.args);
-                connection.write(JSON.stringify(result ?? null));
+            const fileName = request.args[0];
+            const project = getProject(fileName);
+            if (project) {
+                const requestContext = {
+                    typescript: ts,
+                    languageService: project.info.languageService,
+                    files: project.files,
+                    vueOptions: project.vueOptions,
+                    isTsPlugin: true,
+                    getFileId: (fileName) => fileName,
+                };
+                if (request.type === 'containsFile') {
+                    const result = !!getProject(fileName);
+                    connection.write(JSON.stringify(result ?? null));
+                }
+                else if (request.type === 'collectExtractProps') {
+                    const result = collectExtractProps_1.collectExtractProps.apply(requestContext, request.args);
+                    connection.write(JSON.stringify(result ?? null));
+                }
+                else if (request.type === 'getPropertiesAtLocation') {
+                    const result = getPropertiesAtLocation_1.getPropertiesAtLocation.apply(requestContext, request.args);
+                    connection.write(JSON.stringify(result ?? null));
+                }
+                else if (request.type === 'getQuickInfoAtPosition') {
+                    const result = getQuickInfoAtPosition_1.getQuickInfoAtPosition.apply(requestContext, request.args);
+                    connection.write(JSON.stringify(result ?? null));
+                }
+                // Component Infos
+                else if (request.type === 'getComponentProps') {
+                    const result = componentInfos_1.getComponentProps.apply(requestContext, request.args);
+                    connection.write(JSON.stringify(result ?? null));
+                }
+                else if (request.type === 'getComponentEvents') {
+                    const result = componentInfos_1.getComponentEvents.apply(requestContext, request.args);
+                    connection.write(JSON.stringify(result ?? null));
+                }
+                else if (request.type === 'getTemplateContextProps') {
+                    const result = componentInfos_1.getTemplateContextProps.apply(requestContext, request.args);
+                    connection.write(JSON.stringify(result ?? null));
+                }
+                else if (request.type === 'getComponentNames') {
+                    const result = componentInfos_1.getComponentNames.apply(requestContext, request.args);
+                    connection.write(JSON.stringify(result ?? null));
+                }
+                else if (request.type === 'getElementAttrs') {
+                    const result = componentInfos_1.getElementAttrs.apply(requestContext, request.args);
+                    connection.write(JSON.stringify(result ?? null));
+                }
+                else {
+                    console.warn('[Vue Named Pipe Server] Unknown request type:', request.type);
+                }
             }
             else {
-                console.warn('[Vue Named Pipe Server] Unknown request type:', request.type);
+                console.warn('[Vue Named Pipe Server] No project found for:', fileName);
             }
             connection.end();
         });
         connection.on('error', err => console.error('[Vue Named Pipe Server]', err.message));
     });
     cleanupPipeTable();
-    if (!fs.existsSync(utils_1.pipeTable)) {
-        fs.writeFileSync(utils_1.pipeTable, JSON.stringify([]));
-    }
-    const table = JSON.parse(fs.readFileSync(utils_1.pipeTable, 'utf8'));
+    const table = (0, utils_1.readPipeTable)();
     table.push({
         path: pipeFile,
         serverKind,
         currentDirectory,
     });
-    fs.writeFileSync(utils_1.pipeTable, JSON.stringify(table, undefined, 2));
+    (0, utils_1.updatePipeTable)(table);
     try {
         fs.unlinkSync(pipeFile);
     }
@@ -84,20 +96,25 @@ function startNamedPipeServer(serverKind, currentDirectory) {
 }
 exports.startNamedPipeServer = startNamedPipeServer;
 function cleanupPipeTable() {
-    if (!fs.existsSync(utils_1.pipeTable)) {
-        return;
-    }
-    for (const server of JSON.parse(fs.readFileSync(utils_1.pipeTable, 'utf8'))) {
+    for (const server of (0, utils_1.readPipeTable)()) {
         (0, utils_1.connect)(server.path).then(client => {
             if (client) {
                 client.end();
             }
             else {
-                let table = JSON.parse(fs.readFileSync(utils_1.pipeTable, 'utf8'));
+                let table = (0, utils_1.readPipeTable)();
                 table = table.filter(item => item.path !== server.path);
-                fs.writeFileSync(utils_1.pipeTable, JSON.stringify(table, undefined, 2));
+                (0, utils_1.updatePipeTable)(table);
             }
         });
     }
 }
+exports.projects = new Map();
+function getProject(fileName) {
+    for (const [project, data] of exports.projects) {
+        if (project.containsFile(fileName)) {
+            return data;
+        }
+    }
+}
 //# sourceMappingURL=server.js.map

package/lib/utils.d.ts

@@ -1,32 +1,14 @@
 /// <reference types="node" />
-import type { FileRegistry, VueCompilerOptions } from '@vue/language-core';
 import * as net from 'net';
 import type * as ts from 'typescript';
+import type { Request } from './server';
 export interface NamedPipeServer {
     path: string;
     serverKind: ts.server.ProjectKind;
     currentDirectory: string;
 }
-export declare const pipeTable: string;
-export declare const projects: Map<ts.server.Project, {
-    info: ts.server.PluginCreateInfo;
-    files: FileRegistry;
-    ts: typeof ts;
-    vueOptions: VueCompilerOptions;
-}>;
-export declare function getProject(fileName: string): {
-    info: ts.server.PluginCreateInfo;
-    files: {
-        languagePlugins: import("@vue/language-core").LanguagePlugin<import("@vue/language-core").VirtualCode>[];
-        set(id: string, languageId: string, snapshot: ts.IScriptSnapshot, plugins?: import("@vue/language-core").LanguagePlugin<import("@vue/language-core").VirtualCode>[] | undefined): import("@vue/language-core").SourceFile;
-        delete(id: string): void;
-        get(id: string): import("@vue/language-core").SourceFile | undefined;
-        getByVirtualCode(virtualCode: import("@vue/language-core").VirtualCode): import("@vue/language-core").SourceFile;
-        getLinkedCodeMap(virtualCode: import("@vue/language-core").VirtualCode): import("@vue/language-core").LinkedCodeMap | undefined;
-        getMaps(virtualCode: import("@vue/language-core").VirtualCode): Map<string, [ts.IScriptSnapshot, import("@vue/language-core").SourceMap<import("@vue/language-core").CodeInformation>]>;
-        getVirtualCode(sourceFileId: string, virtualCodeId: string): readonly [import("@vue/language-core").VirtualCode, import("@vue/language-core").SourceFile] | readonly [undefined, undefined];
-    };
-    ts: typeof ts;
-    vueOptions: VueCompilerOptions;
-} | undefined;
+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 sendRequestWorker<T>(request: Request, client: net.Socket): Promise<T | null | undefined>;

package/lib/utils.js

@@ -1,20 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.connect = exports.getProject = exports.projects = exports.pipeTable = void 0;
+exports.sendRequestWorker = exports.searchNamedPipeServerForFile = exports.connect = exports.updatePipeTable = exports.readPipeTable = void 0;
 const os = require("os");
 const net = require("net");
 const path = require("path");
+const fs = require("fs");
 const { version } = require('../package.json');
-exports.pipeTable = path.join(os.tmpdir(), `vue-tsp-table-${version}.json`);
-exports.projects = new Map();
-function getProject(fileName) {
-    for (const [project, data] of exports.projects) {
-        if (project.containsFile(fileName)) {
-            return data;
-        }
+const pipeTableFile = path.join(os.tmpdir(), `vue-tsp-table-${version}.json`);
+function readPipeTable() {
+    if (!fs.existsSync(pipeTableFile)) {
+        return [];
+    }
+    try {
+        const servers = JSON.parse(fs.readFileSync(pipeTableFile, 'utf8'));
+        return servers;
+    }
+    catch {
+        fs.unlinkSync(pipeTableFile);
+        return [];
+    }
+}
+exports.readPipeTable = readPipeTable;
+function updatePipeTable(servers) {
+    if (servers.length === 0) {
+        fs.unlinkSync(pipeTableFile);
+    }
+    else {
+        fs.writeFileSync(pipeTableFile, JSON.stringify(servers, undefined, 2));
     }
 }
-exports.getProject = getProject;
+exports.updatePipeTable = updatePipeTable;
 function connect(path) {
     return new Promise(resolve => {
         const client = net.connect(path);
@@ -27,4 +42,59 @@ function connect(path) {
     });
 }
 exports.connect = connect;
+async function searchNamedPipeServerForFile(fileName) {
+    const servers = readPipeTable();
+    const configuredServers = servers
+        .filter(item => item.serverKind === 1);
+    const inferredServers = servers
+        .filter(item => item.serverKind === 0)
+        .sort((a, b) => b.currentDirectory.length - a.currentDirectory.length);
+    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;
+            }
+        }
+    }
+    for (const server of inferredServers) {
+        if (!path.relative(server.currentDirectory, fileName).startsWith('..')) {
+            const client = await connect(server.path);
+            if (client) {
+                return server;
+            }
+        }
+    }
+}
+exports.searchNamedPipeServerForFile = searchNamedPipeServerForFile;
+function sendRequestWorker(request, client) {
+    return new Promise(resolve => {
+        let dataChunks = [];
+        client.on('data', chunk => {
+            dataChunks.push(chunk);
+        });
+        client.on('end', () => {
+            if (!dataChunks.length) {
+                console.warn('[Vue Named Pipe Client] No response from server for request:', request.type);
+                resolve(undefined);
+                return;
+            }
+            const data = Buffer.concat(dataChunks);
+            const text = data.toString();
+            let json = null;
+            try {
+                json = JSON.parse(text);
+            }
+            catch (e) {
+                console.error('[Vue Named Pipe Client] Failed to parse response:', text);
+                resolve(undefined);
+                return;
+            }
+            resolve(json);
+        });
+        client.write(JSON.stringify(request));
+    });
+}
+exports.sendRequestWorker = sendRequestWorker;
 //# sourceMappingURL=utils.js.map

package/package.json

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

package/lib/requests/containsFile.d.ts

@@ -1 +0,0 @@
-export declare function containsFile(fileName: string): boolean;

package/lib/requests/containsFile.js

@@ -1,9 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.containsFile = void 0;
-const utils_1 = require("../utils");
-function containsFile(fileName) {
-    return !!(0, utils_1.getProject)(fileName);
-}
-exports.containsFile = containsFile;
-//# sourceMappingURL=containsFile.js.map