@vue/language-core 2.2.0 → 2.2.2

package/lib/codegen/script/index.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.codeFeatures = void 0;
 exports.generateScript = generateScript;
 exports.generateScriptSectionPartiallyEnding = generateScriptSectionPartiallyEnding;
 const path = require("path-browserify");
+const codeFeatures_1 = require("../codeFeatures");
 const globalTypes_1 = require("../globalTypes");
 const utils_1 = require("../utils");
 const componentSelf_1 = require("./componentSelf");
@@ -12,28 +12,6 @@ const scriptSetup_1 = require("./scriptSetup");
 const src_1 = require("./src");
 const styleModulesType_1 = require("./styleModulesType");
 const template_1 = require("./template");
-exports.codeFeatures = {
-    all: {
-        verification: true,
-        completion: true,
-        semantic: true,
-        navigation: true,
-    },
-    none: {},
-    verification: {
-        verification: true,
-    },
-    navigation: {
-        navigation: true,
-    },
-    navigationWithoutRename: {
-        navigation: {
-            shouldRename() {
-                return false;
-            },
-        },
-    },
-};
 function* generateScript(options) {
     const ctx = (0, context_1.createScriptCodegenContext)(options);
     if (options.vueCompilerOptions.__setupedGlobalTypes) {
@@ -46,7 +24,7 @@ function* generateScript(options) {
             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" />${utils_1.newLine}`;
+            yield `/// <reference types=".vue-global-types/${(0, globalTypes_1.getGlobalTypesFileName)(options.vueCompilerOptions)}" />${utils_1.newLine}`;
         }
     }
     else {
@@ -62,12 +40,12 @@ function* generateScript(options) {
         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, exports.codeFeatures.all);
+                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);
-                yield (0, utils_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, codeFeatures_1.codeFeatures.all);
             }
             else {
-                yield (0, utils_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, codeFeatures_1.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);
             }
@@ -92,27 +70,27 @@ function* generateScript(options) {
                     ? options.vueCompilerOptions.optionsWrapper[1]
                     : '[Missing optionsWrapper[1]]',
             });
-            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.expression.start, exports.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, exportDefault.expression.start, codeFeatures_1.codeFeatures.all);
             yield options.vueCompilerOptions.optionsWrapper[0];
-            yield (0, utils_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, codeFeatures_1.codeFeatures.all);
             yield options.vueCompilerOptions.optionsWrapper[1];
-            yield (0, utils_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, codeFeatures_1.codeFeatures.all);
         }
         else if (classBlockEnd !== undefined) {
             if (options.vueCompilerOptions.skipTemplateCodegen) {
-                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, exports.codeFeatures.all);
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
             }
             else {
-                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, classBlockEnd, exports.codeFeatures.all);
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, classBlockEnd, codeFeatures_1.codeFeatures.all);
                 yield `__VLS_template = () => {${utils_1.newLine}`;
                 const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
                 yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
                 yield `}${utils_1.endOfLine}`;
