@vue/typescript-plugin 2.0.11 → 2.0.12

package/lib/server.js

@@ -30,7 +30,7 @@ function startNamedPipeServer(ts, serverKind, currentDirectory) {
                         name: project.info.project.getProjectName(),
                         kind: project.info.project.projectKind,
                     }
-                    : undefined));
+                    : null));
             }
             else if (project) {
                 const requestContext = {

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,7 +53,7 @@ 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 projectInfo = await sendRequestWorker({ type: 'projectInfoForFile', args: [fileName] }, client);
@@ -74,9 +78,26 @@ async function searchNamedPipeServerForFile(fileName) {
     }
 }
 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);
         });
@@ -99,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.11",
+	"version": "2.0.12",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,12 +12,12 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.2.0-alpha.6",
-		"@vue/language-core": "2.0.11",
+		"@volar/typescript": "2.2.0-alpha.7",
+		"@vue/language-core": "2.0.12",
 		"@vue/shared": "^3.4.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "c89f25ffc32c760130adeeac796b9a5d20585bf7"
+	"gitHead": "c1c4e1a2a6c32da59351641bd41bf7f5db0cac69"
 }