@vue/language-server 2.0.7 → 2.0.11

package/lib/hybridModeProject.d.ts

@@ -0,0 +1,3 @@
+import type { ServerProjectProviderFactory } from '@volar/language-server';
+import type * as ts from 'typescript';
+export declare function createHybridModeProjectProviderFactory(sys: ts.System): ServerProjectProviderFactory;

package/lib/hybridModeProject.js

@@ -0,0 +1,114 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createHybridModeProjectProviderFactory = void 0;
+const simpleProject_1 = require("@volar/language-server/lib/project/simpleProject");
+const simpleProjectProvider_1 = require("@volar/language-server/lib/project/simpleProjectProvider");
+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");
+function createHybridModeProjectProviderFactory(sys) {
+    return (context, servicePlugins, getLanguagePlugins) => {
+        const serviceEnvs = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
+        const tsconfigProjects = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
+        const simpleProjects = new language_core_1.FileMap(sys.useCaseSensitiveFileNames);
+        context.onDidChangeWatchedFiles(({ changes }) => {
+            for (const change of changes) {
+                if (tsconfigProjects.has(change.uri)) {
+                    tsconfigProjects.get(change.uri)?.then(project => project.dispose());
+                    tsconfigProjects.delete(change.uri);
+                    context.reloadDiagnostics();
+                }
+            }
+        });
+        return {
+            async getProject(uri) {
+                const workspaceFolder = (0, simpleProjectProvider_1.getWorkspaceFolder)(uri, context.workspaceFolders);
+                let serviceEnv = serviceEnvs.get(workspaceFolder);
+                if (!serviceEnv) {
+                    serviceEnv = (0, simpleProjectProvider_1.createServiceEnvironment)(context, workspaceFolder);
+                    serviceEnvs.set(workspaceFolder, serviceEnv);
+                }
+                const fileName = serviceEnv.typescript.uriToFileName(uri);
+                const projectInfo = (await (0, utils_1.searchNamedPipeServerForFile)(fileName))?.projectInfo;
+                if (projectInfo?.kind === 1) {
+                    const tsconfig = projectInfo.name;
+                    const tsconfigUri = serviceEnv.typescript.fileNameToUri(tsconfig);
+                    if (!tsconfigProjects.has(tsconfigUri)) {
+                        tsconfigProjects.set(tsconfigUri, (async () => {
+                            const languagePlugins = await getLanguagePlugins(serviceEnv, {
+                                typescript: {
+                                    configFileName: tsconfig,
+                                    host: {
+                                        getScriptFileNames() {
+                                            return [];
+                                        },
+                                    },
+                                    sys: {
+                                        ...sys,
+                                        version: 0,
+                                        async sync() {
+                                            return 0;
+                                        },
+                                        dispose() { },
+                                    },
+                                },
+                            });
+                            return createTSConfigProject(context, serviceEnv, languagePlugins, servicePlugins);
+                        })());
+                    }
+                    return await tsconfigProjects.get(tsconfigUri);
+                }
+                else {
+                    if (!simpleProjects.has(workspaceFolder)) {
+                        simpleProjects.set(workspaceFolder, (() => {
+                            return (0, simpleProject_1.createSimpleServerProject)(context, serviceEnv, servicePlugins, getLanguagePlugins);
+                        })());
+                    }
+                    return await simpleProjects.get(workspaceFolder);
+                }
+            },
+            async getProjects() {
+                return Promise.all([
+                    ...tsconfigProjects.values(),
+                    ...simpleProjects.values(),
+                ]);
+            },
+            async reloadProjects() {
+                for (const project of [
+                    ...tsconfigProjects.values(),
+                    ...simpleProjects.values(),
+                ]) {
+                    (await project).dispose();
+                }
+                tsconfigProjects.clear();
+            },
+        };
+        function createTSConfigProject(context, serviceEnv, languagePlugins, servicePlugins) {
+            let languageService;
+            return {
+                getLanguageService,
+                getLanguageServiceDontCreate: () => languageService,
+                dispose() {
+                    languageService?.dispose();
+                },
+            };
+            function getLanguageService() {
+                if (!languageService) {
+                    const language = (0, language_core_1.createLanguage)(languagePlugins, false, uri => {
+                        const script = context.documents.get(uri);
+                        if (script) {
+                            language.scripts.set(uri, script.languageId, script.getSnapshot());
+                        }
+                        else {
+                            language.scripts.delete(uri);
+                        }
+                    });
+                    languageService = (0, language_service_1.createLanguageService)(language, servicePlugins, serviceEnv);
+                }
+                return languageService;
+            }
+        }
+    };
+}
+exports.createHybridModeProjectProviderFactory = createHybridModeProjectProviderFactory;
+//# sourceMappingURL=hybridModeProject.js.map

package/node.js

@@ -4,10 +4,10 @@ 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");
 const tsPluginClient = require("@vue/typescript-plugin/lib/client");
 const utils_1 = require("@vue/typescript-plugin/lib/utils");
-const protocol_2 = require("./lib/protocol");
+const hybridModeProject_1 = require("./lib/hybridModeProject");
+const protocol_1 = require("./lib/protocol");
 exports.connection = (0, node_1.createConnection)();
 exports.server = (0, node_1.createServer)(exports.connection);
 const envToVueOptions = new WeakMap();
