@vue/language-server 2.0.22 → 2.0.23-alpha.1

package/index.d.ts

@@ -1,5 +1,6 @@
-export * from './lib/protocol';
+export { commands } from '@vue/language-service';
 export * from './lib/types';
-export * from '@volar/language-server/protocol';
+export * from './lib/initialize';
 export * from '@volar/language-server/lib/types';
+export * from '@volar/language-server/protocol';
 export * from '@vue/language-service/lib/types';

package/index.js

@@ -14,11 +14,14 @@ 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("./lib/protocol"), exports);
+exports.commands = void 0;
+var language_service_1 = require("@vue/language-service");
+Object.defineProperty(exports, "commands", { enumerable: true, get: function () { return language_service_1.commands; } });
 __exportStar(require("./lib/types"), exports);
+__exportStar(require("./lib/initialize"), exports);
 // export protocol and types of parent package
-__exportStar(require("@volar/language-server/protocol"), exports);
 __exportStar(require("@volar/language-server/lib/types"), exports);
+__exportStar(require("@volar/language-server/protocol"), exports);
 // only export types of depend packages
 __exportStar(require("@vue/language-service/lib/types"), exports);
 //# sourceMappingURL=index.js.map

package/lib/hybridModeProject.d.ts

@@ -1,16 +1,9 @@
-import type { LanguagePlugin, LanguageServerProject, ProviderResult } from '@volar/language-server';
-import { Disposable, LanguageServiceEnvironment } from '@vue/language-service';
-import { TypeScriptProjectHost } from '@vue/typescript-plugin/lib/utils';
-import type * as ts from 'typescript';
+import type { Language, LanguagePlugin, LanguageServerProject, ProviderResult } from '@volar/language-server';
 import { URI } from 'vscode-uri';
-export type GetLanguagePlugin<T> = (params: {
-    serviceEnv: LanguageServiceEnvironment;
-    asFileName: (scriptId: T) => string;
+export declare function createHybridModeProject(create: (params: {
     configFileName?: string;
-    projectHost?: TypeScriptProjectHost;
-    sys?: ts.System & {
-        version: number;
-        sync(): Promise<number>;
-    } & Disposable;
-}) => ProviderResult<LanguagePlugin<URI>[]>;
-export declare function createHybridModeProject(sys: ts.System, getLanguagePlugins: GetLanguagePlugin<URI>): LanguageServerProject;
+    asFileName: (scriptId: URI) => string;
+}) => ProviderResult<{
+    languagePlugins: LanguagePlugin<URI>[];
+    setup?(language: Language): void;
+}>): LanguageServerProject;

package/lib/hybridModeProject.js

@@ -6,12 +6,11 @@ const language_core_1 = require("@vue/language-core");
 const language_service_1 = require("@vue/language-service");
 const utils_1 = require("@vue/typescript-plugin/lib/utils");
 const vscode_uri_1 = require("vscode-uri");
