@vue/language-core 3.0.4 → 3.0.6

package/lib/codegen/template/elementEvents.js

@@ -49,12 +49,12 @@ function* generateElementEvents(options, ctx, node, componentOriginalVar, compon
             yield `const ${ctx.getInternalVariable()}: __VLS_NormalizeComponentEvent<typeof ${propsVar}, typeof ${emitsVar}, '${propName}', '${emitName}', '${camelizedEmitName}'> = (${utils_1.newLine}`;
             if (prop.name === 'on') {
                 yield `{ `;
-                yield* generateEventArg(options, ctx, source, start, emitPrefix.slice(0, -1), ctx.codeFeatures.navigation);
+                yield* generateEventArg(options, source, start, emitPrefix.slice(0, -1), codeFeatures_1.codeFeatures.navigation);
                 yield `: {} as any } as typeof ${emitsVar},${utils_1.newLine}`;
             }
             yield `{ `;
             if (prop.name === 'on') {
-                yield* generateEventArg(options, ctx, source, start, propPrefix.slice(0, -1));
+                yield* generateEventArg(options, source, start, propPrefix.slice(0, -1));
                 yield `: `;
                 yield* generateEventExpression(options, ctx, prop);
             }
@@ -66,14 +66,14 @@ function* generateElementEvents(options, ctx, node, componentOriginalVar, compon
         }
     }
 }
