@vue/language-server 1.9.0-alpha.3 → 2.0.1

package/bin/vue-language-server.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
-if (process.argv.includes("--version")) {
-	const pkgJSON = require("../package.json");
-	console.log(`${pkgJSON["version"]}`);
+// @ts-check
+if (process.argv.includes('--version')) {
+	console.log(require('../package.json').version);
 }
 else {
-	require("../out/nodeServer.js");
+	require('../node.js');
 }

package/index.d.ts

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

package/{out/index.js → index.js}

@@ -14,11 +14,11 @@ 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("./protocol"), exports);
-__exportStar(require("./types"), exports);
+__exportStar(require("./lib/protocol"), exports);
+__exportStar(require("./lib/types"), exports);
 // export protocol and types of parent package
 __exportStar(require("@volar/language-server/protocol"), exports);
 __exportStar(require("@volar/language-server/lib/types"), exports);
 // only export types of depend packages
-__exportStar(require("@vue/language-service/out/types"), exports);
+__exportStar(require("@vue/language-service/lib/types"), exports);
 //# sourceMappingURL=index.js.map

package/{out → lib}/protocol.d.ts

@@ -1,12 +1,5 @@
+import type { AttrNameCasing, SFCParseResult, TagNameCasing } from '@vue/language-service';
 import * as vscode from 'vscode-languageserver-protocol';
