@vue/language-core 2.2.10 → 3.0.0-alpha.10

package/index.d.ts

@@ -5,9 +5,8 @@ export * from './lib/parsers/scriptSetupRanges';
 export * from './lib/plugins';
 export * from './lib/types';
 export * from './lib/utils/parseSfc';
+export * from './lib/utils/shared';
 export * from './lib/utils/ts';
 export * from './lib/virtualFile/vueFile';
 export { tsCodegen } from './lib/plugins/vue-tsx';
-export * from './lib/utils/shared';
 export * from '@volar/language-core';
-export type * as CompilerDOM from '@vue/compiler-dom';

package/index.js

@@ -22,10 +22,10 @@ __exportStar(require("./lib/parsers/scriptSetupRanges"), exports);
 __exportStar(require("./lib/plugins"), exports);
 __exportStar(require("./lib/types"), exports);
 __exportStar(require("./lib/utils/parseSfc"), exports);
+__exportStar(require("./lib/utils/shared"), exports);
 __exportStar(require("./lib/utils/ts"), exports);
 __exportStar(require("./lib/virtualFile/vueFile"), exports);
 var vue_tsx_1 = require("./lib/plugins/vue-tsx");
 Object.defineProperty(exports, "tsCodegen", { enumerable: true, get: function () { return vue_tsx_1.tsCodegen; } });
-__exportStar(require("./lib/utils/shared"), exports);
 __exportStar(require("@volar/language-core"), exports);
 //# sourceMappingURL=index.js.map

package/lib/codegen/codeFeatures.d.ts

@@ -78,6 +78,11 @@ declare const raw: {
         };
         verification: true;
     };
+    withoutSemantic: {
+        verification: true;
+        navigation: true;
+        completion: true;
+    };
 };
 export declare const codeFeatures: { [K in keyof typeof raw]: VueCodeInformation; };
 export {};

package/lib/codegen/codeFeatures.js

@@ -66,6 +66,11 @@ const raw = {
         semantic: { shouldHighlight: () => false },
         verification: true,
     },
+    withoutSemantic: {
+        verification: true,
+        navigation: true,
+        completion: true,
+    },
 };
 exports.codeFeatures = raw;
 //# sourceMappingURL=codeFeatures.js.map

package/lib/codegen/globalTypes.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGlobalTypesFileName = getGlobalTypesFileName;
 exports.generateGlobalTypes = generateGlobalTypes;
