@vue/typescript-plugin 2.0.3 → 2.0.5

package/README.md

@@ -0,0 +1,33 @@
+# 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.
+
+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
+
+```json
+"initializationOptions":  {
+    "plugins": [
+        {
+          "name": "@vue/typescript-plugin",
+          "location": "/usr/local/lib/node_modules/@vue/typescript-plugin",
+          "languages": ["javascript", "typescript", "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.
+
+## Client-specific configuration
+
+- For neovim, see the [details on configuring `tsserver`][nvim].
+
+[nvim]: https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md#vue-support

package/index.js

@@ -22,13 +22,30 @@ function createLanguageServicePlugin() {
                     decoratedLanguageServices.add(info.languageService);
                     decoratedLanguageServiceHosts.add(info.languageServiceHost);
                     const vueOptions = vue.resolveVueCompilerOptions(getVueCompilerOptions());
-                    const languagePlugin = vue.createVueLanguagePlugin(ts, id => id, info.languageServiceHost.getCompilationSettings(), vueOptions);
+                    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 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 snapshot = getScriptSnapshot(fileName);
                         if (snapshot) {
-                            files.set(fileName, (0, language_core_1.resolveCommonLanguageId)(fileName), snapshot);
+                            let languageId = (0, language_core_1.resolveCommonLanguageId)(fileName);
+                            if (extensions.some(ext => fileName.endsWith(ext))) {
+                                languageId = 'vue';
+                            }
+                            files.set(fileName, languageId, snapshot);
                         }
                         else {
                             files.delete(fileName);
@@ -168,25 +185,33 @@ function createLanguageServicePlugin() {
                 if (updateLevel >= (1)
                     || !externalFiles.has(project)) {
                     const oldFiles = externalFiles.get(project);
-                    const newFiles = (0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, projectExternalFileExtensions.get(project));
+                    const newFiles = new Set((0, decorateLanguageServiceHost_1.searchExternalFiles)(ts, project, projectExternalFileExtensions.get(project)));
+                    console.log('volar-search vue files');
+                    for (const file of newFiles) {
+                        console.log(file);
+                    }
                     externalFiles.set(project, newFiles);
-                    if (oldFiles && !arrayItemsEqual(oldFiles, newFiles)) {
+                    if (oldFiles && !twoSetsEqual(oldFiles, newFiles)) {
+                        for (const oldFile of oldFiles) {
+                            if (!newFiles.has(oldFile)) {
+                                utils_1.projects.get(project)?.files.delete(oldFile);
+                            }
+                        }
                         project.refreshDiagnostics();
                     }
                 }
-                return externalFiles.get(project);
+                return [...externalFiles.get(project)];
             },
         };
         return pluginModule;
     };
 }
-function arrayItemsEqual(a, b) {
-    if (a.length !== b.length) {
+function twoSetsEqual(a, b) {
+    if (a.size !== b.size) {
         return false;
     }
-    const set = new Set(a);
-    for (const file of b) {
-        if (!set.has(file)) {
+    for (const file of a) {
+        if (!b.has(file)) {
             return false;
         }
     }

package/lib/client.d.ts

@@ -1,5 +1,3 @@
-/// <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<{
@@ -14,4 +12,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>;
+export declare function searchNamedPipeServerForFile(fileName: string): Promise<NamedPipeServer | undefined>;

package/lib/client.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.connectForFile = exports.getElementAttrs = exports.getComponentNames = exports.getTemplateContextProps = exports.getComponentEvents = exports.getComponentProps = exports.getQuickInfoAtPosition = exports.getPropertiesAtLocation = exports.collectExtractProps = void 0;
+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");
 const utils_1 = require("./utils");
@@ -62,17 +62,19 @@ function getElementAttrs(...args) {
 }
 exports.getElementAttrs = getElementAttrs;
 async function sendRequest(request) {
-    const connected = await connectForFile(request.args[0]);
-    if (!connected) {
+    const server = await searchNamedPipeServerForFile(request.args[0]);
+    if (!server) {
         console.warn('[Vue Named Pipe Client] No server found for', request.args[0]);
         return;
     }
-    const [client] = connected;
-    const result = await sendRequestWorker(request, client);
-    client.end();
-    return result;
+    const client = await (0, utils_1.connect)(server.path);
+    if (!client) {
+        console.warn('[Vue Named Pipe Client] Failed to connect to', server.path);
+        return;
+    }
+    return await sendRequestWorker(request, client);
 }
-async function connectForFile(fileName) {
+async function searchNamedPipeServerForFile(fileName) {
     if (!fs.existsSync(utils_1.pipeTable)) {
         return;
     }
@@ -87,7 +89,7 @@ async function connectForFile(fileName) {
         if (client) {
             const response = await sendRequestWorker({ type: 'containsFile', args: [fileName] }, client);
             if (response) {
-                return [client, server];
+                return server;
             }
         }
     }
@@ -95,17 +97,36 @@ async function connectForFile(fileName) {
         if (!path.relative(server.currentDirectory, fileName).startsWith('..')) {
             const client = await (0, utils_1.connect)(server.path);
             if (client) {
-                return [client, server];
+                return server;
             }
         }
     }
 }
-exports.connectForFile = connectForFile;
+exports.searchNamedPipeServerForFile = searchNamedPipeServerForFile;
 function sendRequestWorker(request, client) {
     return new Promise(resolve => {
-        client.once('data', data => {
+        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();
-            resolve(JSON.parse(text));
+            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));
     });

package/lib/server.js

@@ -60,8 +60,8 @@ function startNamedPipeServer(serverKind, currentDirectory) {
             }
             else {
                 console.warn('[Vue Named Pipe Server] Unknown request type:', request.type);
-                connection.write(JSON.stringify(null));
             }
+            connection.end();
         });
         connection.on('error', err => console.error('[Vue Named Pipe Server]', err.message));
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/typescript-plugin",
-	"version": "2.0.3",
+	"version": "2.0.5",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -12,12 +12,12 @@
 		"directory": "packages/typescript-plugin"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.1.0",
-		"@vue/language-core": "2.0.3",
+		"@volar/typescript": "~2.1.1",
+		"@vue/language-core": "2.0.5",
 		"@vue/shared": "^3.4.0"
 	},
 	"devDependencies": {
 		"@types/node": "latest"
 	},
-	"gitHead": "fc1e288c8c0c82e6730781006d84a2676b5266ff"
+	"gitHead": "62b4fcb0d3f7153b5b2f5571af32f519117d8466"
 }