@vue/language-core 2.2.2 → 2.2.6

package/lib/codegen/template/elementProps.js

@@ -12,6 +12,7 @@ const inlayHints_1 = require("../inlayHints");
 const utils_1 = require("../utils");
 const camelized_1 = require("../utils/camelized");
 const unicode_1 = require("../utils/unicode");
+const wrapWith_1 = require("../utils/wrapWith");
 const elementDirectives_1 = require("./elementDirectives");
 const elementEvents_1 = require("./elementEvents");
 const interpolation_1 = require("./interpolation");
@@ -40,12 +41,12 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
                 && prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
                 && prop.arg.loc.source.startsWith('[')
                 && prop.arg.loc.source.endsWith(']')) {
-                failedPropExps?.push({ node: prop.arg, prefix: '(', suffix: ')' });
-                failedPropExps?.push({ node: prop.exp, prefix: '() => {', suffix: '}' });
+                failedPropExps?.push({ node: prop.arg, prefix: `(`, suffix: `)` });
+                failedPropExps?.push({ node: prop.exp, prefix: `() => {`, suffix: `}` });
             }
             else if (!prop.arg
                 && prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-                failedPropExps?.push({ node: prop.exp, prefix: '(', suffix: ')' });
+                failedPropExps?.push({ node: prop.exp, prefix: `(`, suffix: `)` });
             }
         }
     }
@@ -66,7 +67,7 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             if (propName === undefined
                 || options.vueCompilerOptions.dataAttributes.some(pattern => (0, minimatch_1.minimatch)(propName, pattern))) {
                 if (prop.exp && prop.exp.constType !== CompilerDOM.ConstantTypes.CAN_STRINGIFY) {
-                    failedPropExps?.push({ node: prop.exp, prefix: '(', suffix: ')' });
+                    failedPropExps?.push({ node: prop.exp, prefix: `(`, suffix: `)` });
                 }
                 continue;
             }
@@ -80,14 +81,14 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             if (shouldSpread) {
                 yield `...{ `;
             }
-            const codes = (0, utils_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, prop.loc.name_2 ??= {}, shouldCamelize)
-                : (0, utils_1.wrapWith)(prop.loc.start.offset, prop.loc.start.offset + 'v-model'.length, ctx.codeFeatures.verification, propName)), `: (`, ...generatePropExp(options, ctx, prop, prop.exp, ctx.codeFeatures.all, enableCodeFeatures), `)`);
+            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, prop.loc.name_2 ??= {}, shouldCamelize)
+                    : (0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.start.offset + 'v-model'.length, ctx.codeFeatures.withoutHighlightAndCompletion, propName)), `: `, ...generatePropExp(options, ctx, prop, prop.exp, ctx.codeFeatures.all, enableCodeFeatures))];
             if (enableCodeFeatures) {
                 yield* codes;
             }
             else {
-                yield (0, muggle_string_1.toString)([...codes]);
+                yield (0, muggle_string_1.toString)(codes);
             }
             if (shouldSpread) {
                 yield ` }`;
@@ -99,12 +100,12 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
                         ? `[__VLS_tryAsConstant(\`$\{${prop.arg.content}\}Modifiers\`)]`
                         : (0, shared_1.camelize)(propName) + `Modifiers`
                     : `modelModifiers`;
-                const codes = (0, elementDirectives_1.generateModifiers)(options, ctx, prop, propertyName);
+                const codes = [...(0, elementDirectives_1.generateModifiers)(options, ctx, prop, propertyName)];
                 if (enableCodeFeatures) {
                     yield* codes;
                 }
                 else {
-                    yield (0, muggle_string_1.toString)([...codes]);
+                    yield (0, muggle_string_1.toString)(codes);
                 }
                 yield utils_1.newLine;
             }
@@ -123,14 +124,14 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             if (shouldSpread) {
                 yield `...{ `;
             }