-function* generateEventArg(options, ctx, name, start, directive = 'on', features) {
-    features ??= ctx.resolveCodeFeatures({
+function* generateEventArg(options, name, start, directive = 'on', features) {
+    features ??= {
         ...codeFeatures_1.codeFeatures.semanticWithoutHighlight,
         ...codeFeatures_1.codeFeatures.navigationWithoutRename,
         ...options.vueCompilerOptions.checkUnknownEvents
             ? codeFeatures_1.codeFeatures.verification
             : codeFeatures_1.codeFeatures.doNotReportTs2353AndTs2561,
-    });
+    };
     if (directive.length) {
         name = (0, shared_1.capitalize)(name);
     }
@@ -88,19 +88,10 @@ function* generateEventArg(options, ctx, name, start, directive = 'on', features
 }
 function* generateEventExpression(options, ctx, prop) {
     if (prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-        let prefix = `(`;
-        let suffix = `)`;
         let isFirstMapping = true;
         const ast = (0, utils_1.createTsAst)(options.ts, ctx.inlineTsAsts, prop.exp.content);
         const isCompound = isCompoundExpression(options.ts, ast);
-        if (isCompound) {
-            ctx.addLocalVariable('$event');
-            yield `(...[$event]) => {${utils_1.newLine}`;
-            yield* ctx.generateConditionGuards();
-            prefix = ``;
-            suffix = ``;
-        }
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', offset => {
+        const interpolation = (0, interpolation_1.generateInterpolation)(options, ctx, 'template', offset => {
             if (isCompound && isFirstMapping) {
                 isFirstMapping = false;
                 ctx.inlayHints.push({
@@ -116,14 +107,21 @@ function* generateEventExpression(options, ctx, prop) {
                     ].join('\n\n'),
                 });
             }
-            return ctx.codeFeatures.all;
-        }, prop.exp.content, prop.exp.loc.start.offset, prefix, suffix);
+            return codeFeatures_1.codeFeatures.all;
+        }, prop.exp.content, prop.exp.loc.start.offset, isCompound ? `` : `(`, isCompound ? `` : `)`);
         if (isCompound) {
-            ctx.removeLocalVariable('$event');
+            yield `(...[$event]) => {${utils_1.newLine}`;
+            ctx.addLocalVariable('$event');
+            yield* ctx.generateConditionGuards();
+            yield* interpolation;
             yield utils_1.endOfLine;
+            ctx.removeLocalVariable('$event');
             yield* ctx.generateAutoImportCompletion();
             yield `}`;
         }
+        else {
+            yield* interpolation;
+        }
     }
     else {
         yield `() => {}`;
@@ -133,7 +131,7 @@ function* generateModelEventExpression(options, ctx, prop) {
     if (prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
         yield `(...[$event]) => {${utils_1.newLine}`;
         yield* ctx.generateConditionGuards();
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.verification, prop.exp.content, prop.exp.loc.start.offset);
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', codeFeatures_1.codeFeatures.verification, prop.exp.content, prop.exp.loc.start.offset);
         yield ` = $event${utils_1.endOfLine}`;
         yield `}`;
     }

package/lib/codegen/template/elementProps.js

@@ -27,7 +27,7 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
                 && !prop.arg.loc.source.endsWith(']')) {
                 if (!isComponent) {
                     yield `...{ `;
-                    yield* (0, elementEvents_1.generateEventArg)(options, ctx, prop.arg.loc.source, prop.arg.loc.start.offset);
+                    yield* (0, elementEvents_1.generateEventArg)(options, prop.arg.loc.source, prop.arg.loc.start.offset);
                     yield `: `;
                     yield* (0, elementEvents_1.generateEventExpression)(options, ctx, prop);
                     yield `},`;
@@ -77,13 +77,13 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             }
             const shouldSpread = propName === 'style' || propName === 'class';
             const shouldCamelize = isComponent && getShouldCamelize(options, prop, propName);
-            const codeInfo = getPropsCodeInfo(ctx, strictPropsCheck);
+            const features = getPropsCodeFeatures(strictPropsCheck);
             if (shouldSpread) {
                 yield `...{ `;
             }
-            const codes = [...(0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.end.offset, ctx.codeFeatures.verification, ...(prop.arg
-                    ? (0, objectProperty_1.generateObjectProperty)(options, ctx, propName, prop.arg.loc.start.offset, codeInfo, shouldCamelize)
-                    : (0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.start.offset + 'v-model'.length, ctx.codeFeatures.withoutHighlightAndCompletion, propName)), `: `, ...(0, wrapWith_1.wrapWith)(prop.arg?.loc.start.offset ?? prop.loc.start.offset, prop.arg?.loc.end.offset ?? prop.loc.end.offset, ctx.codeFeatures.verification, ...generatePropExp(options, ctx, prop, prop.exp, enableCodeFeatures)))];
+            const codes = [...(0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.end.offset, codeFeatures_1.codeFeatures.verification, ...(prop.arg
+                    ? (0, objectProperty_1.generateObjectProperty)(options, ctx, propName, prop.arg.loc.start.offset, features, shouldCamelize)
+                    : (0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.start.offset + 'v-model'.length, codeFeatures_1.codeFeatures.withoutHighlightAndCompletion, propName)), `: `, ...(0, wrapWith_1.wrapWith)(prop.arg?.loc.start.offset ?? prop.loc.start.offset, prop.arg?.loc.end.offset ?? prop.loc.end.offset, codeFeatures_1.codeFeatures.verification, ...generatePropExp(options, ctx, prop, prop.exp, enableCodeFeatures)))];
             if (enableCodeFeatures) {
                 yield* codes;
             }
@@ -120,12 +120,12 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             }
             const shouldSpread = prop.name === 'style' || prop.name === 'class';
             const shouldCamelize = isComponent && getShouldCamelize(options, prop, prop.name);
-            const codeInfo = getPropsCodeInfo(ctx, strictPropsCheck);
+            const features = getPropsCodeFeatures(strictPropsCheck);
             if (shouldSpread) {
                 yield `...{ `;
             }
-            const codes = [...(0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.end.offset, ctx.codeFeatures.verification, ...(0, objectProperty_1.generateObjectProperty)(options, ctx, prop.name, prop.loc.start.offset, codeInfo, shouldCamelize), `: `, ...(prop.value
-                    ? generateAttrValue(prop.value, ctx.codeFeatures.withoutNavigation)
+            const codes = [...(0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.end.offset, codeFeatures_1.codeFeatures.verification, ...(0, objectProperty_1.generateObjectProperty)(options, ctx, prop.name, prop.loc.start.offset, features, shouldCamelize), `: `, ...(prop.value
+                    ? generateAttrValue(prop.value, codeFeatures_1.codeFeatures.withoutNavigation)
                     : [`true`]))];
             if (enableCodeFeatures) {
                 yield* codes;
@@ -148,7 +148,7 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
                 }
             }
             else {
-                const codes = [...(0, wrapWith_1.wrapWith)(prop.exp.loc.start.offset, prop.exp.loc.end.offset, ctx.codeFeatures.verification, `...`, ...generatePropExp(options, ctx, prop, prop.exp, enableCodeFeatures))];
+                const codes = [...(0, wrapWith_1.wrapWith)(prop.exp.loc.start.offset, prop.exp.loc.end.offset, codeFeatures_1.codeFeatures.verification, `...`, ...generatePropExp(options, ctx, prop, prop.exp, enableCodeFeatures))];
                 if (enableCodeFeatures) {
                     yield* codes;
                 }
@@ -163,8 +163,8 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
 function* generatePropExp(options, ctx, prop, exp, enableCodeFeatures = true) {
     const isShorthand = prop.arg?.loc.start.offset === prop.exp?.loc.start.offset;
     const features = isShorthand
-        ? ctx.codeFeatures.withoutHighlightAndCompletion
-        : ctx.codeFeatures.all;
+        ? codeFeatures_1.codeFeatures.withoutHighlightAndCompletion
+        : codeFeatures_1.codeFeatures.all;
     if (exp && exp.constType !== CompilerDOM.ConstantTypes.CAN_STRINGIFY) { // style='z-index: 2' will compile to {'z-index':'2'}
         if (!isShorthand) { // vue 3.4+
             yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', features, exp.loc.source, exp.loc.start.offset, `(`, `)`);
@@ -220,13 +220,13 @@ function getShouldCamelize(options, prop, propName) {
         && (0, shared_2.hyphenateAttr)(propName) === propName
         && !options.vueCompilerOptions.htmlAttributes.some(pattern => (0, picomatch_1.isMatch)(propName, pattern));
 }
-function getPropsCodeInfo(ctx, strictPropsCheck) {
-    return ctx.resolveCodeFeatures({
+function getPropsCodeFeatures(strictPropsCheck) {
+    return {
         ...codeFeatures_1.codeFeatures.withoutHighlightAndCompletion,
         ...strictPropsCheck
             ? codeFeatures_1.codeFeatures.verification
             : codeFeatures_1.codeFeatures.doNotReportTs2353AndTs2561,
-    });
+    };
 }
 function getModelPropName(node, vueCompilerOptions) {
     for (const modelName in vueCompilerOptions.experimentalModelPropName) {

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

@@ -1,7 +1,8 @@
 import * as CompilerDOM from '@vue/compiler-dom';
 import type * as ts from 'typescript';
 import type { Code, Sfc, VueCompilerOptions } from '../../types';
-import { type TemplateCodegenContext } from './context';
+import type { TemplateCodegenContext } from './context';
+export * from './context';
 export interface TemplateCodegenOptions {
     ts: typeof ts;
     compilerOptions: ts.CompilerOptions;
@@ -17,5 +18,5 @@ export interface TemplateCodegenOptions {
     inheritAttrs: boolean;
     selfComponentName?: string;
 }
-export declare function generateTemplate(options: TemplateCodegenOptions): Generator<Code, TemplateCodegenContext>;
+export declare function generateTemplate(options: TemplateCodegenOptions, ctx: TemplateCodegenContext): Generator<Code>;
 export declare function forEachElementNode(node: CompilerDOM.RootNode | CompilerDOM.TemplateChildNode): Generator<CompilerDOM.ElementNode>;

package/lib/codegen/template/index.js

@@ -1,17 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateTemplate = generateTemplate;
 exports.forEachElementNode = forEachElementNode;
 const CompilerDOM = require("@vue/compiler-dom");
 const shared_1 = require("../../utils/shared");
+const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const wrapWith_1 = require("../utils/wrapWith");
-const context_1 = require("./context");
 const objectProperty_1 = require("./objectProperty");
 const styleScopedClasses_1 = require("./styleScopedClasses");
 const templateChild_1 = require("./templateChild");
-function* generateTemplate(options) {
-    const ctx = (0, context_1.createTemplateCodegenContext)(options, options.template.ast);
+__exportStar(require("./context"), exports);
+function* generateTemplate(options, ctx) {
     if (options.slotsAssignName) {
         ctx.addLocalVariable(options.slotsAssignName);
     }
@@ -47,7 +61,6 @@ function* generateTemplate(options) {
         yield `${name}: ${type}${utils_1.endOfLine}`;
     }
     yield `} & { [K in keyof import('${options.vueCompilerOptions.lib}').ComponentPublicInstance]: unknown }${utils_1.endOfLine}`;
-    return ctx;
 }
 function* generateSlots(options, ctx) {
     if (!options.hasDefineSlots) {
@@ -58,10 +71,10 @@ function* generateSlots(options, ctx) {
         for (const slot of ctx.slots) {
             yield `${utils_1.newLine}& { `;
             if (slot.name && slot.offset !== undefined) {
-                yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, slot.name, slot.offset, ctx.codeFeatures.navigation);
+                yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, slot.name, slot.offset, codeFeatures_1.codeFeatures.navigation);
             }
             else {
-                yield* (0, wrapWith_1.wrapWith)(slot.tagRange[0], slot.tagRange[1], ctx.codeFeatures.navigation, `default`);
+                yield* (0, wrapWith_1.wrapWith)(slot.tagRange[0], slot.tagRange[1], codeFeatures_1.codeFeatures.navigation, `default`);
             }
             yield `?: (props: typeof ${slot.propsVar}) => any }`;
         }
@@ -70,10 +83,9 @@ function* generateSlots(options, ctx) {
     return `__VLS_Slots`;
 }
 function* generateInheritedAttrs(options, ctx) {
-    yield `type __VLS_InheritedAttrs = {}`;
-    for (const varName of ctx.inheritedAttrVars) {
-        yield ` & typeof ${varName}`;
-    }
+    yield `type __VLS_InheritedAttrs = ${ctx.inheritedAttrVars.size
+        ? `Partial<${[...ctx.inheritedAttrVars].map(name => `typeof ${name}`).join(` & `)}>`
+        : `{}`}`;
     yield utils_1.endOfLine;
     if (ctx.bindingAttrLocs.length) {
         yield `[`;
@@ -83,13 +95,13 @@ function* generateInheritedAttrs(options, ctx) {
                 loc.source,
                 'template',
                 loc.start.offset,
-                ctx.codeFeatures.all,
+                codeFeatures_1.codeFeatures.all,
             ];
             yield `,`;
         }
         yield `]${utils_1.endOfLine}`;
     }
-    return `import('${options.vueCompilerOptions.lib}').ComponentPublicInstance['$attrs'] & Partial<__VLS_InheritedAttrs>`;
+    return `import('${options.vueCompilerOptions.lib}').ComponentPublicInstance['$attrs'] & __VLS_InheritedAttrs`;
 }
 function* generateTemplateRefs(options, ctx) {
     yield `type __VLS_TemplateRefs = {}`;
@@ -104,7 +116,7 @@ function* generateTemplateRefs(options, ctx) {
                 yield ` | `;
             }
             yield `{ `;
-            yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, name, offset, ctx.codeFeatures.navigation);
+            yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, name, offset, codeFeatures_1.codeFeatures.navigation);
             yield `: ${typeExp} }`;
         }
         if (refs.length >= 2) {

package/lib/codegen/template/interpolation.js

@@ -4,6 +4,7 @@ exports.generateInterpolation = generateInterpolation;
 const shared_1 = require("@vue/shared");
 const collectBindings_1 = require("../../utils/collectBindings");
 const shared_2 = require("../../utils/shared");
+const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 // 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');
@@ -35,7 +36,7 @@ function* generateInterpolation(options, ctx, source, data, code, start, prefix
                         source,
                         start + offset,
                         type === 'errorMappingOnly'
-                            ? ctx.codeFeatures.verification
+                            ? codeFeatures_1.codeFeatures.verification
                             : typeof data === 'function'
                                 ? data(start + offset)
                                 : data,

package/lib/codegen/template/slotOutlet.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSlotOutlet = generateSlotOutlet;
 const CompilerDOM = require("@vue/compiler-dom");
+const shared_1 = require("../../utils/shared");
+const codeFeatures_1 = require("../codeFeatures");
 const inlayHints_1 = require("../inlayHints");
 const utils_1 = require("../utils");
 const wrapWith_1 = require("../utils/wrapWith");
@@ -10,8 +12,7 @@ const elementProps_1 = require("./elementProps");
 const interpolation_1 = require("./interpolation");
 const propertyAccess_1 = require("./propertyAccess");
 function* generateSlotOutlet(options, ctx, node) {
-    const startTagOffset = node.loc.start.offset
-        + options.template.content.slice(node.loc.start.offset).indexOf(node.tag);
+    const [startTagOffset] = (0, shared_1.getElementTagOffsets)(node, options.template);
     const startTagEndOffset = startTagOffset + node.tag.length;
     const propsVar = ctx.getInternalVariable();
     const nameProp = node.props.find(prop => {
@@ -34,7 +35,7 @@ function* generateSlotOutlet(options, ctx, node) {
                     source = source.slice(1, -1);
                     offset++;
                 }
-                codes = (0, propertyAccess_1.generatePropertyAccess)(options, ctx, source, offset, ctx.codeFeatures.navigationAndVerification);
+                codes = (0, propertyAccess_1.generatePropertyAccess)(options, ctx, source, offset, codeFeatures_1.codeFeatures.navigationAndVerification);
             }
             else if (nameProp.type === CompilerDOM.NodeTypes.DIRECTIVE
                 && nameProp.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
@@ -47,13 +48,13 @@ function* generateSlotOutlet(options, ctx, node) {
             else {
                 codes = [`['default']`];
             }
-            yield* (0, wrapWith_1.wrapWith)(nameProp.loc.start.offset, nameProp.loc.end.offset, ctx.codeFeatures.verification, `${options.slotsAssignName ?? '__VLS_slots'}`, ...codes);
+            yield* (0, wrapWith_1.wrapWith)(nameProp.loc.start.offset, nameProp.loc.end.offset, codeFeatures_1.codeFeatures.verification, `${options.slotsAssignName ?? '__VLS_slots'}`, ...codes);
         }
         else {
-            yield* (0, wrapWith_1.wrapWith)(startTagOffset, startTagEndOffset, ctx.codeFeatures.verification, `${options.slotsAssignName ?? '__VLS_slots'}[`, ...(0, wrapWith_1.wrapWith)(startTagOffset, startTagEndOffset, ctx.codeFeatures.verification, `'default'`), `]`);
+            yield* (0, wrapWith_1.wrapWith)(startTagOffset, startTagEndOffset, codeFeatures_1.codeFeatures.verification, `${options.slotsAssignName ?? '__VLS_slots'}[`, ...(0, wrapWith_1.wrapWith)(startTagOffset, startTagEndOffset, codeFeatures_1.codeFeatures.verification, `'default'`), `]`);
         }
         yield `)(`;
-        yield* (0, wrapWith_1.wrapWith)(startTagOffset, startTagEndOffset, ctx.codeFeatures.verification, `{${utils_1.newLine}`, ...(0, elementProps_1.generateElementProps)(options, ctx, node, node.props.filter(prop => prop !== nameProp), true, true), `}`);
+        yield* (0, wrapWith_1.wrapWith)(startTagOffset, startTagEndOffset, codeFeatures_1.codeFeatures.verification, `{${utils_1.newLine}`, ...(0, elementProps_1.generateElementProps)(options, ctx, node, node.props.filter(prop => prop !== nameProp), true, true), `}`);
         yield `)${utils_1.endOfLine}`;
     }
     else {
@@ -78,7 +79,7 @@ function* generateSlotOutlet(options, ctx, node) {
             }
             const expVar = ctx.getInternalVariable();
             yield `var ${expVar} = __VLS_tryAsConstant(`;
-            yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, nameProp.exp.content, nameProp.exp.loc.start.offset);
+            yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', codeFeatures_1.codeFeatures.all, nameProp.exp.content, nameProp.exp.loc.start.offset);
             yield `)${utils_1.endOfLine}`;
             ctx.dynamicSlots.push({
                 expVar: ctx.getHoistVariable(expVar),

package/lib/codegen/template/styleScopedClasses.js

@@ -4,6 +4,7 @@ exports.generateStyleScopedClassReferences = generateStyleScopedClassReferences;
 exports.collectStyleScopedClassReferences = collectStyleScopedClassReferences;
 const CompilerDOM = require("@vue/compiler-dom");
 const shared_1 = require("../../utils/shared");
+const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const escaped_1 = require("../utils/escaped");
 const wrapWith_1 = require("../utils/wrapWith");
@@ -15,13 +16,13 @@ function* generateStyleScopedClassReferences(ctx, withDot = false) {
             '',
             'template',
             offset,
-            ctx.codeFeatures.additionalCompletion,
+            codeFeatures_1.codeFeatures.additionalCompletion,
         ];
         yield `']} */${utils_1.endOfLine}`;
     }
     for (const { source, className, offset } of ctx.scopedClasses) {
         yield `/** @type {__VLS_StyleScopedClasses[`;
-        yield* (0, wrapWith_1.wrapWith)(offset - (withDot ? 1 : 0), offset + className.length, source, ctx.codeFeatures.navigation, `'`, ...(0, escaped_1.generateEscaped)(className, source, offset, ctx.codeFeatures.navigationAndAdditionalCompletion, classNameEscapeRegex), `'`);
+        yield* (0, wrapWith_1.wrapWith)(offset - (withDot ? 1 : 0), offset + className.length, source, codeFeatures_1.codeFeatures.navigation, `'`, ...(0, escaped_1.generateEscaped)(className, source, offset, codeFeatures_1.codeFeatures.navigationAndAdditionalCompletion, classNameEscapeRegex), `'`);
         yield `]} */${utils_1.endOfLine}`;
     }
 }
@@ -61,24 +62,24 @@ function collectStyleScopedClassReferences(options, ctx, node) {
             && prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
             && prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
             && prop.arg.content === 'class') {
-            const content = '`${' + prop.exp.content + '}`';
-            const startOffset = prop.exp.loc.start.offset - 3;
+            const content = '(' + prop.exp.content + ')';
+            const startOffset = prop.exp.loc.start.offset - 1;
             const { ts } = options;
             const ast = ts.createSourceFile('', content, 99);
             const literals = [];
             ts.forEachChild(ast, node => {
                 if (!ts.isExpressionStatement(node)
-                    || !isTemplateExpression(node.expression)) {
+                    || !ts.isParenthesizedExpression(node.expression)) {
                     return;
                 }
-                const expression = node.expression.templateSpans[0].expression;
+                const { expression } = node.expression;
                 if (ts.isStringLiteralLike(expression)) {
                     literals.push(expression);
                 }
-                if (ts.isArrayLiteralExpression(expression)) {
+                else if (ts.isArrayLiteralExpression(expression)) {
                     walkArrayLiteral(expression);
                 }
-                if (ts.isObjectLiteralExpression(expression)) {
+                else if (ts.isObjectLiteralExpression(expression)) {
                     walkObjectLiteral(expression);
                 }
             });
@@ -159,8 +160,4 @@ function collectClasses(content, startOffset = 0) {
     }
     return classes;
 }
-// isTemplateExpression is missing in tsc
-function isTemplateExpression(node) {
-    return node.kind === 228;
-}
 //# sourceMappingURL=styleScopedClasses.js.map

package/lib/codegen/template/templateChild.js

@@ -5,6 +5,7 @@ exports.getVForNode = getVForNode;
 exports.parseInterpolationNode = parseInterpolationNode;
 const CompilerDOM = require("@vue/compiler-dom");
 const shared_1 = require("../../utils/shared");
+const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const element_1 = require("./element");
 const elementChildren_1 = require("./elementChildren");
@@ -83,7 +84,7 @@ function* generateTemplateChild(options, ctx, node, enterNode = true) {
     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, `(`, `)${utils_1.endOfLine}`);
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', codeFeatures_1.codeFeatures.all, content, start, `(`, `)${utils_1.endOfLine}`);
     }
     else if (node.type === CompilerDOM.NodeTypes.IF) {
         // v-if / v-else-if / v-else

package/lib/codegen/template/vFor.js

@@ -4,6 +4,7 @@ exports.generateVFor = generateVFor;
 exports.parseVForNode = parseVForNode;
 const CompilerDOM = require("@vue/compiler-dom");
 const collectBindings_1 = require("../../utils/collectBindings");
+const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const elementChildren_1 = require("./elementChildren");
 const interpolation_1 = require("./interpolation");
@@ -19,13 +20,13 @@ function* generateVFor(options, ctx, node) {
             leftExpressionText,
             'template',
             leftExpressionRange.start,
-            ctx.codeFeatures.all,
+            codeFeatures_1.codeFeatures.all,
         ];
     }
     yield `] of `;
     if (source.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
         yield `__VLS_getVForSourceType(`;
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, source.content, source.loc.start.offset, `(`, `)`);
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', codeFeatures_1.codeFeatures.all, source.content, source.loc.start.offset, `(`, `)`);
         yield `!)`; // #3102
     }
     else {
@@ -47,7 +48,7 @@ function* generateVFor(options, ctx, node) {
             for (const prop of argument.returns.props.properties) {
                 if (prop.value.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
                     && !prop.value.isStatic) {
-                    yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, prop.value.content, prop.value.loc.start.offset, `(`, `)`);
+                    yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', codeFeatures_1.codeFeatures.all, prop.value.content, prop.value.loc.start.offset, `(`, `)`);
                     yield utils_1.endOfLine;
                 }
             }

package/lib/codegen/template/vIf.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateVIf = generateVIf;
 const CompilerDOM = require("@vue/compiler-dom");
 const muggle_string_1 = require("muggle-string");
+const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const elementChildren_1 = require("./elementChildren");
 const interpolation_1 = require("./interpolation");
@@ -21,7 +22,7 @@ function* generateVIf(options, ctx, node) {
         }
         let addedBlockCondition = false;
         if (branch.condition?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-            const codes = [...(0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, branch.condition.content, branch.condition.loc.start.offset, `(`, `)`)];
+            const codes = [...(0, interpolation_1.generateInterpolation)(options, ctx, 'template', codeFeatures_1.codeFeatures.all, branch.condition.content, branch.condition.loc.start.offset, `(`, `)`)];
             yield* codes;
             ctx.blockConditions.push((0, muggle_string_1.toString)(codes));
             addedBlockCondition = true;

package/lib/codegen/template/vSlot.js

@@ -4,6 +4,7 @@ exports.generateVSlot = generateVSlot;
 const CompilerDOM = require("@vue/compiler-dom");
 const collectBindings_1 = require("../../utils/collectBindings");
 const shared_1 = require("../../utils/shared");
+const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const wrapWith_1 = require("../utils/wrapWith");
 const elementChildren_1 = require("./elementChildren");
@@ -22,22 +23,22 @@ function* generateVSlot(options, ctx, node, slotDir) {
         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, false, true);
+                yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, slotDir.arg.loc.source, slotDir.arg.loc.start.offset, slotDir.arg.isStatic ? codeFeatures_1.codeFeatures.withoutHighlight : codeFeatures_1.codeFeatures.all, false, true);
             }
             else {
-                yield* (0, wrapWith_1.wrapWith)(slotDir.loc.start.offset, slotDir.loc.start.offset + (slotDir.rawName?.length ?? 0), ctx.codeFeatures.withoutHighlightAndCompletion, `default`);
+                yield* (0, wrapWith_1.wrapWith)(slotDir.loc.start.offset, slotDir.loc.start.offset + (slotDir.rawName?.length ?? 0), codeFeatures_1.codeFeatures.withoutHighlightAndCompletion, `default`);
             }
         }
         else {
             // #932: reference for implicit default slot
-            yield* (0, wrapWith_1.wrapWith)(node.loc.start.offset, node.loc.end.offset, ctx.codeFeatures.navigation, `default`);
+            yield* (0, wrapWith_1.wrapWith)(node.loc.start.offset, node.loc.end.offset, codeFeatures_1.codeFeatures.navigation, `default`);
         }
         yield `: ${slotVar} } = ${ctx.currentComponent.ctxVar}.slots!${utils_1.endOfLine}`;
     }
     if (slotDir?.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
         const slotAst = (0, utils_1.createTsAst)(options.ts, ctx.inlineTsAsts, `(${slotDir.exp.content}) => {}`);
         slotBlockVars.push(...(0, collectBindings_1.collectBindingNames)(options.ts, slotAst, slotAst));
-        yield* generateSlotParameters(options, ctx, slotAst, slotDir.exp, slotVar);
+        yield* generateSlotParameters(options, slotAst, slotDir.exp, slotVar);
     }
     for (const varName of slotBlockVars) {
         ctx.addLocalVariable(varName);
@@ -61,14 +62,14 @@ function* generateVSlot(options, ctx, node, slotDir) {
                     : slotDir.loc.source.startsWith('v-slot:')
                         ? 'v-slot:'.length
                         : 0),
-                ctx.codeFeatures.completion,
+                codeFeatures_1.codeFeatures.completion,
             ];
             yield `'/* empty slot name completion */]${utils_1.endOfLine}`;
         }
         yield `}${utils_1.newLine}`;
     }
 }
-function* generateSlotParameters(options, ctx, ast, exp, slotVar) {
+function* generateSlotParameters(options, ast, exp, slotVar) {
     const { ts } = options;
     const statement = ast.statements[0];
     if (!ts.isExpressionStatement(statement) || !ts.isArrowFunction(statement.expression)) {
@@ -102,7 +103,7 @@ function* generateSlotParameters(options, ctx, ast, exp, slotVar) {
     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`);
+        yield* (0, wrapWith_1.wrapWith)(exp.loc.start.offset, exp.loc.end.offset, codeFeatures_1.codeFeatures.verification, `(`, ...types.flatMap(type => type ? [`_: `, type, `, `] : `_, `), `) => [] as any`);
     }
     yield `)${utils_1.endOfLine}`;
     function chunk(start, end) {
@@ -110,7 +111,7 @@ function* generateSlotParameters(options, ctx, ast, exp, slotVar) {
             ast.text.slice(start, end),
             'template',
             startOffset + start,
-            ctx.codeFeatures.all,
+            codeFeatures_1.codeFeatures.all,
         ];
     }
 }

package/lib/plugins/file-html.js

@@ -4,7 +4,7 @@ const sfcBlockReg = /<(script|style)\b([\s\S]*?)>([\s\S]*?)<\/\1>/g;
 const langReg = /\blang\s*=\s*(['"]?)(\S*)\b\1/;
 const plugin = ({ vueCompilerOptions }) => {
     return {
-        version: 2.1,
+        version: 2.2,
         getLanguageId(fileName) {
             if (vueCompilerOptions.petiteVueExtensions.some(ext => fileName.endsWith(ext))) {
                 return 'html';

package/lib/plugins/file-md.js

@@ -15,7 +15,7 @@ const sfcBlockReg = /<(script|style)\b[\s\S]*?>([\s\S]*?)<\/\1>/g;
 const codeSnippetImportReg = /^\s*<<<\s*.+/gm;
 const plugin = ({ vueCompilerOptions }) => {
     return {
-        version: 2.1,
+        version: 2.2,
         getLanguageId(fileName) {
             if (vueCompilerOptions.vitePressExtensions.some(ext => fileName.endsWith(ext))) {
                 return 'markdown';

package/lib/plugins/file-vue.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const parseSfc_1 = require("../utils/parseSfc");
 const plugin = ({ vueCompilerOptions }) => {
     return {
-        version: 2.1,
+        version: 2.2,
         getLanguageId(fileName) {
             if (vueCompilerOptions.extensions.some(ext => fileName.endsWith(ext))) {
                 return 'vue';
@@ -16,7 +16,22 @@ const plugin = ({ vueCompilerOptions }) => {
             if (languageId !== 'vue') {
                 return;
             }
-            return (0, parseSfc_1.parse)(content);
+            const sfc = (0, parseSfc_1.parse)(content);
+            for (const error of sfc.errors) {
+                // Handle 'Element is missing end tag.' error, see #4893
+                if ('code' in error && error.code === 24 && sfc.descriptor.template
+                    && error.loc?.start.line === sfc.descriptor.template.loc.start.line) {
+                    const template = sfc.descriptor.template;
+                    const templateText = template.content;
+                    const endTagOffset = templateText.lastIndexOf('<');
+                    const endTagText = templateText.slice(endTagOffset).trimEnd();
+                    if ('</template>'.startsWith(endTagText)) {
+                        sfc.descriptor.template.loc.end.offset = template.loc.start.offset + endTagOffset;
+                        template.content = templateText.slice(0, endTagOffset);
+                    }
+                }
+            }
+            return sfc;
         },
         updateSFC(sfc, change) {
             const blocks = [

package/lib/plugins/vue-root-tags.js

@@ -4,7 +4,7 @@ const muggle_string_1 = require("muggle-string");
 const shared_1 = require("./shared");
 const plugin = () => {
     return {
-        version: 2.1,
+        version: 2.2,
         getEmbeddedCodes() {
             return [{
                     id: 'root_tags',

package/lib/plugins/vue-script-js.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const plugin = ({ modules }) => {
     return {
-        version: 2.1,
+        version: 2.2,
         compileSFCScript(lang, script) {
             if (lang === 'js' || lang === 'ts' || lang === 'jsx' || lang === 'tsx') {
                 const ts = modules.typescript;

package/lib/plugins/vue-sfc-customblocks.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const shared_1 = require("./shared");
 const plugin = () => {
     return {
-        version: 2.1,
+        version: 2.2,
         getEmbeddedCodes(_fileName, sfc) {
             return sfc.customBlocks.map((customBlock, i) => ({
                 id: 'custom_block_' + i,