@vue/language-server 2.0.28 → 2.1.0

package/lib/hybridModeProject.js

@@ -14,15 +14,14 @@ function createHybridModeProject(create) {
         setup(_server) {
             server = _server;
             utils_1.onSomePipeReadyCallbacks.push(() => {
-                server.refresh(project);
+                server.languageFeatures.requestRefresh(false);
             });
-            server.onDidChangeWatchedFiles(({ changes }) => {
+            server.fileWatcher.onDidChangeWatchedFiles(({ changes }) => {
                 for (const change of changes) {
                     const changeUri = vscode_uri_1.URI.parse(change.uri);
                     if (tsconfigProjects.has(changeUri)) {
                         tsconfigProjects.get(changeUri)?.then(project => project.dispose());
                         tsconfigProjects.delete(changeUri);
-                        server.clearPushDiagnostics();
                     }
                 }
             });
@@ -77,11 +76,10 @@ function createHybridModeProject(create) {
             asFileName,
         });
         const language = (0, language_core_1.createLanguage)([
-            { getLanguageId: uri => server.documents.get(server.getSyncedDocumentKey(uri) ?? uri.toString())?.languageId },
+            { getLanguageId: uri => server.documents.get(uri)?.languageId },
             ...languagePlugins,
         ], (0, language_service_1.createUriMap)(), uri => {
-            const documentKey = server.getSyncedDocumentKey(uri);
-            const document = documentKey ? server.documents.get(documentKey) : undefined;
+            const document = server.documents.get(uri);
             if (document) {
                 language.scripts.set(uri, document.getSnapshot(), document.languageId);
             }
@@ -91,7 +89,7 @@ function createHybridModeProject(create) {
         });
         const project = {};
         setup?.({ language, project });
-        return (0, language_service_1.createLanguageService)(language, server.languageServicePlugins, (0, simpleProject_1.createLanguageServiceEnvironment)(server, [...server.workspaceFolders.keys()]), project);
+        return (0, language_service_1.createLanguageService)(language, server.languageServicePlugins, (0, simpleProject_1.createLanguageServiceEnvironment)(server, [...server.workspaceFolders.all]), project);
     }
 }
 //# sourceMappingURL=hybridModeProject.js.map

package/lib/initialize.d.ts

@@ -1,4 +1,4 @@
 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;
+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>;

package/lib/initialize.js

@@ -7,7 +7,7 @@ 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, uriConverter }) => {
+    return server.initialize(params, (0, node_1.createTypeScriptProject)(ts, tsLocalized, async ({ configFileName, sys, uriConverter }) => {
         let compilerOptions;
         let vueCompilerOptions;
         if (configFileName) {
@@ -26,14 +26,43 @@ function initialize(server, params, ts, tsLocalized) {
             compilerOptions = ts.getDefaultCompilerOptions();
             vueCompilerOptions = (0, language_core_1.resolveVueCompilerOptions)({});
         }
+        vueCompilerOptions.__test = params.initializationOptions.typescript.disableAutoImportCache;
         updateFileWatcher(vueCompilerOptions);
         return {
-            languagePlugins: [(0, language_core_1.createVueLanguagePlugin2)(ts, s => uriConverter.asFileName(s), (0, language_core_1.createRootFileChecker)(projectHost.getProjectVersion ? () => projectHost.getProjectVersion() : undefined, () => projectHost.getScriptFileNames(), sys.useCaseSensitiveFileNames), compilerOptions, vueCompilerOptions)],
+            languagePlugins: [
+                (0, language_core_1.createVueLanguagePlugin)(ts, compilerOptions, vueCompilerOptions, s => uriConverter.asFileName(s)),
+            ],
             setup({ project }) {
                 project.vue = { compilerOptions: vueCompilerOptions };
+                if (project.typescript) {
+                    const globalTypesName = `__globalTypes_${vueCompilerOptions.target}_${vueCompilerOptions.strictTemplates}.d.ts`;
+                    const fileExists = project.typescript.languageServiceHost.fileExists.bind(project.typescript.languageServiceHost);
+                    const getScriptSnapshot = project.typescript.languageServiceHost.getScriptSnapshot.bind(project.typescript.languageServiceHost);
+                    const snapshots = new Map();
+                    project.typescript.languageServiceHost.fileExists = path => {
+                        if (path.endsWith(globalTypesName)) {
+                            return true;
+                        }
+                        return fileExists(path);
+                    };
+                    project.typescript.languageServiceHost.getScriptSnapshot = path => {
+                        if (path.endsWith(globalTypesName)) {
+                            if (!snapshots.has(path)) {
+                                const contents = (0, language_core_1.generateGlobalTypes)(vueCompilerOptions.lib, vueCompilerOptions.target, vueCompilerOptions.strictTemplates);
+                                snapshots.set(path, {
+                                    getText: (start, end) => contents.substring(start, end),
+                                    getLength: () => contents.length,
+                                    getChangeRange: () => undefined,
+                                });
+                            }
+                            return snapshots.get(path);
+                        }
+                        return getScriptSnapshot(path);
+                    };
+                }
             },
         };
-    }), (0, language_service_1.getFullLanguageServicePlugins)(ts));
+    }), (0, language_service_1.getFullLanguageServicePlugins)(ts, { disableAutoImportCache: params.initializationOptions.typescript.disableAutoImportCache }));
     function updateFileWatcher(vueCompilerOptions) {
         const extensions = [
             'js', 'cjs', 'mjs', 'ts', 'cts', 'mts', 'jsx', 'tsx', 'json',
@@ -45,7 +74,7 @@ function initialize(server, params, ts, tsLocalized) {
                 watchingExtensions.add(ext);
             }
             fileWatcher?.then(dispose => dispose.dispose());
-            fileWatcher = server.watchFiles(['**/*.{' + [...watchingExtensions].join(',') + '}']);
+            fileWatcher = server.fileWatcher.watchFiles(['**/*.{' + [...watchingExtensions].join(',') + '}']);
         }
     }
 }

