Merge branch 'master' into pr/4878

Author: johnsoncodehk

README.md

@@ -97,14 +97,15 @@ lspconfig.tsserver.setup {
       },
     },
   },
+}
 
 lspconfig.volar.setup {
   init_options = {
     vue = {
       hybridMode = false,
     },
   },
-},
+}
 ```
 
 ### nvim-cmp integration

extensions/vscode/package.json

@@ -551,7 +551,7 @@
 	"devDependencies": {
 		"@types/semver": "^7.5.3",
 		"@types/vscode": "^1.82.0",
-		"@volar/vscode": "~2.4.1",
+		"@volar/vscode": "~2.4.7",
 		"@vscode/vsce": "latest",
 		"@vue/language-core": "2.1.6",
 		"@vue/language-server": "2.1.6",

extensions/vscode/tsconfig.json

@@ -3,6 +3,8 @@
 	"compilerOptions": {
 		"outDir": "out",
 		"rootDir": "src",
+		"module": "CommonJS",
+		"moduleResolution": "Node"
 	},
 	"include": [ "src" ],
 	"references": [

package.json

@@ -25,7 +25,6 @@
 		"@lerna-lite/publish": "latest",
 		"@tsslint/cli": "latest",
 		"@tsslint/config": "latest",
-		"@volar/language-service": "~2.4.1",
 		"typescript": "latest",
 		"vite": "latest",
 		"vitest": "latest"

packages/component-meta/lib/base.ts

@@ -540,7 +540,7 @@ function createSchemaResolvers(
 	function resolveSlotProperties(prop: ts.Symbol): SlotMeta {
 		const propType = typeChecker.getNonNullableType(typeChecker.getTypeOfSymbolAtLocation(prop, symbolNode));
 		const signatures = propType.getCallSignatures();
-		const paramType = signatures[0].parameters[0];
+		const paramType = signatures[0]?.parameters[0];
 		const subtype = paramType ? typeChecker.getTypeOfSymbolAtLocation(paramType, symbolNode) : typeChecker.getAnyType();
 		let schema: PropertyMetaSchema;
 		let declarations: Declaration[];
@@ -721,7 +721,7 @@ function readVueComponentDefaultProps(
 
 	function scriptSetupWorker() {
 
-		const descriptor = vueSourceFile.sfc;
+		const descriptor = vueSourceFile._sfc;
 		const scriptSetupRanges = descriptor.scriptSetup ? vue.parseScriptSetupRanges(ts, descriptor.scriptSetup.ast, vueCompilerOptions) : undefined;
 
 		if (descriptor.scriptSetup && scriptSetupRanges?.props.withDefaults?.arg) {
@@ -772,7 +772,7 @@ function readVueComponentDefaultProps(
 
 	function scriptWorker() {
 
-		const descriptor = vueSourceFile.sfc;
+		const descriptor = vueSourceFile._sfc;
 
 		if (descriptor.script) {
 			const scriptResult = readTsComponentDefaultProps(descriptor.script.lang, descriptor.script.content, 'default', printer, ts);

packages/component-meta/package.json

@@ -6,13 +6,14 @@
 		"**/*.js",
 		"**/*.d.ts"
 	],
+	"sideEffects": false,
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",
 		"directory": "packages/component-meta"
 	},
 	"dependencies": {
-		"@volar/typescript": "~2.4.1",
+		"@volar/typescript": "~2.4.7",
 		"@vue/language-core": "2.1.6",
 		"path-browserify": "^1.0.1",
 		"vue-component-type-helpers": "2.1.6"

packages/component-type-helpers/package.json

@@ -6,6 +6,7 @@
 		"**/*.js",
 		"**/*.d.ts"
 	],
+	"sideEffects": false,
 	"repository": {
 		"type": "git",
 		"url": "https://github.com/vuejs/language-tools.git",

packages/language-core/lib/codegen/globalTypes.ts

@@ -87,6 +87,7 @@ export function generateGlobalTypes(lib: string, target: number, strictTemplates
 		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
 		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
 	>>;
+	type __VLS_UseTemplateRef<T> = Readonly<import('${lib}').ShallowRef<T | null>>;
 
 	function __VLS_getVForSourceType(source: number): [number, number, number][];
 	function __VLS_getVForSourceType(source: string): [string, number, number][];
@@ -115,9 +116,11 @@ export function generateGlobalTypes(lib: string, target: number, strictTemplates
 	function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
 	// @ts-ignore
 	function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
-	function __VLS_directiveAsFunction<T extends import('${lib}').Directive>(dir: T): T extends (...args: any) => any
-		? T | __VLS_unknownDirective
-		: NonNullable<(T & Record<string, __VLS_unknownDirective>)['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>;
+	function __VLS_asFunctionalDirective<T>(dir: T): T extends import('${lib}').ObjectDirective
+		? NonNullable<T['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>
+		: T extends (...args: any) => any
+			? T
+			: __VLS_unknownDirective;
 	function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
 	function __VLS_nonNullable<T>(t: T): T extends null | undefined ? never : T;
 	function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):

packages/language-core/lib/codegen/inlayHints.ts

@@ -0,0 +1,25 @@
+import type * as CompilerDOM from '@vue/compiler-dom';
+
+export interface InlayHintInfo {
+	blockName: string;
+	offset: number;
+	setting: string;
+	label: string;
+	tooltip?: string;
+	paddingRight?: boolean;
+	paddingLeft?: boolean;
+}
+
+export function createVBindShorthandInlayHintInfo(loc: CompilerDOM.SourceLocation, variableName: string): InlayHintInfo {
+	return {
+		blockName: 'template',
+		offset: loc.end.offset,
+		setting: 'vue.inlayHints.vBindShorthand',
+		label: `="${variableName}"`,
+		tooltip: [
+			`This is a shorthand for \`${loc.source}="${variableName}"\`.`,
+			'To hide this hint, set `vue.inlayHints.vBindShorthand` to `false` in IDE settings.',
+			'[More info](https://github.com/vuejs/core/pull/9451)',
+		].join('\n\n'),
+	};
+}

