@vue/language-server 2.2.10 → 3.0.0-alpha.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/index.d.ts CHANGED
@@ -1,4 +1,3 @@
1
1
  export * from './lib/types';
2
- export * from './lib/initialize';
3
2
  export * from '@volar/language-server/lib/types';
4
3
  export * from '@vue/language-service/lib/types';
package/index.js CHANGED
@@ -15,7 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
17
  __exportStar(require("./lib/types"), exports);
18
- __exportStar(require("./lib/initialize"), exports);
19
18
  // export types of parent package
20
19
  __exportStar(require("@volar/language-server/lib/types"), exports);
21
20
  // only export types of depend packages
package/lib/types.d.ts CHANGED
@@ -1,10 +1,2 @@
1
- export type VueInitializationOptions = {
2
- typescript: {
3
- tsdk: string;
4
- };
5
- vue?: {
6
- hybridMode?: boolean;
7
- };
8
- };
9
1
  export * from '@volar/language-server/lib/types';
10
2
  export * from '@vue/language-service/lib/types';
package/node.js CHANGED
@@ -1,39 +1,150 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ const simpleProject_1 = require("@volar/language-server/lib/project/simpleProject");
3
4
  const node_1 = require("@volar/language-server/node");
4
5
  const language_core_1 = require("@vue/language-core");
5
6
  const language_service_1 = require("@vue/language-service");
6
- const namedPipeClient = require("@vue/typescript-plugin/lib/client");
7
- const hybridModeProject_1 = require("./lib/hybridModeProject");
8
- const initialize_1 = require("./lib/initialize");
7
+ const ts = require("typescript");
8
+ const vscode_uri_1 = require("vscode-uri");
9
9
  const connection = (0, node_1.createConnection)();
10
10
  const server = (0, node_1.createServer)(connection);
11
11
  connection.listen();
