@vue/language-core 2.2.2 → 2.2.6

package/lib/codegen/globalTypes.js

@@ -10,12 +10,7 @@ function getGlobalTypesFileName({ lib, target, checkUnknownProps, checkUnknownEv
         checkUnknownProps,
         checkUnknownEvents,
         checkUnknownComponents,
-    ].map(v => {
-        if (typeof v === 'boolean') {
-            return v ? 1 : 0;
-        }
-        return v;
-    }).join('_') + '.d.ts';
+    ].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>'}`;
@@ -34,11 +29,7 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 	const __VLS_unref: typeof import('${lib}').unref;
 	const __VLS_placeholder: any;
 
-	const __VLS_nativeElements = {
-		...{} as SVGElementTagNameMap,
-		...{} as HTMLElementTagNameMap,
-	};
-
+	type __VLS_NativeElements = __VLS_SpreadMerge<SVGElementTagNameMap, HTMLElementTagNameMap>;
 	type __VLS_IntrinsicElements = ${(target >= 3.3
         ? `import('${lib}/jsx-runtime').JSX.IntrinsicElements;`
         : `globalThis.JSX.IntrinsicElements;`)}
@@ -51,7 +42,7 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 	type __VLS_GlobalDirectives = import('${lib}').GlobalDirectives;
 	type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
 	type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
-	type __VLS_unknownDirective = (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
+	type __VLS_SpreadMerge<A, B> = Omit<A, keyof B> & B;
 	type __VLS_WithComponent<N0 extends string, LocalComponents, Self, N1 extends string, N2 extends string, N3 extends string> =
 		N1 extends keyof LocalComponents ? N1 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N1] } :
 		N2 extends keyof LocalComponents ? N2 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N2] } :
@@ -114,19 +105,12 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 	};
 	type __VLS_UseTemplateRef<T> = Readonly<import('${lib}').ShallowRef<T | null>>;
 