@@ -17,8 +17,8 @@ exports.connection.listen();
 exports.connection.onInitialize(async (params) => {
     const options = params.initializationOptions;
     const hybridMode = options.vue?.hybridMode ?? true;
-    tsdk = (0, node_1.loadTsdkByPath)(options.typescript.tsdk, params.locale);
     const vueFileExtensions = ['vue'];
+    tsdk = (0, node_1.loadTsdkByPath)(options.typescript.tsdk, params.locale);
     if (options.vue?.additionalExtensions) {
         for (const additionalExtension of options.vue.additionalExtensions) {
             vueFileExtensions.push(additionalExtension);
@@ -31,9 +31,23 @@ exports.connection.onInitialize(async (params) => {
         getTsPluginClient = (0, language_service_1.createDefaultGetTsPluginClient)(tsdk.typescript, env => envToVueOptions.get(env));
     }
     const result = await exports.server.initialize(params, hybridMode
-        ? (0, node_1.createSimpleProjectProviderFactory)()
+        ? (0, hybridModeProject_1.createHybridModeProjectProviderFactory)(tsdk.typescript.sys)
         : (0, node_1.createTypeScriptProjectProviderFactory)(tsdk.typescript, tsdk.diagnosticMessages), {
         watchFileExtensions: ['js', 'cjs', 'mjs', 'ts', 'cts', 'mts', 'jsx', 'tsx', 'json', ...vueFileExtensions],
+        getLanguageId(uri) {
+            if (vueFileExtensions.some(ext => uri.endsWith(`.${ext}`))) {
+                if (uri.endsWith('.html')) {
+                    return 'html';
+                }
+                else if (uri.endsWith('.md')) {
+                    return 'markdown';
+                }
+                else {
+                    return 'vue';
+                }
+            }
+            return (0, language_core_1.resolveCommonLanguageId)(uri);
+        },
         getServicePlugins() {
             return (0, language_service_1.createVueServicePlugins)(tsdk.typescript, env => envToVueOptions.get(env), getTsPluginClient, hybridMode);
         },
@@ -41,24 +55,11 @@ exports.connection.onInitialize(async (params) => {
             const commandLine = await parseCommandLine();
             const vueOptions = commandLine?.vueOptions ?? (0, language_core_1.resolveVueCompilerOptions)({});
             for (const ext of vueFileExtensions) {
-                if (vueOptions.extensions.includes(`.${ext}`)) {
+                if (!vueOptions.extensions.includes(`.${ext}`)) {
                     vueOptions.extensions.push(`.${ext}`);
                 }
             }
-            const vueLanguagePlugin = (0, language_core_1.createVueLanguagePlugin)(tsdk.typescript, serviceEnv.typescript.uriToFileName, fileName => {
-                if (projectContext.typescript?.sys.useCaseSensitiveFileNames ?? false) {
-                    return projectContext.typescript?.host.getScriptFileNames().includes(fileName) ?? false;
-                }
-                else {
-                    const lowerFileName = fileName.toLowerCase();
-                    for (const rootFile of projectContext.typescript?.host.getScriptFileNames() ?? []) {
-                        if (rootFile.toLowerCase() === lowerFileName) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }
-            }, commandLine?.options ?? {}, vueOptions, options.codegenStack);
+            const vueLanguagePlugin = (0, language_core_1.createVueLanguagePlugin)(tsdk.typescript, serviceEnv.typescript.uriToFileName, projectContext.typescript?.sys.useCaseSensitiveFileNames ?? false, () => projectContext.typescript?.host.getProjectVersion?.() ?? '', () => projectContext.typescript?.host.getScriptFileNames() ?? [], commandLine?.options ?? {}, vueOptions, options.codegenStack);
             envToVueOptions.set(serviceEnv, vueOptions);
             return [vueLanguagePlugin];
             async function parseCommandLine() {
@@ -112,8 +113,8 @@ exports.connection.onRequest(protocol_1.GetConvertAttrCasingEditsRequest.type, a
         return await (0, language_service_1.convertAttrName)(languageService.context, params.textDocument.uri, params.casing, getTsPluginClient(languageService.context));
     }
 });
-exports.connection.onRequest(protocol_2.GetConnectedNamedPipeServerRequest.type, async (fileName) => {
-    const server = await (0, utils_1.searchNamedPipeServerForFile)(fileName);
+exports.connection.onRequest(protocol_1.GetConnectedNamedPipeServerRequest.type, async (fileName) => {
+    const server = (await (0, utils_1.searchNamedPipeServerForFile)(fileName))?.server;
     if (server) {
         return server;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-server",
-	"version": "2.0.7",
+	"version": "2.0.11",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -15,12 +15,12 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.1.3",
-		"@volar/language-server": "~2.1.3",
-		"@vue/language-core": "2.0.7",
-		"@vue/language-service": "2.0.7",
-		"@vue/typescript-plugin": "2.0.7",
+		"@volar/language-core": "~2.2.0-alpha.6",
+		"@volar/language-server": "~2.2.0-alpha.6",
+		"@vue/language-core": "2.0.11",
+		"@vue/language-service": "2.0.11",
+		"@vue/typescript-plugin": "2.0.11",
 		"vscode-languageserver-protocol": "^3.17.5"
 	},
-	"gitHead": "4a37e8f3ebcf31ecfd2ea627f7611d5990ec5df6"
+	"gitHead": "c89f25ffc32c760130adeeac796b9a5d20585bf7"
 }