-                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, classBlockEnd, options.sfc.script.content.length, exports.codeFeatures.all);
+                yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, classBlockEnd, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
             }
         }
         else {
-            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, exports.codeFeatures.all);
+            yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures_1.codeFeatures.all);
         }
     }
     else if (options.sfc.scriptSetup && options.scriptSetupRanges) {
@@ -126,9 +104,7 @@ function* generateScript(options) {
         yield* generateScriptSectionPartiallyEnding(options.sfc.scriptSetup.name, options.sfc.scriptSetup.content.length, '#4569/main.vue');
     }
     if (!ctx.generatedTemplate) {
-        yield `function __VLS_template() {${utils_1.newLine}`;
         const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
-        yield `}${utils_1.endOfLine}`;
         yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
     }
     // #4788
@@ -138,16 +114,16 @@ function* generateScript(options) {
     }
     yield* ctx.localTypes.generate([...ctx.localTypes.getUsedNames()]);
     if (options.appendGlobalTypes) {
-        yield (0, globalTypes_1.generateGlobalTypes)(options.vueCompilerOptions.lib, options.vueCompilerOptions.target, options.vueCompilerOptions.strictTemplates);
+        yield (0, globalTypes_1.generateGlobalTypes)(options.vueCompilerOptions);
     }
     if (options.sfc.scriptSetup) {
-        yield ['', 'scriptSetup', options.sfc.scriptSetup.content.length, exports.codeFeatures.verification];
+        yield ['', 'scriptSetup', options.sfc.scriptSetup.content.length, codeFeatures_1.codeFeatures.verification];
     }
     return ctx;
 }
 function* generateScriptSectionPartiallyEnding(source, end, mark) {
     yield `;`;
-    yield ['', source, end, exports.codeFeatures.verification];
+    yield ['', source, end, codeFeatures_1.codeFeatures.verification];
     yield `/* PartiallyEnd: ${mark} */${utils_1.newLine}`;
 }
 //# sourceMappingURL=index.js.map

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

@@ -1,6 +1,6 @@
 import type { ScriptSetupRanges } from '../../parsers/scriptSetupRanges';
 import type { Code, Sfc } from '../../types';
 import type { ScriptCodegenContext } from './context';
-import { ScriptCodegenOptions } from './index';
+import { type ScriptCodegenOptions } from './index';
 export declare function generateScriptSetupImports(scriptSetup: NonNullable<Sfc['scriptSetup']>, scriptSetupRanges: ScriptSetupRanges): Generator<Code>;
 export declare function generateScriptSetup(options: ScriptCodegenOptions, ctx: ScriptCodegenContext, scriptSetup: NonNullable<Sfc['scriptSetup']>, scriptSetupRanges: ScriptSetupRanges): Generator<Code>;

package/lib/codegen/script/scriptSetup.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateScriptSetupImports = generateScriptSetupImports;
 exports.generateScriptSetup = generateScriptSetup;
+const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const component_1 = require("./component");
 const componentSelf_1 = require("./componentSelf");
@@ -12,7 +13,7 @@ function* generateScriptSetupImports(scriptSetup, scriptSetupRanges) {
         scriptSetup.content.slice(0, Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset)),
         'scriptSetup',
         0,
-        index_1.codeFeatures.all,
+        codeFeatures_1.codeFeatures.all,
     ];
 }
 function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
@@ -24,7 +25,7 @@ function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
                     '',
                     'scriptSetup',
                     options.sfc.scriptSetup.content.length,
-                    index_1.codeFeatures.verification,
+                    codeFeatures_1.codeFeatures.verification,
                 ];
             }
             yield `export default `;
@@ -34,7 +35,7 @@ function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
             scriptSetup.generic,
             scriptSetup.name,
             scriptSetup.genericOffset,
-            index_1.codeFeatures.all,
+            codeFeatures_1.codeFeatures.all,
         ];
         if (!scriptSetup.generic.endsWith(`,`)) {
             yield `,`;
@@ -53,10 +54,10 @@ function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
             emitTypes.push(`typeof __VLS_modelEmit`);
         }
         yield `return {} as {${utils_1.newLine}`
-            + `	props: ${ctx.localTypes.PrettifyLocal}<__VLS_OwnProps & __VLS_PublicProps & __VLS_TemplateResult['attrs']> & __VLS_BuiltInPublicProps,${utils_1.newLine}`
+            + `	props: ${ctx.localTypes.PrettifyLocal}<__VLS_OwnProps & __VLS_PublicProps & Partial<__VLS_InheritedAttrs>> & __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}`
+            + `	slots: __VLS_Slots,${utils_1.newLine}`
             + `	emit: ${emitTypes.length ? emitTypes.join(' & ') : `{}`},${utils_1.newLine}`
             + `}${utils_1.endOfLine}`;
         yield `})(),${utils_1.newLine}`; // __VLS_setup = (async () => {
