@vue/language-server 3.0.0-beta.4 → 3.0.0

package/index.js

@@ -11,7 +11,13 @@ const reactionsAnalyze_1 = require("./lib/reactionsAnalyze");
 const reactionsAnalyzeLS_1 = require("./lib/reactionsAnalyzeLS");
 const connection = (0, node_1.createConnection)();
 const server = (0, node_1.createServer)(connection);
+const tsserverRequestHandlers = new Map();
+let tsserverRequestId = 0;
 connection.listen();
+connection.onNotification('tsserver/response', ([id, res]) => {
+    tsserverRequestHandlers.get(id)?.(res);
+    tsserverRequestHandlers.delete(id);
+});
 connection.onInitialize(params => {
     const tsconfigProjects = (0, language_service_1.createUriMap)();
     const file2ProjectInfo = new Map();
@@ -25,13 +31,7 @@ connection.onInitialize(params => {
             }
         }
     });
-    let simpleLs;
-    let tsserverRequestId = 0;
-    const tsserverRequestHandlers = new Map();
-    connection.onNotification('tsserver/response', ([id, res]) => {
-        tsserverRequestHandlers.get(id)?.(res);
-        tsserverRequestHandlers.delete(id);
-    });
+    let simpleLanguageService;
     return server.initialize(params, {
         setup() { },
         async getLanguageService(uri) {
@@ -39,7 +39,7 @@ connection.onInitialize(params => {
                 const fileName = uri.fsPath.replace(/\\/g, '/');
                 let projectInfoPromise = file2ProjectInfo.get(fileName);
                 if (!projectInfoPromise) {
-                    projectInfoPromise = sendTsRequest('_vue:' + ts.server.protocol.CommandTypes.ProjectInfo, {
+                    projectInfoPromise = sendTsServerRequest('_vue:' + ts.server.protocol.CommandTypes.ProjectInfo, {
                         file: fileName,
                         needFileNameList: false,
                     });
@@ -48,69 +48,69 @@ connection.onInitialize(params => {
                 const projectInfo = await projectInfoPromise;
                 if (projectInfo) {
                     const { configFileName } = projectInfo;
-                    let ls = tsconfigProjects.get(vscode_uri_1.URI.file(configFileName));
-                    if (!ls) {
-                        ls = createLs(server, configFileName);
-                        tsconfigProjects.set(vscode_uri_1.URI.file(configFileName), ls);
+                    let languageService = tsconfigProjects.get(vscode_uri_1.URI.file(configFileName));
+                    if (!languageService) {
+                        languageService = createProjectLanguageService(server, configFileName);
+                        tsconfigProjects.set(vscode_uri_1.URI.file(configFileName), languageService);
                     }
-                    return ls;
+                    return languageService;
                 }
             }
-            return simpleLs ??= createLs(server, undefined);
+            return simpleLanguageService ??= createProjectLanguageService(server, undefined);
         },
         getExistingLanguageServices() {
             return Promise.all([
                 ...tsconfigProjects.values(),
-                simpleLs,
+                simpleLanguageService,
             ].filter(promise => !!promise));
         },
         reload() {
-            for (const ls of tsconfigProjects.values()) {
-                ls.dispose();
+            for (const languageService of tsconfigProjects.values()) {
+                languageService.dispose();
             }
             tsconfigProjects.clear();
-            if (simpleLs) {
-                simpleLs.dispose();
-                simpleLs = undefined;
+            if (simpleLanguageService) {
+                simpleLanguageService.dispose();
+                simpleLanguageService = undefined;
             }
         },
     }, (0, language_service_1.createVueLanguageServicePlugins)(ts, {
         collectExtractProps(...args) {
-            return sendTsRequest('_vue:collectExtractProps', args);
+            return sendTsServerRequest('_vue:collectExtractProps', args);
         },
         getComponentDirectives(...args) {
-            return sendTsRequest('_vue:getComponentDirectives', args);
+            return sendTsServerRequest('_vue:getComponentDirectives', args);
         },
         getComponentEvents(...args) {
-            return sendTsRequest('_vue:getComponentEvents', args);
+            return sendTsServerRequest('_vue:getComponentEvents', args);
         },
         getComponentNames(...args) {
-            return sendTsRequest('_vue:getComponentNames', args);
+            return sendTsServerRequest('_vue:getComponentNames', args);
         },
         getComponentProps(...args) {
-            return sendTsRequest('_vue:getComponentProps', args);
+            return sendTsServerRequest('_vue:getComponentProps', args);
         },
         getElementAttrs(...args) {
-            return sendTsRequest('_vue:getElementAttrs', args);
+            return sendTsServerRequest('_vue:getElementAttrs', args);
         },
         getElementNames(...args) {
-            return sendTsRequest('_vue:getElementNames', args);
+            return sendTsServerRequest('_vue:getElementNames', args);
         },
         getImportPathForFile(...args) {
-            return sendTsRequest('_vue:getImportPathForFile', args);
+            return sendTsServerRequest('_vue:getImportPathForFile', args);
         },
         getPropertiesAtLocation(...args) {
-            return sendTsRequest('_vue:getPropertiesAtLocation', args);
+            return sendTsServerRequest('_vue:getPropertiesAtLocation', args);
         },
         getDocumentHighlights(fileName, position) {
-            return sendTsRequest('_vue:documentHighlights-full', {
+            return sendTsServerRequest('_vue:documentHighlights-full', {
                 file: fileName,
                 ...{ position },
                 filesToSearch: [fileName],
             });
         },
         async getQuickInfoAtPosition(fileName, { line, character }) {
-            const result = await sendTsRequest('_vue:' + ts.server.protocol.CommandTypes.Quickinfo, {
+            const result = await sendTsServerRequest('_vue:' + ts.server.protocol.CommandTypes.Quickinfo, {
                 file: fileName,
                 line: line + 1,
                 offset: character + 1,
@@ -118,14 +118,14 @@ connection.onInitialize(params => {
             return ts.displayPartsToString(result?.displayParts ?? []);
         },
     }));
-    async function sendTsRequest(command, args) {
+    async function sendTsServerRequest(command, args) {
         return await new Promise(resolve => {
             const requestId = ++tsserverRequestId;
             tsserverRequestHandlers.set(requestId, resolve);
             connection.sendNotification('tsserver/request', [requestId, command, args]);
         });
     }
-    function createLs(server, tsconfig) {
+    function createProjectLanguageService(server, tsconfig) {
         const commonLine = tsconfig
             ? (0, language_core_1.createParsedCommandLine)(ts, ts.sys, tsconfig)
             : {

package/lib/types.d.ts

@@ -0,0 +1,2 @@
+export * from '@volar/language-server/lib/types';
+export * from '@vue/language-service/lib/types';

package/lib/types.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@volar/language-server/lib/types"), exports);
+__exportStar(require("@vue/language-service/lib/types"), exports);
+//# sourceMappingURL=types.js.map

package/node.d.ts

@@ -0,0 +1 @@
+export { };

package/node.js

@@ -0,0 +1,152 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const simpleProject_1 = require("@volar/language-server/lib/project/simpleProject");
+const node_1 = require("@volar/language-server/node");
+const language_core_1 = require("@vue/language-core");
+const language_service_1 = require("@vue/language-service");
+const ts = require("typescript");
+const vscode_uri_1 = require("vscode-uri");
+const connection = (0, node_1.createConnection)();
+const server = (0, node_1.createServer)(connection);
+connection.listen();
+connection.onInitialize(params => {
+    const tsconfigProjects = (0, language_service_1.createUriMap)();
+    const file2ProjectInfo = new Map();
+    server.fileWatcher.onDidChangeWatchedFiles(({ changes }) => {
+        for (const change of changes) {
+            const changeUri = vscode_uri_1.URI.parse(change.uri);
+            if (tsconfigProjects.has(changeUri)) {
+                tsconfigProjects.get(changeUri).dispose();
+                tsconfigProjects.delete(changeUri);
+                file2ProjectInfo.clear();
+            }
+        }
+    });
+    let simpleLs;
+    let tsserverRequestId = 0;
+    const tsserverRequestHandlers = new Map();
+    connection.onNotification('tsserver/response', ([id, res]) => {
+        tsserverRequestHandlers.get(id)?.(res);
+        tsserverRequestHandlers.delete(id);
+    });
+    return server.initialize(params, {
+        setup() { },
+        async getLanguageService(uri) {
+            if (uri.scheme === 'file') {
+                const fileName = uri.fsPath.replace(/\\/g, '/');
+                let projectInfoPromise = file2ProjectInfo.get(fileName);
+                if (!projectInfoPromise) {
+                    projectInfoPromise = sendTsRequest(ts.server.protocol.CommandTypes.ProjectInfo, {
+                        file: fileName,
+                        needFileNameList: false,
+                    });
+                    file2ProjectInfo.set(fileName, projectInfoPromise);
+                }
+                const projectInfo = await projectInfoPromise;
+                if (projectInfo) {
+                    const { configFileName } = projectInfo;
+                    let ls = tsconfigProjects.get(vscode_uri_1.URI.file(configFileName));
+                    if (!ls) {
+                        ls = createLs(server, configFileName);
+                        tsconfigProjects.set(vscode_uri_1.URI.file(configFileName), ls);
+                    }
+                    return ls;
+                }
+            }
+            return simpleLs ??= createLs(server, undefined);
+        },
+        getExistingLanguageServices() {
+            return Promise.all([
+                ...tsconfigProjects.values(),
+                simpleLs,
+            ].filter(promise => !!promise));
+        },
+        reload() {
+            for (const ls of tsconfigProjects.values()) {
+                ls.dispose();
+            }
+            tsconfigProjects.clear();
+            if (simpleLs) {
+                simpleLs.dispose();
+                simpleLs = undefined;
+            }
+        },
+    }, (0, language_service_1.getHybridModeLanguageServicePlugins)(ts, {
+        collectExtractProps(...args) {
+            return sendTsRequest('vue:collectExtractProps', args);
+        },
+        getComponentDirectives(...args) {
+            return sendTsRequest('vue:getComponentDirectives', args);
+        },
+        getComponentEvents(...args) {
+            return sendTsRequest('vue:getComponentEvents', args);
+        },
+        getComponentNames(...args) {
+            return sendTsRequest('vue:getComponentNames', args);
+        },
+        getComponentProps(...args) {
+            return sendTsRequest('vue:getComponentProps', args);
+        },
+        getElementAttrs(...args) {
+            return sendTsRequest('vue:getElementAttrs', args);
+        },
+        getElementNames(...args) {
+            return sendTsRequest('vue:getElementNames', args);
+        },
+        getImportPathForFile(...args) {
+            return sendTsRequest('vue:getImportPathForFile', args);
+        },
+        getPropertiesAtLocation(...args) {
+            return sendTsRequest('vue:getPropertiesAtLocation', args);
+        },
+        getDocumentHighlights(fileName, position) {
+            return sendTsRequest('documentHighlights-full', // internal command
+            {
+                file: fileName,
+                ...{ position },
+                filesToSearch: [fileName],
+            });
+        },
+        async getQuickInfoAtPosition(fileName, { line, character }) {
+            const result = await sendTsRequest(ts.server.protocol.CommandTypes.Quickinfo, {
+                file: fileName,
+                line: line + 1,
+                offset: character + 1,
+            });
+            return ts.displayPartsToString(result?.displayParts ?? []);
+        },
+    }));
+    async function sendTsRequest(command, args) {
+        return await new Promise(resolve => {
+            const requestId = ++tsserverRequestId;
+            tsserverRequestHandlers.set(requestId, resolve);
+            connection.sendNotification('tsserver/request', [requestId, command, args]);
+        });
+    }
+    function createLs(server, tsconfig) {
+        const commonLine = tsconfig
+            ? (0, language_core_1.createParsedCommandLine)(ts, ts.sys, tsconfig)
+            : {
+                options: ts.getDefaultCompilerOptions(),
+                vueOptions: (0, language_core_1.getDefaultCompilerOptions)(),
+            };
+        const language = (0, language_core_1.createLanguage)([
+            {
+                getLanguageId: uri => server.documents.get(uri)?.languageId,
+            },
+            (0, language_core_1.createVueLanguagePlugin)(ts, commonLine.options, commonLine.vueOptions, uri => uri.fsPath.replace(/\\/g, '/')),
+        ], (0, language_service_1.createUriMap)(), uri => {
+            const document = server.documents.get(uri);
+            if (document) {
+                language.scripts.set(uri, document.getSnapshot(), document.languageId);
+            }
+            else {
+                language.scripts.delete(uri);
+            }
+        });
+        return (0, language_service_1.createLanguageService)(language, server.languageServicePlugins, (0, simpleProject_1.createLanguageServiceEnvironment)(server, [...server.workspaceFolders.all]), { vue: { compilerOptions: commonLine.vueOptions } });
+    }
+});
+connection.onInitialized(server.initialized);
+connection.onShutdown(server.shutdown);
+//# sourceMappingURL=node.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-server",
-	"version": "3.0.0-beta.4",
+	"version": "3.0.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -16,10 +16,10 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-server": "2.4.15",
-		"@vue/language-core": "3.0.0-beta.4",
-		"@vue/language-service": "3.0.0-beta.4",
-		"@vue/typescript-plugin": "3.0.0-beta.4",
+		"@volar/language-server": "2.4.16",
+		"@vue/language-core": "3.0.0",
+		"@vue/language-service": "3.0.0",
+		"@vue/typescript-plugin": "3.0.0",
 		"vscode-uri": "^3.0.8"
 	},
 	"peerDependencies": {
@@ -27,7 +27,7 @@
 	},
 	"devDependencies": {
 		"@typescript/server-harness": "latest",
-		"@volar/test-utils": "2.4.15"
+		"@volar/test-utils": "2.4.16"
 	},
-	"gitHead": "5cb41faacbfe2d9e2d64637c6c1ae8769d9cba3f"
+	"gitHead": "620f050fd494cccd215781907c950e17dae4fd58"
 }

package/protocol.d.ts

@@ -0,0 +1 @@
+export * from '@volar/language-server/protocol';

package/protocol.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("@volar/language-server/protocol"), exports);
+//# sourceMappingURL=protocol.js.map