@vue/language-core 2.1.8 → 2.2.0

package/lib/codegen/script/scriptSetup.js

@@ -2,22 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateScriptSetupImports = generateScriptSetupImports;
 exports.generateScriptSetup = generateScriptSetup;
-const common_1 = require("../common");
+const utils_1 = require("../utils");
 const component_1 = require("./component");
 const componentSelf_1 = require("./componentSelf");
 const index_1 = require("./index");
 const template_1 = require("./template");
 function* generateScriptSetupImports(scriptSetup, scriptSetupRanges) {
     yield [
-        scriptSetup.content.substring(0, Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset)),
+        scriptSetup.content.slice(0, Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset)),
         'scriptSetup',
         0,
         index_1.codeFeatures.all,
     ];
-    yield common_1.newLine;
 }
 function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
-    const definePropMirrors = new Map();
     if (scriptSetup.generic) {
         if (!options.scriptRanges?.exportDefault) {
             if (options.sfc.scriptSetup) {
@@ -41,290 +39,346 @@ function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
         if (!scriptSetup.generic.endsWith(`,`)) {
             yield `,`;
         }
-        yield `>(${common_1.newLine}`
-            + `	__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>['props'],${common_1.newLine}`
-            + `	__VLS_ctx?: ${ctx.localTypes.PrettifyLocal}<Pick<NonNullable<Awaited<typeof __VLS_setup>>, 'attrs' | 'emit' | 'slots'>>,${common_1.newLine}` // use __VLS_Prettify for less dts code
-            + `	__VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>['expose'],${common_1.newLine}`
-            + `	__VLS_setup = (async () => {${common_1.newLine}`;
-        yield* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, undefined, definePropMirrors);
+        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}`
+            + `	__VLS_setup = (async () => {${utils_1.newLine}`;
+        yield* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, undefined);
         const emitTypes = [];
-        if (scriptSetupRanges.emits.define) {
-            emitTypes.push(`typeof ${scriptSetupRanges.emits.name ?? '__VLS_emit'}`);
+        if (scriptSetupRanges.defineEmits) {
+            emitTypes.push(`typeof ${scriptSetupRanges.defineEmits.name ?? '__VLS_emit'}`);
         }
         if (scriptSetupRanges.defineProp.some(p => p.isModel)) {
             emitTypes.push(`typeof __VLS_modelEmit`);
         }
-        yield `		return {} as {${common_1.newLine}`
-            + `			props: ${ctx.localTypes.PrettifyLocal}<typeof __VLS_functionalComponentProps & __VLS_TemplateResult['attrs'] & __VLS_PublicProps> & __VLS_BuiltInPublicProps,${common_1.newLine}`
-            + `			expose(exposed: import('${options.vueCompilerOptions.lib}').ShallowUnwrapRef<${scriptSetupRanges.expose.define ? 'typeof __VLS_exposed' : '{}'}>): void,${common_1.newLine}`
-            + `			attrs: any,${common_1.newLine}`
-            + `			slots: __VLS_TemplateResult['slots'],${common_1.newLine}`
-            + `			emit: ${emitTypes.length ? emitTypes.join(' & ') : `{}`},${common_1.newLine}`
-            + `		}${common_1.endOfLine}`;
-        yield `	})(),${common_1.newLine}`; // __VLS_setup = (async () => {
+        yield `return {} as {${utils_1.newLine}`
+            + `	props: ${ctx.localTypes.PrettifyLocal}<__VLS_OwnProps & __VLS_PublicProps & __VLS_TemplateResult['attrs']> & __VLS_BuiltInPublicProps,${utils_1.newLine}`
+            + `	expose(exposed: import('${options.vueCompilerOptions.lib}').ShallowUnwrapRef<${scriptSetupRanges.defineExpose ? 'typeof __VLS_exposed' : '{}'}>): void,${utils_1.newLine}`
+            + `	attrs: any,${utils_1.newLine}`
+            + `	slots: __VLS_TemplateResult['slots'],${utils_1.newLine}`
+            + `	emit: ${emitTypes.length ? emitTypes.join(' & ') : `{}`},${utils_1.newLine}`
+            + `}${utils_1.endOfLine}`;
+        yield `})(),${utils_1.newLine}`; // __VLS_setup = (async () => {
         yield `) => ({} as import('${options.vueCompilerOptions.lib}').VNode & { __ctx?: Awaited<typeof __VLS_setup> }))`;
     }
     else if (!options.sfc.script) {
         // no script block, generate script setup code at root
-        yield* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, 'export default', definePropMirrors);
+        yield* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, 'export default');
     }
     else {
         if (!options.scriptRanges?.exportDefault) {
             yield `export default `;
         }
-        yield `await (async () => {${common_1.newLine}`;
-        yield* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, 'return', definePropMirrors);
+        yield `await (async () => {${utils_1.newLine}`;
+        yield* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, 'return');
         yield `})()`;
     }
-    if (ctx.scriptSetupGeneratedOffset !== undefined) {
-        for (const defineProp of scriptSetupRanges.defineProp) {
-            if (!defineProp.localName) {
-                continue;
-            }
-            const [_, localName] = getPropAndLocalName(scriptSetup, defineProp);
-            const propMirror = definePropMirrors.get(localName);
-            if (propMirror !== undefined) {
-                options.linkedCodeMappings.push({
-                    sourceOffsets: [defineProp.localName.start + ctx.scriptSetupGeneratedOffset],
-                    generatedOffsets: [propMirror],
-                    lengths: [defineProp.localName.end - defineProp.localName.start],
-                    data: undefined,
-                });
-            }
-        }
-    }
 }
-function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, syntax, definePropMirrors) {
-    if (options.vueCompilerOptions.target >= 3.3) {
-        yield `const { `;
-        for (const macro of Object.keys(options.vueCompilerOptions.macros)) {
-            if (!ctx.bindingNames.has(macro) && macro !== 'templateRef') {
-                yield macro + `, `;
-            }
-        }
-        yield `} = await import('${options.vueCompilerOptions.lib}')${common_1.endOfLine}`;
-    }
+function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, syntax) {
     ctx.scriptSetupGeneratedOffset = options.getGeneratedLength() - scriptSetupRanges.importSectionEndOffset;
     let setupCodeModifies = [];
-    if (scriptSetupRanges.props.define) {
-        setupCodeModifies.push(...generateDefineWithType(scriptSetup, scriptSetupRanges.props.name, scriptSetupRanges.props.define, scriptSetupRanges.props.withDefaults ?? scriptSetupRanges.props.define, '__VLS_props', '__VLS_Props'));
+    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'));
+    }
+    if (scriptSetupRanges.defineEmits) {
+        const { name, statement, callExp, typeArg } = scriptSetupRanges.defineEmits;
+        setupCodeModifies.push(...generateDefineWithType(scriptSetup, statement, callExp, typeArg, name, '__VLS_emit', '__VLS_Emit'));
     }
-    if (scriptSetupRanges.slots.define) {
-        if (scriptSetupRanges.slots.isObjectBindingPattern) {
+    if (scriptSetupRanges.defineSlots) {
+        const { name, callExp, isObjectBindingPattern } = scriptSetupRanges.defineSlots;
+        if (isObjectBindingPattern) {
             setupCodeModifies.push([
                 [`__VLS_slots;\nconst __VLS_slots = `],
-                scriptSetupRanges.slots.define.start,
-                scriptSetupRanges.slots.define.start,
+                callExp.start,
+                callExp.start,
             ]);
         }
-        else if (!scriptSetupRanges.slots.name) {
-            setupCodeModifies.push([[`const __VLS_slots = `], scriptSetupRanges.slots.define.start, scriptSetupRanges.slots.define.start]);
+        else if (!name) {
+            setupCodeModifies.push([
+                [`const __VLS_slots = `],
+                callExp.start,
+                callExp.start
+            ]);
         }
     }
-    if (scriptSetupRanges.emits.define) {
-        setupCodeModifies.push(...generateDefineWithType(scriptSetup, scriptSetupRanges.emits.name, scriptSetupRanges.emits.define, scriptSetupRanges.emits.define, '__VLS_emit', '__VLS_Emit'));
-    }
-    if (scriptSetupRanges.expose.define) {
-        if (scriptSetupRanges.expose.define?.typeArg) {
+    if (scriptSetupRanges.defineExpose) {
+        const { callExp, arg, typeArg } = scriptSetupRanges.defineExpose;
+        if (typeArg) {
             setupCodeModifies.push([
                 [
                     `let __VLS_exposed!: `,
-                    (0, common_1.generateSfcBlockSection)(scriptSetup, scriptSetupRanges.expose.define.typeArg.start, scriptSetupRanges.expose.define.typeArg.end, index_1.codeFeatures.navigation),
-                    `${common_1.endOfLine}`,
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.start, typeArg.end, index_1.codeFeatures.navigation),
+                    `${utils_1.endOfLine}`,
                 ],
-                scriptSetupRanges.expose.define.start,
-                scriptSetupRanges.expose.define.start,
+                callExp.start,
+                callExp.start,
             ]);
         }
-        else if (scriptSetupRanges.expose.define?.arg) {
+        else if (arg) {
             setupCodeModifies.push([
                 [
                     `const __VLS_exposed = `,
-                    (0, common_1.generateSfcBlockSection)(scriptSetup, scriptSetupRanges.expose.define.arg.start, scriptSetupRanges.expose.define.arg.end, index_1.codeFeatures.navigation),
-                    `${common_1.endOfLine}`,
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, index_1.codeFeatures.navigation),
+                    `${utils_1.endOfLine}`,
                 ],
-                scriptSetupRanges.expose.define.start,
-                scriptSetupRanges.expose.define.start,
+                callExp.start,
+                callExp.start,
             ]);
         }
         else {
             setupCodeModifies.push([
-                [`const __VLS_exposed = {}${common_1.endOfLine}`],
-                scriptSetupRanges.expose.define.start,
-                scriptSetupRanges.expose.define.start,
+                [`const __VLS_exposed = {}${utils_1.endOfLine}`],
+                callExp.start,
+                callExp.start,
             ]);
         }
     }
-    if (scriptSetupRanges.cssModules.length) {
-        for (const { define: { arg, exp } } of scriptSetupRanges.cssModules) {
+    // TODO: circular reference
+    // for (const { callExp } of scriptSetupRanges.useAttrs) {
+    // 	setupCodeModifies.push([
+    // 		[`(`],
+    // 		callExp.start,
+    // 		callExp.start
+    // 	], [
+    // 		[` as __VLS_TemplateResult['attrs'] & Record<string, unknown>)`],
+    // 		callExp.end,
+    // 		callExp.end
+    // 	]);
+    // }
+    for (const { callExp, exp, arg } of scriptSetupRanges.useCssModule) {
+        setupCodeModifies.push([
+            [`(`],
+            callExp.start,
+            callExp.start
+        ], [
+            arg ? [
+                ` as Omit<__VLS_StyleModules, '$style'>[`,
+                (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, index_1.codeFeatures.all),
+                `])`
+            ] : [
+                ` as __VLS_StyleModules[`,
+                ['', scriptSetup.name, exp.start, index_1.codeFeatures.verification],
+                `'$style'`,
+                ['', scriptSetup.name, exp.end, utils_1.combineLastMapping],
+                `])`
+            ],
+            callExp.end,
+            callExp.end
+        ]);
+        if (arg) {
             setupCodeModifies.push([
-                arg ? [
-                    ` as Omit<__VLS_StyleModules, '$style'>[`,
-                    (0, common_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, index_1.codeFeatures.all),
-                    `]`
-                ] : [
-                    ` as __VLS_StyleModules[`,
-                    ['', scriptSetup.name, exp.start, index_1.codeFeatures.verification],
-                    `'$style'`,
-                    ['', scriptSetup.name, exp.end, index_1.codeFeatures.verification],
-                    `]`
-                ],
-                exp.end,
-                exp.end
+                [`(__VLS_placeholder)`],
+                arg.start,
+                arg.end
             ]);
         }
     }
+    for (const { callExp } of scriptSetupRanges.useSlots) {
+        setupCodeModifies.push([
+            [`(`],
+            callExp.start,
+            callExp.start
+        ], [
+            [` as __VLS_TemplateResult['slots'])`],
+            callExp.end,
+            callExp.end
+        ]);
+    }
     const isTs = options.lang !== 'js' && options.lang !== 'jsx';
-    for (const { define } of scriptSetupRanges.templateRefs) {
-        if (!define?.arg) {
-            continue;
-        }
+    for (const { callExp, exp, arg } of scriptSetupRanges.useTemplateRef) {
+        const templateRefType = arg
+            ? [
+                `__VLS_TemplateResult['refs'][`,
+                (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, index_1.codeFeatures.all),
+                `]`
+            ]
+            : [`unknown`];
         if (isTs) {
             setupCodeModifies.push([
                 [
-                    `<__VLS_TemplateResult['refs'][`,
-                    (0, common_1.generateSfcBlockSection)(scriptSetup, define.arg.start, define.arg.end, index_1.codeFeatures.navigation),
-                    `], keyof __VLS_TemplateResult['refs']>`
+                    `<`,
+                    ...templateRefType,
+                    `>`
                 ],
-                define.exp.end,
-                define.exp.end
+                exp.end,
+                exp.end
             ]);
         }
         else {
             setupCodeModifies.push([
                 [`(`],
-                define.start,
-                define.start
+                callExp.start,
+                callExp.start
             ], [
                 [
-                    ` as __VLS_UseTemplateRef<__VLS_TemplateResult['refs'][`,
-                    (0, common_1.generateSfcBlockSection)(scriptSetup, define.arg.start, define.arg.end, index_1.codeFeatures.navigation),
-                    `]>)`
+                    ` as __VLS_UseTemplateRef<`,
+                    ...templateRefType,
+                    `>)`
                 ],
-                define.end,
-                define.end
+                callExp.end,
+                callExp.end
+            ]);
+        }
+        if (arg) {
+            setupCodeModifies.push([
+                [`(__VLS_placeholder)`],
+                arg.start,
+                arg.end
             ]);
         }
     }
     setupCodeModifies = setupCodeModifies.sort((a, b) => a[1] - b[1]);
-    let nextStart = scriptSetupRanges.importSectionEndOffset;
+    let nextStart = Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset);
     for (const [codes, start, end] of setupCodeModifies) {
-        yield (0, common_1.generateSfcBlockSection)(scriptSetup, nextStart, start, index_1.codeFeatures.all);
+        yield (0, utils_1.generateSfcBlockSection)(scriptSetup, nextStart, start, index_1.codeFeatures.all);
         for (const code of codes) {
             yield code;
         }
         nextStart = end;
     }
-    yield (0, common_1.generateSfcBlockSection)(scriptSetup, nextStart, scriptSetup.content.length, index_1.codeFeatures.all);
+    yield (0, utils_1.generateSfcBlockSection)(scriptSetup, nextStart, scriptSetup.content.length, index_1.codeFeatures.all);
     yield* (0, index_1.generateScriptSectionPartiallyEnding)(scriptSetup.name, scriptSetup.content.length, '#3632/scriptSetup.vue');
-    if (scriptSetupRanges.props.define?.typeArg && scriptSetupRanges.props.withDefaults?.arg) {
+    yield* generateMacros(options, ctx);
+    yield* generateDefineProp(options);
+    if (scriptSetupRanges.defineProps?.typeArg && scriptSetupRanges.withDefaults?.arg) {
         // fix https://github.com/vuejs/language-tools/issues/1187
         yield `const __VLS_withDefaultsArg = (function <T>(t: T) { return t })(`;
-        yield (0, common_1.generateSfcBlockSection)(scriptSetup, scriptSetupRanges.props.withDefaults.arg.start, scriptSetupRanges.props.withDefaults.arg.end, index_1.codeFeatures.navigation);
-        yield `)${common_1.endOfLine}`;
+        yield (0, utils_1.generateSfcBlockSection)(scriptSetup, scriptSetupRanges.withDefaults.arg.start, scriptSetupRanges.withDefaults.arg.end, index_1.codeFeatures.navigation);
+        yield `)${utils_1.endOfLine}`;
     }
-    yield* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges, definePropMirrors);
+    yield* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges);
     yield* generateModelEmit(scriptSetup, scriptSetupRanges);
-    yield `function __VLS_template() {${common_1.newLine}`;
+    yield `function __VLS_template() {${utils_1.newLine}`;
     const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
-    yield `}${common_1.endOfLine}`;
+    yield `}${utils_1.endOfLine}`;
     yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
-    yield `type __VLS_TemplateResult = ReturnType<typeof __VLS_template>${common_1.endOfLine}`;
+    yield `type __VLS_TemplateResult = ReturnType<typeof __VLS_template>${utils_1.endOfLine}`;
     if (syntax) {
-        if (!options.vueCompilerOptions.skipTemplateCodegen && (options.templateCodegen?.hasSlot || scriptSetupRanges?.slots.define)) {
+        if (!options.vueCompilerOptions.skipTemplateCodegen && (options.templateCodegen?.hasSlot || scriptSetupRanges.defineSlots)) {
             yield `const __VLS_component = `;
             yield* (0, component_1.generateComponent)(options, ctx, scriptSetup, scriptSetupRanges);
-            yield common_1.endOfLine;
+            yield utils_1.endOfLine;
             yield `${syntax} `;
-            yield `{} as ${ctx.localTypes.WithTemplateSlots}<typeof __VLS_component, __VLS_TemplateResult['slots']>${common_1.endOfLine}`;
+            yield `{} as ${ctx.localTypes.WithTemplateSlots}<typeof __VLS_component, __VLS_TemplateResult['slots']>${utils_1.endOfLine}`;
         }
         else {
             yield `${syntax} `;
             yield* (0, component_1.generateComponent)(options, ctx, scriptSetup, scriptSetupRanges);
-            yield common_1.endOfLine;
+            yield utils_1.endOfLine;
+        }
+    }
+}
+function* generateMacros(options, ctx) {
+    if (options.vueCompilerOptions.target >= 3.3) {
+        yield `declare const { `;
+        for (const macro of Object.keys(options.vueCompilerOptions.macros)) {
+            if (!ctx.bindingNames.has(macro)) {
+                yield `${macro}, `;
+            }
+        }
+        yield `}: typeof import('${options.vueCompilerOptions.lib}')${utils_1.endOfLine}`;
+    }
+}
+function* generateDefineProp(options) {
+    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>>${utils_1.endOfLine}`;
+        if (definePropProposalA) {
+            yield `declare function defineProp<T>(name: string, options: ({ required: true } | { default: T }) & __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${utils_1.endOfLine}`;
+            yield `declare function defineProp<T>(name?: string, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T | undefined>${utils_1.endOfLine}`;
+        }
+        if (definePropProposalB) {
+            yield `declare function defineProp<T>(value: T | (() => T), required?: boolean, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${utils_1.endOfLine}`;
+            yield `declare function defineProp<T>(value: T | (() => T) | undefined, required: true, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${utils_1.endOfLine}`;
+            yield `declare function defineProp<T>(value?: T | (() => T), required?: boolean, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T | undefined>${utils_1.endOfLine}`;
         }
     }
 }
