@vue/language-core 3.0.0-alpha.0 → 3.0.0-alpha.2

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

@@ -5,4 +5,4 @@ export declare function generateInterpolation(options: {
     ts: typeof ts;
     destructuredPropNames: Set<string> | undefined;
     templateRefNames: Set<string> | undefined;
-}, ctx: TemplateCodegenContext, source: string, data: VueCodeInformation | ((offset: number) => VueCodeInformation) | undefined, _code: string, start: number | undefined, astHolder?: any, prefix?: string, suffix?: string): Generator<Code>;
+}, ctx: TemplateCodegenContext, source: string, data: VueCodeInformation | ((offset: number) => VueCodeInformation) | undefined, code: string, start: number | undefined, astHolder?: any, prefix?: string, suffix?: string): Generator<Code>;

package/lib/codegen/template/interpolation.js

@@ -4,17 +4,17 @@ exports.generateInterpolation = generateInterpolation;
 const shared_1 = require("@vue/shared");
 const shared_2 = require("../../utils/shared");
 const utils_1 = require("../utils");
-function* generateInterpolation(options, ctx, source, data, _code, start, astHolder = {}, prefix = '', suffix = '') {
-    const code = prefix + _code + suffix;
-    const ast = (0, utils_1.createTsAst)(options.ts, astHolder, code);
-    for (let [section, offset, type] of forEachInterpolationSegment(options.ts, options.destructuredPropNames, options.templateRefNames, ctx, code, start !== undefined ? start - prefix.length : undefined, ast)) {
+// https://github.com/vuejs/core/blob/fb0c3ca519f1fccf52049cd6b8db3a67a669afe9/packages/compiler-core/src/transforms/transformExpression.ts#L47
+const isLiteralWhitelisted = /*@__PURE__*/ (0, shared_1.makeMap)('true,false,null,this');
+function* generateInterpolation(options, ctx, source, data, code, start, astHolder = {}, prefix = '', suffix = '') {
+    for (let [section, offset, type] of forEachInterpolationSegment(options.ts, options.destructuredPropNames, options.templateRefNames, ctx, code, start, astHolder, prefix, suffix)) {
         if (offset === undefined) {
             yield section;
         }
         else {
             offset -= prefix.length;
             let addSuffix = '';
-            const overLength = offset + section.length - _code.length;
+            const overLength = offset + section.length - code.length;
             if (overLength > 0) {
                 addSuffix = section.slice(section.length - overLength);
                 section = section.slice(0, -overLength);
@@ -46,58 +46,46 @@ function* generateInterpolation(options, ctx, source, data, _code, start, astHol
     }
 }
 ;
-function* forEachInterpolationSegment(ts, destructuredPropNames, templateRefNames, ctx, code, offset, ast) {
+function* forEachInterpolationSegment(ts, destructuredPropNames, templateRefNames, ctx, originalCode, start, astHolder, prefix, suffix) {
+    const code = prefix + originalCode + suffix;
+    const offset = start !== undefined ? start - prefix.length : undefined;
     let ctxVars = [];
-    const varCb = (id, isShorthand) => {
-        const text = (0, shared_2.getNodeText)(ts, id, ast);
-        if (ctx.hasLocalVariable(text)
-            // https://github.com/vuejs/core/blob/245230e135152900189f13a4281302de45fdcfaa/packages/compiler-core/src/transforms/transformExpression.ts#L342-L352
-            || (0, shared_1.isGloballyAllowed)(text)
-            || text === 'require'
-            || text.startsWith('__VLS_')) {
-            // localVarOffsets.push(localVar.getStart(ast));
-        }
-        else {
-            ctxVars.push({
-                text,
-                isShorthand: isShorthand,
-                offset: (0, shared_2.getStartEnd)(ts, id, ast).start,
-            });
-            if (destructuredPropNames?.has(text)) {
-                return;
-            }
-            if (offset !== undefined) {
-                ctx.accessExternalVariable(text, offset + (0, shared_2.getStartEnd)(ts, id, ast).start);
-            }
-            else {
-                ctx.accessExternalVariable(text);
+    if (utils_1.identifierRegex.test(originalCode) && !shouldIdentifierSkipped(ctx, originalCode, destructuredPropNames)) {
+        ctxVars.push({
+            text: originalCode,
+            offset: prefix.length,
+        });
+    }
+    else {
+        const ast = (0, utils_1.createTsAst)(ts, astHolder, code);
+        const varCb = (id, isShorthand) => {
+            const text = (0, shared_2.getNodeText)(ts, id, ast);
+            if (!shouldIdentifierSkipped(ctx, text, destructuredPropNames)) {
+                ctxVars.push({
+                    text,
+                    offset: (0, shared_2.getStartEnd)(ts, id, ast).start,
+                    isShorthand,
+                });
             }
-        }
-    };
-    ts.forEachChild(ast, node => walkIdentifiers(ts, node, ast, varCb, ctx));
+        };
+        ts.forEachChild(ast, node => walkIdentifiers(ts, node, ast, varCb, ctx));
+    }
     ctxVars = ctxVars.sort((a, b) => a.offset - b.offset);
     if (ctxVars.length) {
-        if (ctxVars[0].isShorthand) {
-            yield [code.slice(0, ctxVars[0].offset + ctxVars[0].text.length), 0];
-            yield [': ', undefined];
-        }
-        else if (ctxVars[0].offset > 0) {
-            yield [code.slice(0, ctxVars[0].offset), 0, 'startText'];
-        }
-        for (let i = 0; i < ctxVars.length - 1; i++) {
+        for (let i = 0; i < ctxVars.length; i++) {
+            const lastVar = ctxVars[i - 1];
             const curVar = ctxVars[i];
-            const nextVar = ctxVars[i + 1];
-            yield* generateVar(code, ctx.dollarVars, destructuredPropNames, templateRefNames, curVar);
-            if (nextVar.isShorthand) {
-                yield [code.slice(curVar.offset + curVar.text.length, nextVar.offset + nextVar.text.length), curVar.offset + curVar.text.length];
+            const lastVarEnd = lastVar ? lastVar.offset + lastVar.text.length : 0;
+            if (curVar.isShorthand) {
+                yield [code.slice(lastVarEnd, curVar.offset + curVar.text.length), lastVarEnd];
                 yield [': ', undefined];
             }
             else {
-                yield [code.slice(curVar.offset + curVar.text.length, nextVar.offset), curVar.offset + curVar.text.length];
+                yield [code.slice(lastVarEnd, curVar.offset), lastVarEnd, i ? undefined : 'startText'];
             }
+            yield* generateVar(templateRefNames, ctx, code, offset, curVar);
         }
         const lastVar = ctxVars.at(-1);
-        yield* generateVar(code, ctx.dollarVars, destructuredPropNames, templateRefNames, lastVar);
         if (lastVar.offset + lastVar.text.length < code.length) {
             yield [code.slice(lastVar.offset + lastVar.text.length), lastVar.offset + lastVar.text.length, 'endText'];
         }
@@ -106,11 +94,10 @@ function* forEachInterpolationSegment(ts, destructuredPropNames, templateRefName
         yield [code, 0];
     }
 }
-function* generateVar(code, dollarVars, destructuredPropNames, templateRefNames, curVar) {
+function* generateVar(templateRefNames, ctx, code, offset, curVar) {
     // fix https://github.com/vuejs/language-tools/issues/1205
     // fix https://github.com/vuejs/language-tools/issues/1264
     yield ['', curVar.offset, 'errorMappingOnly'];
-    const isDestructuredProp = destructuredPropNames?.has(curVar.text) ?? false;
     const isTemplateRef = templateRefNames?.has(curVar.text) ?? false;
     if (isTemplateRef) {
         yield [`__VLS_unref(`, undefined];
@@ -118,12 +105,16 @@ function* generateVar(code, dollarVars, destructuredPropNames, templateRefNames,
         yield [`)`, undefined];
     }
     else {
-        if (dollarVars.has(curVar.text)) {
-            yield [`__VLS_dollars.`, undefined];
+        if (offset !== undefined) {
+            ctx.accessExternalVariable(curVar.text, offset + curVar.offset);
         }
-        else if (!isDestructuredProp) {
-            yield [`__VLS_ctx.`, undefined];
+        else {
+            ctx.accessExternalVariable(curVar.text);
+        }
+        if (ctx.dollarVars.has(curVar.text)) {
+            yield [`__VLS_dollars.`, undefined];
         }
+        yield [`__VLS_ctx.`, undefined];
         yield [code.slice(curVar.offset, curVar.offset + curVar.text.length), curVar.offset];
     }
 }
@@ -222,4 +213,13 @@ function walkIdentifiersInTypeReference(ts, node, cb) {
         ts.forEachChild(node, node => walkIdentifiersInTypeReference(ts, node, cb));
     }
 }
+function shouldIdentifierSkipped(ctx, text, destructuredPropNames) {
+    return ctx.hasLocalVariable(text)
+        // https://github.com/vuejs/core/blob/245230e135152900189f13a4281302de45fdcfaa/packages/compiler-core/src/transforms/transformExpression.ts#L342-L352
+        || (0, shared_1.isGloballyAllowed)(text)
+        || isLiteralWhitelisted(text)
+        || text === 'require'
+        || text.startsWith('__VLS_')
+        || destructuredPropNames?.has(text);
+}
 //# sourceMappingURL=interpolation.js.map

package/lib/codegen/template/slotOutlet.js

@@ -93,7 +93,6 @@ function* generateSlotOutlet(options, ctx, node) {
             });
         }
     }
-    yield* ctx.generateAutoImportCompletion();
-    yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node);
+    yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node.children);
 }
 //# sourceMappingURL=slotOutlet.js.map

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

@@ -2,6 +2,6 @@ import * as CompilerDOM from '@vue/compiler-dom';
 import type { Code } from '../../types';
 import type { TemplateCodegenContext } from './context';
 import type { TemplateCodegenOptions } from './index';
-export declare function generateTemplateChild(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.RootNode | CompilerDOM.TemplateChildNode | CompilerDOM.SimpleExpressionNode, prevNode: CompilerDOM.TemplateChildNode | undefined, isVForChild?: boolean): Generator<Code>;
+export declare function generateTemplateChild(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.RootNode | CompilerDOM.TemplateChildNode | CompilerDOM.SimpleExpressionNode, enterNode?: boolean): Generator<Code>;
 export declare function getVForNode(node: CompilerDOM.ElementNode): CompilerDOM.ForNode | undefined;
 export declare function parseInterpolationNode(node: CompilerDOM.InterpolationNode, template: string): readonly [string, number];

package/lib/codegen/template/templateChild.js

@@ -7,12 +7,12 @@ const CompilerDOM = require("@vue/compiler-dom");
 const shared_1 = require("../../utils/shared");
 const utils_1 = require("../utils");
 const element_1 = require("./element");
+const elementChildren_1 = require("./elementChildren");
 const interpolation_1 = require("./interpolation");
 const slotOutlet_1 = require("./slotOutlet");
 const vFor_1 = require("./vFor");
 const vIf_1 = require("./vIf");
 const vSlot_1 = require("./vSlot");
-const commentDirectiveRegex = /^<!--\s*@vue-(?<name>[-\w]+)\b(?<content>[\s\S]*)-->$/;
 // @ts-ignore
 const transformContext = {
     onError: () => { },
@@ -28,36 +28,9 @@ const transformContext = {
     },
     expressionPlugins: ['typescript'],
 };
-function* generateTemplateChild(options, ctx, node, prevNode, isVForChild = false) {
-    if (prevNode?.type === CompilerDOM.NodeTypes.COMMENT) {
-        const match = prevNode.loc.source.match(commentDirectiveRegex);
-        if (match) {
-            const { name, content } = match.groups;
-            switch (name) {
-                case 'skip': {
-                    yield `// @vue-skip${utils_1.newLine}`;
-                    return;
-                }
-                case 'ignore': {
-                    yield* ctx.ignoreError();
-                    break;
-                }
-                case 'expect-error': {
-                    yield* ctx.expectError(prevNode);
-                    break;
-                }
-                case 'generic': {
-                    const text = content.trim();
-                    if (text.startsWith('{') && text.endsWith('}')) {
-                        ctx.lastGenericComment = {
-                            content: text.slice(1, -1),
-                            offset: prevNode.loc.start.offset + prevNode.loc.source.indexOf('{') + 1,
-                        };
-                    }
-                    break;
-                }
-            }
-        }
+function* generateTemplateChild(options, ctx, node, enterNode = true) {
+    if (enterNode && !ctx.enter(node)) {
+        return;
     }
     const cur = node;
     if (cur.codegenNode?.type === CompilerDOM.NodeTypes.JS_CACHE_EXPRESSION) {
@@ -67,12 +40,7 @@ function* generateTemplateChild(options, ctx, node, prevNode, isVForChild = fals
         for (const item of collectSingleRootNodes(options, node.children)) {
             ctx.singleRootNodes.add(item);
         }
-        let prev;
-        for (const childNode of node.children) {
-            yield* generateTemplateChild(options, ctx, childNode, prev);
-            prev = childNode;
-        }
-        yield* ctx.resetDirectiveComments('end of root');
+        yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node.children);
     }
     else if (node.type === CompilerDOM.NodeTypes.ELEMENT) {
         const vForNode = getVForNode(node);
@@ -95,32 +63,27 @@ function* generateTemplateChild(options, ctx, node, prevNode, isVForChild = fals
             }
             else if (node.tagType === CompilerDOM.ElementTypes.ELEMENT
                 || node.tagType === CompilerDOM.ElementTypes.TEMPLATE) {
-                yield* (0, element_1.generateElement)(options, ctx, node, isVForChild);
+                yield* (0, element_1.generateElement)(options, ctx, node);
             }
             else {
                 const { currentComponent } = ctx;
-                yield* (0, element_1.generateComponent)(options, ctx, node, isVForChild);
+                yield* (0, element_1.generateComponent)(options, ctx, node);
                 ctx.currentComponent = currentComponent;
             }
         }
     }
     else if (node.type === CompilerDOM.NodeTypes.TEXT_CALL) {
         // {{ var }}
-        yield* generateTemplateChild(options, ctx, node.content, undefined);
+        yield* generateTemplateChild(options, ctx, node.content, false);
     }
     else if (node.type === CompilerDOM.NodeTypes.COMPOUND_EXPRESSION) {
         // {{ ... }} {{ ... }}
-        for (const childNode of node.children) {
-            if (typeof childNode === 'object') {
-                yield* generateTemplateChild(options, ctx, childNode, undefined);
-            }
-        }
+        yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node.children.filter(child => typeof child === 'object'), false);
     }
     else if (node.type === CompilerDOM.NodeTypes.INTERPOLATION) {
         // {{ ... }}
         const [content, start] = parseInterpolationNode(node, options.template.content);
         yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, content, start, node.content.loc, `(`, `)${utils_1.endOfLine}`);
-        yield* ctx.resetDirectiveComments('end of INTERPOLATION');
     }
     else if (node.type === CompilerDOM.NodeTypes.IF) {
         // v-if / v-else-if / v-else
@@ -133,6 +96,9 @@ function* generateTemplateChild(options, ctx, node, prevNode, isVForChild = fals
     else if (node.type === CompilerDOM.NodeTypes.TEXT) {
         // not needed progress
     }
+    if (enterNode) {
+        yield* ctx.exit();
+    }
 }
 function* collectSingleRootNodes(options, children) {
     if (children.length !== 1) {

package/lib/codegen/template/vFor.js

@@ -4,8 +4,8 @@ exports.generateVFor = generateVFor;
 exports.parseVForNode = parseVForNode;
 const CompilerDOM = require("@vue/compiler-dom");
 const utils_1 = require("../utils");
+const elementChildren_1 = require("./elementChildren");
 const interpolation_1 = require("./interpolation");
-const templateChild_1 = require("./templateChild");
 function* generateVFor(options, ctx, node) {
     const { source } = node.parseResult;
     const { leftExpressionRange, leftExpressionText } = parseVForNode(node);
@@ -52,18 +52,13 @@ function* generateVFor(options, ctx, node) {
             }
         }
     }
-    if (isFragment) {
-        yield* ctx.resetDirectiveComments('end of v-for start');
-    }
-    let prev;
-    for (const childNode of node.children) {
-        yield* (0, templateChild_1.generateTemplateChild)(options, ctx, childNode, prev, true);
-        prev = childNode;
-    }
+    const { inVFor } = ctx;
+    ctx.inVFor = true;
+    yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node.children, isFragment);
+    ctx.inVFor = inVFor;
     for (const varName of forBlockVars) {
         ctx.removeLocalVariable(varName);
     }
-    yield* ctx.generateAutoImportCompletion();
     yield `}${utils_1.newLine}`;
 }
 function parseVForNode(node) {

package/lib/codegen/template/vIf.js

@@ -4,8 +4,8 @@ exports.generateVIf = generateVIf;
 const CompilerDOM = require("@vue/compiler-dom");
 const muggle_string_1 = require("muggle-string");
 const utils_1 = require("../utils");
+const elementChildren_1 = require("./elementChildren");
 const interpolation_1 = require("./interpolation");
-const templateChild_1 = require("./templateChild");
 function* generateVIf(options, ctx, node) {
     const originalBlockConditionsLength = ctx.blockConditions.length;
     for (let i = 0; i < node.branches.length; i++) {
@@ -28,15 +28,7 @@ function* generateVIf(options, ctx, node) {
             yield ` `;
         }
         yield `{${utils_1.newLine}`;
-        if (isFragment(node)) {
-            yield* ctx.resetDirectiveComments('end of v-if start');
-        }
-        let prev;
-        for (const childNode of branch.children) {
-            yield* (0, templateChild_1.generateTemplateChild)(options, ctx, childNode, prev);
-            prev = childNode;
-        }
-        yield* ctx.generateAutoImportCompletion();
+        yield* (0, elementChildren_1.generateElementChildren)(options, ctx, branch.children, isFragment(node));
         yield `}${utils_1.newLine}`;
         if (addedBlockCondition) {
             ctx.blockConditions[ctx.blockConditions.length - 1] = `!${ctx.blockConditions[ctx.blockConditions.length - 1]}`;

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

@@ -2,5 +2,4 @@ import * as CompilerDOM from '@vue/compiler-dom';
 import type { Code } from '../../types';
 import type { TemplateCodegenContext } from './context';
 import type { TemplateCodegenOptions } from './index';
-export declare function generateVSlot(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode, slotDir: CompilerDOM.DirectiveNode): Generator<Code>;
-export declare function generateImplicitDefaultSlot(ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode): Generator<Code, void, any>;
+export declare function generateVSlot(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode, slotDir: CompilerDOM.DirectiveNode | undefined): Generator<Code>;

package/lib/codegen/template/vSlot.js

@@ -1,93 +1,115 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateVSlot = generateVSlot;
-exports.generateImplicitDefaultSlot = generateImplicitDefaultSlot;
 const CompilerDOM = require("@vue/compiler-dom");
+const shared_1 = require("../../utils/shared");
 const utils_1 = require("../utils");
 const wrapWith_1 = require("../utils/wrapWith");
+const elementChildren_1 = require("./elementChildren");
 const objectProperty_1 = require("./objectProperty");
-const templateChild_1 = require("./templateChild");
 function* generateVSlot(options, ctx, node, slotDir) {
     if (!ctx.currentComponent) {
         return;
     }
-    ctx.currentComponent.used = true;
     const slotBlockVars = [];
-    yield `{${utils_1.newLine}`;
-    yield `const { `;
-    if (slotDir.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && slotDir.arg.content) {
-        yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, slotDir.arg.loc.source, slotDir.arg.loc.start.offset, slotDir.arg.isStatic ? ctx.codeFeatures.withoutHighlight : ctx.codeFeatures.all, slotDir.arg.loc, false, true);
+    const slotVar = ctx.getInternalVariable();
+    if (slotDir) {
+        yield `{${utils_1.newLine}`;
     }
-    else {
-        yield* (0, wrapWith_1.wrapWith)(slotDir.loc.start.offset, slotDir.loc.start.offset + (slotDir.rawName?.length ?? 0), ctx.codeFeatures.withoutHighlightAndCompletion, `default`);
+    if (slotDir || node.children.length) {
+        ctx.currentComponent.used = true;
+        yield `const { `;
+        if (slotDir) {
+            if (slotDir.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && slotDir.arg.content) {
+                yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, slotDir.arg.loc.source, slotDir.arg.loc.start.offset, slotDir.arg.isStatic ? ctx.codeFeatures.withoutHighlight : ctx.codeFeatures.all, slotDir.arg.loc, false, true);
+            }
+            else {
+                yield* (0, wrapWith_1.wrapWith)(slotDir.loc.start.offset, slotDir.loc.start.offset + (slotDir.rawName?.length ?? 0), ctx.codeFeatures.withoutHighlightAndCompletion, `default`);
+            }
+        }
+        else {
+            yield* (0, wrapWith_1.wrapWith)(node.children[0].loc.start.offset, node.children.at(-1).loc.end.offset, ctx.codeFeatures.navigation, `default`);
+        }
+        yield `: ${slotVar} } = ${ctx.currentComponent.ctxVar}.slots!${utils_1.endOfLine}`;
     }
-    yield `: __VLS_thisSlot } = ${ctx.currentComponent.ctxVar}.slots!${utils_1.endOfLine}`;
-    if (slotDir.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
+    if (slotDir?.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
         const slotAst = (0, utils_1.createTsAst)(options.ts, slotDir, `(${slotDir.exp.content}) => {}`);
         (0, utils_1.collectVars)(options.ts, slotAst, slotAst, slotBlockVars);
-        if (!slotDir.exp.content.includes(':')) {
-            yield `const [`;
-            yield [
-                slotDir.exp.content,
-                'template',
-                slotDir.exp.loc.start.offset,
-                ctx.codeFeatures.all,
-            ];
-            yield `] = __VLS_getSlotParams(__VLS_thisSlot)${utils_1.endOfLine}`;
+        yield* generateSlotParameters(options, ctx, slotAst, slotDir.exp, slotVar);
+    }
+    for (const varName of slotBlockVars) {
+        ctx.addLocalVariable(varName);
+    }
+    yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node.children);
+    for (const varName of slotBlockVars) {
+        ctx.removeLocalVariable(varName);
+    }
+    if (slotDir) {
+        let isStatic = true;
+        if (slotDir.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
+            isStatic = slotDir.arg.isStatic;
         }
-        else {
-            yield `const `;
+        if (isStatic && !slotDir.arg) {
+            yield `${ctx.currentComponent.ctxVar}.slots!['`;
             yield [
-                slotDir.exp.content,
+                '',
                 'template',
-                slotDir.exp.loc.start.offset,
-                ctx.codeFeatures.all,
+                slotDir.loc.start.offset + (slotDir.loc.source.startsWith('#')
+                    ? '#'.length
+                    : slotDir.loc.source.startsWith('v-slot:')
+                        ? 'v-slot:'.length
+                        : 0),
+                ctx.codeFeatures.completion,
             ];
-            yield ` = __VLS_getSlotParam(__VLS_thisSlot)${utils_1.endOfLine}`;
+            yield `'/* empty slot name completion */]${utils_1.endOfLine}`;
         }
+        yield `}${utils_1.newLine}`;
     }
-    for (const varName of slotBlockVars) {
-        ctx.addLocalVariable(varName);
+}
+function* generateSlotParameters(options, ctx, ast, exp, slotVar) {
+    const { ts } = options;
+    const statement = ast.statements[0];
+    if (!ts.isExpressionStatement(statement) || !ts.isArrowFunction(statement.expression)) {
+        return;
     }
-    yield* ctx.resetDirectiveComments('end of slot children start');
-    let prev;
-    for (const childNode of node.children) {
-        yield* (0, templateChild_1.generateTemplateChild)(options, ctx, childNode, prev);
-        prev = childNode;
+    const { expression } = statement;
+    const startOffset = exp.loc.start.offset - 1;
+    const modifies = [];
+    const types = [];
+    for (const { name, type } of expression.parameters) {
+        if (type) {
+            modifies.push([
+                [``],
+                name.end,
+                type.end,
+            ]);
+            types.push(chunk((0, shared_1.getStartEnd)(ts, type, ast).start, type.end));
+        }
+        else {
+            types.push(null);
+        }
     }
-    for (const varName of slotBlockVars) {
-        ctx.removeLocalVariable(varName);
+    yield `const [`;
+    let nextStart = 1;
+    for (const [codes, start, end] of modifies) {
+        yield chunk(nextStart, start);
+        yield* codes;
+        nextStart = end;
     }
-    let isStatic = true;
-    if (slotDir.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-        isStatic = slotDir.arg.isStatic;
+    yield chunk(nextStart, expression.equalsGreaterThanToken.pos - 1);
+    yield `] = __VLS_getSlotParameters(${slotVar}`;
+    if (types.some(t => t)) {
+        yield `, `;
+        yield* (0, wrapWith_1.wrapWith)(exp.loc.start.offset, exp.loc.end.offset, ctx.codeFeatures.verification, `(`, ...types.flatMap(type => type ? [`_: `, type, `, `] : `_, `), `) => [] as any`);
     }
-    if (isStatic && !slotDir.arg) {
-        yield `${ctx.currentComponent.ctxVar}.slots!['`;
-        yield [
-            '',
+    yield `)${utils_1.endOfLine}`;
+    function chunk(start, end) {
+        return [
+            ast.text.slice(start, end),
             'template',
-            slotDir.loc.start.offset + (slotDir.loc.source.startsWith('#')
-                ? '#'.length
-                : slotDir.loc.source.startsWith('v-slot:')
-                    ? 'v-slot:'.length
-                    : 0),
-            ctx.codeFeatures.completion,
+            startOffset + start,
+            ctx.codeFeatures.all,
         ];
-        yield `'/* empty slot name completion */]${utils_1.endOfLine}`;
-    }
-    yield* ctx.generateAutoImportCompletion();
-    yield `}${utils_1.newLine}`;
-}
-function* generateImplicitDefaultSlot(ctx, node) {
-    if (!ctx.currentComponent) {
-        return;
-    }
-    if (node.children.length) {
-        ctx.currentComponent.used = true;
-        yield `${ctx.currentComponent.ctxVar}.slots!.`;
-        yield* (0, wrapWith_1.wrapWith)(node.children[0].loc.start.offset, node.children[node.children.length - 1].loc.end.offset, ctx.codeFeatures.navigation, `default`);
-        yield utils_1.endOfLine;
     }
 }
 //# sourceMappingURL=vSlot.js.map

package/lib/codegen/utils/objectProperty.d.ts

@@ -0,0 +1,3 @@
+import type { Code, VueCodeInformation } from '../../types';
+export declare function getObjectProperty(code: string): string;
+export declare function generateObjectProperty(code: string, source: string, offset: number, features: VueCodeInformation, hasQuotes?: boolean, shouldCamelize?: boolean): Generator<Code>;

package/lib/codegen/utils/objectProperty.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getObjectProperty = getObjectProperty;
+exports.generateObjectProperty = generateObjectProperty;
+const shared_1 = require("@vue/shared");
+const utils_1 = require("../utils");
+const camelized_1 = require("../utils/camelized");
+const stringLiteralKey_1 = require("../utils/stringLiteralKey");
+function getObjectProperty(code) {
+    if (utils_1.identifierRegex.test(code)) {
+        return code;
+    }
+    else {
+        return `'${code}'`;
+    }
+}
+function* generateObjectProperty(code, source, offset, features, hasQuotes = false, shouldCamelize = false) {
+    const start = offset;
+    const end = offset + code.length;
+    if (hasQuotes) {
+        code = code.slice(1, -1);
+        offset++;
+    }
+    if (shouldCamelize) {
+        if (utils_1.identifierRegex.test((0, shared_1.camelize)(code))) {
+            yield* (0, camelized_1.generateCamelized)(code, source, offset, features);
+        }
+        else {
+            yield* (0, utils_1.wrapWith)(start, end, source, features, `'`, ...(0, camelized_1.generateCamelized)(code, source, offset, features), `'`);
+        }
+    }
+    else {
+        if (utils_1.identifierRegex.test(code)) {
+            yield [code, source, offset, features];
+        }
+        else {
+            yield* (0, stringLiteralKey_1.generateStringLiteralKey)(code, source, offset, features);
+        }
+    }
+}
+//# sourceMappingURL=objectProperty.js.map

package/lib/parsers/scriptSetupRanges.js

@@ -159,7 +159,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
                     defaultValue,
                     required,
                     isModel: isDefineModel,
-                    comments: getCommentsRange(ts, node, parents, ast),
+                    comments: getClosestMultiLineCommentRange(ts, node, parents, ast),
                     argNode: options,
                 });
             }
@@ -410,18 +410,20 @@ function getStatementRange(ts, parents, node, ast) {
     }
     return statementRange;
 }
-function getCommentsRange(ts, node, parents, ast) {
+function getClosestMultiLineCommentRange(ts, node, parents, ast) {
     for (let i = parents.length - 1; i >= 0; i--) {
         if (ts.isStatement(node)) {
             break;
         }
         node = parents[i];
     }
-    const comments = ts.getLeadingCommentRanges(ast.text, node.pos);
-    if (comments?.length) {
+    const comment = ts.getLeadingCommentRanges(ast.text, node.pos)
+        ?.reverse()
+        .find(range => range.kind === 3);
+    if (comment) {
         return {
-            start: comments[0].pos,
-            end: comments.at(-1).end,
+            start: comment.pos,
+            end: comment.end,
         };
     }
 }