@vue/typescript-plugin 2.0.10 → 2.0.12

package/index.js

@@ -42,7 +42,7 @@ function createLanguageServicePlugin() {
                     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, getLanguageId);
+                    (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(ts, language, info.languageServiceHost);
                     (0, server_1.startNamedPipeServer)(ts, info.project.projectKind, info.project.getCurrentDirectory());
                 }
                 return info.languageService;

package/lib/client.js

@@ -67,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/server.d.ts

@@ -1,7 +1,7 @@
 import type * as ts from 'typescript';
 import type { Language, VueCompilerOptions } from '@vue/language-core';
 export interface Request {
-    type: 'containsFile' | 'collectExtractProps' | 'getImportPathForFile' | '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;

package/lib/server.js

@@ -24,8 +24,13 @@ function startNamedPipeServer(ts, serverKind, currentDirectory) {
             const request = JSON.parse(text);
             const fileName = request.args[0];
             const project = getProject(fileName);
-            if (request.type === 'containsFile') {
-                connection.write(JSON.stringify(!!project));
+            if (request.type === 'projectInfoForFile') {
+                connection.write(JSON.stringify(project
+                    ? {
+                        name: project.info.project.getProjectName(),
+                        kind: project.info.project.projectKind,
+                    }
+                    : null));
             }
             else if (project) {
                 const requestContext = {

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

@@ -33,12 +33,16 @@ exports.updatePipeTable = updatePipeTable;
 function connect(path) {
     return new Promise(resolve => {
         const client = net.connect(path);
+        client.setTimeout(1000);
         client.on('connect', () => {
             resolve(client);
         });
         client.on('error', () => {
             return resolve(undefined);
         });
+        client.on('timeout', () => {
+            return resolve(undefined);
+        });
     });
 }
 exports.connect = connect;
@@ -49,12 +53,15 @@ async function searchNamedPipeServerForFile(fileName) {
     const inferredServers = servers
         .filter(item => item.serverKind === 0)
         .sort((a, b) => b.currentDirectory.length - a.currentDirectory.length);
-    for (const server of configuredServers) {
+    for (const server of configuredServers.sort((a, b) => sortTSConfigs(fileName, a.currentDirectory, b.currentDirectory))) {
         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,15 +69,35 @@ 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,
+                };
             }
         }
     }
 }
 exports.searchNamedPipeServerForFile = searchNamedPipeServerForFile;
+function sortTSConfigs(file, a, b) {
+    const inA = isFileInDir(file, path.dirname(a));
+    const inB = isFileInDir(file, path.dirname(b));
+    if (inA !== inB) {
+        const aWeight = inA ? 1 : 0;
+        const bWeight = inB ? 1 : 0;
+        return bWeight - aWeight;
+    }
+    const aLength = a.split('/').length;
+    const bLength = b.split('/').length;
+    return bLength - aLength;
+}
+function isFileInDir(fileName, dir) {
+    const relative = path.relative(dir, fileName);
+    return !!relative && !relative.startsWith('..') && !path.isAbsolute(relative);
+}
 function sendRequestWorker(request, client) {
     return new Promise(resolve => {
         let dataChunks = [];
+        client.setTimeout(5000);
         client.on('data', chunk => {
             dataChunks.push(chunk);
         });
@@ -93,6 +120,14 @@ function sendRequestWorker(request, client) {
             }
             resolve(json);
         });
+        client.on('error', err => {
+            console.error('[Vue Named Pipe Client] Error:', err.message);
+            resolve(undefined);
+        });
+        client.on('timeout', () => {
+            console.error('[Vue Named Pipe Client] Timeout');
+            resolve(undefined);
+        });
         client.write(JSON.stringify(request));
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "2.0.10",
+	"version": "2.0.12",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,12 +12,12 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.2.0-alpha.5",
-		"@vue/language-core": "2.0.10",
+		"@volar/typescript": "2.2.0-alpha.7",
+		"@vue/language-core": "2.0.12",
 		"@vue/shared": "^3.4.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "a20a2ee950b63a949660b7e8faf0faed0e5bad33"
+	"gitHead": "c1c4e1a2a6c32da59351641bd41bf7f5db0cac69"
 }