-function* generateDefineWithType(scriptSetup, name, define, expression, defaultName, typeName) {
-    const { statement, typeArg } = define;
+function* generateDefineWithType(scriptSetup, statement, callExp, typeArg, name, defaultName, typeName) {
     if (typeArg) {
         yield [[
                 `type ${typeName} = `,
-                (0, common_1.generateSfcBlockSection)(scriptSetup, typeArg.start, typeArg.end, index_1.codeFeatures.all),
-                common_1.endOfLine,
+                (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.start, typeArg.end, index_1.codeFeatures.all),
+                utils_1.endOfLine,
             ], statement.start, statement.start];
         yield [[typeName], typeArg.start, typeArg.end];
     }
     if (!name) {
-        if (statement.start === expression.start && statement.end === expression.end) {
-            yield [[`const ${defaultName} = `], expression.start, expression.start];
+        if (statement.start === callExp.start && statement.end === callExp.end) {
+            yield [[`const ${defaultName} = `], callExp.start, callExp.start];
         }
         else if (typeArg) {
             yield [[
                     `const ${defaultName} = `,
-                    (0, common_1.generateSfcBlockSection)(scriptSetup, expression.start, typeArg.start, index_1.codeFeatures.all)
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, callExp.start, typeArg.start, index_1.codeFeatures.all)
                 ], statement.start, typeArg.start];
             yield [[
-                    (0, common_1.generateSfcBlockSection)(scriptSetup, typeArg.end, expression.end, index_1.codeFeatures.all),
-                    common_1.endOfLine,
-                    (0, common_1.generateSfcBlockSection)(scriptSetup, statement.start, expression.start, index_1.codeFeatures.all),
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.end, callExp.end, index_1.codeFeatures.all),
+                    utils_1.endOfLine,
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, statement.start, callExp.start, index_1.codeFeatures.all),
                     defaultName
-                ], typeArg.end, expression.end];
+                ], typeArg.end, callExp.end];
         }
         else {
             yield [[
                     `const ${defaultName} = `,
-                    (0, common_1.generateSfcBlockSection)(scriptSetup, expression.start, expression.end, index_1.codeFeatures.all),
-                    common_1.endOfLine,
-                    (0, common_1.generateSfcBlockSection)(scriptSetup, statement.start, expression.start, index_1.codeFeatures.all),
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, callExp.start, callExp.end, index_1.codeFeatures.all),
+                    utils_1.endOfLine,
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, statement.start, callExp.start, index_1.codeFeatures.all),
                     defaultName
-                ], statement.start, expression.end];
+                ], statement.start, callExp.end];
         }
     }
 }