-function createHybridModeProject(sys, getLanguagePlugins) {
+function createHybridModeProject(create) {
     let initialized = false;
     let simpleLs;
-    let serviceEnv;
     let server;
-    const tsconfigProjects = (0, language_service_1.createUriMap)(sys.useCaseSensitiveFileNames);
+    const tsconfigProjects = (0, language_service_1.createUriMap)();
     return {
         setup(_server) {
             server = _server;
@@ -28,30 +27,23 @@ function createHybridModeProject(sys, getLanguagePlugins) {
                 const tsconfigUri = vscode_uri_1.URI.file(tsconfig);
                 if (!tsconfigProjects.has(tsconfigUri)) {
                     tsconfigProjects.set(tsconfigUri, (async () => {
-                        serviceEnv ??= (0, simpleProject_1.createLanguageServiceEnvironment)(server, [...server.workspaceFolders.keys()]);
-                        const languagePlugins = await getLanguagePlugins({
-                            serviceEnv,
+                        const { languagePlugins, setup } = await create({
                             configFileName: tsconfig,
-                            sys: {
-                                ...sys,
-                                version: 0,
-                                async sync() {
-                                    return await 0;
-                                },
-                                dispose() { },
-                            },
                             asFileName,
                         });
-                        return createLs(server, serviceEnv, languagePlugins);
+                        const languageService = createLs(server, languagePlugins);
+                        setup?.(languageService.context.language);
+                        return languageService;
                     })());
                 }
                 return await tsconfigProjects.get(tsconfigUri);
             }
             else {
                 simpleLs ??= (async () => {
-                    serviceEnv ??= (0, simpleProject_1.createLanguageServiceEnvironment)(server, [...server.workspaceFolders.keys()]);
-                    const languagePlugins = await getLanguagePlugins({ serviceEnv, asFileName });
-                    return createLs(server, serviceEnv, languagePlugins);
+                    const { languagePlugins, setup } = await create({ asFileName });
+                    const languageService = createLs(server, languagePlugins);
+                    setup?.(languageService.context.language);
+                    return languageService;
                 })();
                 return await simpleLs;
             }
@@ -88,7 +80,7 @@ function createHybridModeProject(sys, getLanguagePlugins) {
             }
         });
     }
-    function createLs(server, serviceEnv, languagePlugins) {
+    function createLs(server, languagePlugins) {
         const language = (0, language_core_1.createLanguage)([
             { getLanguageId: uri => server.documents.get(server.getSyncedDocumentKey(uri) ?? uri.toString())?.languageId },
             ...languagePlugins,
@@ -102,7 +94,7 @@ function createHybridModeProject(sys, getLanguagePlugins) {
                 language.scripts.delete(uri);
             }
         });
-        return (0, language_service_1.createLanguageService)(language, server.languageServicePlugins, serviceEnv);
+        return (0, language_service_1.createLanguageService)(language, server.languageServicePlugins, (0, simpleProject_1.createLanguageServiceEnvironment)(server, [...server.workspaceFolders.keys()]));
     }
 }
 //# sourceMappingURL=hybridModeProject.js.map

package/lib/initialize.d.ts

@@ -0,0 +1,4 @@
+import { LanguageServer } from '@volar/language-server';
+import { InitializeParams } from '@vue/language-service';
+import type * as ts from 'typescript';
+export declare function initialize(server: LanguageServer, params: InitializeParams, ts: typeof import('typescript'), tsLocalized: ts.MapLike<string> | undefined): import("@volar/language-server").VolarInitializeResult;

package/lib/initialize.js

@@ -0,0 +1,62 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initialize = initialize;
+const node_1 = require("@volar/language-server/node");
+const language_core_1 = require("@vue/language-core");
+const language_service_1 = require("@vue/language-service");
+function initialize(server, params, ts, tsLocalized) {
+    const watchingExtensions = new Set();
+    let fileWatcher;
+    return server.initialize(params, (0, node_1.createTypeScriptProject)(ts, tsLocalized, async ({ configFileName, sys, projectHost, asFileName }) => {
+        let compilerOptions;
+        let vueCompilerOptions;
+        if (configFileName) {
+            let commandLine = (0, language_core_1.createParsedCommandLine)(ts, sys, configFileName);
+            let sysVersion = sys.version;
+            let newSysVersion = await sys.sync();
+            while (sysVersion !== newSysVersion) {
+                commandLine = (0, language_core_1.createParsedCommandLine)(ts, sys, configFileName);
+                sysVersion = newSysVersion;
+                newSysVersion = await sys.sync();
+            }
+            compilerOptions = commandLine.options;
+            vueCompilerOptions = commandLine.vueOptions;
+        }
+        else {
+            compilerOptions = ts.getDefaultCompilerOptions();
+            vueCompilerOptions = (0, language_core_1.resolveVueCompilerOptions)({});
+        }
+        updateFileWatcher(vueCompilerOptions);
+        return {
+            languagePlugins: [(0, language_core_1.createVueLanguagePlugin)(ts, asFileName, () => projectHost?.getProjectVersion?.() ?? '', fileName => {
+                    const fileMap = new language_core_1.FileMap(sys?.useCaseSensitiveFileNames ?? false);
+                    for (const vueFileName of projectHost?.getScriptFileNames() ?? []) {
+                        fileMap.set(vueFileName, undefined);
+                    }
+                    return fileMap.has(fileName);
+                }, compilerOptions, vueCompilerOptions)],
+            setup(language) {
+                language.vue = {
+                    compilerOptions: vueCompilerOptions,
+                };
+            },
+        };
+    }), (0, language_service_1.getFullLanguageServicePlugins)(ts));
+    function updateFileWatcher(vueCompilerOptions) {
+        const extensions = [
+            'js', 'cjs', 'mjs', 'ts', 'cts', 'mts', 'jsx', 'tsx', 'json',
+            ...vueCompilerOptions.extensions.map(ext => ext.slice(1)),
+            ...vueCompilerOptions.vitePressExtensions.map(ext => ext.slice(1)),
+            ...vueCompilerOptions.petiteVueExtensions.map(ext => ext.slice(1)),
+        ];
+        const newExtensions = extensions.filter(ext => !watchingExtensions.has(ext));
+        if (newExtensions.length) {
+            for (const ext of newExtensions) {
+                watchingExtensions.add(ext);
+            }
+            fileWatcher?.then(dispose => dispose.dispose());
+            fileWatcher = server.watchFiles(['**/*.{' + [...watchingExtensions].join(',') + '}']);
+        }
+    }
+}
+//# sourceMappingURL=initialize.js.map

package/node.d.ts

@@ -1,32 +1 @@
-import type { Connection } from '@volar/language-server';
-import { URI } from 'vscode-uri';
-import { GetLanguagePlugin } from './lib/hybridModeProject';
-export declare const connection: Connection;
-export declare const server: {
-    connection: Connection;
-    fs: import("@volar/language-server").FileSystem;
-    initializeParams: import("@volar/language-server").InitializeParams;
-    initializeResult: import("@volar/language-server").VolarInitializeResult;
-    languageServicePlugins: import("@volar/language-server").LanguageServicePlugin[];
-    project: import("@volar/language-server").LanguageServerProject;
-    pullModelDiagnostics: boolean;
-    documents: import("@volar/language-server").TextDocuments<import("@volar/language-server/node").SnapshotDocument>;
-    workspaceFolders: Map<import("vscode-uri").URI, boolean>;
-    getSyncedDocumentKey: (uri: import("vscode-uri").URI) => string | undefined;
-    initialize: (initializeParams: import("@volar/language-server").InitializeParams, project: import("@volar/language-server").LanguageServerProject, languageServicePlugins: import("@volar/language-server").LanguageServicePlugin[], options?: {
-        pullModelDiagnostics?: boolean;
-    }) => import("@volar/language-server").VolarInitializeResult;
-    initialized: () => void;
-    shutdown: () => void;
-    watchFiles: (patterns: string[]) => void;
-    getConfiguration: <T>(section: string, scopeUri?: string) => Promise<T | undefined>;
-    onDidChangeConfiguration: (cb: import("@volar/language-server").NotificationHandler<import("@volar/language-server").DidChangeConfigurationParams>) => {
-        dispose(): void;
-    };
-    onDidChangeWatchedFiles: (cb: import("@volar/language-server").NotificationHandler<import("@volar/language-server").DidChangeWatchedFilesParams>) => {
-        dispose: () => void;
-    };
-    clearPushDiagnostics: () => void;
-    refresh: (projects: import("@volar/language-server").LanguageServerProject) => Promise<void>;
-};
-export declare const getLanguagePlugins: GetLanguagePlugin<URI>;
+export {};

package/node.js

@@ -1,127 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLanguagePlugins = exports.server = exports.connection = void 0;
 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 tsPluginClient = require("@vue/typescript-plugin/lib/client");
-const utils_1 = require("@vue/typescript-plugin/lib/utils");
-const vscode_uri_1 = require("vscode-uri");
+const namedPipeClient = require("@vue/typescript-plugin/lib/client");
 const hybridModeProject_1 = require("./lib/hybridModeProject");
-const protocol_1 = require("./lib/protocol");
-let tsdk;
-let hybridMode;
-let getTsPluginClient;
-const envToVueOptions = new WeakMap();
-const watchedExtensions = new Set();
-exports.connection = (0, node_1.createConnection)();
-exports.server = (0, node_1.createServer)(exports.connection);
-const getLanguagePlugins = async ({ serviceEnv, configFileName, projectHost, sys, asFileName }) => {
-    const commandLine = await parseCommandLine();
-    const vueOptions = commandLine?.vueOptions ?? (0, language_core_1.resolveVueCompilerOptions)({});
-    const vueLanguagePlugin = (0, language_core_1.createVueLanguagePlugin)(tsdk.typescript, asFileName, () => projectHost?.getProjectVersion?.() ?? '', fileName => {
-        const fileMap = new language_core_1.FileMap(sys?.useCaseSensitiveFileNames ?? false);
-        for (const vueFileName of projectHost?.getScriptFileNames() ?? []) {
-            fileMap.set(vueFileName, undefined);
-        }
-        return fileMap.has(fileName);
-    }, commandLine?.options ?? {}, vueOptions);
-    if (!hybridMode) {
-        const extensions = [
-            'js', 'cjs', 'mjs', 'ts', 'cts', 'mts', 'jsx', 'tsx', 'json',
-            ...vueOptions.extensions.map(ext => ext.slice(1)),
-            ...vueOptions.vitePressExtensions.map(ext => ext.slice(1)),
-            ...vueOptions.petiteVueExtensions.map(ext => ext.slice(1)),
-        ];
-        const newExtensions = extensions.filter(ext => !watchedExtensions.has(ext));
-        if (newExtensions.length) {
-            for (const ext of newExtensions) {
-                watchedExtensions.add(ext);
-            }
-            exports.server.watchFiles(['**/*.{' + newExtensions.join(',') + '}']);
-        }
-    }
-    envToVueOptions.set(serviceEnv, vueOptions);
-    return [vueLanguagePlugin];
-    async function parseCommandLine() {
-        let commandLine;
-        let sysVersion;
-        if (sys) {
-            let newSysVersion = await sys.sync();
-            while (sysVersion !== newSysVersion) {
-                sysVersion = newSysVersion;
-                if (configFileName) {
-                    commandLine = (0, language_core_1.createParsedCommandLine)(tsdk.typescript, sys, configFileName);
-                }
-                newSysVersion = await sys.sync();
-            }
-        }
-        return commandLine;
-    }
-};
-exports.getLanguagePlugins = getLanguagePlugins;
-exports.connection.listen();
-exports.connection.onInitialize(params => {
+const initialize_1 = require("./lib/initialize");
+const connection = (0, node_1.createConnection)();
+const server = (0, node_1.createServer)(connection);
+connection.listen();
+connection.onInitialize(params => {
     const options = params.initializationOptions;
-    hybridMode = options.vue?.hybridMode ?? true;
-    tsdk = (0, node_1.loadTsdkByPath)(options.typescript.tsdk, params.locale);
+    const { typescript: ts, diagnosticMessages } = (0, node_1.loadTsdkByPath)(options.typescript.tsdk, params.locale);
+    const hybridMode = options.vue?.hybridMode ?? true;
     if (hybridMode) {
-        getTsPluginClient = () => tsPluginClient;
+        return server.initialize(params, (0, hybridModeProject_1.createHybridModeProject)(({ asFileName, configFileName }) => {
+            const commandLine = configFileName
+                ? (0, language_core_1.createParsedCommandLine)(ts, ts.sys, configFileName)
+                : {
+                    vueOptions: (0, language_core_1.resolveVueCompilerOptions)({}),
+                    options: ts.getDefaultCompilerOptions(),
+                };
+            return {
+                languagePlugins: [(0, language_core_1.createVueLanguagePlugin)(ts, asFileName, () => '', () => false, commandLine.options, commandLine.vueOptions)],
+                setup(language) {
+                    language.vue = {
+                        compilerOptions: commandLine.vueOptions,
+                    };
+                },
+            };
+        }), (0, language_service_1.getHybridModeLanguageServicePlugins)(ts, namedPipeClient), { pullModelDiagnostics: true });
     }
     else {
-        getTsPluginClient = (0, language_service_1.createDefaultGetTsPluginClient)(tsdk.typescript);
-    }
-    const result = exports.server.initialize(params, hybridMode
-        ? (0, hybridModeProject_1.createHybridModeProject)(tsdk.typescript.sys, exports.getLanguagePlugins)
-        : (0, node_1.createTypeScriptProject)(tsdk.typescript, tsdk.diagnosticMessages, (env, ctx) => (0, exports.getLanguagePlugins)({
-            serviceEnv: env,
-            configFileName: ctx.configFileName,
-            projectHost: ctx.projectHost,
-            sys: ctx.sys,
-            asFileName: ctx.asFileName,
-        })), (0, language_service_1.getVueLanguageServicePlugins)(tsdk.typescript, env => envToVueOptions.get(env), getTsPluginClient, hybridMode), {
-        pullModelDiagnostics: hybridMode,
-    });
-    if (hybridMode) {
-        // provided by tsserver + @vue/typescript-plugin
-        result.capabilities.semanticTokensProvider = undefined;
-    }
-    return result;
-});
-exports.connection.onInitialized(() => {
-    exports.server.initialized();
-});
-exports.connection.onShutdown(() => {
-    exports.server.shutdown();
-});
-exports.connection.onRequest(protocol_1.ParseSFCRequest.type, params => {
-    return (0, language_core_1.parse)(params);
-});
-exports.connection.onRequest(protocol_1.DetectNameCasingRequest.type, async (params) => {
-    const uri = vscode_uri_1.URI.parse(params.textDocument.uri);
-    const languageService = await exports.server.project.getLanguageService(uri);
-    if (languageService) {
-        return await (0, language_service_1.detect)(languageService.context, uri);
-    }
-});
-exports.connection.onRequest(protocol_1.GetConvertTagCasingEditsRequest.type, async (params) => {
-    const uri = vscode_uri_1.URI.parse(params.textDocument.uri);
-    const languageService = await exports.server.project.getLanguageService(uri);
-    if (languageService) {
-        return await (0, language_service_1.convertTagName)(languageService.context, uri, params.casing, getTsPluginClient(languageService.context));
-    }
-});
-exports.connection.onRequest(protocol_1.GetConvertAttrCasingEditsRequest.type, async (params) => {
-    const uri = vscode_uri_1.URI.parse(params.textDocument.uri);
-    const languageService = await exports.server.project.getLanguageService(uri);
-    if (languageService) {
-        return await (0, language_service_1.convertAttrName)(languageService.context, uri, params.casing, getTsPluginClient(languageService.context));
-    }
-});
-exports.connection.onRequest(protocol_1.GetConnectedNamedPipeServerRequest.type, async (fileName) => {
-    const server = (await (0, utils_1.searchNamedPipeServerForFile)(fileName))?.server;
-    if (server) {
-        return server;
+        return (0, initialize_1.initialize)(server, params, ts, diagnosticMessages);
     }
 });
+connection.onInitialized(server.initialized);
+connection.onShutdown(server.shutdown);
 //# sourceMappingURL=node.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-server",
-	"version": "2.0.22",
+	"version": "2.0.23-alpha.1",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -15,13 +15,13 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.3.1",
-		"@volar/language-server": "~2.3.1",
-		"@vue/language-core": "2.0.22",
-		"@vue/language-service": "2.0.22",
-		"@vue/typescript-plugin": "2.0.22",
+		"@volar/language-core": "~2.4.0-alpha.0",
+		"@volar/language-server": "~2.4.0-alpha.0",
+		"@vue/language-core": "2.0.23-alpha.1",
+		"@vue/language-service": "2.0.23-alpha.1",
+		"@vue/typescript-plugin": "2.0.23-alpha.1",
 		"vscode-languageserver-protocol": "^3.17.5",
 		"vscode-uri": "^3.0.8"
 	},
-	"gitHead": "884c8a553d4fd240167fcb97c6a738564f9d697a"
+	"gitHead": "70cb34e9d58afd603d50cb5b870116b189f4662b"
 }

package/lib/protocol.d.ts

@@ -1,46 +0,0 @@
-import type { AttrNameCasing, SFCParseResult, TagNameCasing } from '@vue/language-service';
-import * as vscode from 'vscode-languageserver-protocol';
-export declare namespace DetectNameCasingRequest {
-    type ParamsType = {
-        textDocument: vscode.TextDocumentIdentifier;
-    };
-    type ResponseType = {
-        tag: TagNameCasing[];
-        attr: AttrNameCasing[];
-    } | null | undefined;
-    type ErrorType = never;
-    const type: vscode.RequestType<ParamsType, ResponseType, never>;
-}
-export declare namespace GetConvertTagCasingEditsRequest {
-    type ParamsType = {
-        textDocument: vscode.TextDocumentIdentifier;
-        casing: TagNameCasing;
-    };
-    type ResponseType = vscode.TextEdit[] | null | undefined;
-    type ErrorType = never;
-    const type: vscode.RequestType<ParamsType, ResponseType, never>;
-}
-export declare namespace GetConvertAttrCasingEditsRequest {
-    type ParamsType = {
-        textDocument: vscode.TextDocumentIdentifier;
-        casing: AttrNameCasing;
-    };
-    type ResponseType = vscode.TextEdit[] | null | undefined;
-    type ErrorType = never;
-    const type: vscode.RequestType<ParamsType, ResponseType, never>;
-}
-export declare namespace ParseSFCRequest {
-    type ParamsType = string;
-    type ResponseType = SFCParseResult;
-    type ErrorType = never;
-    const type: vscode.RequestType<string, SFCParseResult, never>;
-}
-export declare namespace GetConnectedNamedPipeServerRequest {
-    type ParamsType = string;
-    type ResponseType = {
-        path: string;
-        serverKind: number;
-    } | undefined;
-    type ErrorType = never;
-    const type: vscode.RequestType<string, ResponseType, never>;
-}

package/lib/protocol.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.GetConnectedNamedPipeServerRequest = exports.ParseSFCRequest = exports.GetConvertAttrCasingEditsRequest = exports.GetConvertTagCasingEditsRequest = exports.DetectNameCasingRequest = void 0;
-const vscode = require("vscode-languageserver-protocol");
-var DetectNameCasingRequest;
-(function (DetectNameCasingRequest) {
-    DetectNameCasingRequest.type = new vscode.RequestType('vue/detectTagCasing');
-})(DetectNameCasingRequest || (exports.DetectNameCasingRequest = DetectNameCasingRequest = {}));
-var GetConvertTagCasingEditsRequest;
-(function (GetConvertTagCasingEditsRequest) {
-    GetConvertTagCasingEditsRequest.type = new vscode.RequestType('vue/convertTagNameCasing');
-})(GetConvertTagCasingEditsRequest || (exports.GetConvertTagCasingEditsRequest = GetConvertTagCasingEditsRequest = {}));
-var GetConvertAttrCasingEditsRequest;
-(function (GetConvertAttrCasingEditsRequest) {
-    GetConvertAttrCasingEditsRequest.type = new vscode.RequestType('vue/convertPropNameCasing');
-})(GetConvertAttrCasingEditsRequest || (exports.GetConvertAttrCasingEditsRequest = GetConvertAttrCasingEditsRequest = {}));
-var ParseSFCRequest;
-(function (ParseSFCRequest) {
-    ParseSFCRequest.type = new vscode.RequestType('vue/parseSfc');
-})(ParseSFCRequest || (exports.ParseSFCRequest = ParseSFCRequest = {}));
-var GetConnectedNamedPipeServerRequest;
-(function (GetConnectedNamedPipeServerRequest) {
-    GetConnectedNamedPipeServerRequest.type = new vscode.RequestType('vue/namedPipeServer');
-})(GetConnectedNamedPipeServerRequest || (exports.GetConnectedNamedPipeServerRequest = GetConnectedNamedPipeServerRequest = {}));
-//# sourceMappingURL=protocol.js.map