Merge branch 'master' into pr/4642

Author: johnsoncodehk

.github/workflows/pkg.pr.new.yml

@@ -0,0 +1,24 @@
+name: Publish Any Commit
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - run: corepack enable
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: "pnpm"
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build
+        run: pnpm build
+
+      - run: pnpx pkg-pr-new publish './packages/*'

extensions/vscode/package.json

@@ -255,7 +255,7 @@
 					"description": "Traces the communication between VS Code and the language server."
 				},
 				"vue.server.hybridMode": {
-					"type": "boolean",
+					"type": ["boolean", "string"],
 					"default": "auto",
 					"enum": [
 						"auto",
@@ -548,14 +548,14 @@
 	"devDependencies": {
 		"@types/semver": "^7.5.3",
 		"@types/vscode": "^1.82.0",
-		"@volar/vscode": "~2.4.0-alpha.18",
+		"@volar/vscode": "~2.4.0",
+		"@vscode/vsce": "latest",
 		"@vue/language-core": "2.0.28",
 		"@vue/language-server": "2.0.28",
 		"@vue/typescript-plugin": "2.0.28",
 		"esbuild": "~0.21.0",
 		"esbuild-plugin-copy": "latest",
 		"esbuild-visualizer": "latest",
-		"semver": "^7.5.4",
-		"vsce": "latest"
+		"semver": "^7.5.4"
 	}
 }

extensions/vscode/src/common.ts

@@ -234,7 +234,6 @@ async function doActivate(context: vscode.ExtensionContext, createLc: CreateLang
 	lsp.activateAutoInsertion(selectors, client);
 	lsp.activateDocumentDropEdit(selectors, client);
 	lsp.activateWriteVirtualFiles('vue.action.writeVirtualFiles', client);
-	lsp.activateServerSys(client);
 
 	if (!enabledHybridMode) {
 		lsp.activateTsConfigStatusItem(selectors, 'vue.tsconfig', client);

package.json

@@ -24,7 +24,7 @@
 		"@lerna-lite/publish": "latest",
 		"@tsslint/cli": "latest",
 		"@tsslint/config": "latest",
-		"@volar/language-service": "~2.4.0-alpha.18",
+		"@volar/language-service": "~2.4.0",
 		"typescript": "latest",
 		"vite": "latest",
 		"vitest": "latest"

packages/component-meta/lib/base.ts

@@ -27,7 +27,7 @@ export function createCheckerByJsonConfigBase(
 	checkerOptions: MetaCheckerOptions = {}
 ) {
 	rootDir = rootDir.replace(windowsPathReg, '/');
-	return createCheckerWorker(
+	return baseCreate(
 		ts,
 		() => vue.createParsedCommandLineByJson(ts, ts.sys, rootDir, json),
 		checkerOptions,
@@ -42,7 +42,7 @@ export function createCheckerBase(
 	checkerOptions: MetaCheckerOptions = {}
 ) {
 	tsconfig = tsconfig.replace(windowsPathReg, '/');
-	return createCheckerWorker(
+	return baseCreate(
 		ts,
 		() => vue.createParsedCommandLine(ts, ts.sys, tsconfig),
 		checkerOptions,
@@ -51,75 +51,28 @@ export function createCheckerBase(
 	);
 }
 
-function createCheckerWorker(
+export function baseCreate(
 	ts: typeof import('typescript'),
-	loadParsedCommandLine: () => vue.ParsedCommandLine,
+	getCommandLine: () => vue.ParsedCommandLine,
 	checkerOptions: MetaCheckerOptions,
 	rootPath: string,
 	globalComponentName: string
 ) {
-
-	/**
-	 * Original Host
-	 */
-
-	let parsedCommandLine = loadParsedCommandLine();
-	let fileNames = parsedCommandLine.fileNames.map(path => path.replace(windowsPathReg, '/'));
+	let commandLine = getCommandLine();
+	let fileNames = commandLine.fileNames.map(path => path.replace(windowsPathReg, '/'));
 	let projectVersion = 0;
 
-	const scriptSnapshots = new Map<string, ts.IScriptSnapshot>();
 	const projectHost: TypeScriptProjectHost = {
 		getCurrentDirectory: () => rootPath,
 		getProjectVersion: () => projectVersion.toString(),
-		getCompilationSettings: () => parsedCommandLine.options,
+		getCompilationSettings: () => commandLine.options,
 		getScriptFileNames: () => fileNames,
-		getProjectReferences: () => parsedCommandLine.projectReferences,
-		getScriptSnapshot: fileName => {
-			if (!scriptSnapshots.has(fileName)) {
-				const fileText = ts.sys.readFile(fileName);
-				if (fileText !== undefined) {
-					scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(fileText));
-				}
-			}
-			return scriptSnapshots.get(fileName);
-		},
+		getProjectReferences: () => commandLine.projectReferences,
 	};
-
-	return {
-		...baseCreate(ts, projectHost, parsedCommandLine.vueOptions, checkerOptions, globalComponentName),
-		updateFile(fileName: string, text: string) {
-			fileName = fileName.replace(windowsPathReg, '/');
-			scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text));
-			projectVersion++;
-		},
-		deleteFile(fileName: string) {
-			fileName = fileName.replace(windowsPathReg, '/');
-			fileNames = fileNames.filter(f => f !== fileName);
-			projectVersion++;
-		},
-		reload() {
-			parsedCommandLine = loadParsedCommandLine();
-			fileNames = parsedCommandLine.fileNames.map(path => path.replace(windowsPathReg, '/'));
-			this.clearCache();
-		},
-		clearCache() {
-			scriptSnapshots.clear();
-			projectVersion++;
-		},
-	};
-}
-
-export function baseCreate(
-	ts: typeof import('typescript'),
-	projectHost: TypeScriptProjectHost,
-	vueCompilerOptions: vue.VueCompilerOptions,
-	checkerOptions: MetaCheckerOptions,
-	globalComponentName: string
-) {
 	const globalComponentSnapshot = ts.ScriptSnapshot.fromString('<script setup lang="ts"></script>');
-	const metaSnapshots: Record<string, ts.IScriptSnapshot> = {};
+	const scriptSnapshots = new Map<string, ts.IScriptSnapshot | undefined>();
+	const metaSnapshots = new Map<string, ts.IScriptSnapshot>();
 	const getScriptFileNames = projectHost.getScriptFileNames;
-	const getScriptSnapshot = projectHost.getScriptSnapshot;
 	projectHost.getScriptFileNames = () => {
 		const names = getScriptFileNames();
 		return [
@@ -129,20 +82,6 @@ export function baseCreate(
 			getMetaFileName(globalComponentName),
 		];
 	};
-	projectHost.getScriptSnapshot = fileName => {
-		if (isMetaFileName(fileName)) {
-			if (!metaSnapshots[fileName]) {
-				metaSnapshots[fileName] = ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName));
-			}
-			return metaSnapshots[fileName];
-		}
-		else if (fileName === globalComponentName) {
-			return globalComponentSnapshot;
-		}
-		else {
-			return getScriptSnapshot(fileName);
-		}
-	};
 
 	const vueLanguagePlugin = vue.createVueLanguagePlugin2<string>(
 		ts,
@@ -153,7 +92,7 @@ export function baseCreate(
 			ts.sys.useCaseSensitiveFileNames
 		),
 		projectHost.getCompilationSettings(),
-		vueCompilerOptions
+		commandLine.vueOptions
 	);
 	const language = vue.createLanguage(
 		[
@@ -166,7 +105,30 @@ export function baseCreate(
 		],
 		new vue.FileMap(ts.sys.useCaseSensitiveFileNames),
 		fileName => {
-			const snapshot = projectHost.getScriptSnapshot(fileName);
+			let snapshot = scriptSnapshots.get(fileName);
+
+			if (fileName === globalComponentName) {
+				snapshot = globalComponentSnapshot;
+			}
+			else if (isMetaFileName(fileName)) {
+				if (!metaSnapshots.has(fileName)) {
+					metaSnapshots.set(fileName, ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName)));
+				}
+				snapshot = metaSnapshots.get(fileName);
+			}
+			else {
+				if (!scriptSnapshots.has(fileName)) {
+					const fileText = ts.sys.readFile(fileName);
+					if (fileText !== undefined) {
+						scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(fileText));
+					}
+					else {
+						scriptSnapshots.set(fileName, undefined);
+					}
+				}
+				snapshot = scriptSnapshots.get(fileName);
+			}
+
 			if (snapshot) {
 				language.scripts.set(fileName, snapshot);
 			}
@@ -182,7 +144,7 @@ export function baseCreate(
 		const getScriptKind = languageServiceHost.getScriptKind?.bind(languageServiceHost);
 		languageServiceHost.getScriptKind = fileName => {
 			const scriptKind = getScriptKind!(fileName);
-			if (vueCompilerOptions.extensions.some(ext => fileName.endsWith(ext))) {
+			if (commandLine.vueOptions.extensions.some(ext => fileName.endsWith(ext))) {
 				if (scriptKind === ts.ScriptKind.JS) {
 					return ts.ScriptKind.TS;
 				}
@@ -199,6 +161,25 @@ export function baseCreate(
 	return {
 		getExportNames,
 		getComponentMeta,
+		updateFile(fileName: string, text: string) {
+			fileName = fileName.replace(windowsPathReg, '/');
+			scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(text));
+			projectVersion++;
+		},
+		deleteFile(fileName: string) {
+			fileName = fileName.replace(windowsPathReg, '/');
+			fileNames = fileNames.filter(f => f !== fileName);
+			projectVersion++;
+		},
+		reload() {
+			commandLine = getCommandLine();
+			fileNames = commandLine.fileNames.map(path => path.replace(windowsPathReg, '/'));
+			this.clearCache();
+		},
+		clearCache() {
+			scriptSnapshots.clear();
+			projectVersion++;
+		},
 		__internal__: {
 			tsLs,
 		},
@@ -210,7 +191,7 @@ export function baseCreate(
 
 	function getMetaFileName(fileName: string) {
 		return (
-			vueCompilerOptions.extensions.some(ext => fileName.endsWith(ext))
+			commandLine.vueOptions.extensions.some(ext => fileName.endsWith(ext))
 				? fileName
 				: fileName.substring(0, fileName.lastIndexOf('.'))
 		) + '.meta.ts';
@@ -229,7 +210,7 @@ interface ComponentMeta<T> {
 	exposed: ComponentExposed<T>;
 };
 
-${vueCompilerOptions.target < 3 ? vue2TypeHelpersCode : typeHelpersCode}
+${commandLine.vueOptions.target < 3 ? vue2TypeHelpersCode : typeHelpersCode}
 `.trim();
 		return code;
 	}
@@ -321,11 +302,11 @@ ${vueCompilerOptions.target < 3 ? vue2TypeHelpersCode : typeHelpersCode}
 
 			// fill defaults
 			const printer = ts.createPrinter(checkerOptions.printer);
-			const snapshot = projectHost.getScriptSnapshot(componentPath)!;
+			const snapshot = language.scripts.get(componentPath)?.snapshot!;
 
 			const vueFile = language.scripts.get(componentPath)?.generated?.root;
 			const vueDefaults = vueFile && exportName === 'default'
-				? (vueFile instanceof vue.VueVirtualCode ? readVueComponentDefaultProps(vueFile, printer, ts, vueCompilerOptions) : {})
+				? (vueFile instanceof vue.VueVirtualCode ? readVueComponentDefaultProps(vueFile, printer, ts, commandLine.vueOptions) : {})
 				: {};
 			const tsDefaults = !vueFile ? readTsComponentDefaultProps(
 				componentPath.substring(componentPath.lastIndexOf('.') + 1), // ts | js | tsx | jsx

packages/component-meta/package.json

@@ -12,7 +12,7 @@
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.4.0-alpha.18",
+		"@volar/typescript": "~2.4.0",
 		"@vue/language-core": "2.0.28",
 		"path-browserify": "^1.0.1",
 		"vue-component-type-helpers": "2.0.28"

packages/language-core/lib/codegen/template/element.ts

@@ -177,7 +177,7 @@ export function* generateComponent(
 								resolveRenameNewName: node.tag !== expectName ? camelizeComponentName : undefined,
 								resolveRenameEditText: getTagRenameApply(node.tag),
 							},
-						} as VueCodeInformation
+						}
 					);
 					yield `;`;
 				}
@@ -195,7 +195,7 @@ export function* generateComponent(
 							isAdditional: true,
 							onlyImport: true,
 						},
-					} as VueCodeInformation
+					}
 				);
 				yield `,`;
 			}

packages/language-core/package.json

@@ -12,7 +12,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~2.4.0-alpha.18",
+		"@volar/language-core": "~2.4.0",
 		"@vue/compiler-dom": "^3.4.0",
 		"@vue/shared": "^3.4.0",
 		"computeds": "^0.0.1",
@@ -25,7 +25,7 @@
 		"@types/minimatch": "^5.1.2",
 		"@types/node": "latest",
 		"@types/path-browserify": "^1.0.1",
-		"@volar/typescript": "~2.4.0-alpha.18",
+		"@volar/typescript": "~2.4.0",
 		"@vue/compiler-sfc": "^3.4.0"
 	},
 	"peerDependencies": {

packages/language-plugin-pug/package.json

@@ -16,7 +16,7 @@
 		"@vue/language-core": "2.0.28"
 	},
 	"dependencies": {
-		"@volar/source-map": "~2.4.0-alpha.18",
-		"volar-service-pug": "0.0.59"
+		"@volar/source-map": "~2.4.0",
+		"volar-service-pug": "0.0.61"
 	}
 }

packages/language-server/lib/hybridModeProject.ts

@@ -25,15 +25,14 @@ export function createHybridModeProject(
 		setup(_server) {
 			server = _server;
 			onSomePipeReadyCallbacks.push(() => {
-				server.refresh(project);
+				server.languageFeatures.requestRefresh(false);
 			});
-			server.onDidChangeWatchedFiles(({ changes }) => {
+			server.fileWatcher.onDidChangeWatchedFiles(({ changes }) => {
 				for (const change of changes) {
 					const changeUri = URI.parse(change.uri);
 					if (tsconfigProjects.has(changeUri)) {
 						tsconfigProjects.get(changeUri)?.then(project => project.dispose());
 						tsconfigProjects.delete(changeUri);
-						server.clearPushDiagnostics();
 					}
 				}
 			});
@@ -91,11 +90,10 @@ export function createHybridModeProject(
 			asFileName,
 		});
 		const language = createLanguage([
-			{ getLanguageId: uri => server.documents.get(server.getSyncedDocumentKey(uri) ?? uri.toString())?.languageId },
+			{ getLanguageId: uri => server.documents.get(uri)?.languageId },
 			...languagePlugins,
 		], 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);
 			}
@@ -108,7 +106,7 @@ export function createHybridModeProject(
 		return createLanguageService(
 			language,
 			server.languageServicePlugins,
-			createLanguageServiceEnvironment(server, [...server.workspaceFolders.keys()]),
+			createLanguageServiceEnvironment(server, [...server.workspaceFolders.all]),
 			project
 		);
 	}