@vue/language-core 2.1.10 → 2.2.0

package/lib/codegen/globalTypes.js

@@ -17,6 +17,7 @@ function generateGlobalTypes(lib, target, strictTemplates) {
 	const __VLS_intrinsicElements: __VLS_IntrinsicElements;
 	const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any };
 	const __VLS_unref: typeof import('${lib}').unref;
+	const __VLS_placeholder: any;
 
 	const __VLS_nativeElements = {
 		...{} as SVGElementTagNameMap,
@@ -43,7 +44,7 @@ function generateGlobalTypes(lib, target, strictTemplates) {
 		N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } :
 		N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } :
 		N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } :
-		${strictTemplates ? '{}' : '{ [K in N0]: unknown }'}
+		${strictTemplates ? '{}' : '{ [K in N0]: unknown }'};
 	type __VLS_FunctionalComponentProps<T, K> =
 		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
 		: T extends (props: infer P, ...args: any) => any ? P :
@@ -55,6 +56,15 @@ function generateGlobalTypes(lib, target, strictTemplates) {
 		: true
 		: false
 		: false;
+	type __VLS_NormalizeComponentEvent<Props, Events, onEvent extends keyof Props, Event extends keyof Events, CamelizedEvent extends keyof Events> = (
+		__VLS_IsFunction<Props, onEvent> extends true
+			? Props
+			: __VLS_IsFunction<Events, Event> extends true
+				? { [K in onEvent]?: Events[Event] }
+				: __VLS_IsFunction<Events, CamelizedEvent> extends true
+					? { [K in onEvent]?: Events[CamelizedEvent] }
+					: Props
+	)${strictTemplates ? '' : ' & Record<string, unknown>'};
 	// fix https://github.com/vuejs/language-tools/issues/926
 	type __VLS_UnionToIntersection<U> = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never;
 	type __VLS_OverloadUnionInner<T, U = unknown> = U & T extends (...args: infer A) => infer R
@@ -119,7 +129,6 @@ function generateGlobalTypes(lib, target, strictTemplates) {
 			: __VLS_unknownDirective;
 	function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
 	function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
-	function __VLS_nonNullable<T>(t: T): T extends null | undefined ? never : T;
 	function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
 		T extends new (...args: any) => any
 		? (props: ${fnPropsType}, ctx?: any) => __VLS_Element & { __ctx?: {

package/lib/codegen/localTypes.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLocalTypesGenerator = getLocalTypesGenerator;
 const shared_1 = require("../utils/shared");
-const common_1 = require("./common");
+const utils_1 = require("./utils");
 function getLocalTypesGenerator(compilerOptions, vueCompilerOptions) {
     const used = new Set();
     const OmitKeepDiscriminatedUnion = defineHelper(`__VLS_OmitKeepDiscriminatedUnion`, () => `
@@ -17,7 +17,7 @@ type __VLS_WithDefaults<P, D> = {
 		: P[K]
 };
 `.trimStart());
-    const PrettifyLocal = defineHelper(`__VLS_PrettifyLocal`, () => `type __VLS_PrettifyLocal<T> = { [K in keyof T]: T[K]; } & {}${common_1.endOfLine}`);
+    const PrettifyLocal = defineHelper(`__VLS_PrettifyLocal`, () => `type __VLS_PrettifyLocal<T> = { [K in keyof T]: T[K]; } & {}${utils_1.endOfLine}`);
     const WithTemplateSlots = defineHelper(`__VLS_WithTemplateSlots`, () => `
 type __VLS_WithTemplateSlots<T, S> = T & {
 	new(): {
@@ -57,7 +57,7 @@ type __VLS_TypePropsToOption<T> = {
 		: { type: import('${vueCompilerOptions.lib}').PropType<T[K]>, required: true }
 };
 `.trimStart());
-    const OmitIndexSignature = defineHelper(`__VLS_OmitIndexSignature`, () => `type __VLS_OmitIndexSignature<T> = { [K in keyof T as {} extends Record<K, unknown> ? never : K]: T[K]; }${common_1.endOfLine}`);
+    const OmitIndexSignature = defineHelper(`__VLS_OmitIndexSignature`, () => `type __VLS_OmitIndexSignature<T> = { [K in keyof T as {} extends Record<K, unknown> ? never : K]: T[K]; }${utils_1.endOfLine}`);
     const helpers = {
         [PrettifyLocal.name]: PrettifyLocal,
         [OmitKeepDiscriminatedUnion.name]: OmitKeepDiscriminatedUnion,

package/lib/codegen/script/component.js

@@ -4,27 +4,27 @@ exports.generateComponent = generateComponent;
 exports.generateComponentSetupReturns = generateComponentSetupReturns;
 exports.generateEmitsOption = generateEmitsOption;
 exports.generatePropsOption = generatePropsOption;
-const common_1 = require("../common");
+const utils_1 = require("../utils");
 const index_1 = require("./index");
 function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
     if (options.sfc.script && options.scriptRanges?.exportDefault && options.scriptRanges.exportDefault.expression.start !== options.scriptRanges.exportDefault.args.start) {
         // use defineComponent() from user space code if it exist
-        yield (0, common_1.generateSfcBlockSection)(options.sfc.script, options.scriptRanges.exportDefault.expression.start, options.scriptRanges.exportDefault.args.start, index_1.codeFeatures.all);
-        yield `{${common_1.newLine}`;
+        yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, options.scriptRanges.exportDefault.expression.start, options.scriptRanges.exportDefault.args.start, index_1.codeFeatures.all);
+        yield `{${utils_1.newLine}`;
     }
     else {
-        yield `(await import('${options.vueCompilerOptions.lib}')).defineComponent({${common_1.newLine}`;
+        yield `(await import('${options.vueCompilerOptions.lib}')).defineComponent({${utils_1.newLine}`;
     }
-    yield `setup() {${common_1.newLine}`;
-    yield `return {${common_1.newLine}`;
+    yield `setup() {${utils_1.newLine}`;
+    yield `return {${utils_1.newLine}`;
     if (ctx.bypassDefineComponent) {
         yield* generateComponentSetupReturns(scriptSetupRanges);
     }
-    if (scriptSetupRanges.expose.define) {
-        yield `...__VLS_exposed,${common_1.newLine}`;
+    if (scriptSetupRanges.defineExpose) {
+        yield `...__VLS_exposed,${utils_1.newLine}`;
     }
-    yield `}${common_1.endOfLine}`;
-    yield `},${common_1.newLine}`;
+    yield `}${utils_1.endOfLine}`;
+    yield `},${utils_1.newLine}`;
     if (!ctx.bypassDefineComponent) {
         const emitOptionCodes = [...generateEmitsOption(options, scriptSetupRanges)];
         for (const code of emitOptionCodes) {
@@ -34,26 +34,26 @@ function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
     }
     if (options.sfc.script && options.scriptRanges?.exportDefault?.args) {
         const { args } = options.scriptRanges.exportDefault;
-        yield (0, common_1.generateSfcBlockSection)(options.sfc.script, args.start + 1, args.end - 1, index_1.codeFeatures.all);
+        yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, args.start + 1, args.end - 1, index_1.codeFeatures.all);
     }
-    if (options.vueCompilerOptions.target >= 3.5 && scriptSetupRanges.templateRefs.length) {
-        yield `__typeRefs: {} as __VLS_TemplateResult['refs'],${common_1.newLine}`;
+    if (options.vueCompilerOptions.target >= 3.5 && options.templateCodegen?.templateRefs.size) {
+        yield `__typeRefs: {} as __VLS_TemplateResult['refs'],${utils_1.newLine}`;
     }
     if (options.vueCompilerOptions.target >= 3.5 && options.templateCodegen?.singleRootElType) {
-        yield `__typeEl: {} as __VLS_TemplateResult['rootEl'],${common_1.newLine}`;
+        yield `__typeEl: {} as __VLS_TemplateResult['rootEl'],${utils_1.newLine}`;
     }
     yield `})`;
 }
 function* generateComponentSetupReturns(scriptSetupRanges) {
     // fill $props
-    if (scriptSetupRanges.props.define) {
+    if (scriptSetupRanges.defineProps) {
         // NOTE: defineProps is inaccurate for $props
-        yield `$props: __VLS_makeOptional(${scriptSetupRanges.props.name ?? `__VLS_props`}),${common_1.newLine}`;
-        yield `...${scriptSetupRanges.props.name ?? `__VLS_props`},${common_1.newLine}`;
+        yield `$props: __VLS_makeOptional(${scriptSetupRanges.defineProps.name ?? `__VLS_props`}),${utils_1.newLine}`;
+        yield `...${scriptSetupRanges.defineProps.name ?? `__VLS_props`},${utils_1.newLine}`;
     }
     // fill $emit
-    if (scriptSetupRanges.emits.define) {
-        yield `$emit: ${scriptSetupRanges.emits.name ?? '__VLS_emit'},${common_1.newLine}`;
+    if (scriptSetupRanges.defineEmits) {
+        yield `$emit: ${scriptSetupRanges.defineEmits.name ?? '__VLS_emit'},${utils_1.newLine}`;
     }
 }
 function* generateEmitsOption(options, scriptSetupRanges) {
@@ -64,10 +64,10 @@ function* generateEmitsOption(options, scriptSetupRanges) {
             typeOptionType: `__VLS_ModelEmit`,
         });
     }
-    if (scriptSetupRanges.emits.define) {
-        const { typeArg, hasUnionTypeArg } = scriptSetupRanges.emits.define;
+    if (scriptSetupRanges.defineEmits) {
+        const { name, typeArg, hasUnionTypeArg } = scriptSetupRanges.defineEmits;
         codes.push({
-            optionExp: `{} as __VLS_NormalizeEmits<typeof ${scriptSetupRanges.emits.name ?? '__VLS_emit'}>`,
+            optionExp: `{} as __VLS_NormalizeEmits<typeof ${name ?? '__VLS_emit'}>`,
             typeOptionType: typeArg && !hasUnionTypeArg
                 ? `__VLS_Emit`
                 : undefined,
@@ -77,7 +77,7 @@ function* generateEmitsOption(options, scriptSetupRanges) {
         if (codes.length === 1) {
             yield `__typeEmits: {} as `;
             yield codes[0].typeOptionType;
-            yield `,${common_1.newLine}`;
+            yield `,${utils_1.newLine}`;
         }
         else if (codes.length >= 2) {
             yield `__typeEmits: {} as `;
@@ -86,23 +86,23 @@ function* generateEmitsOption(options, scriptSetupRanges) {
                 yield ` & `;
                 yield codes[i].typeOptionType;
             }
-            yield `,${common_1.newLine}`;
+            yield `,${utils_1.newLine}`;
         }
     }
     else if (codes.every(code => code.optionExp)) {
         if (codes.length === 1) {
             yield `emits: `;
             yield codes[0].optionExp;
-            yield `,${common_1.newLine}`;
+            yield `,${utils_1.newLine}`;
         }
         else if (codes.length >= 2) {
-            yield `emits: {${common_1.newLine}`;
+            yield `emits: {${utils_1.newLine}`;
             for (const code of codes) {
                 yield `...`;
                 yield code.optionExp;
-                yield `,${common_1.newLine}`;
+                yield `,${utils_1.newLine}`;
             }
-            yield `},${common_1.newLine}`;
+            yield `},${utils_1.newLine}`;
         }
     }
 }
@@ -112,17 +112,17 @@ function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasE
         codes.push({
             optionExp: [
                 `{} as `,
-                scriptSetupRanges.props.withDefaults?.arg ? `${ctx.localTypes.WithDefaults}<` : '',
+                scriptSetupRanges.withDefaults?.arg ? `${ctx.localTypes.WithDefaults}<` : '',
                 `${ctx.localTypes.TypePropsToOption}<__VLS_PublicProps>`,
-                scriptSetupRanges.props.withDefaults?.arg ? `, typeof __VLS_withDefaultsArg>` : '',
+                scriptSetupRanges.withDefaults?.arg ? `, typeof __VLS_withDefaultsArg>` : '',
             ].join(''),
             typeOptionExp: `{} as __VLS_PublicProps`,
         });
     }
-    if (scriptSetupRanges.props.define?.arg) {
-        const { arg } = scriptSetupRanges.props.define;
+    if (scriptSetupRanges.defineProps?.arg) {
+        const { arg } = scriptSetupRanges.defineProps;
         codes.push({
-            optionExp: (0, common_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, index_1.codeFeatures.navigation),
+            optionExp: (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, index_1.codeFeatures.navigation),
             typeOptionExp: undefined,
         });
     }
@@ -142,37 +142,37 @@ function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasE
         });
     }
     const useTypeOption = options.vueCompilerOptions.target >= 3.5 && codes.every(code => code.typeOptionExp);
-    const useOption = !useTypeOption || scriptSetupRanges.props.withDefaults;
+    const useOption = !useTypeOption || scriptSetupRanges.withDefaults;
     if (useTypeOption) {
         if (codes.length === 1) {
             yield `__typeProps: `;
             yield codes[0].typeOptionExp;
-            yield `,${common_1.newLine}`;
+            yield `,${utils_1.newLine}`;
         }
         else if (codes.length >= 2) {
-            yield `__typeProps: {${common_1.newLine}`;
+            yield `__typeProps: {${utils_1.newLine}`;
             for (const { typeOptionExp } of codes) {
                 yield `...`;
                 yield typeOptionExp;
-                yield `,${common_1.newLine}`;
+                yield `,${utils_1.newLine}`;
             }
-            yield `},${common_1.newLine}`;
+            yield `},${utils_1.newLine}`;
         }
     }
     if (useOption) {
         if (codes.length === 1) {
             yield `props: `;
             yield codes[0].optionExp;
-            yield `,${common_1.newLine}`;
+            yield `,${utils_1.newLine}`;
         }
         else if (codes.length >= 2) {
-            yield `props: {${common_1.newLine}`;
+            yield `props: {${utils_1.newLine}`;
             for (const { optionExp } of codes) {
                 yield `...`;
                 yield optionExp;
-                yield `,${common_1.newLine}`;
+                yield `,${utils_1.newLine}`;
             }
-            yield `},${common_1.newLine}`;
+            yield `},${utils_1.newLine}`;
         }
     }
 }

package/lib/codegen/script/componentSelf.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateComponentSelf = generateComponentSelf;
 const path = require("path-browserify");
-const common_1 = require("../common");
+const utils_1 = require("../utils");
 const component_1 = require("./component");
 const index_1 = require("./index");
 const template_1 = require("./template");
 function* generateComponentSelf(options, ctx, templateCodegenCtx) {
     if (options.sfc.scriptSetup && options.scriptSetupRanges) {
-        yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({${common_1.newLine}`;
-        yield `setup() {${common_1.newLine}`;
-        yield `return {${common_1.newLine}`;
+        yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({${utils_1.newLine}`;
+        yield `setup() {${utils_1.newLine}`;
+        yield `return {${utils_1.newLine}`;
         if (ctx.bypassDefineComponent) {
             yield* (0, component_1.generateComponentSetupReturns)(options.scriptSetupRanges);
         }
@@ -22,15 +22,15 @@ function* generateComponentSelf(options, ctx, templateCodegenCtx) {
                 ? [options.sfc.script.content, options.scriptRanges.bindings]
                 : ['', []],
         ]) {
-            for (const expose of bindings) {
-                const varName = content.substring(expose.start, expose.end);
+            for (const { range } of bindings) {
+                const varName = content.slice(range.start, range.end);
                 if (!templateUsageVars.has(varName) && !templateCodegenCtx.accessExternalVariables.has(varName)) {
                     continue;
                 }
                 const templateOffset = options.getGeneratedLength();
                 yield `${varName}: ${varName} as typeof `;
                 const scriptOffset = options.getGeneratedLength();
-                yield `${varName},${common_1.newLine}`;
+                yield `${varName},${utils_1.newLine}`;
                 options.linkedCodeMappings.push({
                     sourceOffsets: [scriptOffset],
                     generatedOffsets: [templateOffset],
@@ -39,8 +39,8 @@ function* generateComponentSelf(options, ctx, templateCodegenCtx) {
                 });
             }
         }
-        yield `}${common_1.endOfLine}`; // return {
-        yield `},${common_1.newLine}`; // setup() {
+        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) {
@@ -50,15 +50,15 @@ function* generateComponentSelf(options, ctx, templateCodegenCtx) {
         }
         if (options.sfc.script && options.scriptRanges?.exportDefault?.args) {
             const { args } = options.scriptRanges.exportDefault;
-            yield (0, common_1.generateSfcBlockSection)(options.sfc.script, args.start + 1, args.end - 1, index_1.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, args.start + 1, args.end - 1, index_1.codeFeatures.all);
         }
-        yield `})${common_1.endOfLine}`; // defineComponent {
+        yield `})${utils_1.endOfLine}`; // defineComponent {
     }
     else if (options.sfc.script) {
-        yield `let __VLS_self!: typeof import('./${path.basename(options.fileName)}').default${common_1.endOfLine}`;
+        yield `let __VLS_self!: typeof import('./${path.basename(options.fileName)}').default${utils_1.endOfLine}`;
     }
     else {
-        yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({})${common_1.endOfLine}`;
+        yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({})${utils_1.endOfLine}`;
     }
 }
 //# sourceMappingURL=componentSelf.js.map

package/lib/codegen/script/context.js

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

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

@@ -13,21 +13,23 @@ export declare const codeFeatures: {
     navigationWithoutRename: VueCodeInformation;
 };
 export interface ScriptCodegenOptions {
-    fileName: string;
     ts: typeof ts;
     compilerOptions: ts.CompilerOptions;
     vueCompilerOptions: VueCompilerOptions;
     sfc: Sfc;
+    edited: boolean;
+    fileName: string;
     lang: string;
     scriptRanges: ScriptRanges | undefined;
     scriptSetupRanges: ScriptSetupRanges | undefined;
     templateCodegen: TemplateCodegenContext & {
         codes: Code[];
     } | undefined;
-    edited: boolean;
-    appendGlobalTypes: boolean;
+    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>;

package/lib/codegen/script/index.js

@@ -4,8 +4,8 @@ exports.codeFeatures = void 0;
 exports.generateScript = generateScript;
 exports.generateScriptSectionPartiallyEnding = generateScriptSectionPartiallyEnding;
 const path = require("path-browserify");
-const common_1 = require("../common");
 const globalTypes_1 = require("../globalTypes");
+const utils_1 = require("../utils");
 const componentSelf_1 = require("./componentSelf");
 const context_1 = require("./context");
 const scriptSetup_1 = require("./scriptSetup");
@@ -43,10 +43,10 @@ function* generateScript(options) {
             if (relativePath !== globalTypes.absolutePath && !relativePath.startsWith('./') && !relativePath.startsWith('../')) {
                 relativePath = './' + relativePath;
             }
-            yield `/// <reference types="${relativePath}" />${common_1.newLine}`;
+            yield `/// <reference types="${relativePath}" />${utils_1.newLine}`;
         }
         else {
-            yield `/// <reference types=".vue-global-types/${options.vueCompilerOptions.lib}_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}.d.ts" />${common_1.newLine}`;
+            yield `/// <reference types=".vue-global-types/${options.vueCompilerOptions.lib}_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}.d.ts" />${utils_1.newLine}`;
         }
     }
     else {
@@ -61,14 +61,13 @@ function* generateScript(options) {
             && options.sfc.script.content[exportDefault.expression.start] === '{';
         if (options.sfc.scriptSetup && options.scriptSetupRanges) {
             yield* (0, scriptSetup_1.generateScriptSetupImports)(options.sfc.scriptSetup, options.scriptSetupRanges);
-            yield* generateDefineProp(options, options.sfc.scriptSetup);
             if (exportDefault) {
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.expression.start, exports.codeFeatures.all);
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.expression.start, exports.codeFeatures.all);
                 yield* (0, scriptSetup_1.generateScriptSetup)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.end, options.sfc.script.content.length, exports.codeFeatures.all);
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.end, options.sfc.script.content.length, exports.codeFeatures.all);
             }
             else {
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, exports.codeFeatures.all);
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, exports.codeFeatures.all);
                 yield* generateScriptSectionPartiallyEnding(options.sfc.script.name, options.sfc.script.content.length, '#3632/both.vue');
                 yield* (0, scriptSetup_1.generateScriptSetup)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
             }
@@ -93,32 +92,31 @@ function* generateScript(options) {
                     ? options.vueCompilerOptions.optionsWrapper[1]
                     : '[Missing optionsWrapper[1]]',
             });
-            yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.expression.start, exports.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.expression.start, exports.codeFeatures.all);
             yield options.vueCompilerOptions.optionsWrapper[0];
-            yield (0, common_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.start, exportDefault.expression.end, exports.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.start, exportDefault.expression.end, exports.codeFeatures.all);
             yield options.vueCompilerOptions.optionsWrapper[1];
-            yield (0, common_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.end, options.sfc.script.content.length, exports.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, exportDefault.expression.end, options.sfc.script.content.length, exports.codeFeatures.all);
         }
         else if (classBlockEnd !== undefined) {
             if (options.vueCompilerOptions.skipTemplateCodegen) {
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, exports.codeFeatures.all);
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, exports.codeFeatures.all);
             }
             else {
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, classBlockEnd, exports.codeFeatures.all);
-                yield `__VLS_template = () => {${common_1.newLine}`;
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, classBlockEnd, exports.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 `}${common_1.endOfLine}`;
-                yield (0, common_1.generateSfcBlockSection)(options.sfc.script, classBlockEnd, options.sfc.script.content.length, exports.codeFeatures.all);
+                yield `}${utils_1.endOfLine}`;
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, classBlockEnd, options.sfc.script.content.length, exports.codeFeatures.all);
             }
         }
         else {
-            yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, exports.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, exports.codeFeatures.all);
         }
     }
     else if (options.sfc.scriptSetup && options.scriptSetupRanges) {
         yield* (0, scriptSetup_1.generateScriptSetupImports)(options.sfc.scriptSetup, options.scriptSetupRanges);
-        yield* generateDefineProp(options, options.sfc.scriptSetup);
         yield* (0, scriptSetup_1.generateScriptSetup)(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
     }
     if (options.sfc.script) {
@@ -128,15 +126,15 @@ function* generateScript(options) {
         yield* generateScriptSectionPartiallyEnding(options.sfc.scriptSetup.name, options.sfc.scriptSetup.content.length, '#4569/main.vue');
     }
     if (!ctx.generatedTemplate) {
-        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);
     }
     // #4788
     yield* (0, styleModulesType_1.generateStyleModulesType)(options, ctx);
     if (options.edited) {
-        yield `type __VLS_IntrinsicElementsCompletion = __VLS_IntrinsicElements${common_1.endOfLine}`;
+        yield `type __VLS_IntrinsicElementsCompletion = __VLS_IntrinsicElements${utils_1.endOfLine}`;
     }
     yield* ctx.localTypes.generate([...ctx.localTypes.getUsedNames()]);
     if (options.appendGlobalTypes) {
@@ -150,22 +148,6 @@ function* generateScript(options) {
 function* generateScriptSectionPartiallyEnding(source, end, mark) {
     yield `;`;
     yield ['', source, end, exports.codeFeatures.verification];
-    yield `/* PartiallyEnd: ${mark} */${common_1.newLine}`;
-}
-function* generateDefineProp(options, scriptSetup) {
-    const definePropProposalA = scriptSetup.content.trimStart().startsWith('// @experimentalDefinePropProposal=kevinEdition') || options.vueCompilerOptions.experimentalDefinePropProposal === 'kevinEdition';
-    const definePropProposalB = scriptSetup.content.trimStart().startsWith('// @experimentalDefinePropProposal=johnsonEdition') || 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>>${common_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>${common_1.endOfLine}`;
-            yield `declare function defineProp<T>(name?: string, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T | undefined>${common_1.endOfLine}`;
-        }
-        if (definePropProposalB) {
-            yield `declare function defineProp<T>(value: T | (() => T), required?: boolean, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${common_1.endOfLine}`;
-            yield `declare function defineProp<T>(value: T | (() => T) | undefined, required: true, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T>${common_1.endOfLine}`;
-            yield `declare function defineProp<T>(value?: T | (() => T), required?: boolean, options?: __VLS_PropOptions<T>): import('${options.vueCompilerOptions.lib}').ComputedRef<T | undefined>${common_1.endOfLine}`;
-        }
-    }
+    yield `/* PartiallyEnd: ${mark} */${utils_1.newLine}`;
 }
 //# sourceMappingURL=index.js.map