-const shared_1 = require("../utils/shared");
 function getGlobalTypesFileName({ lib, target, checkUnknownProps, checkUnknownEvents, checkUnknownComponents, }) {
     return [
         lib,
@@ -13,7 +12,7 @@ function getGlobalTypesFileName({ lib, target, checkUnknownProps, checkUnknownEv
     ].map(v => (typeof v === 'boolean' ? Number(v) : v)).join('_') + '.d.ts';
 }
 function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvents, checkUnknownComponents, }) {
-    const fnPropsType = `(K extends { $props: infer Props } ? Props : any)${checkUnknownProps ? '' : ' & Record<string, unknown>'}`;
+    const fnPropsType = `(T extends { $props: infer Props } ? Props : {})${checkUnknownProps ? '' : ' & Record<string, unknown>'}`;
     let text = ``;
     if (target < 3.5) {
         text += `
@@ -24,7 +23,6 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
     }
     text += `
 ; declare global {
-	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;
@@ -52,10 +50,31 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 		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] } :
 		${checkUnknownComponents ? '{}' : '{ [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 :
-		{};
+	type __VLS_FunctionalComponentCtx<T, K> = __VLS_PickNotAny<'__ctx' extends keyof __VLS_PickNotAny<K, {}>
+		? K extends { __ctx?: infer Ctx } ? NonNullable<Ctx> : never : any
+		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
+	>;
+	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
+		: {};
+	type __VLS_FunctionalComponent<T> = (props: ${fnPropsType}, ctx?: any) => __VLS_Element & {
+		__ctx?: {
+			attrs?: any,
+			slots?: T extends { $slots: infer Slots } ? Slots : Record<string, any>,
+			emit?: T extends { $emit: infer Emit } ? Emit : {},
+			props?: ${fnPropsType},
+			expose?: (exposed: T) => void,
+		}
+	};
+	type __VLS_NormalizeSlotReturns<S, R = NonNullable<S> extends (...args: any) => infer K ? K : any> = R extends any[] ? {
+		[K in keyof R]: R[K] extends infer V
+			? V extends Element ? V
+			: V extends new (...args: any) => infer R ? ReturnType<__VLS_FunctionalComponent<R>>
+			: V extends (...args: any) => infer R ? R
+			: any
+			: never
+	} : R;
 	type __VLS_IsFunction<T, K> = K extends keyof T
 		? __VLS_IsAny<T[K]> extends false
 		? unknown extends T[K]
@@ -63,13 +82,13 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 		: true
 		: false
 		: false;
-	type __VLS_NormalizeComponentEvent<Props, Events, onEvent extends keyof Props, Event extends keyof Events, CamelizedEvent extends keyof Events> = (
+	type __VLS_NormalizeComponentEvent<Props, Emits, onEvent extends keyof Props, Event extends keyof Emits, CamelizedEvent extends keyof Emits> = (
 		__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] }
+			: __VLS_IsFunction<Emits, Event> extends true
+				? { [K in onEvent]?: Emits[Event] }
+				: __VLS_IsFunction<Emits, CamelizedEvent> extends true
+					? { [K in onEvent]?: Emits[CamelizedEvent] }
 					: Props
 	)${checkUnknownEvents ? '' : ' & Record<string, unknown>'};
 	// fix https://github.com/vuejs/language-tools/issues/926
@@ -95,11 +114,16 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 			}
 		>
 	>;