@@ -80,28 +81,15 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
     let setupCodeModifies = [];
     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'));
+        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'));
+        setupCodeModifies.push(...generateDefineWithType(scriptSetup, statement, callExp, typeArg, name, `__VLS_emit`, `__VLS_Emit`));
     }
     if (scriptSetupRanges.defineSlots) {
-        const { name, callExp, isObjectBindingPattern } = scriptSetupRanges.defineSlots;
-        if (isObjectBindingPattern) {
-            setupCodeModifies.push([
-                [`__VLS_slots;\nconst __VLS_slots = `],
-                callExp.start,
-                callExp.start,
-            ]);
-        }
-        else if (!name) {
-            setupCodeModifies.push([
-                [`const __VLS_slots = `],
-                callExp.start,
-                callExp.start
-            ]);
-        }
+        const { name, statement, callExp, typeArg } = scriptSetupRanges.defineSlots;
+        setupCodeModifies.push(...generateDefineWithType(scriptSetup, statement, callExp, typeArg, name, `__VLS_slots`, `__VLS_Slots`));
     }
     if (scriptSetupRanges.defineExpose) {
         const { callExp, arg, typeArg } = scriptSetupRanges.defineExpose;
@@ -109,7 +97,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
             setupCodeModifies.push([
                 [
                     `let __VLS_exposed!: `,
-                    (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.start, typeArg.end, index_1.codeFeatures.navigation),
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.start, typeArg.end, codeFeatures_1.codeFeatures.navigation),
                     `${utils_1.endOfLine}`,
                 ],
                 callExp.start,
@@ -120,7 +108,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
             setupCodeModifies.push([
                 [
                     `const __VLS_exposed = `,
-                    (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, index_1.codeFeatures.navigation),
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.navigation),
                     `${utils_1.endOfLine}`,
                 ],
                 callExp.start,
@@ -135,18 +123,17 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
             ]);
         }
     }
-    // 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 } of scriptSetupRanges.useAttrs) {
+        setupCodeModifies.push([
+            [`(`],
+            callExp.start,
+            callExp.start
+        ], [
+            [` as typeof __VLS_special.$attrs)`],
+            callExp.end,
+            callExp.end
+        ]);
+    }
     for (const { callExp, exp, arg } of scriptSetupRanges.useCssModule) {
         setupCodeModifies.push([
             [`(`],
@@ -155,11 +142,11 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
         ], [
             arg ? [
                 ` as Omit<__VLS_StyleModules, '$style'>[`,
-                (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, index_1.codeFeatures.all),
+                (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.all),
                 `])`
             ] : [
                 ` as __VLS_StyleModules[`,
-                ['', scriptSetup.name, exp.start, index_1.codeFeatures.verification],
+                ['', scriptSetup.name, exp.start, codeFeatures_1.codeFeatures.verification],
                 `'$style'`,
                 ['', scriptSetup.name, exp.end, utils_1.combineLastMapping],
                 `])`
@@ -181,7 +168,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
             callExp.start,
             callExp.start
         ], [
-            [` as __VLS_TemplateResult['slots'])`],
+            [` as typeof __VLS_special.$slots)`],
             callExp.end,
             callExp.end
         ]);
@@ -190,8 +177,8 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
     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),
+                `__VLS_TemplateRefs[`,
+                (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.all),
                 `]`
             ]
             : [`unknown`];
@@ -232,36 +219,33 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
     setupCodeModifies = setupCodeModifies.sort((a, b) => a[1] - b[1]);
     let nextStart = Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset);
     for (const [codes, start, end] of setupCodeModifies) {
-        yield (0, utils_1.generateSfcBlockSection)(scriptSetup, nextStart, start, index_1.codeFeatures.all);
+        yield (0, utils_1.generateSfcBlockSection)(scriptSetup, nextStart, start, codeFeatures_1.codeFeatures.all);
         for (const code of codes) {
             yield code;
         }
         nextStart = end;
     }
