Merge branch 'master' of https://github.com/vuejs/language-tools into…

… feat/local-vue-compiler-options

.github/workflows/update-html-data.yml

@@ -1,6 +1,9 @@
 name: update-html-data
 
 on:
+  push:
+    branches:
+    - 'master'
   workflow_dispatch:
   schedule:
     - cron: '0 0 * * *'

extensions/vscode/README.md

@@ -259,13 +259,13 @@ Finally you need to make VS Code recognize your new extension and automatically
 
 <!-- commands -->
 
-| Command                        | Title                                             |
-| ------------------------------ | ------------------------------------------------- |
-| `vue.action.restartServer`     | Vue: Restart Vue and TS servers                   |
-| `vue.action.doctor`            | Vue: Doctor                                       |
-| `vue.action.writeVirtualFiles` | Vue (Debug): Write Virtual Files                  |
-| `vue.action.splitEditors`      | Vue: Split <script>, <template>, <style> Editors  |
-| `vue.findAllFileReferences`    | Vue: Find File References via Vue Language Server |
+| Command                        | Title                                                  |
+| ------------------------------ | ------------------------------------------------------ |
+| `vue.action.restartServer`     | Vue: Restart Vue and TS servers                        |
+| `vue.action.doctor`            | Vue: Doctor                                            |
+| `vue.action.writeVirtualFiles` | Vue (Debug): Write Virtual Files                       |
+| `vue.action.splitEditors`      | Vue: Split &lt;script&gt;, <template>, <style> Editors |
+| `vue.findAllFileReferences`    | Vue: Find File References via Vue Language Server      |
 
 <!-- commands -->
 
@@ -292,7 +292,7 @@ Finally you need to make VS Code recognize your new extension and automatically
 | `vue.complete.casing.props`           | Preferred attr name case.                                                                                                                                          | `string`         | `"autoKebab"`                       |
 | `vue.complete.defineAssignment`       | Auto add `const props = ` before `defineProps` when selecting the completion item `props`. (also `emit` and `slots`)                                               | `boolean`        | `true`                              |
 | `vue.autoInsert.dotValue`             | Auto-complete Ref value with `.value`.                                                                                                                             | `boolean`        | `false`                             |
-| `vue.autoInsert.bracketSpacing`       | Auto add space between double curly brackets: {{|}} -> {{ | }}                                                                                                     | `boolean`        | `true`                              |
+| `vue.autoInsert.bracketSpacing`       | Auto add space between double curly brackets: {{&vert;}} -&gt; {{ | }}                                                                                             | `boolean`        | `true`                              |
 | `vue.inlayHints.destructuredProps`    | Show inlay hints for destructured props.                                                                                                                           | `boolean`        | `false`                             |
 | `vue.inlayHints.missingProps`         | Show inlay hints for missing required props.                                                                                                                       | `boolean`        | `false`                             |
 | `vue.inlayHints.inlineHandlerLeading` | Show inlay hints for event argument in inline handlers.                                                                                                            | `boolean`        | `false`                             |

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

@@ -15,6 +15,7 @@ export function generateGlobalTypes(lib: string, target: number, strictTemplates
 	const __VLS_intrinsicElements: __VLS_IntrinsicElements;
 	const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any };
 	const __VLS_unref: typeof import('${lib}').unref;
+	const __VLS_placeholder: any;
 
 	const __VLS_nativeElements = {
 		...{} as SVGElementTagNameMap,
@@ -47,7 +48,7 @@ export function generateGlobalTypes(lib: string, target: number, strictTemplates
 		N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } :
 		N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } :
 		N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } :
-		${strictTemplates ? '{}' : '{ [K in N0]: unknown }'}
+		${strictTemplates ? '{}' : '{ [K in N0]: unknown }'};
 	type __VLS_FunctionalComponentProps<T, K> =
 		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
 		: T extends (props: infer P, ...args: any) => any ? P :