12
12
  connection.onInitialize(params => {
13
- const options = params.initializationOptions;
14
- const { typescript: ts, diagnosticMessages } = (0, node_1.loadTsdkByPath)(options.typescript.tsdk, params.locale);
15
- const hybridMode = options.vue?.hybridMode ?? true;
16
- if (hybridMode) {
17
- return server.initialize(params, (0, hybridModeProject_1.createHybridModeProject)(({ asFileName, configFileName }) => {
18
- const commandLine = configFileName
19
- ? (0, language_core_1.createParsedCommandLine)(ts, ts.sys, configFileName)
20
- : {
21
- vueOptions: (0, language_core_1.getDefaultCompilerOptions)(),
22
- options: ts.getDefaultCompilerOptions(),
23
- };
24
- commandLine.vueOptions.__test = params.initializationOptions.typescript.disableAutoImportCache;
25
- return {
26
- languagePlugins: [
27
- (0, language_core_1.createVueLanguagePlugin)(ts, commandLine.options, commandLine.vueOptions, asFileName),
28
- ],
29
- setup({ project }) {
30
- project.vue = { compilerOptions: commandLine.vueOptions };
31
- },
32
- };
33
- }), (0, language_service_1.getHybridModeLanguageServicePlugins)(ts, namedPipeClient));
13
+ const tsconfigProjects = (0, language_service_1.createUriMap)();
14
+ const file2ProjectInfo = new Map();
15
+ server.fileWatcher.onDidChangeWatchedFiles(({ changes }) => {
16
+ for (const change of changes) {
17
+ const changeUri = vscode_uri_1.URI.parse(change.uri);
18
+ if (tsconfigProjects.has(changeUri)) {
19
+ tsconfigProjects.get(changeUri).dispose();
20
+ tsconfigProjects.delete(changeUri);
21
+ file2ProjectInfo.clear();
22
+ }
23
+ }
24
+ });
25
+ let simpleLs;
26
+ let tsserverRequestId = 0;
27
+ const tsserverRequestHandlers = new Map();
28
+ connection.onNotification('tsserver/response', ([id, res]) => {
29
+ tsserverRequestHandlers.get(id)?.(res);
30
+ tsserverRequestHandlers.delete(id);
31
+ });
32
+ return server.initialize(params, {
33
+ setup() { },
34
+ async getLanguageService(uri) {
35
+ if (uri.scheme === 'file') {
36
+ const fileName = uri.fsPath.replace(/\\/g, '/');
37
+ let projectInfoPromise = file2ProjectInfo.get(fileName);
38
+ if (!projectInfoPromise) {
39
+ projectInfoPromise = sendTsRequest(ts.server.protocol.CommandTypes.ProjectInfo, {
40
+ file: fileName,
41
+ needFileNameList: false,
42
+ });
43
+ file2ProjectInfo.set(fileName, projectInfoPromise);
44
+ }
45
+ const projectInfo = await projectInfoPromise;
46
+ if (projectInfo) {
47
+ const { configFileName } = projectInfo;
48
+ let ls = tsconfigProjects.get(vscode_uri_1.URI.file(configFileName));
49
+ if (!ls) {
50
+ ls = createLs(server, configFileName);
51
+ tsconfigProjects.set(vscode_uri_1.URI.file(configFileName), ls);
52
+ }
53
+ return ls;
54
+ }
55
+ }
56
+ return simpleLs ??= createLs(server, undefined);
57
+ },
58
+ getExistingLanguageServices() {
59
+ return Promise.all([
60
+ ...tsconfigProjects.values(),
61
+ simpleLs,
62
+ ].filter(promise => !!promise));
63
+ },
64
+ reload() {
65
+ for (const ls of tsconfigProjects.values()) {
66
+ ls.dispose();
67
+ }
68
+ tsconfigProjects.clear();
69
+ if (simpleLs) {
70
+ simpleLs.dispose();
71
+ simpleLs = undefined;
72
+ }
73
+ },
74
+ }, (0, language_service_1.getHybridModeLanguageServicePlugins)(ts, {
75
+ collectExtractProps(...args) {
76
+ return sendTsRequest('vue:collectExtractProps', args);
77
+ },
78
+ getComponentDirectives(...args) {
79
+ return sendTsRequest('vue:getComponentDirectives', args);
80
+ },
81
+ getComponentEvents(...args) {
82
+ return sendTsRequest('vue:getComponentEvents', args);
83
+ },
84
+ getComponentNames(...args) {
85
+ return sendTsRequest('vue:getComponentNames', args);
86
+ },
87
+ getComponentProps(...args) {
88
+ return sendTsRequest('vue:getComponentProps', args);
89
+ },
90
+ getElementAttrs(...args) {
91
+ return sendTsRequest('vue:getElementAttrs', args);
92
+ },
93
+ getElementNames(...args) {
94
+ return sendTsRequest('vue:getElementNames', args);
95
+ },
96
+ getImportPathForFile(...args) {
97
+ return sendTsRequest('vue:getImportPathForFile', args);
98
+ },
99
+ getPropertiesAtLocation(...args) {
100
+ return sendTsRequest('vue:getPropertiesAtLocation', args);
101
+ },
102
+ getDocumentHighlights(fileName, position) {
103
+ return sendTsRequest('documentHighlights-full', // internal command
104
+ {
105
+ file: fileName,
106
+ ...{ position },
107
+ filesToSearch: [fileName],
108
+ });
109
+ },
110
+ async getQuickInfoAtPosition(fileName, { line, character }) {
111
+ const result = await sendTsRequest(ts.server.protocol.CommandTypes.Quickinfo, {
112
+ file: fileName,
113
+ line: line + 1,
114
+ offset: character + 1,
115
+ });
116
+ return ts.displayPartsToString(result?.displayParts ?? []);
117
+ },
118
+ }));
119
+ async function sendTsRequest(command, args) {
120
+ return await new Promise(resolve => {
121
+ const requestId = ++tsserverRequestId;
122
+ tsserverRequestHandlers.set(requestId, resolve);
123
+ connection.sendNotification('tsserver/request', [requestId, command, args]);
124
+ });
34
125
  }
35
- else {
36
- return (0, initialize_1.initialize)(server, params, ts, diagnosticMessages);
126
+ function createLs(server, tsconfig) {
127
+ const commonLine = tsconfig
128
+ ? (0, language_core_1.createParsedCommandLine)(ts, ts.sys, tsconfig)
129
+ : {
130
+ options: ts.getDefaultCompilerOptions(),
131
+ vueOptions: (0, language_core_1.getDefaultCompilerOptions)(),
132
+ };
133
+ const language = (0, language_core_1.createLanguage)([
134
+ {
135
+ getLanguageId: uri => server.documents.get(uri)?.languageId,
136
+ },
137
+ (0, language_core_1.createVueLanguagePlugin)(ts, commonLine.options, commonLine.vueOptions, uri => uri.fsPath.replace(/\\/g, '/')),
138
+ ], (0, language_service_1.createUriMap)(), uri => {
139
+ const document = server.documents.get(uri);
140
+ if (document) {
141
+ language.scripts.set(uri, document.getSnapshot(), document.languageId);
142
+ }
143
+ else {
144
+ language.scripts.delete(uri);
145
+ }
146
+ });
147
+ return (0, language_service_1.createLanguageService)(language, server.languageServicePlugins, (0, simpleProject_1.createLanguageServiceEnvironment)(server, [...server.workspaceFolders.all]), { vue: { compilerOptions: commonLine.vueOptions } });
37
148
  }
38
149
  });
39
150
  connection.onInitialized(server.initialized);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vue/language-server",
3
- "version": "2.2.10",
3
+ "version": "3.0.0-alpha.10",
4
4
  "license": "MIT",
5
5
  "files": [
6
6
  "**/*.js",
@@ -16,14 +16,20 @@
16
16
  "directory": "packages/language-server"
17
17
  },
18
18
  "dependencies": {
19
- "@volar/language-core": "~2.4.11",
20
- "@volar/language-server": "~2.4.11",
21
- "@volar/test-utils": "~2.4.11",
22
- "@vue/language-core": "2.2.10",
23
- "@vue/language-service": "2.2.10",
24
- "@vue/typescript-plugin": "2.2.10",
19
+ "@volar/language-core": "~2.4.13",
20
+ "@volar/language-server": "~2.4.13",
21
+ "@volar/test-utils": "~2.4.13",
22
+ "@vue/language-core": "3.0.0-alpha.10",
23
+ "@vue/language-service": "3.0.0-alpha.10",
24
+ "@vue/typescript-plugin": "3.0.0-alpha.10",
25
25
  "vscode-languageserver-protocol": "^3.17.5",
26
26
  "vscode-uri": "^3.0.8"
27
27
  },
28
- "gitHead": "0422c03ffa4958431c9cd3cd19ae51f726c30b07"
28
+ "peerDependencies": {
29
+ "typescript": "*"
30
+ },
31
+ "devDependencies": {
32
+ "@typescript/server-harness": "latest"
33
+ },
34
+ "gitHead": "28308b4f76cc80c7632f39ae7e0944f1889661a2"
29
35
  }