-    yield (0, utils_1.generateSfcBlockSection)(scriptSetup, nextStart, scriptSetup.content.length, index_1.codeFeatures.all);
+    yield (0, utils_1.generateSfcBlockSection)(scriptSetup, nextStart, scriptSetup.content.length, codeFeatures_1.codeFeatures.all);
     yield* (0, index_1.generateScriptSectionPartiallyEnding)(scriptSetup.name, scriptSetup.content.length, '#3632/scriptSetup.vue');
     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, utils_1.generateSfcBlockSection)(scriptSetup, scriptSetupRanges.withDefaults.arg.start, scriptSetupRanges.withDefaults.arg.end, index_1.codeFeatures.navigation);
+        yield (0, utils_1.generateSfcBlockSection)(scriptSetup, scriptSetupRanges.withDefaults.arg.start, scriptSetupRanges.withDefaults.arg.end, codeFeatures_1.codeFeatures.navigation);
         yield `)${utils_1.endOfLine}`;
     }
     yield* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges);
     yield* generateModelEmit(scriptSetup, scriptSetupRanges);
-    yield `function __VLS_template() {${utils_1.newLine}`;
     const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx);
-    yield `}${utils_1.endOfLine}`;
     yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
-    yield `type __VLS_TemplateResult = ReturnType<typeof __VLS_template>${utils_1.endOfLine}`;
     if (syntax) {
         if (!options.vueCompilerOptions.skipTemplateCodegen && (options.templateCodegen?.hasSlot || scriptSetupRanges.defineSlots)) {
             yield `const __VLS_component = `;
             yield* (0, component_1.generateComponent)(options, ctx, scriptSetup, scriptSetupRanges);
             yield utils_1.endOfLine;
             yield `${syntax} `;
-            yield `{} as ${ctx.localTypes.WithTemplateSlots}<typeof __VLS_component, __VLS_TemplateResult['slots']>${utils_1.endOfLine}`;
+            yield `{} as ${ctx.localTypes.WithSlots}<typeof __VLS_component, __VLS_Slots>${utils_1.endOfLine}`;
         }
         else {
             yield `${syntax} `;
@@ -272,6 +256,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
 }
 function* generateMacros(options, ctx) {
     if (options.vueCompilerOptions.target >= 3.3) {
+        yield `// @ts-ignore${utils_1.newLine}`;
         yield `declare const { `;
         for (const macro of Object.keys(options.vueCompilerOptions.macros)) {
             if (!ctx.bindingNames.has(macro)) {
@@ -301,7 +286,7 @@ function* generateDefineWithType(scriptSetup, statement, callExp, typeArg, name,
     if (typeArg) {
         yield [[
                 `type ${typeName} = `,
-                (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.start, typeArg.end, index_1.codeFeatures.all),
+                (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.start, typeArg.end, codeFeatures_1.codeFeatures.all),
                 utils_1.endOfLine,
             ], statement.start, statement.start];
         yield [[typeName], typeArg.start, typeArg.end];
@@ -313,21 +298,21 @@ function* generateDefineWithType(scriptSetup, statement, callExp, typeArg, name,
         else if (typeArg) {
             yield [[
                     `const ${defaultName} = `,
-                    (0, utils_1.generateSfcBlockSection)(scriptSetup, callExp.start, typeArg.start, index_1.codeFeatures.all)
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, callExp.start, typeArg.start, codeFeatures_1.codeFeatures.all)
                 ], statement.start, typeArg.start];
             yield [[
-                    (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.end, callExp.end, index_1.codeFeatures.all),
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.end, callExp.end, codeFeatures_1.codeFeatures.all),
                     utils_1.endOfLine,
-                    (0, utils_1.generateSfcBlockSection)(scriptSetup, statement.start, callExp.start, index_1.codeFeatures.all),
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, statement.start, callExp.start, codeFeatures_1.codeFeatures.all),
                     defaultName
                 ], typeArg.end, callExp.end];
         }
         else {
             yield [[
                     `const ${defaultName} = `,
-                    (0, utils_1.generateSfcBlockSection)(scriptSetup, callExp.start, callExp.end, index_1.codeFeatures.all),
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, callExp.start, callExp.end, codeFeatures_1.codeFeatures.all),
                     utils_1.endOfLine,
-                    (0, utils_1.generateSfcBlockSection)(scriptSetup, statement.start, callExp.start, index_1.codeFeatures.all),
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, statement.start, callExp.start, codeFeatures_1.codeFeatures.all),
                     defaultName
                 ], statement.start, callExp.end];
         }
@@ -338,7 +323,7 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
         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 (0, utils_1.generateSfcBlockSection)(scriptSetup, scriptSetupRanges.defineProps.arg.start, scriptSetupRanges.defineProps.arg.end, codeFeatures_1.codeFeatures.navigation);
             yield `,${utils_1.newLine}`;
         }
         yield* (0, component_1.generateEmitsOption)(options, scriptSetupRanges);
@@ -383,7 +368,7 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
             yield ` & `;
         }
         ctx.generatedPropsType = true;
-        yield `${ctx.localTypes.PropsChildren}<typeof __VLS_slots>`;
+        yield `${ctx.localTypes.PropsChildren}<__VLS_Slots>`;
     }
     if (scriptSetupRanges.defineProp.length) {
         if (ctx.generatedPropsType) {
@@ -397,10 +382,10 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
                 yield propName;
             }
             else if (defineProp.name) {
-                yield (0, utils_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, codeFeatures_1.codeFeatures.navigation);
             }
             else if (defineProp.localName) {
-                yield (0, utils_1.generateSfcBlockSection)(scriptSetup, defineProp.localName.start, defineProp.localName.end, index_1.codeFeatures.navigation);
+                yield (0, utils_1.generateSfcBlockSection)(scriptSetup, defineProp.localName.start, defineProp.localName.end, codeFeatures_1.codeFeatures.navigation);
             }
             else {
                 continue;
@@ -438,6 +423,9 @@ function* generateModelEmit(scriptSetup, scriptSetupRanges) {
             const [propName, localName] = getPropAndLocalName(scriptSetup, defineModel);
             yield `'update:${propName}': [value: `;
             yield* generateDefinePropType(scriptSetup, propName, localName, defineModel);
+            if (!defineModel.required) {
+                yield ` | undefined`;
+            }
             yield `]${utils_1.endOfLine}`;
         }
         yield `}${utils_1.endOfLine}`;

package/lib/codegen/script/src.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSrc = generateSrc;
+const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
-const index_1 = require("./index");
 function* generateSrc(script, src) {
     if (src.endsWith('.d.ts')) {
         src = src.slice(0, -'.d.ts'.length);
@@ -22,7 +22,7 @@ function* generateSrc(script, src) {
         'script',
         script.srcOffset - 1,
         {
-            ...index_1.codeFeatures.all,
+            ...codeFeatures_1.codeFeatures.all,
             navigation: src === script.src
                 ? true
                 : {

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

@@ -1,4 +1,4 @@
 import type { Code } from '../../types';
 import type { ScriptCodegenContext } from './context';
-import { ScriptCodegenOptions } from './index';
+import type { ScriptCodegenOptions } from './index';
 export declare function generateStyleModulesType(options: ScriptCodegenOptions, ctx: ScriptCodegenContext): Generator<Code>;

package/lib/codegen/script/styleModulesType.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateStyleModulesType = generateStyleModulesType;
+const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
-const index_1 = require("./index");
 const template_1 = require("./template");
 function* generateStyleModulesType(options, ctx) {
     const styles = options.sfc.styles.map((style, i) => [style, i]).filter(([style]) => style.module);
@@ -17,7 +17,7 @@ function* generateStyleModulesType(options, ctx) {
                 name,
                 'main',
                 offset + 1,
-                index_1.codeFeatures.all
+                codeFeatures_1.codeFeatures.all
             ];
         }
         else {

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

@@ -1,7 +1,7 @@
 import type { Code } from '../../types';
 import { TemplateCodegenContext } from '../template/context';
 import type { ScriptCodegenContext } from './context';
-import { type ScriptCodegenOptions } from './index';
+import type { ScriptCodegenOptions } from './index';
 export declare function generateTemplate(options: ScriptCodegenOptions, ctx: ScriptCodegenContext): Generator<Code, TemplateCodegenContext>;
 export declare function generateTemplateDirectives(options: ScriptCodegenOptions): Generator<Code>;
 export declare function generateCssClassProperty(styleIndex: number, classNameWithDot: string, offset: number, propertyType: string, optional: boolean): Generator<Code>;

package/lib/codegen/script/template.js

@@ -4,13 +4,12 @@ exports.generateTemplate = generateTemplate;
 exports.generateTemplateDirectives = generateTemplateDirectives;
 exports.generateCssClassProperty = generateCssClassProperty;
 exports.getTemplateUsageVars = getTemplateUsageVars;
-const path = require("path-browserify");
 const shared_1 = require("../../utils/shared");
+const codeFeatures_1 = require("../codeFeatures");
 const context_1 = require("../template/context");
 const interpolation_1 = require("../template/interpolation");
 const styleScopedClasses_1 = require("../template/styleScopedClasses");
 const utils_1 = require("../utils");
-const index_1 = require("./index");
 function* generateTemplate(options, ctx) {
     ctx.generatedTemplate = true;
     const templateCodegenCtx = (0, context_1.createTemplateCodegenContext)({
@@ -56,25 +55,11 @@ function* generateTemplateComponents(options) {
             options.sfc.script.content.slice(componentsOption.start, componentsOption.end),
             'script',
             componentsOption.start,
-            index_1.codeFeatures.navigation,
+            codeFeatures_1.codeFeatures.navigation,
         ];
         yield utils_1.endOfLine;
         types.push(`typeof __VLS_componentsOption`);
     }
-    let nameType;
-    if (options.sfc.script && options.scriptRanges?.exportDefault?.nameOption) {
-        const { nameOption } = options.scriptRanges.exportDefault;
-        nameType = options.sfc.script.content.slice(nameOption.start, nameOption.end);
-    }
-    else if (options.sfc.scriptSetup) {
-        const baseName = path.basename(options.fileName);
-        nameType = `'${options.scriptSetupRanges?.defineOptions?.name ?? baseName.slice(0, baseName.lastIndexOf('.'))}'`;
-    }
-    if (nameType) {
-        types.push(`{ [K in ${nameType}]: typeof __VLS_self & (new () => { `
-            + (0, shared_1.getSlotsPropertyName)(options.vueCompilerOptions.target)
-            + `: typeof ${options.scriptSetupRanges?.defineSlots?.name ?? `__VLS_slots`} }) }`);
-    }
     types.push(`typeof __VLS_ctx`);
     yield `type __VLS_LocalComponents =`;
     for (const type of types) {
@@ -93,7 +78,7 @@ function* generateTemplateDirectives(options) {
             options.sfc.script.content.slice(directivesOption.start, directivesOption.end),
             'script',
             directivesOption.start,
-            index_1.codeFeatures.navigation,
+            codeFeatures_1.codeFeatures.navigation,
         ];
         yield utils_1.endOfLine;
         types.push(`typeof __VLS_directivesOption`);
@@ -119,18 +104,12 @@ function* generateTemplateBody(options, templateCodegenCtx) {
     else {
         yield `// no template${utils_1.newLine}`;
         if (!options.scriptSetupRanges?.defineSlots) {
-            yield `const __VLS_slots = {}${utils_1.endOfLine}`;
+            yield `type __VLS_Slots = {}${utils_1.endOfLine}`;
         }
-        yield `const __VLS_inheritedAttrs = {}${utils_1.endOfLine}`;
-        yield `const $refs = {}${utils_1.endOfLine}`;
-        yield `const $el = {} as any${utils_1.endOfLine}`;
+        yield `type __VLS_InheritedAttrs = {}${utils_1.endOfLine}`;
+        yield `type __VLS_TemplateRefs = {}${utils_1.endOfLine}`;
+        yield `type __VLS_RootEl = any${utils_1.endOfLine}`;
     }
-    yield `return {${utils_1.newLine}`;
-    yield `	attrs: {} as Partial<typeof __VLS_inheritedAttrs>,${utils_1.newLine}`;
-    yield `	slots: ${options.scriptSetupRanges?.defineSlots?.name ?? '__VLS_slots'},${utils_1.newLine}`;
-    yield `	refs: $refs,${utils_1.newLine}`;
-    yield `	rootEl: $el,${utils_1.newLine}`;
-    yield `}${utils_1.endOfLine}`;
 }
 function* generateStyleScopedClasses(options, ctx) {
     const firstClasses = new Set();
@@ -161,21 +140,21 @@ function* generateCssClassProperty(styleIndex, classNameWithDot, offset, propert
         '',
         'style_' + styleIndex,
         offset,
-        index_1.codeFeatures.navigation,
+        codeFeatures_1.codeFeatures.navigation,
     ];
     yield `'`;
     yield [
         classNameWithDot.slice(1),
         'style_' + styleIndex,
         offset + 1,
-        index_1.codeFeatures.navigation,
+        codeFeatures_1.codeFeatures.navigation,
     ];
     yield `'`;
     yield [
         '',
         'style_' + styleIndex,
         offset + classNameWithDot.length,
-        index_1.codeFeatures.navigationWithoutRename,
+        codeFeatures_1.codeFeatures.navigationWithoutRename,
     ];
     yield `${optional ? '?' : ''}: ${propertyType}`;
     yield ` }`;
@@ -187,7 +166,7 @@ function* generateCssVars(options, ctx) {
     yield `// CSS variable injection ${utils_1.newLine}`;
     for (const style of options.sfc.styles) {
         for (const cssBind of style.cssVars) {
-            yield* (0, interpolation_1.generateInterpolation)(options, ctx, style.name, index_1.codeFeatures.all, cssBind.text, cssBind.offset);
+            yield* (0, interpolation_1.generateInterpolation)(options, ctx, style.name, codeFeatures_1.codeFeatures.all, cssBind.text, cssBind.offset);
             yield utils_1.endOfLine;
         }
     }

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

@@ -0,0 +1,2 @@
+import type { Code, VueCodeInformation } from '../../types';
+export declare function generateCamelized(code: string, offset: number, info: VueCodeInformation): Generator<Code>;

package/lib/codegen/template/camelized.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateCamelized = generateCamelized;
+const shared_1 = require("@vue/shared");
+const common_1 = require("../common");
+function* generateCamelized(code, offset, info) {
+    const parts = code.split('-');
+    for (let i = 0; i < parts.length; i++) {
+        const part = parts[i];
+        if (part !== '') {
+            if (i === 0) {
+                yield [
+                    part,
+                    'template',
+                    offset,
+                    info,
+                ];
+            }
+            else {
+                yield [
+                    (0, shared_1.capitalize)(part),
+                    'template',
+                    offset,
+                    common_1.combineLastMapping,
+                ];
+            }
+        }
+        offset += part.length + 1;
+    }
+}
+//# sourceMappingURL=camelized.js.map