@vue/language-server 2.0.23-alpha.1 → 2.0.26-alpha.0

package/index.d.ts

@@ -1,6 +1,4 @@
-export { commands } from '@vue/language-service';
 export * from './lib/types';
 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,14 +14,10 @@ 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 });
-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
+// export types of parent package
 __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,9 +1,12 @@
-import type { Language, LanguagePlugin, LanguageServerProject, ProviderResult } from '@volar/language-server';
+import type { Language, LanguagePlugin, LanguageServerProject, ProjectContext, ProviderResult } from '@volar/language-server';
 import { URI } from 'vscode-uri';
 export declare function createHybridModeProject(create: (params: {
     configFileName?: string;
     asFileName: (scriptId: URI) => string;
 }) => ProviderResult<{
     languagePlugins: LanguagePlugin<URI>[];
-    setup?(language: Language): void;
+    setup?(options: {
+        language: Language;
+        project: ProjectContext;
+    }): void;
 }>): LanguageServerProject;

package/lib/hybridModeProject.js

@@ -26,25 +26,12 @@ function createHybridModeProject(create) {
                 const tsconfig = projectInfo.name;
                 const tsconfigUri = vscode_uri_1.URI.file(tsconfig);
                 if (!tsconfigProjects.has(tsconfigUri)) {
-                    tsconfigProjects.set(tsconfigUri, (async () => {
-                        const { languagePlugins, setup } = await create({
-                            configFileName: tsconfig,
-                            asFileName,
-                        });
-                        const languageService = createLs(server, languagePlugins);
-                        setup?.(languageService.context.language);
-                        return languageService;
-                    })());
+                    tsconfigProjects.set(tsconfigUri, createLs(server, tsconfig));
                 }
                 return await tsconfigProjects.get(tsconfigUri);
             }
             else {
-                simpleLs ??= (async () => {
-                    const { languagePlugins, setup } = await create({ asFileName });
-                    const languageService = createLs(server, languagePlugins);
-                    setup?.(languageService.context.language);
-                    return languageService;
-                })();
+                simpleLs ??= createLs(server, undefined);
                 return await simpleLs;
             }
         },
@@ -80,7 +67,11 @@ function createHybridModeProject(create) {
             }
         });
     }
-    function createLs(server, languagePlugins) {
+    async function createLs(server, tsconfig) {
+        const { languagePlugins, setup } = await create({
+            configFileName: tsconfig,
+            asFileName,
+        });
         const language = (0, language_core_1.createLanguage)([
             { getLanguageId: uri => server.documents.get(server.getSyncedDocumentKey(uri) ?? uri.toString())?.languageId },
             ...languagePlugins,
@@ -94,7 +85,9 @@ function createHybridModeProject(create) {
                 language.scripts.delete(uri);
             }
         });
-        return (0, language_service_1.createLanguageService)(language, server.languageServicePlugins, (0, simpleProject_1.createLanguageServiceEnvironment)(server, [...server.workspaceFolders.keys()]));
+        const project = {};
+        setup?.({ language, project });
+        return (0, language_service_1.createLanguageService)(language, server.languageServicePlugins, (0, simpleProject_1.createLanguageServiceEnvironment)(server, [...server.workspaceFolders.keys()]), project);
     }
 }
 //# sourceMappingURL=hybridModeProject.js.map

package/lib/initialize.d.ts

@@ -1,4 +1,4 @@
-import { LanguageServer } from '@volar/language-server';
+import type { 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

@@ -35,10 +35,8 @@ function initialize(server, params, ts, tsLocalized) {
                     }
                     return fileMap.has(fileName);
                 }, compilerOptions, vueCompilerOptions)],
-            setup(language) {
-                language.vue = {
-                    compilerOptions: vueCompilerOptions,
-                };
+            setup({ project }) {
+                project.vue = { compilerOptions: vueCompilerOptions };
             },
         };
     }), (0, language_service_1.getFullLanguageServicePlugins)(ts));

package/lib/types.d.ts

@@ -6,3 +6,5 @@ export type VueInitializationOptions = {
         hybridMode?: boolean;
     };
 };
+export * from '@volar/language-server/lib/types';
+export * from '@vue/language-service/lib/types';

package/lib/types.js

@@ -1,3 +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.js

@@ -23,10 +23,8 @@ connection.onInitialize(params => {
                 };
             return {
                 languagePlugins: [(0, language_core_1.createVueLanguagePlugin)(ts, asFileName, () => '', () => false, commandLine.options, commandLine.vueOptions)],
-                setup(language) {
-                    language.vue = {
-                        compilerOptions: commandLine.vueOptions,
-                    };
+                setup({ project }) {
+                    project.vue = { compilerOptions: commandLine.vueOptions };
                 },
             };
         }), (0, language_service_1.getHybridModeLanguageServicePlugins)(ts, namedPipeClient), { pullModelDiagnostics: true });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-server",
-	"version": "2.0.23-alpha.1",
+	"version": "2.0.26-alpha.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -15,13 +15,13 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@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",
+		"@volar/language-core": "~2.4.0-alpha.11",
+		"@volar/language-server": "~2.4.0-alpha.11",
+		"@vue/language-core": "2.0.26-alpha.0",
+		"@vue/language-service": "2.0.26-alpha.0",
+		"@vue/typescript-plugin": "2.0.26-alpha.0",
 		"vscode-languageserver-protocol": "^3.17.5",
 		"vscode-uri": "^3.0.8"
 	},
-	"gitHead": "70cb34e9d58afd603d50cb5b870116b189f4662b"
+	"gitHead": "7ace5046de671cda22fac8dd7d71b3658489c5c6"
 }

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