-function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges, definePropMirrors) {
-    yield `const __VLS_fnComponent = (await import('${options.vueCompilerOptions.lib}')).defineComponent({${common_1.newLine}`;
-    if (scriptSetupRanges.props.define?.arg) {
-        yield `props: `;
-        yield (0, common_1.generateSfcBlockSection)(scriptSetup, scriptSetupRanges.props.define.arg.start, scriptSetupRanges.props.define.arg.end, index_1.codeFeatures.navigation);
-        yield `,${common_1.newLine}`;
+function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
+    if (scriptSetup.generic) {
+        yield `const __VLS_fnComponent = (await import('${options.vueCompilerOptions.lib}')).defineComponent({${utils_1.newLine}`;
+        if (scriptSetupRanges.defineProps?.arg) {
+            yield `props: `;
+            yield (0, utils_1.generateSfcBlockSection)(scriptSetup, scriptSetupRanges.defineProps.arg.start, scriptSetupRanges.defineProps.arg.end, index_1.codeFeatures.navigation);
+            yield `,${utils_1.newLine}`;
+        }
+        yield* (0, component_1.generateEmitsOption)(options, 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`}`;
+        yield utils_1.endOfLine;
+        yield `type __VLS_OwnProps = `;
+        yield `${ctx.localTypes.OmitKeepDiscriminatedUnion}<InstanceType<typeof __VLS_fnComponent>['$props'], keyof __VLS_BuiltInPublicProps>`;
+        yield utils_1.endOfLine;
     }
-    yield* (0, component_1.generateEmitsOption)(options, scriptSetupRanges);
-    yield `})${common_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;`}`;
-    yield common_1.endOfLine;
-    yield `let __VLS_functionalComponentProps!: `;
-    yield `${ctx.localTypes.OmitKeepDiscriminatedUnion}<InstanceType<typeof __VLS_fnComponent>['$props'], keyof __VLS_BuiltInPublicProps>`;
-    yield common_1.endOfLine;
     if (scriptSetupRanges.defineProp.length) {
-        yield `const __VLS_defaults = {${common_1.newLine}`;
+        yield `const __VLS_defaults = {${utils_1.newLine}`;
         for (const defineProp of scriptSetupRanges.defineProp) {
-            if (defineProp.defaultValue) {
-                const [propName, localName] = getPropAndLocalName(scriptSetup, defineProp);
-                if (defineProp.name || defineProp.isModel) {
-                    yield propName;
-                }
-                else if (defineProp.localName) {
-                    yield localName;
-                }
-                else {
-                    continue;
-                }
-                yield `: `;
-                yield getRangeName(scriptSetup, defineProp.defaultValue);
-                yield `,${common_1.newLine}`;
+            if (!defineProp.defaultValue) {
+                continue;
+            }
+            const [propName, localName] = getPropAndLocalName(scriptSetup, defineProp);
+            if (defineProp.name || defineProp.isModel) {
+                yield `'${propName}'`;
             }
+            else if (defineProp.localName) {
+                yield localName;
+            }
+            else {
+                continue;
+            }
+            yield `: `;
+            yield getRangeName(scriptSetup, defineProp.defaultValue);
+            yield `,${utils_1.newLine}`;
         }
-        yield `}${common_1.endOfLine}`;
+        yield `}${utils_1.endOfLine}`;
     }
     yield `type __VLS_PublicProps = `;
-    if (scriptSetupRanges.slots.define && options.vueCompilerOptions.jsxSlots) {
+    if (scriptSetupRanges.defineSlots && options.vueCompilerOptions.jsxSlots) {
         if (ctx.generatedPropsType) {
             yield ` & `;
         }
@@ -336,19 +390,17 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges, d
             yield ` & `;
         }
         ctx.generatedPropsType = true;
-        yield `{${common_1.newLine}`;
+        yield `{${utils_1.newLine}`;
         for (const defineProp of scriptSetupRanges.defineProp) {
             const [propName, localName] = getPropAndLocalName(scriptSetup, defineProp);
             if (defineProp.isModel && !defineProp.name) {
                 yield propName;
             }
             else if (defineProp.name) {
-                // renaming support
-                yield (0, common_1.generateSfcBlockSection)(scriptSetup, defineProp.name.start, defineProp.name.end, index_1.codeFeatures.navigation);
+                yield (0, utils_1.generateSfcBlockSection)(scriptSetup, defineProp.name.start, defineProp.name.end, index_1.codeFeatures.navigation);
             }
             else if (defineProp.localName) {
-                definePropMirrors.set(localName, options.getGeneratedLength());
-                yield localName;
+                yield (0, utils_1.generateSfcBlockSection)(scriptSetup, defineProp.localName.start, defineProp.localName.end, index_1.codeFeatures.navigation);
             }
             else {
                 continue;
@@ -357,20 +409,16 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges, d
                 ? `: `
                 : `?: `;
             yield* generateDefinePropType(scriptSetup, propName, localName, defineProp);
-            yield `,${common_1.newLine}`;
+            yield `,${utils_1.newLine}`;
             if (defineProp.modifierType) {
-                let propModifierName = 'modelModifiers';
-                if (defineProp.name) {
-                    propModifierName = `${getRangeName(scriptSetup, defineProp.name, true)}Modifiers`;
-                }
+                const modifierName = `${defineProp.name ? propName : 'model'}Modifiers`;
                 const modifierType = getRangeName(scriptSetup, defineProp.modifierType);
-                definePropMirrors.set(propModifierName, options.getGeneratedLength());
-                yield `${propModifierName}?: Record<${modifierType}, true>,${common_1.endOfLine}`;
+                yield `'${modifierName}'?: Partial<Record<${modifierType}, true>>,${utils_1.newLine}`;
             }
         }
         yield `}`;
     }
-    if (scriptSetupRanges.props.define?.typeArg) {
+    if (scriptSetupRanges.defineProps?.typeArg) {
         if (ctx.generatedPropsType) {
             yield ` & `;
         }
@@ -380,20 +428,20 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges, d
     if (!ctx.generatedPropsType) {
         yield `{}`;
     }
-    yield common_1.endOfLine;
+    yield utils_1.endOfLine;
 }
 function* generateModelEmit(scriptSetup, scriptSetupRanges) {
     const defineModels = scriptSetupRanges.defineProp.filter(p => p.isModel);
     if (defineModels.length) {
-        yield `type __VLS_ModelEmit = {${common_1.newLine}`;
+        yield `type __VLS_ModelEmit = {${utils_1.newLine}`;
         for (const defineModel of defineModels) {
             const [propName, localName] = getPropAndLocalName(scriptSetup, defineModel);
-            yield `'update:${propName}': [value:`;
+            yield `'update:${propName}': [value: `;
             yield* generateDefinePropType(scriptSetup, propName, localName, defineModel);
-            yield `]${common_1.endOfLine}`;
+            yield `]${utils_1.endOfLine}`;
         }
-        yield `}${common_1.endOfLine}`;
-        yield `const __VLS_modelEmit = defineEmits<__VLS_ModelEmit>()${common_1.endOfLine}`;
+        yield `}${utils_1.endOfLine}`;
+        yield `const __VLS_modelEmit = defineEmits<__VLS_ModelEmit>()${utils_1.endOfLine}`;
     }
 }
 function* generateDefinePropType(scriptSetup, propName, localName, defineProp) {
@@ -427,8 +475,7 @@ function getPropAndLocalName(scriptSetup, defineProp) {
     }
     return [propName, localName];
 }
-function getRangeName(scriptSetup, range, unwrap = false) {
-    const offset = unwrap ? 1 : 0;
-    return scriptSetup.content.substring(range.start + offset, range.end - offset);
+function getRangeName(scriptSetup, range) {
+    return scriptSetup.content.slice(range.start, range.end);
 }
 //# sourceMappingURL=scriptSetup.js.map