-import { TagNameCasing, AttrNameCasing, SFCParseResult } from '@vue/language-service';
-import { ComponentMeta } from 'vue-component-meta';
-export declare namespace GetComponentMeta {
-    type ParamsType = vscode.TextDocumentIdentifier;
-    type ResponseType = ComponentMeta | null | undefined;
-    type ErrorType = never;
-    const type: vscode.RequestType<vscode.TextDocumentIdentifier, ResponseType, never>;
-}
 export declare namespace DetectNameCasingRequest {
     type ParamsType = {
         textDocument: vscode.TextDocumentIdentifier;
@@ -27,20 +20,6 @@ export declare namespace GetConvertTagCasingEditsRequest {
     type ErrorType = never;
     const type: vscode.RequestType<ParamsType, ResponseType, never>;
 }
-export declare namespace GetDragAndDragImportEditsRequest {
-    type ParamsType = {
-        uri: string;
-        importUri: string;
-        casing: TagNameCasing;
-    };
-    type ResponseType = {
-        insertText: string;
-        insertTextFormat: vscode.InsertTextFormat;
-        additionalEdits: vscode.TextEdit[];
-    } | null | undefined;
-    type ErrorType = never;
-    const type: vscode.RequestType<ParamsType, ResponseType, never>;
-}
 export declare namespace GetConvertAttrCasingEditsRequest {
     type ParamsType = {
         textDocument: vscode.TextDocumentIdentifier;
@@ -56,4 +35,3 @@ export declare namespace ParseSFCRequest {
     type ErrorType = never;
     const type: vscode.RequestType<string, SFCParseResult, never>;
 }
-//# sourceMappingURL=protocol.d.ts.map

package/{out → lib}/protocol.js

@@ -1,11 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ParseSFCRequest = exports.GetConvertAttrCasingEditsRequest = exports.GetDragAndDragImportEditsRequest = exports.GetConvertTagCasingEditsRequest = exports.DetectNameCasingRequest = exports.GetComponentMeta = void 0;
+exports.ParseSFCRequest = exports.GetConvertAttrCasingEditsRequest = exports.GetConvertTagCasingEditsRequest = exports.DetectNameCasingRequest = void 0;
 const vscode = require("vscode-languageserver-protocol");
-var GetComponentMeta;
-(function (GetComponentMeta) {
-    GetComponentMeta.type = new vscode.RequestType('vue/componentMeta');
-})(GetComponentMeta || (exports.GetComponentMeta = GetComponentMeta = {}));
 var DetectNameCasingRequest;
 (function (DetectNameCasingRequest) {
     DetectNameCasingRequest.type = new vscode.RequestType('vue/detectTagCasing');
@@ -14,10 +10,6 @@ var GetConvertTagCasingEditsRequest;
 (function (GetConvertTagCasingEditsRequest) {
     GetConvertTagCasingEditsRequest.type = new vscode.RequestType('vue/convertTagNameCasing');
 })(GetConvertTagCasingEditsRequest || (exports.GetConvertTagCasingEditsRequest = GetConvertTagCasingEditsRequest = {}));
-var GetDragAndDragImportEditsRequest;
-(function (GetDragAndDragImportEditsRequest) {
-    GetDragAndDragImportEditsRequest.type = new vscode.RequestType('vue/dragImportEdits');
-})(GetDragAndDragImportEditsRequest || (exports.GetDragAndDragImportEditsRequest = GetDragAndDragImportEditsRequest = {}));
 var GetConvertAttrCasingEditsRequest;
 (function (GetConvertAttrCasingEditsRequest) {
     GetConvertAttrCasingEditsRequest.type = new vscode.RequestType('vue/convertPropNameCasing');

package/lib/types.d.ts

@@ -0,0 +1,12 @@
+import type { InitializationOptions } from "@volar/language-server";
+export type VueInitializationOptions = InitializationOptions & {
+    typescript: {
+        tsdk: string;
+    };
+    vue?: {
+        /**
+         * @example ['vue1', 'vue2']
+         */
+        additionalExtensions?: string[];
+    };
+};

package/node.d.ts

@@ -0,0 +1,11 @@
+import type { Connection } from '@volar/language-server';
+export declare const connection: Connection;
+export declare const server: {
+    initialize: (params: Omit<import("@volar/language-server").InitializeParams, "initializationOptions"> & {
+        initializationOptions?: import("@volar/language-server").InitializationOptions | undefined;
+    }, projectProviderFactory: import("@volar/language-server").ServerProjectProviderFactory, _serverOptions: import("@volar/language-server/lib/server").ServerOptions) => Promise<import("@volar/language-server").InitializeResult<any>>;
+    initialized: () => void;
+    shutdown: () => void;
+    readonly projects: import("@volar/language-server").ServerProjectProvider;
+    readonly env: import("@volar/language-server").ServerRuntimeEnvironment;
+};

package/node.js

@@ -0,0 +1,94 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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 protocol_1 = require("./lib/protocol");
+exports.connection = (0, node_1.createConnection)();
+exports.server = (0, node_1.createServer)(exports.connection);
+const envToVueOptions = new WeakMap();
+let tsdk;
+exports.connection.listen();
+exports.connection.onInitialize(async (params) => {
+    const options = params.initializationOptions;
+    tsdk = (0, node_1.loadTsdkByPath)(options.typescript.tsdk, params.locale);
+    const vueFileExtensions = ['vue'];
+    if (options.vue?.additionalExtensions) {
+        for (const additionalExtension of options.vue.additionalExtensions) {
+            vueFileExtensions.push(additionalExtension);
+        }
+    }
+    const result = await exports.server.initialize(params, (0, node_1.createSimpleProjectProviderFactory)(), {
+        watchFileExtensions: ['js', 'cjs', 'mjs', 'ts', 'cts', 'mts', 'jsx', 'tsx', 'json', ...vueFileExtensions],
+        getServicePlugins() {
+            return (0, language_service_1.createVueServicePlugins)(tsdk.typescript, env => envToVueOptions.get(env));
+        },
+        async getLanguagePlugins(serviceEnv, projectContext) {
+            const [commandLine, vueOptions] = await parseCommandLine();
+            const resolvedVueOptions = (0, language_core_1.resolveVueCompilerOptions)(vueOptions);
+            const vueLanguagePlugin = (0, language_core_1.createVueLanguagePlugin)(tsdk.typescript, serviceEnv.typescript.uriToFileName, commandLine?.options ?? {}, resolvedVueOptions, options.codegenStack);
+            envToVueOptions.set(serviceEnv, resolvedVueOptions);
+            return [vueLanguagePlugin];
+            async function parseCommandLine() {
+                let commandLine;
+                let vueOptions = {};
+                if (projectContext.typescript) {
+                    const { sys } = projectContext.typescript;
+                    let sysVersion;
+                    let newSysVersion = await sys.sync();
+                    while (sysVersion !== newSysVersion) {
+                        sysVersion = newSysVersion;
+                        if (projectContext.typescript.configFileName) {
+                            commandLine = (0, language_core_1.createParsedCommandLine)(tsdk.typescript, sys, projectContext.typescript.configFileName);
+                        }
+                        newSysVersion = await sys.sync();
+                    }
+                }
+                if (commandLine) {
+                    vueOptions = commandLine.vueOptions;
+                }
+                vueOptions.extensions = [
+                    ...vueOptions.extensions ?? ['.vue'],
+                    ...vueFileExtensions.map(ext => '.' + ext),
+                ];
+                vueOptions.extensions = [...new Set(vueOptions.extensions)];
+                return [commandLine, vueOptions];
+            }
+        },
+    });
+    // handle 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 languageService = await getService(params.textDocument.uri);
+    if (languageService) {
+        return await (0, language_service_1.detect)(languageService.context, params.textDocument.uri);
+    }
+});
+exports.connection.onRequest(protocol_1.GetConvertTagCasingEditsRequest.type, async (params) => {
+    const languageService = await getService(params.textDocument.uri);
+    if (languageService) {
+        return await (0, language_service_1.convertTagName)(languageService.context, params.textDocument.uri, params.casing);
+    }
+});
+exports.connection.onRequest(protocol_1.GetConvertAttrCasingEditsRequest.type, async (params) => {
+    const languageService = await getService(params.textDocument.uri);
+    if (languageService) {
+        return await (0, language_service_1.convertAttrName)(languageService.context, params.textDocument.uri, params.casing);
+    }
+});
+async function getService(uri) {
+    return (await exports.server.projects.getProject(uri)).getLanguageService();
+}
+//# sourceMappingURL=node.js.map

package/package.json

@@ -1,11 +1,10 @@
 {
 	"name": "@vue/language-server",
-	"version": "1.9.0-alpha.3",
-	"main": "out/index.js",
+	"version": "2.0.1",
 	"license": "MIT",
 	"files": [
-		"out/**/*.js",
-		"out/**/*.d.ts"
+		"**/*.js",
+		"**/*.d.ts"
 	],
 	"bin": {
 		"vue-language-server": "./bin/vue-language-server.js"
@@ -16,13 +15,11 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "~1.11.0",
-		"@volar/language-server": "~1.11.0",
-		"@volar/typescript": "~1.11.0",
-		"@vue/language-core": "1.9.0-alpha.3",
-		"@vue/language-service": "1.9.0-alpha.3",
-		"vscode-languageserver-protocol": "^3.17.5",
-		"vue-component-meta": "1.9.0-alpha.3"
+		"@volar/language-core": "~2.1.0",
+		"@volar/language-server": "~2.1.0",
+		"@vue/language-core": "2.0.1",
+		"@vue/language-service": "2.0.1",
+		"vscode-languageserver-protocol": "^3.17.5"
 	},
-	"gitHead": "cf6564bc8c649151c2e72a93d0aa482d4a59a773"
+	"gitHead": "adedfd0983c910370d080e955702cca7d2275420"
 }

package/out/index.d.ts

@@ -1,6 +0,0 @@
-export * from './protocol';
-export * from './types';
-export * from '@volar/language-server/protocol';
-export * from '@volar/language-server/lib/types';
-export * from '@vue/language-service/out/types';
-//# sourceMappingURL=index.d.ts.map

package/out/languageServerPlugin.d.ts

@@ -1,3 +0,0 @@
-import { LanguageServerPlugin, Connection } from '@volar/language-server';
-export declare function createServerPlugin(connection: Connection): LanguageServerPlugin;
-//# sourceMappingURL=languageServerPlugin.d.ts.map

package/out/languageServerPlugin.js

@@ -1,109 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createServerPlugin = void 0;
-const vue = require("@vue/language-service");
-const vue2 = require("@vue/language-core");
-const nameCasing = require("@vue/language-service");
-const protocol_1 = require("./protocol");
-const componentMeta = require("vue-component-meta/out/base");
-const typescript_1 = require("@volar/typescript");
-function createServerPlugin(connection) {
-    const plugin = (initOptions, modules) => {
-        if (!modules.typescript) {
-            console.warn('No typescript found, vue-language-server will not work.');
-            return {};
-        }
-        const ts = modules.typescript;
-        const vueFileExtensions = ['vue'];
-        const hostToVueOptions = new WeakMap();
-        if (initOptions.additionalExtensions) {
-            for (const additionalExtension of initOptions.additionalExtensions) {
-                vueFileExtensions.push(additionalExtension);
-            }
-        }
-        return {
-            extraFileExtensions: vueFileExtensions.map(ext => ({ extension: ext, isMixedContent: true, scriptKind: ts.ScriptKind.Deferred })),
-            watchFileExtensions: ['js', 'cjs', 'mjs', 'ts', 'cts', 'mts', 'jsx', 'tsx', 'json', ...vueFileExtensions],
-            async resolveConfig(config, ctx) {
-                const vueOptions = await getVueCompilerOptions();
-                if (ctx) {
-                    hostToVueOptions.set(ctx.host, vue.resolveVueCompilerOptions(vueOptions));
-                }
-                return vue.resolveConfig(ts, config, ctx?.host.getCompilationSettings() ?? {}, vueOptions, initOptions.codegenStack);
-                async function getVueCompilerOptions() {
-                    const ts = modules.typescript;
-                    let vueOptions = {};
-                    if (ts && ctx) {
-                        const sys = (0, typescript_1.createSys)(ts, ctx.env);
-                        let sysVersion;
-                        let newSysVersion = await sys.sync();
-                        while (sysVersion !== newSysVersion) {
-                            sysVersion = newSysVersion;
-                            if (typeof ctx?.project.tsConfig === 'string' && ts) {
-                                vueOptions = vue2.createParsedCommandLine(ts, sys, ctx.project.tsConfig).vueOptions;
-                            }
-                            else if (typeof ctx?.project.tsConfig === 'object' && ts) {
-                                vueOptions = vue2.createParsedCommandLineByJson(ts, sys, ctx.host.rootPath, ctx.project.tsConfig).vueOptions;
-                            }
-                            newSysVersion = await sys.sync();
-                        }
-                    }
-                    vueOptions.extensions = [
-                        ...vueOptions.extensions ?? ['.vue'],
-                        ...vueFileExtensions.map(ext => '.' + ext),
-                    ];
-                    vueOptions.extensions = [...new Set(vueOptions.extensions)];
-                    return vueOptions;
-                }
-            },
-            onInitialized(getService, env) {
-                connection.onRequest(protocol_1.ParseSFCRequest.type, params => {
-                    return vue2.parse(params);
-                });
-                connection.onRequest(protocol_1.DetectNameCasingRequest.type, async (params) => {
-                    const languageService = await getService(params.textDocument.uri);
-                    if (languageService) {
-                        return nameCasing.detect(ts, languageService.context, params.textDocument.uri, hostToVueOptions.get(languageService.context.rawHost));
-                    }
-                });
-                connection.onRequest(protocol_1.GetConvertTagCasingEditsRequest.type, async (params) => {
-                    const languageService = await getService(params.textDocument.uri);
-                    if (languageService) {
-                        return nameCasing.convertTagName(ts, languageService.context, params.textDocument.uri, params.casing, hostToVueOptions.get(languageService.context.rawHost));
-                    }
-                });
-                connection.onRequest(protocol_1.GetDragAndDragImportEditsRequest.type, async (params) => {
-                    const languageService = await getService(params.uri);
-                    if (languageService) {
-                        return nameCasing.getDragImportEdits(ts, languageService.context, params.uri, params.importUri, params.casing);
-                    }
-                });
-                connection.onRequest(protocol_1.GetConvertAttrCasingEditsRequest.type, async (params) => {
-                    const languageService = await getService(params.textDocument.uri);
-                    if (languageService) {
-                        const vueOptions = hostToVueOptions.get(languageService.context.host);
-                        if (vueOptions) {
-                            return nameCasing.convertAttrName(ts, languageService.context, params.textDocument.uri, params.casing, hostToVueOptions.get(languageService.context.rawHost));
-                        }
-                    }
-                });
-                const checkers = new WeakMap();
-                connection.onRequest(protocol_1.GetComponentMeta.type, async (params) => {
-                    const languageService = await getService(params.uri);
-                    if (!languageService)
-                        return;
-                    const host = languageService.context.rawHost;
-                    let checker = checkers.get(host);
-                    if (!checker) {
-                        checker = componentMeta.baseCreate(ts, host, hostToVueOptions.get(host), {}, host.rootPath + '/tsconfig.json.global.vue');
-                        checkers.set(host, checker);
-                    }
-                    return checker.getComponentMeta(env.uriToFileName(params.uri));
-                });
-            },
-        };
-    };
-    return plugin;
-}
-exports.createServerPlugin = createServerPlugin;
-//# sourceMappingURL=languageServerPlugin.js.map

package/out/nodeServer.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=nodeServer.d.ts.map

package/out/nodeServer.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const node_1 = require("@volar/language-server/node");
-const languageServerPlugin_1 = require("./languageServerPlugin");
-const connection = (0, node_1.createConnection)();
-const plugin = (0, languageServerPlugin_1.createServerPlugin)(connection);
-(0, node_1.startLanguageServer)(connection, plugin);
-//# sourceMappingURL=nodeServer.js.map

package/out/types.d.ts

@@ -1,8 +0,0 @@
-import { InitializationOptions } from "@volar/language-server";
-export type VueServerInitializationOptions = InitializationOptions & {
-    /**
-     * @example ['vue1', 'vue2']
-     */
-    additionalExtensions?: string[];
-};
-//# sourceMappingURL=types.d.ts.map

package/out/webServer.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=webServer.d.ts.map

package/out/webServer.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const browser_1 = require("@volar/language-server/browser");
-const languageServerPlugin_1 = require("./languageServerPlugin");
-const connection = (0, browser_1.createConnection)();
-const plugin = (0, languageServerPlugin_1.createServerPlugin)(connection);
-(0, browser_1.startLanguageServer)(connection, plugin);
-//# sourceMappingURL=webServer.js.map