-	function __VLS_getVForSourceType(source: number): [number, number][];
-	function __VLS_getVForSourceType(source: string): [string, number][];
-	function __VLS_getVForSourceType<T extends any[]>(source: T): [
-		item: T[number],
-		index: number,
-	][];
-	function __VLS_getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
-		item: T extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never, 
-		index: number,
-	][];
-	// #3845
-	function __VLS_getVForSourceType<T extends number | { [Symbol.iterator](): Iterator<any> }>(source: T): [
-		item: number | (Exclude<T, number> extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never), 
+	function __VLS_getVForSourceType<T extends number | string | any[] | Iterable<any>>(source: T): [
+		item: T extends number ? number
+			: T extends string ? string
+			: T extends any[] ? T[number]
+			: T extends Iterable<infer T1> ? T1
+			: any,
 		index: number,
 	][];
 	function __VLS_getVForSourceType<T>(source: T): [
@@ -142,22 +126,25 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 		? 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;
+			: (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
-		} & { props?: ${fnPropsType}; expose?(exposed: K): void; } }
+		? (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 () => 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>'} } };
-	function __VLS_asFunctionalElement<T>(tag: T, endTag?: T): (_: T${checkUnknownComponents ? '' : ' & Record<string, unknown>'}) => void;
 	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
-	function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
+	function __VLS_asFunctionalElement<T>(tag: T, endTag?: T): (attrs: T${checkUnknownComponents ? '' : ' & Record<string, unknown>'}) => void;
+	function __VLS_asFunctionalSlot<S>(slot: S): (props: NonNullable<S> extends (props: infer P) => any ? P : {}) => void;
 	function __VLS_tryAsConstant<const T>(t: T): T;
 }
 `;

package/lib/codegen/script/component.js

@@ -27,21 +27,23 @@ function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
     yield `},${utils_1.newLine}`;
     if (!ctx.bypassDefineComponent) {
         const emitOptionCodes = [...generateEmitsOption(options, scriptSetupRanges)];
-        for (const code of emitOptionCodes) {
-            yield code;
-        }
+        yield* emitOptionCodes;
         yield* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, !!emitOptionCodes.length, true);
     }
-    if (options.sfc.script && options.scriptRanges?.exportDefault?.args) {
-        const { args } = options.scriptRanges.exportDefault;
-        yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, args.start + 1, args.end - 1, codeFeatures_1.codeFeatures.all);
-    }
-    if (options.vueCompilerOptions.target >= 3.5 && options.templateCodegen?.templateRefs.size) {
+    if (options.vueCompilerOptions.target >= 3.5
+        && options.vueCompilerOptions.inferComponentDollarRefs
+        && options.templateCodegen?.templateRefs.size) {
         yield `__typeRefs: {} as __VLS_TemplateRefs,${utils_1.newLine}`;
     }
-    if (options.vueCompilerOptions.target >= 3.5 && options.templateCodegen?.singleRootElType) {
+    if (options.vueCompilerOptions.target >= 3.5
+        && options.vueCompilerOptions.inferComponentDollarEl
+        && options.templateCodegen?.singleRootElTypes.length) {
         yield `__typeEl: {} as __VLS_RootEl,${utils_1.newLine}`;
     }
+    if (options.sfc.script && options.scriptRanges?.exportDefault?.args) {
+        const { args } = options.scriptRanges.exportDefault;
+        yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, args.start + 1, args.end - 1, codeFeatures_1.codeFeatures.all);
+    }
     yield `})`;
 }
 function* generateComponentSetupReturns(scriptSetupRanges) {

package/lib/codegen/script/componentSelf.js

@@ -27,25 +27,18 @@ function* generateComponentSelf(options, ctx, templateCodegenCtx) {
                 if (!templateUsageVars.has(varName) && !templateCodegenCtx.accessExternalVariables.has(varName)) {
                     continue;
                 }
-                const templateOffset = options.getGeneratedLength();
+                const token = Symbol(varName.length);
+                yield ['', undefined, 0, { __linkedToken: token }];
                 yield `${varName}: ${varName} as typeof `;
-                const scriptOffset = options.getGeneratedLength();
+                yield ['', undefined, 0, { __linkedToken: token }];
                 yield `${varName},${utils_1.newLine}`;
-                options.linkedCodeMappings.push({
-                    sourceOffsets: [scriptOffset],
-                    generatedOffsets: [templateOffset],
-                    lengths: [varName.length],
-                    data: undefined,
-                });
             }
         }
         yield `}${utils_1.endOfLine}`; // return {
         yield `},${utils_1.newLine}`; // setup() {
         if (options.sfc.scriptSetup && options.scriptSetupRanges && !ctx.bypassDefineComponent) {
             const emitOptionCodes = [...(0, component_1.generateEmitsOption)(options, options.scriptSetupRanges)];
-            for (const code of emitOptionCodes) {
-                yield code;
-            }
+            yield* emitOptionCodes;
             yield* (0, component_1.generatePropsOption)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges, !!emitOptionCodes.length, false);
         }
         if (options.sfc.script && options.scriptRanges?.exportDefault?.args) {

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

@@ -10,7 +10,6 @@ export type ScriptCodegenContext = ReturnType<typeof createScriptCodegenContext>
 export declare function createScriptCodegenContext(options: ScriptCodegenOptions): {
     generatedTemplate: boolean;
     generatedPropsType: boolean;
-    scriptSetupGeneratedOffset: number | undefined;
     bypassDefineComponent: boolean;
     bindingNames: Set<string>;
     localTypes: {

package/lib/codegen/script/context.js

@@ -8,7 +8,6 @@ function createScriptCodegenContext(options) {
     return {
         generatedTemplate: false,
         generatedPropsType: false,
-        scriptSetupGeneratedOffset: 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)) ?? [],

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

@@ -1,4 +1,3 @@
-import type { Mapping } from '@volar/language-core';
 import type * as ts from 'typescript';
 import type { ScriptRanges } from '../../parsers/scriptRanges';
 import type { ScriptSetupRanges } from '../../parsers/scriptSetupRanges';
@@ -20,9 +19,7 @@ export interface ScriptCodegenOptions {
     } | undefined;
     destructuredPropNames: Set<string>;
     templateRefNames: Set<string>;
-    getGeneratedLength: () => number;
-    linkedCodeMappings: Mapping[];
     appendGlobalTypes: boolean;
 }
 export declare function generateScript(options: ScriptCodegenOptions): Generator<Code, ScriptCodegenContext>;
-export declare function generateScriptSectionPartiallyEnding(source: string, end: number, mark: string): Generator<Code>;
+export declare function generateScriptSectionPartiallyEnding(source: string, end: number, mark: string, delimiter?: string): Generator<Code>;

package/lib/codegen/script/index.js

@@ -10,7 +10,6 @@ const componentSelf_1 = require("./componentSelf");
 const context_1 = require("./context");
 const scriptSetup_1 = require("./scriptSetup");
 const src_1 = require("./src");
-const styleModulesType_1 = require("./styleModulesType");
 const template_1 = require("./template");
 function* generateScript(options) {
     const ctx = (0, context_1.createScriptCodegenContext)(options);
@@ -31,14 +30,16 @@ function* generateScript(options) {
         yield `/* placeholder */`;
     }
     if (options.sfc.script?.src) {
-        yield* (0, src_1.generateSrc)(options.sfc.script, options.sfc.script.src);
+        yield* (0, src_1.generateSrc)(options.sfc.script.src);
+    }
+    if (options.sfc.scriptSetup && options.scriptSetupRanges) {
+        yield* (0, scriptSetup_1.generateScriptSetupImports)(options.sfc.scriptSetup, options.scriptSetupRanges);
     }
     if (options.sfc.script && options.scriptRanges) {
         const { exportDefault, classBlockEnd } = options.scriptRanges;
         const isExportRawObject = exportDefault
             && options.sfc.script.content[exportDefault.expression.start] === '{';
         if (options.sfc.scriptSetup && options.scriptSetupRanges) {
-            yield* (0, scriptSetup_1.generateScriptSetupImports)(options.sfc.scriptSetup, options.scriptSetupRanges);
             if (exportDefault) {
                 yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.expression.start, codeFeatures_1.codeFeatures.all);
                 yield* (0, scriptSetup_1.generateScriptSetup)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
@@ -91,24 +92,19 @@ function* generateScript(options) {
         }
         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');
         }
     }
     else if (options.sfc.scriptSetup && options.scriptSetupRanges) {
-        yield* (0, scriptSetup_1.generateScriptSetupImports)(options.sfc.scriptSetup, options.scriptSetupRanges);
         yield* (0, scriptSetup_1.generateScriptSetup)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
     }
-    if (options.sfc.script) {
-        yield* generateScriptSectionPartiallyEnding(options.sfc.script.name, options.sfc.script.content.length, '#3632/script.vue');
-    }
     if (options.sfc.scriptSetup) {
-        yield* generateScriptSectionPartiallyEnding(options.sfc.scriptSetup.name, options.sfc.scriptSetup.content.length, '#4569/main.vue');
+        yield* generateScriptSectionPartiallyEnding(options.sfc.scriptSetup.name, options.sfc.scriptSetup.content.length, '#4569/main.vue', ';');
     }
     if (!ctx.generatedTemplate) {
         const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
         yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
     }
-    // #4788
-    yield* (0, styleModulesType_1.generateStyleModulesType)(options, ctx);
     if (options.edited) {
         yield `type __VLS_IntrinsicElementsCompletion = __VLS_IntrinsicElements${utils_1.endOfLine}`;
     }
@@ -121,8 +117,8 @@ function* generateScript(options) {
     }
     return ctx;
 }
-function* generateScriptSectionPartiallyEnding(source, end, mark) {
-    yield `;`;
+function* generateScriptSectionPartiallyEnding(source, end, mark, delimiter = 'debugger') {
+    yield delimiter;
     yield ['', source, end, codeFeatures_1.codeFeatures.verification];
     yield `/* PartiallyEnd: ${mark} */${utils_1.newLine}`;
 }

package/lib/codegen/script/scriptSetup.js

@@ -2,8 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateScriptSetupImports = generateScriptSetupImports;
 exports.generateScriptSetup = generateScriptSetup;
+const shared_1 = require("@vue/shared");
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
+const camelized_1 = require("../utils/camelized");
+const wrapWith_1 = require("../utils/wrapWith");
 const component_1 = require("./component");
 const componentSelf_1 = require("./componentSelf");
 const index_1 = require("./index");
@@ -19,28 +22,25 @@ function* generateScriptSetupImports(scriptSetup, scriptSetupRanges) {
 function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
     if (scriptSetup.generic) {
         if (!options.scriptRanges?.exportDefault) {
-            if (options.sfc.scriptSetup) {
-                // #4569
-                yield [
-                    '',
-                    'scriptSetup',
-                    options.sfc.scriptSetup.content.length,
-                    codeFeatures_1.codeFeatures.verification,
-                ];
-            }
+            // #4569
+            yield ['', 'scriptSetup', 0, codeFeatures_1.codeFeatures.verification];
             yield `export default `;
         }
-        yield `(<`;
-        yield [
-            scriptSetup.generic,
-            scriptSetup.name,
-            scriptSetup.genericOffset,
-            codeFeatures_1.codeFeatures.all,
-        ];
-        if (!scriptSetup.generic.endsWith(`,`)) {
-            yield `,`;
+        yield `(`;
+        if (typeof scriptSetup.generic === 'object') {
+            yield `<`;
+            yield [
+                scriptSetup.generic.text,
+                'main',
+                scriptSetup.generic.offset,
+                codeFeatures_1.codeFeatures.all,
+            ];
+            if (!scriptSetup.generic.text.endsWith(`,`)) {
+                yield `,`;
+            }
+            yield `>`;
         }
-        yield `>(${utils_1.newLine}`
+        yield `(${utils_1.newLine}`
             + `	__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>['props'],${utils_1.newLine}`
             + `	__VLS_ctx?: ${ctx.localTypes.PrettifyLocal}<Pick<NonNullable<Awaited<typeof __VLS_setup>>, 'attrs' | 'emit' | 'slots'>>,${utils_1.newLine}` // use __VLS_Prettify for less dts code
             + `	__VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>['expose'],${utils_1.newLine}`
@@ -77,8 +77,16 @@ function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
     }
 }
 function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, syntax) {
-    ctx.scriptSetupGeneratedOffset = options.getGeneratedLength() - scriptSetupRanges.importSectionEndOffset;
     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`));
@@ -97,22 +105,30 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
             setupCodeModifies.push([
                 [
                     `let __VLS_exposed!: `,
-                    (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.start, typeArg.end, codeFeatures_1.codeFeatures.navigation),
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.start, typeArg.end, codeFeatures_1.codeFeatures.all),
                     `${utils_1.endOfLine}`,
                 ],
                 callExp.start,
                 callExp.start,
+            ], [
+                [`typeof __VLS_exposed`],
+                typeArg.start,
+                typeArg.end,
             ]);
         }
         else if (arg) {
             setupCodeModifies.push([
                 [
                     `const __VLS_exposed = `,
-                    (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.navigation),
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.all),
                     `${utils_1.endOfLine}`,
                 ],
                 callExp.start,
                 callExp.start,
+            ], [
+                [`__VLS_exposed`],
+                arg.start,
+                arg.end,
             ]);
         }
         else {
@@ -123,16 +139,18 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
             ]);
         }
     }