packages/language-core/lib/codegen/script/component.ts

@@ -30,7 +30,7 @@ export function* generateComponent(
 	yield `}${endOfLine}`;
 	yield `},${newLine}`;
 	if (!ctx.bypassDefineComponent) {
-		const emitOptionCodes = [...generateEmitsOption(options, scriptSetup, scriptSetupRanges)];
+		const emitOptionCodes = [...generateEmitsOption(options, scriptSetupRanges)];
 		for (const code of emitOptionCodes) {
 			yield code;
 		}
@@ -63,7 +63,6 @@ export function* generateComponentSetupReturns(scriptSetupRanges: ScriptSetupRan
 
 export function* generateEmitsOption(
 	options: ScriptCodegenOptions,
-	scriptSetup: NonNullable<Sfc['scriptSetup']>,
 	scriptSetupRanges: ScriptSetupRanges
 ): Generator<Code> {
 	const codes: {
@@ -74,16 +73,16 @@ export function* generateEmitsOption(
 	}[] = [];
 	if (scriptSetupRanges.defineProp.some(p => p.isModel)) {
 		codes.push({
-			optionExp: `{} as __VLS_NormalizeEmits<__VLS_ModelEmitsType>`,
-			typeOptionType: `__VLS_ModelEmitsType`,
+			optionExp: `{} as __VLS_NormalizeEmits<typeof __VLS_modelEmit>`,
+			typeOptionType: `__VLS_ModelEmit`,
 		});
 	}
 	if (scriptSetupRanges.emits.define) {
 		const { typeArg, hasUnionTypeArg } = scriptSetupRanges.emits.define;
 		codes.push({
 			optionExp: `{} as __VLS_NormalizeEmits<typeof ${scriptSetupRanges.emits.name ?? '__VLS_emit'}>`,
 			typeOptionType: typeArg && !hasUnionTypeArg
-				? scriptSetup.content.slice(typeArg.start, typeArg.end)
+				? `__VLS_Emit`
 				: undefined,
 		});
 	}

packages/language-core/lib/codegen/script/componentSelf.ts

@@ -48,7 +48,7 @@ export function* generateComponentSelf(
 		yield `}${endOfLine}`; // return {
 		yield `},${newLine}`; // setup() {
 		if (options.sfc.scriptSetup && options.scriptSetupRanges && !ctx.bypassDefineComponent) {
-			const emitOptionCodes = [...generateEmitsOption(options, options.sfc.scriptSetup, options.scriptSetupRanges)];
+			const emitOptionCodes = [...generateEmitsOption(options, options.scriptSetupRanges)];
 			for (const code of emitOptionCodes) {
 				yield code;
 			}

packages/language-core/lib/codegen/script/context.ts

@@ -1,4 +1,4 @@
-import { InlayHintInfo } from '../types';
+import { InlayHintInfo } from '../inlayHints';
 import { getLocalTypesGenerator } from '../localTypes';
 import type { ScriptCodegenOptions } from './index';
 

packages/language-core/lib/codegen/script/index.ts

@@ -6,8 +6,8 @@ import type { Code, Sfc, VueCodeInformation, VueCompilerOptions } from '../../ty
 import { endOfLine, generateSfcBlockSection, newLine } from '../common';
 import { generateGlobalTypes } from '../globalTypes';
 import type { TemplateCodegenContext } from '../template/context';
-import { createScriptCodegenContext, ScriptCodegenContext } from './context';
 import { generateComponentSelf } from './componentSelf';
+import { createScriptCodegenContext, ScriptCodegenContext } from './context';
 import { generateScriptSetup, generateScriptSetupImports } from './scriptSetup';
 import { generateSrc } from './src';
 import { generateStyleModulesType } from './styleModulesType';
@@ -56,7 +56,13 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 	const ctx = createScriptCodegenContext(options);
 
 	if (options.vueCompilerOptions.__setupedGlobalTypes) {
-		yield `/// <reference types=".vue-global-types/${options.vueCompilerOptions.lib}_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}.d.ts" />${newLine}`;
+		const globalTypes = options.vueCompilerOptions.__setupedGlobalTypes;
+		if (typeof globalTypes === 'object') {
+			yield `/// <reference types="${globalTypes.absolutePath}" />${newLine}`;
+		}
+		else {
+			yield `/// <reference types=".vue-global-types/${options.vueCompilerOptions.lib}_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}.d.ts" />${newLine}`;
+		}
 	}
 	else {
 		yield `/* placeholder */`;
@@ -79,6 +85,7 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 			}
 			else {
 				yield generateSfcBlockSection(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures.all);
+				yield* generateScriptSectionPartiallyEnding(options.sfc.script.name, options.sfc.script.content.length, '#3632/both.vue');
 				yield* generateScriptSetup(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
 			}
 		}
@@ -117,7 +124,7 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 				yield `__VLS_template = () => {${newLine}`;
 				const templateCodegenCtx = yield* generateTemplate(options, ctx);
 				yield* generateComponentSelf(options, ctx, templateCodegenCtx);
-				yield `},${newLine}`;
+				yield `}${endOfLine}`;
 				yield generateSfcBlockSection(options.sfc.script, classBlockEnd, options.sfc.script.content.length, codeFeatures.all);
 			}
 		}
@@ -131,12 +138,12 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 		yield* generateScriptSetup(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
 	}
 
-	yield `;`;
+	if (options.sfc.script) {
+		yield* generateScriptSectionPartiallyEnding(options.sfc.script.name, options.sfc.script.content.length, '#3632/script.vue');
+	}
 	if (options.sfc.scriptSetup) {
-		// #4569
-		yield ['', 'scriptSetup', options.sfc.scriptSetup.content.length, codeFeatures.verification];
+		yield* generateScriptSectionPartiallyEnding(options.sfc.scriptSetup.name, options.sfc.scriptSetup.content.length, '#4569/main.vue');
 	}
-	yield newLine;
 
 	if (!ctx.generatedTemplate) {
 		yield `function __VLS_template() {${newLine}`;
@@ -163,6 +170,12 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 	return ctx;
 }
 
+export function* generateScriptSectionPartiallyEnding(source: string, end: number, mark: string): Generator<Code> {
+	yield `;`;
+	yield ['', source, end, codeFeatures.verification];
+	yield `/* PartiallyEnd: ${mark} */${newLine}`;
+}
+
 function* generateDefineProp(
 	options: ScriptCodegenOptions,
 	scriptSetup: NonNullable<Sfc['scriptSetup']>