package/node.js

@@ -21,13 +21,16 @@ connection.onInitialize(params => {
                     vueOptions: (0, language_core_1.resolveVueCompilerOptions)({}),
                     options: ts.getDefaultCompilerOptions(),
                 };
+            commandLine.vueOptions.__test = params.initializationOptions.typescript.disableAutoImportCache;
             return {
-                languagePlugins: [(0, language_core_1.createVueLanguagePlugin2)(ts, asFileName, () => false, commandLine.options, commandLine.vueOptions)],
+                languagePlugins: [
+                    (0, language_core_1.createVueLanguagePlugin)(ts, commandLine.options, commandLine.vueOptions, asFileName),
+                ],
                 setup({ project }) {
                     project.vue = { compilerOptions: commandLine.vueOptions };
                 },
             };
-        }), (0, language_service_1.getHybridModeLanguageServicePlugins)(ts, namedPipeClient), { pullModelDiagnostics: true });
+        }), (0, language_service_1.getHybridModeLanguageServicePlugins)(ts, namedPipeClient));
     }
     else {
         return (0, initialize_1.initialize)(server, params, ts, diagnosticMessages);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-server",
-	"version": "2.0.28",
+	"version": "2.1.0",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -15,13 +15,14 @@
 		"directory": "packages/language-server"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.4.0-alpha.18",
-		"@volar/language-server": "~2.4.0-alpha.18",
-		"@vue/language-core": "2.0.28",
-		"@vue/language-service": "2.0.28",
-		"@vue/typescript-plugin": "2.0.28",
+		"@volar/language-core": "~2.4.1",
+		"@volar/language-server": "~2.4.1",
+		"@volar/test-utils": "~2.4.1",
+		"@vue/language-core": "2.1.0",
+		"@vue/language-service": "2.1.0",
+		"@vue/typescript-plugin": "2.1.0",
 		"vscode-languageserver-protocol": "^3.17.5",
 		"vscode-uri": "^3.0.8"
 	},
-	"gitHead": "0cdbd70996f4fc7ac8d511b0d9fdbe20b7a4f6a3"
+	"gitHead": "510063740b90b64caedaee1f0bde70974613a92c"
 }