-            const codes = (0, utils_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, prop.loc.name_1 ??= {}, shouldCamelize), `: (`, ...(prop.value
-                ? generateAttrValue(prop.value, ctx.codeFeatures.withoutNavigation)
-                : [`true`]), `)`);
+            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, prop.loc.name_1 ??= {}, shouldCamelize), `: `, ...(prop.value
+                    ? generateAttrValue(prop.value, ctx.codeFeatures.withoutNavigation)
+                    : [`true`]))];
             if (enableCodeFeatures) {
                 yield* codes;
             }
             else {
-                yield (0, muggle_string_1.toString)([...codes]);
+                yield (0, muggle_string_1.toString)(codes);
             }
             if (shouldSpread) {
                 yield ` }`;
@@ -147,19 +148,19 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
                 }
             }
             else {
-                const codes = (0, utils_1.wrapWith)(prop.exp.loc.start.offset, prop.exp.loc.end.offset, ctx.codeFeatures.verification, `...`, ...generatePropExp(options, ctx, prop, prop.exp, ctx.codeFeatures.all, enableCodeFeatures));
+                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, ctx.codeFeatures.all, enableCodeFeatures))];
                 if (enableCodeFeatures) {
                     yield* codes;
                 }
                 else {
-                    yield (0, muggle_string_1.toString)([...codes]);
+                    yield (0, muggle_string_1.toString)(codes);
                 }
                 yield `,${utils_1.newLine}`;
             }
         }
     }
 }