-    for (const { callExp } of scriptSetupRanges.useAttrs) {
-        setupCodeModifies.push([
-            [`(`],
-            callExp.start,
-            callExp.start
-        ], [
-            [` as typeof __VLS_special.$attrs)`],
-            callExp.end,
-            callExp.end
-        ]);
+    if (options.vueCompilerOptions.inferTemplateDollarAttrs) {
+        for (const { callExp } of scriptSetupRanges.useAttrs) {
+            setupCodeModifies.push([
+                [`(`],
+                callExp.start,
+                callExp.start
+            ], [
+                [` as typeof __VLS_dollars.$attrs)`],
+                callExp.end,
+                callExp.end
+            ]);
+        }
     }
     for (const { callExp, exp, arg } of scriptSetupRanges.useCssModule) {
         setupCodeModifies.push([
@@ -146,9 +164,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
                 `])`
             ] : [
                 ` as __VLS_StyleModules[`,
-                ['', scriptSetup.name, exp.start, codeFeatures_1.codeFeatures.verification],
-                `'$style'`,
-                ['', scriptSetup.name, exp.end, utils_1.combineLastMapping],
+                ...(0, wrapWith_1.wrapWith)(exp.start, exp.end, scriptSetup.name, codeFeatures_1.codeFeatures.verification, `'$style'`),
                 `])`
             ],
             callExp.end,
@@ -156,22 +172,24 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
         ]);
         if (arg) {
             setupCodeModifies.push([
-                [`(__VLS_placeholder)`],
+                [`__VLS_placeholder`],
                 arg.start,
                 arg.end
             ]);
         }
     }
