@vue/language-server 3.0.0-alpha.0 → 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.
File without changes
@@ -0,0 +1,12 @@
1
+ import type { Language, LanguagePlugin, LanguageServerProject, ProjectContext, ProviderResult } from '@volar/language-server';
2
+ import { URI } from 'vscode-uri';
3
+ export declare function createHybridModeProject(create: (params: {
4
+ configFileName?: string;
5
+ asFileName: (scriptId: URI) => string;
6
+ }) => ProviderResult<{
7
+ languagePlugins: LanguagePlugin<URI>[];
8
+ setup?(options: {
9
+ language: Language;
10
+ project: ProjectContext;
11
+ }): void;
12
+ }>): LanguageServerProject;
@@ -0,0 +1,100 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.createHybridModeProject = createHybridModeProject;
4
+ const simpleProject_1 = require("@volar/language-server/lib/project/simpleProject");
5
+ const language_core_1 = require("@vue/language-core");
6
+ const language_service_1 = require("@vue/language-service");
7
+ const utils_1 = require("@vue/typescript-plugin/lib/utils");
8
+ const vscode_uri_1 = require("vscode-uri");
9
+ function createHybridModeProject(create) {
10
+ let simpleLs;
11
+ let server;
12
+ const tsconfigProjects = (0, language_service_1.createUriMap)();
13
+ const project = {
14
+ setup(_server) {
15
+ server = _server;
16
+ utils_1.onServerReady.push(() => {
17
+ server.languageFeatures.requestRefresh(false);
18
+ });
19
+ server.fileWatcher.onDidChangeWatchedFiles(({ changes }) => {
20
+ for (const change of changes) {
21
+ const changeUri = vscode_uri_1.URI.parse(change.uri);
22
+ if (tsconfigProjects.has(changeUri)) {
23
+ tsconfigProjects.get(changeUri)?.then(project => project.dispose());
24
+ tsconfigProjects.delete(changeUri);
25
+ }
26
+ }
27
+ });
28
+ const end = Date.now() + 60000;
29
+ const pipeWatcher = setInterval(() => {
30
+ for (const server of utils_1.configuredServers) {
31
+ server.update();
32
+ }
33
+ for (const server of utils_1.inferredServers) {
34
+ server.update();
35
+ }
36
+ if (Date.now() > end) {
37
+ clearInterval(pipeWatcher);
38
+ }
39
+ }, 2500);
40
+ },
41
+ async getLanguageService(uri) {
42
+ const fileName = asFileName(uri);
43
+ const namedPipeServer = await (0, utils_1.getBestServer)(fileName);
44
+ if (namedPipeServer?.projectInfo?.kind === 1) {
45
+ const tsconfig = namedPipeServer.projectInfo.name;
46
+ const tsconfigUri = vscode_uri_1.URI.file(tsconfig);
47
+ if (!tsconfigProjects.has(tsconfigUri)) {
48
+ tsconfigProjects.set(tsconfigUri, createLs(server, tsconfig));
49
+ }
50
+ return await tsconfigProjects.get(tsconfigUri);
51
+ }
52
+ else {
53
+ simpleLs ??= createLs(server, undefined);
54
+ return await simpleLs;
55
+ }
56
+ },
57
+ getExistingLanguageServices() {
58
+ return Promise.all([
59
+ ...tsconfigProjects.values(),
60
+ simpleLs,
61
+ ].filter(promise => !!promise));
62
+ },
63
+ reload() {
64
+ for (const ls of [
65
+ ...tsconfigProjects.values(),
66
+ simpleLs,
67
+ ]) {
68
+ ls?.then(ls => ls.dispose());
69
+ }
70
+ tsconfigProjects.clear();
71
+ simpleLs = undefined;
72
+ },
73
+ };
74
+ return project;
75
+ function asFileName(uri) {
76
+ return uri.fsPath.replace(/\\/g, '/');
77
+ }
78
+ async function createLs(server, tsconfig) {
79
+ const { languagePlugins, setup } = await create({
80
+ configFileName: tsconfig,
81
+ asFileName,
82
+ });
83
+ const language = (0, language_core_1.createLanguage)([
84
+ { getLanguageId: uri => server.documents.get(uri)?.languageId },
85
+ ...languagePlugins,
86
+ ], (0, language_service_1.createUriMap)(), uri => {
87
+ const document = server.documents.get(uri);
88
+ if (document) {
89
+ language.scripts.set(uri, document.getSnapshot(), document.languageId);
90
+ }
91
+ else {
92
+ language.scripts.delete(uri);
93
+ }
94
+ });
95
+ const project = {};
96
+ setup?.({ language, project });
97
+ return (0, language_service_1.createLanguageService)(language, server.languageServicePlugins, (0, simpleProject_1.createLanguageServiceEnvironment)(server, [...server.workspaceFolders.all]), project);
98
+ }
99
+ }
100
+ //# sourceMappingURL=hybridModeProject.js.map
@@ -0,0 +1,4 @@
1
+ import type { LanguageServer } from '@volar/language-server';
2
+ import { InitializeParams } from '@vue/language-service';
3
+ import type * as ts from 'typescript';
4
+ export declare function initialize(server: LanguageServer, params: InitializeParams, ts: typeof import('typescript'), tsLocalized: ts.MapLike<string> | undefined): import("@volar/language-server").InitializeResult<import("@volar/language-server").ExperimentalFeatures>;
@@ -0,0 +1,87 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.initialize = initialize;
4
+ const node_1 = require("@volar/language-server/node");
5
+ const language_core_1 = require("@vue/language-core");
6
+ const language_service_1 = require("@vue/language-service");
7
+ function initialize(server, params, ts, tsLocalized) {
8
+ const watchingExtensions = new Set();
9
+ let fileWatcher;
10
+ return server.initialize(params, (0, node_1.createTypeScriptProject)(ts, tsLocalized, async ({ configFileName, sys, uriConverter }) => {
11
+ let compilerOptions;
12
+ let vueCompilerOptions;
13
+ if (configFileName) {
14
+ let commandLine = (0, language_core_1.createParsedCommandLine)(ts, sys, configFileName, true);
15
+ let sysVersion = sys.version;
16
+ let newSysVersion = await sys.sync();
17
+ while (sysVersion !== newSysVersion) {
18
+ commandLine = (0, language_core_1.createParsedCommandLine)(ts, sys, configFileName, true);
19
+ sysVersion = newSysVersion;
20
+ newSysVersion = await sys.sync();
21
+ }
22
+ compilerOptions = commandLine.options;
23
+ vueCompilerOptions = commandLine.vueOptions;
24
+ }
25
+ else {
26
+ compilerOptions = ts.getDefaultCompilerOptions();
27
+ vueCompilerOptions = (0, language_core_1.getDefaultCompilerOptions)();
28
+ }
29
+ vueCompilerOptions.__test = params.initializationOptions.typescript.disableAutoImportCache;
30
+ updateFileWatcher(vueCompilerOptions);
31
+ return {
32
+ languagePlugins: [
33
+ (0, language_core_1.createVueLanguagePlugin)(ts, compilerOptions, vueCompilerOptions, s => uriConverter.asFileName(s)),
34
+ ],
35
+ setup({ project }) {
36
+ project.vue = { compilerOptions: vueCompilerOptions };
37
+ if (project.typescript) {
38
+ const directoryExists = project.typescript.languageServiceHost.directoryExists?.bind(project.typescript.languageServiceHost);
39
+ const fileExists = project.typescript.languageServiceHost.fileExists.bind(project.typescript.languageServiceHost);
40
+ const getScriptSnapshot = project.typescript.languageServiceHost.getScriptSnapshot.bind(project.typescript.languageServiceHost);
41
+ const globalTypesName = (0, language_core_1.getGlobalTypesFileName)(vueCompilerOptions);
42
+ const globalTypesContents = `// @ts-nocheck\nexport {};\n` + (0, language_core_1.generateGlobalTypes)(vueCompilerOptions);
43
+ const globalTypesSnapshot = {
44
+ getText: (start, end) => globalTypesContents.slice(start, end),
45
+ getLength: () => globalTypesContents.length,
46
+ getChangeRange: () => undefined,
47
+ };
48
+ if (directoryExists) {
49
+ project.typescript.languageServiceHost.directoryExists = path => {
50
+ if (path.endsWith('.vue-global-types')) {
51
+ return true;
52
+ }
53
+ return directoryExists(path);
54
+ };
55
+ }
56
+ project.typescript.languageServiceHost.fileExists = path => {
57
+ if (path.endsWith(`.vue-global-types/${globalTypesName}`) || path.endsWith(`.vue-global-types\\${globalTypesName}`)) {
58
+ return true;
59
+ }
60
+ return fileExists(path);
61
+ };
62
+ project.typescript.languageServiceHost.getScriptSnapshot = path => {
63
+ if (path.endsWith(`.vue-global-types/${globalTypesName}`) || path.endsWith(`.vue-global-types\\${globalTypesName}`)) {
64
+ return globalTypesSnapshot;
65
+ }
66
+ return getScriptSnapshot(path);
67
+ };
68
+ }
69
+ },
70
+ };
71
+ }), (0, language_service_1.getFullLanguageServicePlugins)(ts, { disableAutoImportCache: params.initializationOptions.typescript.disableAutoImportCache }));
72
+ function updateFileWatcher(vueCompilerOptions) {
73
+ const extensions = [
74
+ 'js', 'cjs', 'mjs', 'ts', 'cts', 'mts', 'jsx', 'tsx', 'json',
75
+ ...(0, language_core_1.getAllExtensions)(vueCompilerOptions).map(ext => ext.slice(1)),
76
+ ];
77
+ const newExtensions = extensions.filter(ext => !watchingExtensions.has(ext));
78
+ if (newExtensions.length) {
79
+ for (const ext of newExtensions) {
80
+ watchingExtensions.add(ext);
81
+ }
82
+ fileWatcher?.then(dispose => dispose.dispose());
83
+ fileWatcher = server.fileWatcher.watchFiles(['**/*.{' + [...watchingExtensions].join(',') + '}']);
84
+ }
85
+ }
86
+ }
87
+ //# sourceMappingURL=initialize.js.map
package/lib/types.d.ts CHANGED
@@ -1,8 +1,2 @@
1
- export type VueInitializationOptions = {
2
- typescript: {
3
- tsdk: string;
4
- tsserverRequestCommand?: string;
5
- };
6
- };
7
1
  export * from '@volar/language-server/lib/types';