-function* generatePropExp(options, ctx, prop, exp, features, enableCodeFeatures) {
+function* generatePropExp(options, ctx, prop, exp, features, enableCodeFeatures = true) {
     const isShorthand = prop.arg?.loc.start.offset === prop.exp?.loc.start.offset;
     if (isShorthand && features.completion) {
         features = {
@@ -169,14 +170,14 @@ function* generatePropExp(options, ctx, prop, exp, features, enableCodeFeatures)
     }
     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, exp.loc, '(', ')');
+            yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', features, exp.loc.source, exp.loc.start.offset, exp.loc, `(`, `)`);
         }
         else {
             const propVariableName = (0, shared_1.camelize)(exp.loc.source);
-            if (utils_1.variableNameRegex.test(propVariableName)) {
+            if (utils_1.identifierRegex.test(propVariableName)) {
                 const isDestructuredProp = options.destructuredPropNames?.has(propVariableName) ?? false;
                 const isTemplateRef = options.templateRefNames?.has(propVariableName) ?? false;
-                const codes = (0, camelized_1.generateCamelized)(exp.loc.source, exp.loc.start.offset, features);
+                const codes = (0, camelized_1.generateCamelized)(exp.loc.source, 'template', exp.loc.start.offset, features);
                 if (ctx.hasLocalVariable(propVariableName) || isDestructuredProp) {
                     yield* codes;
                 }
@@ -231,6 +232,8 @@ function getPropsCodeInfo(ctx, strictPropsCheck, shouldCamelize) {
         },
         verification: strictPropsCheck || {
             shouldReport(_source, code) {
+                // https://typescript.tv/errors/#ts2353
+                // https://typescript.tv/errors/#ts2561
                 if (String(code) === '2353' || String(code) === '2561') {
                     return false;
                 }

package/lib/codegen/template/index.js

@@ -5,6 +5,7 @@ exports.forEachElementNode = forEachElementNode;
 const CompilerDOM = require("@vue/compiler-dom");
 const shared_1 = require("../../utils/shared");
 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");
@@ -18,26 +19,35 @@ function* generateTemplate(options) {
         ctx.addLocalVariable(options.propsAssignName);
     }
     const slotsPropertyName = (0, shared_1.getSlotsPropertyName)(options.vueCompilerOptions.target);
-    ctx.specialVars.add(slotsPropertyName);
-    ctx.specialVars.add('$attrs');
-    ctx.specialVars.add('$refs');
-    ctx.specialVars.add('$el');
+    if (options.vueCompilerOptions.inferTemplateDollarSlots) {
+        ctx.dollarVars.add(slotsPropertyName);
+    }
+    if (options.vueCompilerOptions.inferTemplateDollarAttrs) {
+        ctx.dollarVars.add('$attrs');
+    }
+    if (options.vueCompilerOptions.inferTemplateDollarRefs) {
+        ctx.dollarVars.add('$refs');
+    }
+    if (options.vueCompilerOptions.inferTemplateDollarEl) {
+        ctx.dollarVars.add('$el');
+    }
     if (options.template.ast) {
         yield* (0, templateChild_1.generateTemplateChild)(options, ctx, options.template.ast, undefined);
     }
     yield* (0, styleScopedClasses_1.generateStyleScopedClassReferences)(ctx);
+    yield* ctx.generateAutoImportCompletion();
+    yield* ctx.generateHoistVariables();
     const speicalTypes = [
         [slotsPropertyName, yield* generateSlots(options, ctx)],
         ['$attrs', yield* generateInheritedAttrs(options, ctx)],
         ['$refs', yield* generateTemplateRefs(options, ctx)],
         ['$el', yield* generateRootEl(ctx)]
     ];
-    yield `var __VLS_special!: {${utils_1.newLine}`;
+    yield `var __VLS_dollars!: {${utils_1.newLine}`;
     for (const [name, type] of speicalTypes) {
         yield `${name}: ${type}${utils_1.endOfLine}`;
     }
-    yield `} & { [K in keyof typeof __VLS_ctx]: unknown }${utils_1.endOfLine}`;
-    yield* ctx.generateAutoImportCompletion();
+    yield `} & { [K in keyof import('${options.vueCompilerOptions.lib}').ComponentPublicInstance]: unknown }${utils_1.endOfLine}`;
     return ctx;
 }
 function* generateSlots(options, ctx) {
@@ -45,17 +55,15 @@ function* generateSlots(options, ctx) {
         const name = (0, shared_1.getSlotsPropertyName)(options.vueCompilerOptions.target);
         yield `type __VLS_Slots = __VLS_PrettifyGlobal<__VLS_OmitStringIndex<typeof __VLS_ctx.${name}>`;
         for (const { expVar, propsVar } of ctx.dynamicSlots) {
-            ctx.hasSlot = true;
             yield `${utils_1.newLine}& { [K in NonNullable<typeof ${expVar}>]?: (props: typeof ${propsVar}) => any }`;
         }
         for (const slot of ctx.slots) {
             yield `${utils_1.newLine}& { `;
-            ctx.hasSlot = true;
             if (slot.name && slot.offset !== undefined) {
                 yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, slot.name, slot.offset, ctx.codeFeatures.withoutHighlightAndCompletion, slot.nodeLoc);
             }
             else {
-                yield* (0, utils_1.wrapWith)(slot.tagRange[0], slot.tagRange[1], ctx.codeFeatures.withoutHighlightAndCompletion, `default`);
+                yield* (0, wrapWith_1.wrapWith)(slot.tagRange[0], slot.tagRange[1], ctx.codeFeatures.withoutHighlightAndCompletion, `default`);
             }
             yield `?: (props: typeof ${slot.propsVar}) => any }`;
         }
@@ -72,7 +80,7 @@ function* generateInheritedAttrs(options, ctx) {
     if (ctx.bindingAttrLocs.length) {
         yield `[`;
         for (const loc of ctx.bindingAttrLocs) {
-            yield `__VLS_special.`;
+            yield `__VLS_dollars.`;
             yield [
                 loc.source,
                 'template',
@@ -87,16 +95,23 @@ function* generateInheritedAttrs(options, ctx) {
 }
 function* generateTemplateRefs(options, ctx) {
     yield `type __VLS_TemplateRefs = {${utils_1.newLine}`;
-    for (const [name, [varName, offset]] of ctx.templateRefs) {
+    for (const [name, { typeExp, offset }] of ctx.templateRefs) {
         yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, name, offset, ctx.codeFeatures.navigationAndCompletion);
-        yield `: typeof ${varName},${utils_1.newLine}`;
+        yield `: ${typeExp},${utils_1.newLine}`;
     }
     yield `}${utils_1.endOfLine}`;
     return `__VLS_TemplateRefs`;
 }
 function* generateRootEl(ctx) {
     yield `type __VLS_RootEl = `;
-    yield ctx.singleRootElType ?? `any`;
+    if (ctx.singleRootElTypes.length && !ctx.singleRootNodes.has(null)) {
+        for (const type of ctx.singleRootElTypes) {
+            yield `${utils_1.newLine}| ${type}`;
+        }
+    }
+    else {
+        yield `any`;
+    }
     yield utils_1.endOfLine;
     return `__VLS_RootEl`;
 }

package/lib/codegen/template/interpolation.js

@@ -87,7 +87,7 @@ function* forEachInterpolationSegment(ts, destructuredPropNames, templateRefName
         for (let i = 0; i < ctxVars.length - 1; i++) {
             const curVar = ctxVars[i];
             const nextVar = ctxVars[i + 1];
-            yield* generateVar(code, ctx.specialVars, destructuredPropNames, templateRefNames, curVar);
+            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];
                 yield [': ', undefined];
@@ -97,7 +97,7 @@ function* forEachInterpolationSegment(ts, destructuredPropNames, templateRefName
             }
         }
         const lastVar = ctxVars.at(-1);
-        yield* generateVar(code, ctx.specialVars, destructuredPropNames, templateRefNames, lastVar);
+        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,7 +106,7 @@ function* forEachInterpolationSegment(ts, destructuredPropNames, templateRefName
         yield [code, 0];
     }
 }
-function* generateVar(code, specialVars, destructuredPropNames, templateRefNames, curVar) {
+function* generateVar(code, dollarVars, destructuredPropNames, templateRefNames, curVar) {
     // fix https://github.com/vuejs/language-tools/issues/1205
     // fix https://github.com/vuejs/language-tools/issues/1264
     yield ['', curVar.offset, 'errorMappingOnly'];
@@ -118,8 +118,8 @@ function* generateVar(code, specialVars, destructuredPropNames, templateRefNames
         yield [`)`, undefined];
     }
     else {
-        if (specialVars.has(curVar.text)) {
-            yield [`__VLS_special.`, undefined];
+        if (dollarVars.has(curVar.text)) {
+            yield [`__VLS_dollars.`, undefined];
         }
         else if (!isDestructuredProp) {
             yield [`__VLS_ctx.`, undefined];

package/lib/codegen/template/objectProperty.js

@@ -5,6 +5,7 @@ const shared_1 = require("@vue/shared");
 const utils_1 = require("../utils");
 const camelized_1 = require("../utils/camelized");
 const stringLiteralKey_1 = require("../utils/stringLiteralKey");
+const wrapWith_1 = require("../utils/wrapWith");
 const interpolation_1 = require("./interpolation");
 function* generateObjectProperty(options, ctx, code, offset, features, astHolder, shouldCamelize = false, shouldBeConstant = false) {
     if (code.startsWith('[') && code.endsWith(']') && astHolder) {
@@ -16,15 +17,15 @@ function* generateObjectProperty(options, ctx, code, offset, features, astHolder
         }
     }
     else if (shouldCamelize) {
-        if (utils_1.variableNameRegex.test((0, shared_1.camelize)(code))) {
-            yield* (0, camelized_1.generateCamelized)(code, offset, features);
+        if (utils_1.identifierRegex.test((0, shared_1.camelize)(code))) {
+            yield* (0, camelized_1.generateCamelized)(code, 'template', offset, features);
         }
         else {
-            yield* (0, utils_1.wrapWith)(offset, offset + code.length, features, `'`, ...(0, camelized_1.generateCamelized)(code, offset, utils_1.combineLastMapping), `'`);
+            yield* (0, wrapWith_1.wrapWith)(offset, offset + code.length, features, `'`, ...(0, camelized_1.generateCamelized)(code, 'template', offset, utils_1.combineLastMapping), `'`);
         }
     }
     else {
-        if (utils_1.variableNameRegex.test(code)) {
+        if (utils_1.identifierRegex.test(code)) {
             yield [code, 'template', offset, features];
         }
         else {

package/lib/codegen/template/propertyAccess.js

@@ -5,7 +5,7 @@ const utils_1 = require("../utils");
 const stringLiteralKey_1 = require("../utils/stringLiteralKey");
 const interpolation_1 = require("./interpolation");
 function* generatePropertyAccess(options, ctx, code, offset, features, astHolder) {
-    if (!options.compilerOptions.noPropertyAccessFromIndexSignature && utils_1.variableNameRegex.test(code)) {
+    if (!options.compilerOptions.noPropertyAccessFromIndexSignature && utils_1.identifierRegex.test(code)) {
         yield `.`;
         yield offset !== undefined && features
             ? [code, 'template', offset, features]

package/lib/codegen/template/slotOutlet.js

@@ -4,12 +4,14 @@ exports.generateSlotOutlet = generateSlotOutlet;
 const CompilerDOM = require("@vue/compiler-dom");
 const inlayHints_1 = require("../inlayHints");
 const utils_1 = require("../utils");
+const wrapWith_1 = require("../utils/wrapWith");
 const elementChildren_1 = require("./elementChildren");
 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 startTagEndOffset = startTagOffset + node.tag.length;
     const propsVar = ctx.getInternalVariable();
     const nameProp = node.props.find(prop => {
         if (prop.type === CompilerDOM.NodeTypes.ATTRIBUTE) {
@@ -22,7 +24,7 @@ function* generateSlotOutlet(options, ctx, node) {
         }
     });
     if (options.hasDefineSlots) {
-        yield `__VLS_normalizeSlot(`;
+        yield `__VLS_asFunctionalSlot(`;
         if (nameProp) {
             let codes;
             if (nameProp.type === CompilerDOM.NodeTypes.ATTRIBUTE && nameProp.value) {
@@ -37,20 +39,20 @@ function* generateSlotOutlet(options, ctx, node) {
                 && nameProp.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
                 codes = [
                     `[`,
-                    ...(0, elementProps_1.generatePropExp)(options, ctx, nameProp, nameProp.exp, ctx.codeFeatures.all, true),
+                    ...(0, elementProps_1.generatePropExp)(options, ctx, nameProp, nameProp.exp, ctx.codeFeatures.all),
                     `]`
                 ];
             }
             else {
                 codes = [`['default']`];
             }
-            yield* (0, utils_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, ctx.codeFeatures.verification, `${options.slotsAssignName ?? '__VLS_slots'}`, ...codes);
         }
         else {
-            yield* (0, utils_1.wrapWith)(node.loc.start.offset, node.loc.end.offset, ctx.codeFeatures.verification, `${options.slotsAssignName ?? '__VLS_slots'}['default']`);
+            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 `)?.(`;
-        yield* (0, utils_1.wrapWith)(startTagOffset, startTagOffset + node.tag.length, ctx.codeFeatures.verification, `{${utils_1.newLine}`, ...(0, elementProps_1.generateElementProps)(options, ctx, node, node.props.filter(prop => prop !== nameProp), true, true), `}`);
+        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 `)${utils_1.endOfLine}`;
     }
     else {
@@ -64,7 +66,7 @@ function* generateSlotOutlet(options, ctx, node) {
                 offset: nameProp.loc.start.offset + nameProp.loc.source.indexOf(nameProp.value.content, nameProp.name.length),
                 tagRange: [startTagOffset, startTagOffset + node.tag.length],
                 nodeLoc: node.loc,
-                propsVar,
+                propsVar: ctx.getHoistVariable(propsVar),
             });
         }
         else if (nameProp?.type === CompilerDOM.NodeTypes.DIRECTIVE
@@ -78,16 +80,16 @@ function* generateSlotOutlet(options, ctx, node) {
             yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, nameProp.exp.content, nameProp.exp.loc.start.offset, nameProp.exp);
             yield `)${utils_1.endOfLine}`;
             ctx.dynamicSlots.push({
-                expVar,
-                propsVar,
+                expVar: ctx.getHoistVariable(expVar),
+                propsVar: ctx.getHoistVariable(propsVar),
             });
         }
         else {
             ctx.slots.push({
                 name: 'default',
-                tagRange: [startTagOffset, startTagOffset + node.tag.length],
+                tagRange: [startTagOffset, startTagEndOffset],
                 nodeLoc: node.loc,
-                propsVar,
+                propsVar: ctx.getHoistVariable(propsVar),
             });
         }
     }

package/lib/codegen/template/styleScopedClasses.js

@@ -5,74 +5,24 @@ exports.collectStyleScopedClassReferences = collectStyleScopedClassReferences;
 const CompilerDOM = require("@vue/compiler-dom");
 const scriptSetupRanges_1 = require("../../parsers/scriptSetupRanges");
 const utils_1 = require("../utils");
+const escaped_1 = require("../utils/escaped");
+const wrapWith_1 = require("../utils/wrapWith");
+const classNameEscapeRegex = /([\\'])/;
 function* generateStyleScopedClassReferences(ctx, withDot = false) {
-    if (!ctx.emptyClassOffsets.length && !ctx.scopedClasses.length) {
-        return;
-    }
-    yield `[`;
     for (const offset of ctx.emptyClassOffsets) {
-        yield `'`;
+        yield `/** @type {__VLS_StyleScopedClasses['`;
         yield [
             '',
             'template',
             offset,
             ctx.codeFeatures.additionalCompletion,
         ];
-        yield `', `;
+        yield `']} */${utils_1.endOfLine}`;
     }
     for (const { source, className, offset } of ctx.scopedClasses) {
-        yield [
-            '',
-            source,
-            offset - (withDot ? 1 : 0),
-            ctx.codeFeatures.navigation,
-        ];
-        yield `'`;
-        // fix https://github.com/vuejs/language-tools/issues/4537
-        yield* escapeString(source, className, offset, ['\\', '\'']);
-        yield `'`;
-        yield [
-            '',
-            source,
-            offset + className.length,
-            ctx.codeFeatures.navigationWithoutRename,
-        ];
-        yield `, `;
-    }
-    yield `] as (keyof __VLS_StyleScopedClasses)[]${utils_1.endOfLine}`;
-    function* escapeString(source, className, offset, escapeTargets) {
-        let count = 0;
-        const currentEscapeTargets = [...escapeTargets];
-        const firstEscapeTarget = currentEscapeTargets.shift();
-        const splitted = className.split(firstEscapeTarget);
-        for (let i = 0; i < splitted.length; i++) {
-            const part = splitted[i];
-            const partLength = part.length;
-            if (escapeTargets.length > 0) {
-                yield* escapeString(source, part, offset + count, [...currentEscapeTargets]);
-            }
-            else {
-                yield [
-                    part,
-                    source,
-                    offset + count,
-                    ctx.codeFeatures.navigationAndAdditionalCompletion,
-                ];
-            }
-            if (i !== splitted.length - 1) {
-                yield '\\';
-                yield [
-                    firstEscapeTarget,
-                    source,
-                    offset + count + partLength,
-                    ctx.codeFeatures.navigationAndAdditionalCompletion,
-                ];
-                count += partLength + 1;
-            }
-            else {
-                count += partLength;
-            }
-        }
+        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 `]} */${utils_1.endOfLine}`;
     }
 }
 function collectStyleScopedClassReferences(options, ctx, node) {

package/lib/codegen/template/templateChild.js

@@ -4,6 +4,7 @@ exports.generateTemplateChild = generateTemplateChild;
 exports.getVForNode = getVForNode;
 exports.parseInterpolationNode = parseInterpolationNode;
 const CompilerDOM = require("@vue/compiler-dom");
+const shared_1 = require("../../utils/shared");
 const utils_1 = require("../utils");
 const element_1 = require("./element");
 const interpolation_1 = require("./interpolation");
@@ -11,6 +12,7 @@ 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,38 +30,44 @@ const transformContext = {
 };
 function* generateTemplateChild(options, ctx, node, prevNode, isVForChild = false) {
     if (prevNode?.type === CompilerDOM.NodeTypes.COMMENT) {
-        const commentText = prevNode.content.trim().split(' ')[0];
-        if (/^@vue-skip\b[\s\S]*/.test(commentText)) {
-            yield `// @vue-skip${utils_1.newLine}`;
-            return;
-        }
-        else if (/^@vue-ignore\b[\s\S]*/.test(commentText)) {
-            yield* ctx.ignoreError();
-        }
-        else if (/^@vue-expect-error\b[\s\S]*/.test(commentText)) {
-            yield* ctx.expectError(prevNode);
-        }
-        else {
-            const match = prevNode.loc.source.match(/^<!--\s*@vue-generic\b\s*\{(?<content>[^}]*)\}/);
-            if (match) {
-                const { content } = match.groups ?? {};
-                ctx.lastGenericComment = {
-                    content,
-                    offset: prevNode.loc.start.offset + match[0].indexOf(content)
-                };
+        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;
+                }
             }
         }
     }
-    const shouldInheritRootNodeAttrs = options.inheritAttrs;
     const cur = node;
     if (cur.codegenNode?.type === CompilerDOM.NodeTypes.JS_CACHE_EXPRESSION) {
         cur.codegenNode = cur.codegenNode.value;
     }
     if (node.type === CompilerDOM.NodeTypes.ROOT) {
-        let prev;
-        if (shouldInheritRootNodeAttrs && node.children.length === 1 && node.children[0].type === CompilerDOM.NodeTypes.ELEMENT) {
-            ctx.singleRootNode = node.children[0];
+        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;
@@ -91,7 +99,7 @@ function* generateTemplateChild(options, ctx, node, prevNode, isVForChild = fals
             }
             else {
                 const { currentComponent } = ctx;
-                yield* (0, element_1.generateComponent)(options, ctx, node);
+                yield* (0, element_1.generateComponent)(options, ctx, node, isVForChild);
                 ctx.currentComponent = currentComponent;
             }
         }
@@ -126,6 +134,30 @@ function* generateTemplateChild(options, ctx, node, prevNode, isVForChild = fals
         // not needed progress
     }
 }
+function* collectSingleRootNodes(options, children) {
+    if (children.length !== 1) {
+        // "null" is used to determine whether the component is not always has a single root
+        if (children.length > 1) {
+            yield null;
+        }
+        return;
+    }
+    const child = children[0];
+    if (child.type === CompilerDOM.NodeTypes.IF) {
+        for (const branch of child.branches) {
+            yield* collectSingleRootNodes(options, branch.children);
+        }
+        return;
+    }
+    else if (child.type !== CompilerDOM.NodeTypes.ELEMENT) {
+        return;
+    }
+    yield child;
+    const tag = (0, shared_1.hyphenateTag)(child.tag);
+    if (options.vueCompilerOptions.fallthroughComponentNames.includes(tag)) {
+        yield* collectSingleRootNodes(options, child.children);
+    }
+}
 // TODO: track https://github.com/vuejs/vue-next/issues/3498
 function getVForNode(node) {
     const forDirective = node.props.find((prop) => prop.type === CompilerDOM.NodeTypes.DIRECTIVE
@@ -146,11 +178,11 @@ function getVForNode(node) {
     }
 }
 function getVIfNode(node) {
-    const forDirective = node.props.find((prop) => prop.type === CompilerDOM.NodeTypes.DIRECTIVE
+    const ifDirective = node.props.find((prop) => prop.type === CompilerDOM.NodeTypes.DIRECTIVE
         && prop.name === 'if');
-    if (forDirective) {
+    if (ifDirective) {
         let ifNode;
-        CompilerDOM.processIf(node, forDirective, transformContext, _ifNode => {
+        CompilerDOM.processIf(node, ifDirective, transformContext, _ifNode => {
             ifNode = { ..._ifNode };
             return undefined;
         });
@@ -158,7 +190,7 @@ function getVIfNode(node) {
             for (const branch of ifNode.branches) {
                 branch.children = [{
                         ...node,
-                        props: node.props.filter(prop => prop !== forDirective),
+                        props: node.props.filter(prop => prop !== ifDirective),
                     }];
             }
             return ifNode;

package/lib/codegen/template/vFor.js

@@ -24,7 +24,7 @@ function* generateVFor(options, ctx, node) {
     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, source.loc, '(', ')');
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, source.content, source.loc.start.offset, source.loc, `(`, `)`);
         yield `!)`; // #3102
     }
     else {
@@ -46,7 +46,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, prop.value.loc, '(', ')');
+                    yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, prop.value.content, prop.value.loc.start.offset, prop.value.loc, `(`, `)`);
                     yield utils_1.endOfLine;
                 }
             }