@@ -59,6 +60,15 @@ export function generateGlobalTypes(lib: string, target: number, strictTemplates
 		: true
 		: false
 		: false;
+	type __VLS_NormalizeComponentEvent<Props, Events, onEvent extends keyof Props, Event extends keyof Events, CamelizedEvent extends keyof Events> = (
+		__VLS_IsFunction<Props, onEvent> extends true
+			? Props
+			: __VLS_IsFunction<Events, Event> extends true
+				? { [K in onEvent]?: Events[Event] }
+				: __VLS_IsFunction<Events, CamelizedEvent> extends true
+					? { [K in onEvent]?: Events[CamelizedEvent] }
+					: Props
+	)${strictTemplates ? '' : ' & Record<string, unknown>'};
 	// fix https://github.com/vuejs/language-tools/issues/926
 	type __VLS_UnionToIntersection<U> = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never;
 	type __VLS_OverloadUnionInner<T, U = unknown> = U & T extends (...args: infer A) => infer R

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

@@ -27,8 +27,8 @@ export function* generateComponentSelf(
 				? [options.sfc.script.content, options.scriptRanges.bindings] as const
 				: ['', []] as const,
 		]) {
-			for (const expose of bindings) {
-				const varName = content.slice(expose.start, expose.end);
+			for (const { range } of bindings) {
+				const varName = content.slice(range.start, range.end);
 				if (!templateUsageVars.has(varName) && !templateCodegenCtx.accessExternalVariables.has(varName)) {
 					continue;
 				}

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

@@ -21,8 +21,12 @@ export function createScriptCodegenContext(options: ScriptCodegenOptions) {
 		scriptSetupGeneratedOffset: undefined as number | undefined,
 		bypassDefineComponent: options.lang === 'js' || options.lang === 'jsx',
 		bindingNames: new Set([
-			...options.scriptRanges?.bindings.map(range => options.sfc.script!.content.slice(range.start, range.end)) ?? [],
-			...options.scriptSetupRanges?.bindings.map(range => options.sfc.scriptSetup!.content.slice(range.start, range.end)) ?? [],
+			...options.scriptRanges?.bindings.map(
+				({ range }) => options.sfc.script!.content.slice(range.start, range.end)
+			) ?? [],
+			...options.scriptSetupRanges?.bindings.map(
+				({ range }) => options.sfc.scriptSetup!.content.slice(range.start, range.end)
+			) ?? [],
 		]),
 		localTypes,
 		inlayHints,

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

@@ -84,7 +84,6 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 			&& options.sfc.script.content[exportDefault.expression.start] === '{';
 		if (options.sfc.scriptSetup && options.scriptSetupRanges) {
 			yield* generateScriptSetupImports(options.sfc.scriptSetup, options.scriptSetupRanges);
-			yield* generateDefineProp(options);
 			if (exportDefault) {
 				yield generateSfcBlockSection(options.sfc.script, 0, exportDefault.expression.start, codeFeatures.all);
 				yield* generateScriptSetup(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
@@ -141,7 +140,6 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 	}
 	else if (options.sfc.scriptSetup && options.scriptSetupRanges) {
 		yield* generateScriptSetupImports(options.sfc.scriptSetup, options.scriptSetupRanges);
-		yield* generateDefineProp(options);
 		yield* generateScriptSetup(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
 	}
 
@@ -182,21 +180,3 @@ export function* generateScriptSectionPartiallyEnding(source: string, end: numbe
 	yield ['', source, end, codeFeatures.verification];
 	yield `/* PartiallyEnd: ${mark} */${newLine}`;
 }
-
-function* generateDefineProp(options: ScriptCodegenOptions): Generator<Code> {
-	const definePropProposalA = options.vueCompilerOptions.experimentalDefinePropProposal === 'kevinEdition';
-	const definePropProposalB = options.vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition';
-
-	if (definePropProposalA || definePropProposalB) {
-		yield `type __VLS_PropOptions<T> = Exclude<import('${options.vueCompilerOptions.lib}').Prop<T>, import('${options.vueCompilerOptions.lib}').PropType<T>>${endOfLine}`;
-		if (definePropProposalA) {
-			yield `declare function defineProp<T>(name: string, options: ({ required: true } | { default: T }) & __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${endOfLine}`;
-			yield `declare function defineProp<T>(name?: string, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T | undefined>${endOfLine}`;
-		}
-		if (definePropProposalB) {
-			yield `declare function defineProp<T>(value: T | (() => T), required?: boolean, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${endOfLine}`;
-			yield `declare function defineProp<T>(value: T | (() => T) | undefined, required: true, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${endOfLine}`;
-			yield `declare function defineProp<T>(value?: T | (() => T), required?: boolean, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T | undefined>${endOfLine}`;
-		}
-	}
-}