8
2
  export * from '@vue/language-service/lib/types';
package/node.js CHANGED
@@ -4,19 +4,12 @@ const simpleProject_1 = require("@volar/language-server/lib/project/simpleProjec
4
4
  const node_1 = require("@volar/language-server/node");
5
5
  const language_core_1 = require("@vue/language-core");
6
6
  const language_service_1 = require("@vue/language-service");
7
+ const ts = require("typescript");
7
8
  const vscode_uri_1 = require("vscode-uri");
8
9
  const connection = (0, node_1.createConnection)();
9
10
  const server = (0, node_1.createServer)(connection);
10
11
  connection.listen();
11
12
  connection.onInitialize(params => {
12
- const options = params.initializationOptions;
13
- if (!options.typescript?.tsdk) {
14
- throw new Error('typescript.tsdk is required');
15
- }
16
- if (!options.typescript?.tsserverRequestCommand) {
17
- connection.console.warn('typescript.tsserverRequestCommand is required since >= 3.0 for complete TS features');
18
- }
19
- const { typescript: ts } = (0, node_1.loadTsdkByPath)(options.typescript.tsdk, params.locale);
20
13
  const tsconfigProjects = (0, language_service_1.createUriMap)();
21
14
  const file2ProjectInfo = new Map();
22
15
  server.fileWatcher.onDidChangeWatchedFiles(({ changes }) => {
@@ -30,10 +23,16 @@ connection.onInitialize(params => {
30
23
  }
31
24
  });
32
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
+ });
33
32
  return server.initialize(params, {
34
33
  setup() { },
35
34
  async getLanguageService(uri) {
36
- if (uri.scheme === 'file' && options.typescript.tsserverRequestCommand) {
35
+ if (uri.scheme === 'file') {
37
36
  const fileName = uri.fsPath.replace(/\\/g, '/');
38
37
  let projectInfoPromise = file2ProjectInfo.get(fileName);
39
38
  if (!projectInfoPromise) {
@@ -63,16 +62,16 @@ connection.onInitialize(params => {
63
62
  ].filter(promise => !!promise));
64
63
  },
65
64
  reload() {
66
- for (const ls of [
67
- ...tsconfigProjects.values(),
68
- simpleLs,
69
- ]) {
70
- ls?.dispose();
65
+ for (const ls of tsconfigProjects.values()) {
66
+ ls.dispose();
71
67
  }
72
68
  tsconfigProjects.clear();
73
- simpleLs = undefined;
69
+ if (simpleLs) {
70
+ simpleLs.dispose();
71
+ simpleLs = undefined;
72
+ }
74
73
  },
75
- }, (0, language_service_1.getHybridModeLanguageServicePlugins)(ts, options.typescript.tsserverRequestCommand ? {
74
+ }, (0, language_service_1.getHybridModeLanguageServicePlugins)(ts, {
76
75
  collectExtractProps(...args) {
77
76
  return sendTsRequest('vue:collectExtractProps', args);
78
77
  },
@@ -100,12 +99,29 @@ connection.onInitialize(params => {
100
99
  getPropertiesAtLocation(...args) {
101
100
  return sendTsRequest('vue:getPropertiesAtLocation', args);
102
101
  },
103
- getQuickInfoAtPosition(...args) {
104
- return sendTsRequest('vue:getQuickInfoAtPosition', args);
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 ?? []);
105
117
  },
106
- } : undefined));
107
- function sendTsRequest(command, args) {
108
- return connection.sendRequest(options.typescript.tsserverRequestCommand, [command, args]);
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
+ });
109
125
  }
110
126
  function createLs(server, tsconfig) {
111
127
  const commonLine = tsconfig
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vue/language-server",
3
- "version": "3.0.0-alpha.0",
3
+ "version": "3.0.0-alpha.10",
4
4
  "license": "MIT",
5
5
  "files": [
6
6
  "**/*.js",
@@ -16,15 +16,20 @@
16
16
  "directory": "packages/language-server"
17
17
  },
18
18
  "dependencies": {
19
- "@typescript/server-harness": "latest",
20
- "@volar/language-core": "~2.4.11",
21
- "@volar/language-server": "~2.4.11",
22
- "@volar/test-utils": "~2.4.11",
23
- "@vue/language-core": "3.0.0-alpha.0",
24
- "@vue/language-service": "3.0.0-alpha.0",
25
- "@vue/typescript-plugin": "3.0.0-alpha.0",
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",
26
25
  "vscode-languageserver-protocol": "^3.17.5",
27
26
  "vscode-uri": "^3.0.8"
28
27
  },
29
- "gitHead": "4b49cbe09097e482def4603b90f6c3b93bb2e913"
28
+ "peerDependencies": {
29
+ "typescript": "*"
30
+ },
31
+ "devDependencies": {
32
+ "@typescript/server-harness": "latest"
33
+ },
34
+ "gitHead": "28308b4f76cc80c7632f39ae7e0944f1889661a2"
30
35
  }