-    for (const { callExp } of scriptSetupRanges.useSlots) {
-        setupCodeModifies.push([
-            [`(`],
-            callExp.start,
-            callExp.start
-        ], [
-            [` as typeof __VLS_special.$slots)`],
-            callExp.end,
-            callExp.end
-        ]);
+    if (options.vueCompilerOptions.inferTemplateDollarSlots) {
+        for (const { callExp } of scriptSetupRanges.useSlots) {
+            setupCodeModifies.push([
+                [`(`],
+                callExp.start,
+                callExp.start
+            ], [
+                [` as typeof __VLS_dollars.$slots)`],
+                callExp.end,
+                callExp.end
+            ]);
+        }
     }
     const isTs = options.lang !== 'js' && options.lang !== 'jsx';
     for (const { callExp, exp, arg } of scriptSetupRanges.useTemplateRef) {
@@ -210,7 +228,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
         }
         if (arg) {
             setupCodeModifies.push([
-                [`(__VLS_placeholder)`],
+                [`__VLS_placeholder`],
                 arg.start,
                 arg.end
             ]);
@@ -220,9 +238,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
     let nextStart = Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset);
     for (const [codes, start, end] of setupCodeModifies) {
         yield (0, utils_1.generateSfcBlockSection)(scriptSetup, nextStart, start, codeFeatures_1.codeFeatures.all);
-        for (const code of codes) {
-            yield code;
-        }
+        yield* codes;
         nextStart = end;
     }
     yield (0, utils_1.generateSfcBlockSection)(scriptSetup, nextStart, scriptSetup.content.length, codeFeatures_1.codeFeatures.all);
@@ -240,7 +256,10 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
     const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
     yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
     if (syntax) {
-        if (!options.vueCompilerOptions.skipTemplateCodegen && (options.templateCodegen?.hasSlot || scriptSetupRanges.defineSlots)) {
+        if (!options.vueCompilerOptions.skipTemplateCodegen
+            && (scriptSetupRanges.defineSlots
+                || options.templateCodegen?.slots.length
+                || options.templateCodegen?.dynamicSlots.length)) {
             yield `const __VLS_component = `;
             yield* (0, component_1.generateComponent)(options, ctx, scriptSetup, scriptSetupRanges);
             yield utils_1.endOfLine;
@@ -357,7 +376,7 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
                 continue;
             }
             yield `: `;
-            yield getRangeName(scriptSetup, defineProp.defaultValue);
+            yield getRangeText(scriptSetup, defineProp.defaultValue);
             yield `,${utils_1.newLine}`;
         }
         yield `}${utils_1.endOfLine}`;
@@ -370,6 +389,13 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
         ctx.generatedPropsType = true;
         yield `${ctx.localTypes.PropsChildren}<__VLS_Slots>`;
     }
+    if (scriptSetupRanges.defineProps?.typeArg) {
+        if (ctx.generatedPropsType) {
+            yield ` & `;
+        }
+        ctx.generatedPropsType = true;
+        yield `__VLS_Props`;
+    }
     if (scriptSetupRanges.defineProp.length) {
         if (ctx.generatedPropsType) {
             yield ` & `;
@@ -378,11 +404,15 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
         yield `{${utils_1.newLine}`;
         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 utils_1.newLine;
+            }
             if (defineProp.isModel && !defineProp.name) {
                 yield propName;
             }
             else if (defineProp.name) {
-                yield (0, utils_1.generateSfcBlockSection)(scriptSetup, defineProp.name.start, defineProp.name.end, codeFeatures_1.codeFeatures.navigation);
+                yield* (0, camelized_1.generateCamelized)(getRangeText(scriptSetup, defineProp.name), scriptSetup.name, defineProp.name.start, codeFeatures_1.codeFeatures.navigation);
             }
             else if (defineProp.localName) {
                 yield (0, utils_1.generateSfcBlockSection)(scriptSetup, defineProp.localName.start, defineProp.localName.end, codeFeatures_1.codeFeatures.navigation);
@@ -397,19 +427,12 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
             yield `,${utils_1.newLine}`;
             if (defineProp.modifierType) {
                 const modifierName = `${defineProp.name ? propName : 'model'}Modifiers`;
-                const modifierType = getRangeName(scriptSetup, defineProp.modifierType);
+                const modifierType = getRangeText(scriptSetup, defineProp.modifierType);
                 yield `'${modifierName}'?: Partial<Record<${modifierType}, true>>,${utils_1.newLine}`;
             }
         }
         yield `}`;
     }
-    if (scriptSetupRanges.defineProps?.typeArg) {
-        if (ctx.generatedPropsType) {
-            yield ` & `;
-        }
-        ctx.generatedPropsType = true;
-        yield `__VLS_Props`;
-    }
     if (!ctx.generatedPropsType) {
         yield `{}`;
     }
@@ -423,7 +446,7 @@ function* generateModelEmit(scriptSetup, scriptSetupRanges) {
             const [propName, localName] = getPropAndLocalName(scriptSetup, defineModel);
             yield `'update:${propName}': [value: `;
             yield* generateDefinePropType(scriptSetup, propName, localName, defineModel);
-            if (!defineModel.required) {
+            if (!defineModel.required && !defineModel.defaultValue) {
                 yield ` | undefined`;
             }
             yield `]${utils_1.endOfLine}`;
@@ -435,7 +458,7 @@ function* generateModelEmit(scriptSetup, scriptSetupRanges) {
 function* generateDefinePropType(scriptSetup, propName, localName, defineProp) {
     if (defineProp.type) {
         // Infer from defineProp<T>
-        yield getRangeName(scriptSetup, defineProp.type);
+        yield getRangeText(scriptSetup, defineProp.type);
     }
     else if (defineProp.runtimeType && localName) {
         // Infer from actual prop declaration code 
@@ -451,19 +474,16 @@ function* generateDefinePropType(scriptSetup, propName, localName, defineProp) {
 }
 function getPropAndLocalName(scriptSetup, defineProp) {
     const localName = defineProp.localName
-        ? getRangeName(scriptSetup, defineProp.localName)
+        ? getRangeText(scriptSetup, defineProp.localName)
         : undefined;
-    let propName = defineProp.name
-        ? getRangeName(scriptSetup, defineProp.name)
+    const propName = defineProp.name
+        ? (0, shared_1.camelize)(getRangeText(scriptSetup, defineProp.name).slice(1, -1))
         : defineProp.isModel
             ? 'modelValue'
             : localName;
-    if (defineProp.name) {
-        propName = propName.replace(/['"]+/g, '');
-    }
     return [propName, localName];
 }
-function getRangeName(scriptSetup, range) {
+function getRangeText(scriptSetup, range) {
     return scriptSetup.content.slice(range.start, range.end);
 }
 //# sourceMappingURL=scriptSetup.js.map

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

@@ -1,2 +1,2 @@
-import type { Code, Sfc } from '../../types';
-export declare function generateSrc(script: NonNullable<Sfc['script']>, src: string): Generator<Code>;
+import type { Code, SfcBlockAttr } from '../../types';
+export declare function generateSrc(src: SfcBlockAttr): Generator<Code>;