+	type __VLS_ResolveEmits<
+		Comp,
+		Emits,
+		TypeEmits = ${target >= 3.6 ? `Comp extends { __typeEmits?: infer T } ? unknown extends T ? {} : import('${lib}').ShortEmitsToObject<T> : {}` : `{}`},
+		NormalizedEmits = __VLS_NormalizeEmits<Emits> extends infer E ? string extends keyof E ? {} : E : never,
+	> = __VLS_SpreadMerge<NormalizedEmits, TypeEmits>;
+	type __VLS_ResolveDirectives<T> = {
+		[K in Exclude<keyof T, keyof __VLS_GlobalDirectives> & string as \`v\${Capitalize<K>}\`]: T[K];
+	};
 	type __VLS_PrettifyGlobal<T> = { [K in keyof T]: T[K]; } & {};
-	type __VLS_PickFunctionalComponentCtx<T, K> = NonNullable<__VLS_PickNotAny<
-		'__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<T extends number | string | any[] | Iterable<any>>(source: T): [
@@ -115,10 +139,8 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 		key: keyof T,
 		index: number,
 	][];
-	// @ts-ignore
-	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_getSlotParameters<S, D extends S>(slot: S, decl?: D):
+		__VLS_PickNotAny<NonNullable<D>, (...args: any) => any> extends (...args: infer P) => any ? P : any[];
 	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
@@ -126,19 +148,10 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 			: (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
 	function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
 	function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
-		T extends new (...args: any) => any
-		? (props: ${fnPropsType}, ctx?: any) => __VLS_Element & {
-			__ctx?: {
-				attrs?: any;
-				slots?: K extends { ${(0, shared_1.getSlotsPropertyName)(target)}: infer Slots } ? Slots : any;
-				emit?: K extends { $emit: infer Emit } ? Emit : any;
-				expose?(exposed: K): void;
-				props?: ${fnPropsType};
-			}
-		}
+		T extends new (...args: any) => any ? __VLS_FunctionalComponent<K>
 		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
 		: T extends (...args: any) => any ? T
-		: (_: {}${checkUnknownProps ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {}${checkUnknownProps ? '' : ' & Record<string, unknown>'} } };
+		: __VLS_FunctionalComponent<{}>;
 	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
 	function __VLS_asFunctionalElement<T>(tag: T, endTag?: T): (attrs: T${checkUnknownComponents ? '' : ' & Record<string, unknown>'}) => void;
 	function __VLS_asFunctionalSlot<S>(slot: S): S extends () => infer R ? (props: {}) => R : NonNullable<S>;

package/lib/codegen/localTypes.d.ts

@@ -1,6 +1,5 @@
-import type * as ts from 'typescript';
-import { VueCompilerOptions } from '../types';
-export declare function getLocalTypesGenerator(compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions): {
+import type { VueCompilerOptions } from '../types';
+export declare function getLocalTypesGenerator(vueCompilerOptions: VueCompilerOptions): {
     generate: (names: string[]) => Generator<string, void, unknown>;
     getUsedNames(): Set<string>;
     readonly PrettifyLocal: string;

package/lib/codegen/localTypes.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalTypesGenerator = getLocalTypesGenerator;
-const shared_1 = require("../utils/shared");
 const utils_1 = require("./utils");
-function getLocalTypesGenerator(compilerOptions, vueCompilerOptions) {
+function getLocalTypesGenerator(vueCompilerOptions) {
     const used = new Set();
     const OmitKeepDiscriminatedUnion = defineHelper(`__VLS_OmitKeepDiscriminatedUnion`, () => `
 type __VLS_OmitKeepDiscriminatedUnion<T, K extends keyof any> = T extends any
@@ -13,7 +12,7 @@ type __VLS_OmitKeepDiscriminatedUnion<T, K extends keyof any> = T extends any
     const WithDefaults = defineHelper(`__VLS_WithDefaults`, () => `
 type __VLS_WithDefaults<P, D> = {
 	[K in keyof Pick<P, keyof P>]: K extends keyof D
-		? ${PrettifyLocal.name}<P[K] & { default: D[K]}>
+		? ${PrettifyLocal.name}<P[K] & { default: D[K] }>
 		: P[K]
 };
 `.trimStart());
@@ -21,7 +20,7 @@ type __VLS_WithDefaults<P, D> = {
     const WithSlots = defineHelper(`__VLS_WithSlots`, () => `
 type __VLS_WithSlots<T, S> = T & {
 	new(): {
-		${(0, shared_1.getSlotsPropertyName)(vueCompilerOptions.target)}: S;
+		$slots: S;
 		${vueCompilerOptions.jsxSlots ? `$props: ${PropsChildren.name}<S>;` : ''}
 	}
 };
@@ -41,19 +40,10 @@ type __VLS_PropsChildren<S> = {
 	)]?: S;
 };
 `.trimStart());
-    const TypePropsToOption = defineHelper(`__VLS_TypePropsToOption`, () => compilerOptions.exactOptionalPropertyTypes ?
-        `
+    const TypePropsToOption = defineHelper(`__VLS_TypePropsToOption`, () => `
 type __VLS_TypePropsToOption<T> = {
 	[K in keyof T]-?: {} extends Pick<T, K>
-		? { type: import('${vueCompilerOptions.lib}').PropType<T[K]> }
-		: { type: import('${vueCompilerOptions.lib}').PropType<T[K]>, required: true }
-};
-`.trimStart() :
-        `
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-	[K in keyof T]-?: {} extends Pick<T, K>
-		? { type: import('${vueCompilerOptions.lib}').PropType<__VLS_NonUndefinedable<T[K]>> }
+		? { type: import('${vueCompilerOptions.lib}').PropType<Required<T>[K]> }
 		: { type: import('${vueCompilerOptions.lib}').PropType<T[K]>, required: true }
 };
 `.trimStart());

package/lib/codegen/script/component.js

@@ -111,15 +111,23 @@ function* generateEmitsOption(options, scriptSetupRanges) {
 function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasEmitsOption, inheritAttrs) {
     const codes = [];
     if (ctx.generatedPropsType) {
-        codes.push({
-            optionExp: [
-                `{} as `,
-                scriptSetupRanges.withDefaults?.arg ? `${ctx.localTypes.WithDefaults}<` : '',
-                `${ctx.localTypes.TypePropsToOption}<__VLS_PublicProps>`,
-                scriptSetupRanges.withDefaults?.arg ? `, typeof __VLS_withDefaultsArg>` : '',
-            ].join(''),
-            typeOptionExp: `{} as __VLS_PublicProps`,
-        });
+        if (options.vueCompilerOptions.target >= 3.6) {
+            codes.push({
+                optionExp: '{}',
+                typeOptionExp: `{} as __VLS_PublicProps`,
+            });
+        }
+        else {
+            codes.push({
+                optionExp: [
+                    `{} as `,
+                    scriptSetupRanges.withDefaults?.arg ? `${ctx.localTypes.WithDefaults}<` : '',
+                    `${ctx.localTypes.TypePropsToOption}<__VLS_PublicProps>`,
+                    scriptSetupRanges.withDefaults?.arg ? `, typeof __VLS_withDefaultsArg>` : '',
+                ].join(''),
+                typeOptionExp: `{} as __VLS_PublicProps`,
+            });
+        }
     }
     if (scriptSetupRanges.defineProps?.arg) {
         const { arg } = scriptSetupRanges.defineProps;
@@ -146,6 +154,10 @@ function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasE
     const useTypeOption = options.vueCompilerOptions.target >= 3.5 && codes.every(code => code.typeOptionExp);
     const useOption = !useTypeOption || scriptSetupRanges.withDefaults;
     if (useTypeOption) {
+        if (options.vueCompilerOptions.target >= 3.6
+            && scriptSetupRanges.withDefaults?.arg) {
+            yield `__defaults: __VLS_withDefaultsArg,${utils_1.newLine}`;
+        }
         if (codes.length === 1) {
             yield `__typeProps: `;
             yield codes[0].typeOptionExp;

package/lib/codegen/script/context.d.ts

@@ -1,4 +1,4 @@
-import { InlayHintInfo } from '../inlayHints';
+import type { InlayHintInfo } from '../inlayHints';
 import type { ScriptCodegenOptions } from './index';
 export interface HelperType {
     name: string;

package/lib/codegen/script/context.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createScriptCodegenContext = createScriptCodegenContext;
 const localTypes_1 = require("../localTypes");
 function createScriptCodegenContext(options) {
-    const localTypes = (0, localTypes_1.getLocalTypesGenerator)(options.compilerOptions, options.vueCompilerOptions);
+    const localTypes = (0, localTypes_1.getLocalTypesGenerator)(options.vueCompilerOptions);
     const inlayHints = [];
     return {
         generatedTemplate: false,

package/lib/codegen/script/index.d.ts

@@ -3,13 +3,12 @@ import type { ScriptRanges } from '../../parsers/scriptRanges';
 import type { ScriptSetupRanges } from '../../parsers/scriptSetupRanges';
 import type { Code, Sfc, VueCompilerOptions } from '../../types';
 import type { TemplateCodegenContext } from '../template/context';
-import { ScriptCodegenContext } from './context';
+import { type ScriptCodegenContext } from './context';
 export interface ScriptCodegenOptions {
     ts: typeof ts;
     compilerOptions: ts.CompilerOptions;
     vueCompilerOptions: VueCompilerOptions;
     sfc: Sfc;
-    edited: boolean;
     fileName: string;
     lang: string;
     scriptRanges: ScriptRanges | undefined;

package/lib/codegen/script/index.js

@@ -27,7 +27,7 @@ function* generateScript(options) {
         }
     }
     else {
-        yield `/* placeholder */`;
+        yield `/// <reference path="./__VLS_fake.d.ts" />`;
     }
     if (options.sfc.script?.src) {
         yield* (0, src_1.generateSrc)(options.sfc.script.src);
@@ -36,7 +36,7 @@ function* generateScript(options) {
         yield* (0, scriptSetup_1.generateScriptSetupImports)(options.sfc.scriptSetup, options.scriptSetupRanges);
     }
     if (options.sfc.script && options.scriptRanges) {
-        const { exportDefault, classBlockEnd } = options.scriptRanges;
+        const { exportDefault } = options.scriptRanges;
         const isExportRawObject = exportDefault
             && options.sfc.script.content[exportDefault.expression.start] === '{';
         if (options.sfc.scriptSetup && options.scriptSetupRanges) {
@@ -77,19 +77,6 @@ function* generateScript(options) {
             yield options.vueCompilerOptions.optionsWrapper[1];
             yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.end, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
         }
-        else if (classBlockEnd !== undefined) {
-            if (options.vueCompilerOptions.skipTemplateCodegen) {
-                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
-            }
-            else {
-                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, classBlockEnd, codeFeatures_1.codeFeatures.all);
-                yield `__VLS_template = () => {${utils_1.newLine}`;
-                const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
-                yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
-                yield `}${utils_1.endOfLine}`;
-                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, classBlockEnd, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
-            }
-        }
         else {
             yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
             yield* generateScriptSectionPartiallyEnding(options.sfc.script.name, options.sfc.script.content.length, '#3632/script.vue');
@@ -105,9 +92,6 @@ function* generateScript(options) {
         const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
         yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
     }
-    if (options.edited) {
-        yield `type __VLS_IntrinsicElementsCompletion = __VLS_IntrinsicElements${utils_1.endOfLine}`;
-    }
     yield* ctx.localTypes.generate([...ctx.localTypes.getUsedNames()]);
     if (options.appendGlobalTypes) {
         yield (0, globalTypes_1.generateGlobalTypes)(options.vueCompilerOptions);

package/lib/codegen/script/scriptSetup.js

@@ -78,15 +78,6 @@ function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
 }
 function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, syntax) {
     let setupCodeModifies = [];
-    for (const { comments } of scriptSetupRanges.defineProp) {
-        if (comments) {
-            setupCodeModifies.push([
-                [``],
-                comments.start,
-                comments.end,
-            ]);
-        }
-    }
     if (scriptSetupRanges.defineProps) {
         const { name, statement, callExp, typeArg } = scriptSetupRanges.defineProps;
         setupCodeModifies.push(...generateDefineWithType(scriptSetup, statement, scriptSetupRanges.withDefaults?.callExp ?? callExp, typeArg, name, `__VLS_props`, `__VLS_Props`));
@@ -196,7 +187,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
         const templateRefType = arg
             ? [
                 `__VLS_TemplateRefs[`,
-                (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.all),
+                (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.withoutSemantic),
                 `]`
             ]
             : [`unknown`];
@@ -349,11 +340,9 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
         yield `})${utils_1.endOfLine}`;
         yield `type __VLS_BuiltInPublicProps = ${options.vueCompilerOptions.target >= 3.4
             ? `import('${options.vueCompilerOptions.lib}').PublicProps`
-            : options.vueCompilerOptions.target >= 3.0
-                ? `import('${options.vueCompilerOptions.lib}').VNodeProps`
-                    + ` & import('${options.vueCompilerOptions.lib}').AllowedComponentProps`
-                    + ` & import('${options.vueCompilerOptions.lib}').ComponentCustomProps`
-                : `globalThis.JSX.IntrinsicAttributes`}`;
+            : `import('${options.vueCompilerOptions.lib}').VNodeProps`
+                + ` & import('${options.vueCompilerOptions.lib}').AllowedComponentProps`
+                + ` & import('${options.vueCompilerOptions.lib}').ComponentCustomProps`}`;
         yield utils_1.endOfLine;
         yield `type __VLS_OwnProps = `;
         yield `${ctx.localTypes.OmitKeepDiscriminatedUnion}<InstanceType<typeof __VLS_fnComponent>['$props'], keyof __VLS_BuiltInPublicProps>`;
@@ -405,7 +394,7 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
         for (const defineProp of scriptSetupRanges.defineProp) {
             const [propName, localName] = getPropAndLocalName(scriptSetup, defineProp);
             if (defineProp.comments) {
-                yield (0, utils_1.generateSfcBlockSection)(scriptSetup, defineProp.comments.start, defineProp.comments.end, codeFeatures_1.codeFeatures.all);
+                yield scriptSetup.content.slice(defineProp.comments.start, defineProp.comments.end);
                 yield utils_1.newLine;
             }
             if (defineProp.isModel && !defineProp.name) {

package/lib/codegen/script/src.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSrc = generateSrc;
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
+const wrapWith_1 = require("../utils/wrapWith");
 function* generateSrc(src) {
     if (src === true) {
         return;
@@ -21,29 +22,10 @@ function* generateSrc(src) {
         text = text + '.js';
     }
     yield `export * from `;
-    yield* (0, utils_1.generateSfcBlockAttrValue)(src, text, {
+    yield* (0, wrapWith_1.wrapWith)(src.offset, src.offset + src.text.length, 'main', {
         ...codeFeatures_1.codeFeatures.all,
-        navigation: text === src.text
-            ? true
-            : {
-                shouldRename: () => false,
-                resolveRenameEditText(newName) {
-                    if (newName.endsWith('.jsx') || newName.endsWith('.js')) {
-                        newName = newName.split('.').slice(0, -1).join('.');
-                    }
-                    if (src?.text.endsWith('.d.ts')) {
-                        newName = newName + '.d.ts';
-                    }
-                    else if (src?.text.endsWith('.ts')) {
-                        newName = newName + '.ts';
-                    }
-                    else if (src?.text.endsWith('.tsx')) {
-                        newName = newName + '.tsx';
-                    }
-                    return newName;
-                },
-            },
-    });
+        ...text !== src.text ? codeFeatures_1.codeFeatures.navigationWithoutRename : {},
+    }, `'`, [text.slice(0, src.text.length), 'main', src.offset, utils_1.combineLastMapping], text.slice(src.text.length), `'`);
     yield utils_1.endOfLine;
     yield `export { default } from '${text}'${utils_1.endOfLine}`;
 }

package/lib/codegen/script/template.js

@@ -15,9 +15,9 @@ function* generateTemplate(options, ctx) {
     ctx.generatedTemplate = true;
     const templateCodegenCtx = (0, context_1.createTemplateCodegenContext)({
         scriptSetupBindingNames: new Set(),
-        edited: options.edited,
     });
     yield* generateTemplateCtx(options);
+    yield* generateTemplateElements();
     yield* generateTemplateComponents(options);
     yield* generateTemplateDirectives(options);
     yield* generateTemplateBody(options, templateCodegenCtx);
@@ -47,8 +47,11 @@ function* generateTemplateCtx(options) {
         yield `}${utils_1.endOfLine}`;
     }
 }
+function* generateTemplateElements() {
+    yield `let __VLS_elements!: __VLS_IntrinsicElements${utils_1.endOfLine}`;
+}
 function* generateTemplateComponents(options) {
-    const types = [];
+    const types = [`typeof __VLS_ctx`];
     if (options.sfc.script && options.scriptRanges?.exportDefault?.componentsOption) {
         const { componentsOption } = options.scriptRanges.exportDefault;
         yield `const __VLS_componentsOption = `;
@@ -61,7 +64,6 @@ function* generateTemplateComponents(options) {
         yield utils_1.endOfLine;
         types.push(`typeof __VLS_componentsOption`);
     }
-    types.push(`typeof __VLS_ctx`);
     yield `type __VLS_LocalComponents =`;
     for (const type of types) {
         yield ` & `;
@@ -71,7 +73,7 @@ function* generateTemplateComponents(options) {
     yield `let __VLS_components!: __VLS_LocalComponents & __VLS_GlobalComponents${utils_1.endOfLine}`;
 }
 function* generateTemplateDirectives(options) {
-    const types = [];
+    const types = [`typeof __VLS_ctx`];
     if (options.sfc.script && options.scriptRanges?.exportDefault?.directivesOption) {
         const { directivesOption } = options.scriptRanges.exportDefault;
         yield `const __VLS_directivesOption = `;
@@ -82,9 +84,8 @@ function* generateTemplateDirectives(options) {
             codeFeatures_1.codeFeatures.navigation,
         ];
         yield utils_1.endOfLine;
-        types.push(`typeof __VLS_directivesOption`);
+        types.push(`__VLS_ResolveDirectives<typeof __VLS_directivesOption>`);
     }
-    types.push(`typeof __VLS_ctx`);
     yield `type __VLS_LocalDirectives =`;
     for (const type of types) {
         yield ` & `;

package/lib/codegen/template/context.d.ts

@@ -1,6 +1,6 @@
-import type * as CompilerDOM from '@vue/compiler-dom';
+import * as CompilerDOM from '@vue/compiler-dom';
 import type { Code, VueCodeInformation } from '../../types';
-import { InlayHintInfo } from '../inlayHints';
+import type { InlayHintInfo } from '../inlayHints';
 import type { TemplateCodegenOptions } from './index';
 export type TemplateCodegenContext = ReturnType<typeof createTemplateCodegenContext>;
 /**
@@ -100,7 +100,18 @@ export type TemplateCodegenContext = ReturnType<typeof createTemplateCodegenCont
  * an error/diagnostic was encountered for a region of code covered by a `@vue-expect-error` directive,
  * and additionally how we use that to determine whether to propagate diagnostics back upward.
  */
-export declare function createTemplateCodegenContext(options: Pick<TemplateCodegenOptions, 'scriptSetupBindingNames' | 'edited'>): {
+export declare function createTemplateCodegenContext(options: Pick<TemplateCodegenOptions, 'scriptSetupBindingNames'>): {
+    readonly currentInfo: {
+        ignoreError?: boolean;
+        expectError?: {
+            token: number;
+            node: CompilerDOM.CommentNode;
+        };
+        generic?: {
+            content: string;
+            offset: number;
+        };
+    };
     codeFeatures: {
         all: VueCodeInformation;
         none: VueCodeInformation;
@@ -118,8 +129,10 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
         withoutHighlightAndNavigation: VueCodeInformation;
         withoutHighlightAndCompletion: VueCodeInformation;
         withoutHighlightAndCompletionAndNavigation: VueCodeInformation;
+        withoutSemantic: VueCodeInformation;
     };
     resolveCodeFeatures: (features: VueCodeInformation) => VueCodeInformation;
+    inVFor: boolean;
     slots: {
         name: string;
         offset?: number;
@@ -133,10 +146,6 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
     }[];
     dollarVars: Set<string>;
     accessExternalVariables: Map<string, Set<number>>;
-    lastGenericComment: {
-        content: string;
-        offset: number;
-    } | undefined;
     blockConditions: string[];
     scopedClasses: {
         source: string;
@@ -150,23 +159,24 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
     templateRefs: Map<string, {
         typeExp: string;
         offset: number;
-    }>;
+    }[]>;
     currentComponent: {
         ctxVar: string;
+        childTypes: string[];
         used: boolean;
     } | undefined;
     singleRootElTypes: string[];
     singleRootNodes: Set<CompilerDOM.ElementNode | null>;
+    addTemplateRef(name: string, typeExp: string, offset: number): void;
     accessExternalVariable(name: string, offset?: number): void;
-    hasLocalVariable: (name: string) => boolean;
-    addLocalVariable: (name: string) => void;
-    removeLocalVariable: (name: string) => void;
-    getInternalVariable: () => string;
-    getHoistVariable: (originalVar: string) => string;
-    generateHoistVariables: () => Generator<string, void, unknown>;
-    generateConditionGuards: () => Generator<string, void, unknown>;
-    ignoreError: () => Generator<Code>;
-    expectError: (prevNode: CompilerDOM.CommentNode) => Generator<Code>;
-    resetDirectiveComments: (endStr: string) => Generator<Code>;
-    generateAutoImportCompletion: () => Generator<Code>;
+    hasLocalVariable(name: string): boolean;
+    addLocalVariable(name: string): void;
+    removeLocalVariable(name: string): void;
+    getInternalVariable(): string;
+    getHoistVariable(originalVar: string): string;
+    generateHoistVariables(): Generator<string, void, unknown>;
+    generateConditionGuards(): Generator<string, void, unknown>;
+    generateAutoImportCompletion(): Generator<Code>;
+    enter(node: CompilerDOM.RootNode | CompilerDOM.TemplateChildNode | CompilerDOM.SimpleExpressionNode): boolean;
+    exit(): Generator<Code>;
 };