@vue/typescript-plugin 2.0.2 → 2.0.3

package/index.js

@@ -43,7 +43,7 @@ function createLanguageServicePlugin() {
                     });
                     (0, decorateLanguageService_1.decorateLanguageService)(files, info.languageService);
                     (0, decorateLanguageServiceHost_1.decorateLanguageServiceHost)(files, info.languageServiceHost, ts);
-                    (0, server_1.startNamedPipeServer)(info.project.projectKind);
+                    (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;

package/lib/client.d.ts

@@ -1,4 +1,7 @@
+/// <reference types="node" />
+import type * as net from 'net';
 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;
@@ -11,3 +14,4 @@ export declare function getComponentEvents(...args: Parameters<typeof import('./
 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 connectForFile(fileName: string): Promise<readonly [net.Socket, NamedPipeServer] | undefined>;

package/lib/client.js

@@ -1,8 +1,8 @@
 "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;
-const net = require("net");
+exports.connectForFile = 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");
 const utils_1 = require("./utils");
 function collectExtractProps(...args) {
     return sendRequest({
@@ -62,58 +62,52 @@ function getElementAttrs(...args) {
 }
 exports.getElementAttrs = getElementAttrs;
 async function sendRequest(request) {
-    const pipeFile = await getPipeFile(request.args[0]);
-    if (!pipeFile) {
-        console.error('[Vue Named Pipe Client] pipeFile not found');
+    const connected = await connectForFile(request.args[0]);
+    if (!connected) {
+        console.warn('[Vue Named Pipe Client] No server found for', request.args[0]);
         return;
     }
-    return await _sendRequest(request, pipeFile);
+    const [client] = connected;
+    const result = await sendRequestWorker(request, client);
+    client.end();
+    return result;
 }
-async function getPipeFile(fileName) {
-    if (fs.existsSync(utils_1.pipeTable)) {
-        const table = JSON.parse(fs.readFileSync(utils_1.pipeTable, 'utf8'));
-        const all = Object.values(table);
-        const configuredServers = all
-            .filter(item => item.serverKind === 1)
-            .sort((a, b) => Math.abs(process.pid - a.pid) - Math.abs(process.pid - b.pid));
-        const inferredServers = all
-            .filter(item => item.serverKind === 0)
-            .sort((a, b) => Math.abs(process.pid - a.pid) - Math.abs(process.pid - b.pid));
-        for (const server of configuredServers) {
-            const response = await _sendRequest({ type: 'containsFile', args: [fileName] }, server.pipeFile);
+async function connectForFile(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.pipeFile;
+                return [client, server];
             }
         }
-        for (const server of inferredServers) {
-            const response = await _sendRequest({ type: 'containsFile', args: [fileName] }, server.pipeFile);
-            if (typeof response === 'boolean') {
-                return server.pipeFile;
+    }
+    for (const server of inferredServers) {
+        if (!path.relative(server.currentDirectory, fileName).startsWith('..')) {
+            const client = await (0, utils_1.connect)(server.path);
+            if (client) {
+                return [client, server];
             }
         }
     }
 }
-function _sendRequest(request, pipeFile) {
+exports.connectForFile = connectForFile;
+function sendRequestWorker(request, client) {
     return new Promise(resolve => {
-        try {
-            const client = net.connect(pipeFile);
-            client.on('connect', () => {
-                client.write(JSON.stringify(request));
-            });
-            client.on('data', data => {
-                const text = data.toString();
-                resolve(JSON.parse(text));
-                client.end();
-            });
-            client.on('error', err => {
-                console.error('[Vue Named Pipe Client]', err);
-                return resolve(undefined);
-            });
-        }
-        catch (e) {
-            console.error('[Vue Named Pipe Client]', e);
-            return resolve(undefined);
-        }
+        client.once('data', data => {
+            const text = data.toString();
+            resolve(JSON.parse(text));
+        });
+        client.write(JSON.stringify(request));
     });
 }
 //# sourceMappingURL=client.js.map

package/lib/server.d.ts

@@ -3,4 +3,4 @@ export interface Request {
     type: 'containsFile' | 'collectExtractProps' | 'getPropertiesAtLocation' | 'getQuickInfoAtPosition' | 'getComponentProps' | 'getComponentEvents' | 'getTemplateContextProps' | 'getComponentNames' | 'getElementAttrs';
     args: any;
 }
-export declare function startNamedPipeServer(serverKind: ts.server.ProjectKind): void;
+export declare function startNamedPipeServer(serverKind: ts.server.ProjectKind, currentDirectory: string): void;

package/lib/server.js

@@ -10,7 +10,7 @@ const getPropertiesAtLocation_1 = require("./requests/getPropertiesAtLocation");
 const getQuickInfoAtPosition_1 = require("./requests/getQuickInfoAtPosition");
 const utils_1 = require("./utils");
 let started = false;
-function startNamedPipeServer(serverKind) {
+function startNamedPipeServer(serverKind, currentDirectory) {
     if (started)
         return;
     started = true;
@@ -65,16 +65,16 @@ function startNamedPipeServer(serverKind) {
         });
         connection.on('error', err => console.error('[Vue Named Pipe Server]', err.message));
     });
-    clearupPipeTable();
+    cleanupPipeTable();
     if (!fs.existsSync(utils_1.pipeTable)) {
-        fs.writeFileSync(utils_1.pipeTable, JSON.stringify({}));
+        fs.writeFileSync(utils_1.pipeTable, JSON.stringify([]));
     }
     const table = JSON.parse(fs.readFileSync(utils_1.pipeTable, 'utf8'));
-    table[process.pid] = {
-        pid: process.pid,
-        pipeFile,
+    table.push({
+        path: pipeFile,
         serverKind,
-    };
+        currentDirectory,
+    });
     fs.writeFileSync(utils_1.pipeTable, JSON.stringify(table, undefined, 2));
     try {
         fs.unlinkSync(pipeFile);
@@ -83,24 +83,21 @@ function startNamedPipeServer(serverKind) {
     server.listen(pipeFile);
 }
 exports.startNamedPipeServer = startNamedPipeServer;
-function clearupPipeTable() {
-    if (fs.existsSync(utils_1.pipeTable)) {
-        const table = JSON.parse(fs.readFileSync(utils_1.pipeTable, 'utf8'));
-        for (const pid in table) {
-            const { pipeFile } = table[pid];
-            try {
-                const client = net.connect(pipeFile);
-                client.on('connect', () => {
-                    client.end();
-                });
-                client.on('error', () => {
-                    const table = JSON.parse(fs.readFileSync(utils_1.pipeTable, 'utf8'));
-                    delete table[pid];
-                    fs.writeFileSync(utils_1.pipeTable, JSON.stringify(table, undefined, 2));
-                });
+function cleanupPipeTable() {
+    if (!fs.existsSync(utils_1.pipeTable)) {
+        return;
+    }
+    for (const server of JSON.parse(fs.readFileSync(utils_1.pipeTable, 'utf8'))) {
+        (0, utils_1.connect)(server.path).then(client => {
+            if (client) {
+                client.end();
             }
-            catch { }
-        }
+            else {
+                let table = JSON.parse(fs.readFileSync(utils_1.pipeTable, 'utf8'));
+                table = table.filter(item => item.path !== server.path);
+                fs.writeFileSync(utils_1.pipeTable, JSON.stringify(table, undefined, 2));
+            }
+        });
     }
 }
 //# sourceMappingURL=server.js.map

package/lib/utils.d.ts

@@ -1,11 +1,11 @@
+/// <reference types="node" />
 import type { FileRegistry, VueCompilerOptions } from '@vue/language-core';
+import * as net from 'net';
 import type * as ts from 'typescript';
-export interface PipeTable {
-    [pid: string]: {
-        pid: number;
-        pipeFile: string;
-        serverKind: ts.server.ProjectKind;
-    };
+export interface NamedPipeServer {
+    path: string;
+    serverKind: ts.server.ProjectKind;
+    currentDirectory: string;
 }
 export declare const pipeTable: string;
 export declare const projects: Map<ts.server.Project, {
@@ -29,3 +29,4 @@ export declare function getProject(fileName: string): {
     ts: typeof ts;
     vueOptions: VueCompilerOptions;
 } | undefined;
+export declare function connect(path: string): Promise<net.Socket | undefined>;

package/lib/utils.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getProject = exports.projects = exports.pipeTable = void 0;
+exports.connect = exports.getProject = exports.projects = exports.pipeTable = void 0;
 const os = require("os");
+const net = require("net");
 const path = require("path");
-exports.pipeTable = path.join(os.tmpdir(), 'vue-tsp-table.json');
+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) {
@@ -13,4 +15,16 @@ function getProject(fileName) {
     }
 }
 exports.getProject = getProject;
+function connect(path) {
+    return new Promise(resolve => {
+        const client = net.connect(path);
+        client.on('connect', () => {
+            resolve(client);
+        });
+        client.on('error', () => {
+            return resolve(undefined);
+        });
+    });
+}
+exports.connect = connect;
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "2.0.2",
+	"version": "2.0.3",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,11 +13,11 @@
 	},
 	"dependencies": {
 		"@volar/typescript": "~2.1.0",
-		"@vue/language-core": "2.0.2",
+		"@vue/language-core": "2.0.3",
 		"@vue/shared": "^3.4.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "b377d5f990ffe7ef44f0d1871fcb8b5c2deafad1"
+	"gitHead": "fc1e288c8c0c82e6730781006d84a2676b5266ff"
 }