@vue/language-core 2.2.0 → 2.2.4

package/lib/codegen/template/element.js

@@ -4,7 +4,6 @@ exports.generateComponent = generateComponent;
 exports.generateElement = generateElement;
 const CompilerDOM = require("@vue/compiler-dom");
 const shared_1 = require("@vue/shared");
-const scriptSetupRanges_1 = require("../../parsers/scriptSetupRanges");
 const shared_2 = require("../../utils/shared");
 const inlayHints_1 = require("../inlayHints");
 const utils_1 = require("../utils");
@@ -14,11 +13,11 @@ const elementDirectives_1 = require("./elementDirectives");
 const elementEvents_1 = require("./elementEvents");
 const elementProps_1 = require("./elementProps");
 const interpolation_1 = require("./interpolation");
-const objectProperty_1 = require("./objectProperty");
 const propertyAccess_1 = require("./propertyAccess");
-const templateChild_1 = require("./templateChild");
+const styleScopedClasses_1 = require("./styleScopedClasses");
+const vSlot_1 = require("./vSlot");
 const colonReg = /:/g;
-function* generateComponent(options, ctx, node) {
+function* generateComponent(options, ctx, node, isVForChild) {
     const tagOffsets = [node.loc.start.offset + options.template.content.slice(node.loc.start.offset).indexOf(node.tag)];
     if (!node.isSelfClosing && options.template.lang === 'html') {
         const endTagOffset = node.loc.start.offset + node.loc.source.lastIndexOf(node.tag);
@@ -29,16 +28,13 @@ function* generateComponent(options, ctx, node) {
     const failedPropExps = [];
     const possibleOriginalNames = getPossibleOriginalComponentNames(node.tag, true);
     const matchImportName = possibleOriginalNames.find(name => options.scriptSetupImportComponentNames.has(name));
-    const var_originalComponent = matchImportName ?? ctx.getInternalVariable();
-    const var_functionalComponent = ctx.getInternalVariable();
-    const var_componentInstance = ctx.getInternalVariable();
-    const var_componentEmit = ctx.getInternalVariable();
-    const var_componentEvents = ctx.getInternalVariable();
-    const var_defineComponentCtx = ctx.getInternalVariable();
+    const componentOriginalVar = matchImportName ?? ctx.getInternalVariable();
+    const componentFunctionalVar = ctx.getInternalVariable();
+    const componentVNodeVar = ctx.getInternalVariable();
+    const componentCtxVar = ctx.getInternalVariable();
     const isComponentTag = node.tag.toLowerCase() === 'component';
     ctx.currentComponent = {
-        node,
-        ctxVar: var_defineComponentCtx,
+        ctxVar: componentCtxVar,
         used: false
     };
     let props = node.props;
@@ -71,14 +67,13 @@ function* generateComponent(options, ctx, node) {
         };
     }
     if (matchImportName) {
-        // hover, renaming / find references support
-        yield `// @ts-ignore${utils_1.newLine}`; // #2304
-        yield `/** @type { [`;
+        // navigation support
+        yield `/** @type {[`;
         for (const tagOffset of tagOffsets) {
             yield `typeof `;
-            if (var_originalComponent === node.tag) {
+            if (componentOriginalVar === node.tag) {
                 yield [
-                    var_originalComponent,
+                    componentOriginalVar,
                     'template',
                     tagOffset,
                     ctx.codeFeatures.withoutHighlightAndCompletion,
@@ -96,22 +91,27 @@ function* generateComponent(options, ctx, node) {
             }
             yield `, `;
         }
-        yield `] } */${utils_1.endOfLine}`;
+        yield `]} */${utils_1.endOfLine}`;
     }
     else if (dynamicTagInfo) {
-        yield `const ${var_originalComponent} = (`;
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, dynamicTagInfo.tag, dynamicTagInfo.offsets[0], dynamicTagInfo.astHolder, '(', ')');
+        yield `const ${componentOriginalVar} = (`;
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, dynamicTagInfo.tag, dynamicTagInfo.offsets[0], dynamicTagInfo.astHolder, `(`, `)`);
         if (dynamicTagInfo.offsets[1] !== undefined) {
             yield `,`;
-            yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', {
-                ...ctx.codeFeatures.all,
-                completion: false,
-            }, dynamicTagInfo.tag, dynamicTagInfo.offsets[1], dynamicTagInfo.astHolder, '(', ')');
+            yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.withoutCompletion, dynamicTagInfo.tag, dynamicTagInfo.offsets[1], dynamicTagInfo.astHolder, `(`, `)`);
         }
         yield `)${utils_1.endOfLine}`;
     }
     else if (!isComponentTag) {
-        yield `const ${var_originalComponent} = ({} as __VLS_WithComponent<'${getCanonicalComponentName(node.tag)}', __VLS_LocalComponents, `;
+        yield `const ${componentOriginalVar} = ({} as __VLS_WithComponent<'${getCanonicalComponentName(node.tag)}', __VLS_LocalComponents, `;
+        if (options.selfComponentName && possibleOriginalNames.includes(options.selfComponentName)) {
+            yield `typeof __VLS_self & (new () => { `
+                + (0, shared_2.getSlotsPropertyName)(options.vueCompilerOptions.target)
+                + `: __VLS_Slots }), `;
+        }
+        else {
+            yield `void, `;
+        }
         yield getPossibleOriginalComponentNames(node.tag, false)
             .map(name => `'${name}'`)
             .join(`, `);
@@ -120,8 +120,8 @@ function* generateComponent(options, ctx, node) {
         yield `${utils_1.endOfLine}`;
         const camelizedTag = (0, shared_1.camelize)(node.tag);
         if (utils_1.variableNameRegex.test(camelizedTag)) {
-            // renaming / find references support
-            yield `/** @type { [`;
+            // navigation support
+            yield `/** @type {[`;
             for (const tagOffset of tagOffsets) {
                 for (const shouldCapitalize of (node.tag[0] === node.tag[0].toUpperCase() ? [false] : [true, false])) {
                     const expectName = shouldCapitalize ? (0, shared_1.capitalize)(camelizedTag) : camelizedTag;
@@ -135,7 +135,7 @@ function* generateComponent(options, ctx, node) {
                     yield `, `;
                 }
             }
-            yield `] } */${utils_1.endOfLine}`;
+            yield `]} */${utils_1.endOfLine}`;
             // auto import support
             if (options.edited) {
                 yield `// @ts-ignore${utils_1.newLine}`; // #2304
@@ -150,67 +150,67 @@ function* generateComponent(options, ctx, node) {
         }
     }
     else {
-        yield `const ${var_originalComponent} = {} as any${utils_1.endOfLine}`;
+        yield `const ${componentOriginalVar} = {} as any${utils_1.endOfLine}`;
     }
     yield `// @ts-ignore${utils_1.newLine}`;
-    yield `const ${var_functionalComponent} = __VLS_asFunctionalComponent(${var_originalComponent}, new ${var_originalComponent}({${utils_1.newLine}`;
-    yield* (0, elementProps_1.generateElementProps)(options, ctx, node, props, options.vueCompilerOptions.strictTemplates, false);
+    yield `const ${componentFunctionalVar} = __VLS_asFunctionalComponent(${componentOriginalVar}, new ${componentOriginalVar}({${utils_1.newLine}`;
+    yield* (0, elementProps_1.generateElementProps)(options, ctx, node, props, options.vueCompilerOptions.checkUnknownProps, false);
     yield `}))${utils_1.endOfLine}`;
     yield `const `;
-    yield* (0, utils_1.wrapWith)(node.loc.start.offset, node.loc.end.offset, {
+    yield* (0, utils_1.wrapWith)(node.loc.start.offset, node.loc.end.offset, ctx.resolveCodeFeatures({
         verification: {
             shouldReport(_source, code) {
+                // https://typescript.tv/errors/#ts6133
                 return String(code) !== '6133';
             },
         }
-    }, var_componentInstance);
-    yield ` = ${var_functionalComponent}`;
+    }), componentVNodeVar);
+    yield ` = ${componentFunctionalVar}`;
     yield* generateComponentGeneric(ctx);
     yield `(`;
-    yield* (0, utils_1.wrapWith)(tagOffsets[0], tagOffsets[0] + node.tag.length, ctx.codeFeatures.verification, `{${utils_1.newLine}`, ...(0, elementProps_1.generateElementProps)(options, ctx, node, props, options.vueCompilerOptions.strictTemplates, true, failedPropExps), `}`);
-    yield `, ...__VLS_functionalComponentArgsRest(${var_functionalComponent}))${utils_1.endOfLine}`;
+    yield* (0, utils_1.wrapWith)(tagOffsets[0], tagOffsets[0] + node.tag.length, ctx.codeFeatures.verification, `{${utils_1.newLine}`, ...(0, elementProps_1.generateElementProps)(options, ctx, node, props, options.vueCompilerOptions.checkUnknownProps, true, failedPropExps), `}`);
+    yield `, ...__VLS_functionalComponentArgsRest(${componentFunctionalVar}))${utils_1.endOfLine}`;
     yield* generateFailedPropExps(options, ctx, failedPropExps);
-    const [refName, offset] = yield* generateVScope(options, ctx, node, props);
-    const isRootNode = node === ctx.singleRootNode;
+    yield* (0, elementEvents_1.generateElementEvents)(options, ctx, node, componentFunctionalVar, componentVNodeVar, componentCtxVar);
+    yield* (0, elementDirectives_1.generateElementDirectives)(options, ctx, node);
+    const [refName, offset] = yield* generateElementReference(options, ctx, node);
+    const tag = (0, shared_2.hyphenateTag)(node.tag);
+    const isRootNode = ctx.singleRootNodes.has(node) && !options.vueCompilerOptions.fallthroughComponentNames.includes(tag);
     if (refName || isRootNode) {
-        const varName = ctx.getInternalVariable();
+        const componentInstanceVar = ctx.getInternalVariable();
         ctx.currentComponent.used = true;
-        yield `var ${varName} = {} as (Parameters<NonNullable<typeof ${var_defineComponentCtx}['expose']>>[0] | null)`;
-        if (node.codegenNode?.type === CompilerDOM.NodeTypes.VNODE_CALL
-            && node.codegenNode.props?.type === CompilerDOM.NodeTypes.JS_OBJECT_EXPRESSION
-            && node.codegenNode.props.properties.some(({ key }) => key.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && key.content === 'ref_for')) {
+        yield `var ${componentInstanceVar} = {} as (Parameters<NonNullable<typeof ${componentCtxVar}['expose']>>[0] | null)`;
+        if (isVForChild) {
             yield `[]`;
         }
         yield `${utils_1.endOfLine}`;
-        if (refName) {
-            ctx.templateRefs.set(refName, [varName, offset]);
+        if (refName && offset) {
+            ctx.templateRefs.set(refName, {
+                typeExp: `typeof ${ctx.getHoistVariable(componentInstanceVar)}`,
+                offset
+            });
         }
         if (isRootNode) {
-            ctx.singleRootElType = `NonNullable<typeof ${varName}>['$el']`;
+            ctx.singleRootElTypes.push(`NonNullable<typeof ${componentInstanceVar}>['$el']`);
         }
     }
-    const usedComponentEventsVar = yield* (0, elementEvents_1.generateElementEvents)(options, ctx, node, var_functionalComponent, var_componentInstance, var_componentEvents);
-    if (usedComponentEventsVar) {
-        ctx.currentComponent.used = true;
-        yield `let ${var_componentEmit}!: typeof ${var_defineComponentCtx}.emit${utils_1.endOfLine}`;
-        yield `let ${var_componentEvents}!: __VLS_NormalizeEmits<typeof ${var_componentEmit}>${utils_1.endOfLine}`;
-    }
-    if (options.vueCompilerOptions.fallthroughAttributes
-        && (node.props.some(prop => prop.type === CompilerDOM.NodeTypes.DIRECTIVE && prop.name === 'bind' && prop.exp?.loc.source === '$attrs')
-            || node === ctx.singleRootNode)) {
-        const varAttrs = ctx.getInternalVariable();
-        ctx.inheritedAttrVars.add(varAttrs);
-        yield `var ${varAttrs}!: Parameters<typeof ${var_functionalComponent}>[0];\n`;
+    if (hasVBindAttrs(options, ctx, node)) {
+        const attrsVar = ctx.getInternalVariable();
+        yield `let ${attrsVar}!: Parameters<typeof ${componentFunctionalVar}>[0]${utils_1.endOfLine}`;
+        ctx.inheritedAttrVars.add(attrsVar);
     }
+    (0, styleScopedClasses_1.collectStyleScopedClassReferences)(options, ctx, node);
     const slotDir = node.props.find(p => p.type === CompilerDOM.NodeTypes.DIRECTIVE && p.name === 'slot');
     if (slotDir) {
-        yield* generateComponentSlot(options, ctx, node, slotDir);
+        yield* (0, vSlot_1.generateVSlot)(options, ctx, node, slotDir);
     }
     else {
+        // #932: reference for default slot
+        yield* (0, vSlot_1.generateImplicitDefaultSlot)(ctx, node);
         yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node);
     }
     if (ctx.currentComponent.used) {
-        yield `var ${var_defineComponentCtx}!: __VLS_PickFunctionalComponentCtx<typeof ${var_originalComponent}, typeof ${var_componentInstance}>${utils_1.endOfLine}`;
+        yield `var ${componentCtxVar}!: __VLS_PickFunctionalComponentCtx<typeof ${componentOriginalVar}, typeof ${componentVNodeVar}>${utils_1.endOfLine}`;
     }
 }
 function* generateElement(options, ctx, node, isVForChild) {
@@ -219,39 +219,36 @@ function* generateElement(options, ctx, node, isVForChild) {
         ? node.loc.start.offset + node.loc.source.lastIndexOf(node.tag)
         : undefined;
     const failedPropExps = [];
-    yield `__VLS_elementAsFunction(__VLS_intrinsicElements`;
+    yield `__VLS_asFunctionalElement(__VLS_intrinsicElements`;
     yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, startTagOffset, ctx.codeFeatures.withoutHighlightAndCompletion);
     if (endTagOffset !== undefined) {
         yield `, __VLS_intrinsicElements`;
         yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, endTagOffset, ctx.codeFeatures.withoutHighlightAndCompletion);
     }
     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, options.vueCompilerOptions.strictTemplates, true, failedPropExps), `}`);
+    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, options.vueCompilerOptions.checkUnknownProps, true, failedPropExps), `}`);
     yield `)${utils_1.endOfLine}`;
     yield* generateFailedPropExps(options, ctx, failedPropExps);
-    const [refName, offset] = yield* generateVScope(options, ctx, node, node.props);
-    if (refName) {
-        let refValue = `__VLS_nativeElements['${node.tag}']`;
+    yield* (0, elementDirectives_1.generateElementDirectives)(options, ctx, node);
+    const [refName, offset] = yield* generateElementReference(options, ctx, node);
+    if (refName && offset) {
+        let typeExp = `__VLS_NativeElements['${node.tag}']`;
         if (isVForChild) {
-            refValue = `[${refValue}]`;
+            typeExp += `[]`;
         }
-        ctx.templateRefs.set(refName, [refValue, offset]);
+        ctx.templateRefs.set(refName, {
+            typeExp,
+            offset
+        });
     }
-    if (ctx.singleRootNode === node) {
-        ctx.singleRootElType = `typeof __VLS_nativeElements['${node.tag}']`;
+    if (ctx.singleRootNodes.has(node)) {
+        ctx.singleRootElTypes.push(`__VLS_NativeElements['${node.tag}']`);
     }
-    const slotDir = node.props.find(p => p.type === CompilerDOM.NodeTypes.DIRECTIVE && p.name === 'slot');
-    if (slotDir && ctx.currentComponent) {
-        yield* generateComponentSlot(options, ctx, node, slotDir);
-    }
-    else {
-        yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node);
-    }
-    if (options.vueCompilerOptions.fallthroughAttributes
-        && (node.props.some(prop => prop.type === CompilerDOM.NodeTypes.DIRECTIVE && prop.name === 'bind' && prop.exp?.loc.source === '$attrs')
-            || node === ctx.singleRootNode)) {
+    if (hasVBindAttrs(options, ctx, node)) {
         ctx.inheritedAttrVars.add(`__VLS_intrinsicElements.${node.tag}`);
     }
+    (0, styleScopedClasses_1.collectStyleScopedClassReferences)(options, ctx, node);
+    yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node);
 }
 function* generateFailedPropExps(options, ctx, failedPropExps) {
     for (const failedExp of failedPropExps) {
@@ -259,34 +256,6 @@ function* generateFailedPropExps(options, ctx, failedPropExps) {
         yield utils_1.endOfLine;
     }
 }
-function* generateVScope(options, ctx, node, props) {
-    const vScope = props.find(prop => prop.type === CompilerDOM.NodeTypes.DIRECTIVE && (prop.name === 'scope' || prop.name === 'data'));
-    let inScope = false;
-    let originalConditionsNum = ctx.blockConditions.length;
-    if (vScope?.type === CompilerDOM.NodeTypes.DIRECTIVE && vScope.exp) {
-        const scopeVar = ctx.getInternalVariable();
-        const condition = `__VLS_withScope(__VLS_ctx, ${scopeVar})`;
-        yield `const ${scopeVar} = `;
-        yield [
-            vScope.exp.loc.source,
-            'template',
-            vScope.exp.loc.start.offset,
-            ctx.codeFeatures.all,
-        ];
-        yield utils_1.endOfLine;
-        yield `if (${condition}) {${utils_1.newLine}`;
-        ctx.blockConditions.push(condition);
-        inScope = true;
-    }
-    yield* (0, elementDirectives_1.generateElementDirectives)(options, ctx, node);
-    const [refName, offset] = yield* generateReferencesForElements(options, ctx, node); // <el ref="foo" />
-    yield* generateReferencesForScopedCssClasses(options, ctx, node);
-    if (inScope) {
-        yield `}${utils_1.newLine}`;
-        ctx.blockConditions.length = originalConditionsNum;
-    }
-    return [refName, offset];
-}
 function getCanonicalComponentName(tagText) {
     return utils_1.variableNameRegex.test(tagText)
         ? tagText
@@ -325,87 +294,16 @@ function* generateComponentGeneric(ctx) {
     }
     ctx.lastGenericComment = undefined;
 }
-function* generateComponentSlot(options, ctx, node, slotDir) {
-    yield `{${utils_1.newLine}`;
-    if (ctx.currentComponent) {
-        ctx.currentComponent.used = true;
-        ctx.hasSlotElements.add(ctx.currentComponent.node);
-    }
-    const slotBlockVars = [];
-    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);
-    }
-    else {
-        yield* (0, utils_1.wrapWith)(slotDir.loc.start.offset, slotDir.loc.start.offset + (slotDir.rawName?.length ?? 0), ctx.codeFeatures.withoutHighlightAndCompletion, `default`);
-    }
-    yield `: __VLS_thisSlot } = ${ctx.currentComponent.ctxVar}.slots!${utils_1.endOfLine}`;
-    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}`;
-        }
-        else {
-            yield `const `;
-            yield [
-                slotDir.exp.content,
-                'template',
-                slotDir.exp.loc.start.offset,
-                ctx.codeFeatures.all,
-            ];
-            yield ` = __VLS_getSlotParam(__VLS_thisSlot)${utils_1.endOfLine}`;
-        }
-    }
-    for (const varName of slotBlockVars) {
-        ctx.addLocalVariable(varName);
-    }
-    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;
-    }
-    for (const varName of slotBlockVars) {
-        ctx.removeLocalVariable(varName);
-    }
-    let isStatic = true;
-    if (slotDir?.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-        isStatic = slotDir.arg.isStatic;
-    }
-    if (isStatic && slotDir && !slotDir.arg) {
-        yield `${ctx.currentComponent.ctxVar}.slots!['`;
-        yield [
-            '',
-            'template',
-            slotDir.loc.start.offset + (slotDir.loc.source.startsWith('#')
-                ? '#'.length : slotDir.loc.source.startsWith('v-slot:')
-                ? 'v-slot:'.length
-                : 0),
-            ctx.codeFeatures.completion,
-        ];
-        yield `'/* empty slot name completion */]${utils_1.newLine}`;
-    }
-    yield* ctx.generateAutoImportCompletion();
-    yield `}${utils_1.newLine}`;
-}
-function* generateReferencesForElements(options, ctx, node) {
+function* generateElementReference(options, ctx, node) {
     for (const prop of node.props) {
         if (prop.type === CompilerDOM.NodeTypes.ATTRIBUTE
             && prop.name === 'ref'
             && prop.value) {
-            const [content, startOffset] = normalizeAttributeValue(prop.value);
-            yield `// @ts-ignore navigation for \`const ${content} = ref()\`${utils_1.newLine}`;
-            yield `/** @type { typeof __VLS_ctx`;
+            const [content, startOffset] = (0, utils_1.normalizeAttributeValue)(prop.value);
+            // navigation support for `const foo = ref()`
+            yield `/** @type {typeof __VLS_ctx`;
             yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, content, startOffset, ctx.codeFeatures.navigation, prop.value.loc);
-            yield ` } */${utils_1.endOfLine}`;
+            yield `} */${utils_1.endOfLine}`;
             if (utils_1.variableNameRegex.test(content) && !options.templateRefNames.has(content)) {
                 ctx.accessExternalVariable(content, startOffset);
             }
@@ -414,116 +312,11 @@ function* generateReferencesForElements(options, ctx, node) {
     }
     return [];
 }
-function* generateReferencesForScopedCssClasses(options, ctx, node) {
-    for (const prop of node.props) {
-        if (prop.type === CompilerDOM.NodeTypes.ATTRIBUTE
-            && prop.name === 'class'
-            && prop.value) {
-            if (options.template.lang === 'pug') {
-                const getClassOffset = Reflect.get(prop.value.loc.start, 'getClassOffset');
-                const content = prop.value.loc.source.slice(1, -1);
-                let startOffset = 1;
-                for (const className of content.split(' ')) {
-                    if (className) {
-                        ctx.scopedClasses.push({
-                            source: 'template',
-                            className,
-                            offset: getClassOffset(startOffset),
-                        });
-                    }
-                    startOffset += className.length + 1;
-                }
-            }
-            else {
-                let isWrapped = false;
-                const [content, startOffset] = normalizeAttributeValue(prop.value);
-                if (content) {
-                    const classes = collectClasses(content, startOffset + (isWrapped ? 1 : 0));
-                    ctx.scopedClasses.push(...classes);
-                }
-                else {
-                    ctx.emptyClassOffsets.push(startOffset);
-                }
-            }
-        }
-        else if (prop.type === CompilerDOM.NodeTypes.DIRECTIVE
-            && 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 { ts } = options;
-            const ast = ts.createSourceFile('', content, 99);
-            const literals = [];
-            ts.forEachChild(ast, node => {
-                if (!ts.isExpressionStatement(node) ||
-                    !isTemplateExpression(node.expression)) {
-                    return;
-                }
-                const expression = node.expression.templateSpans[0].expression;
-                if (ts.isStringLiteralLike(expression)) {
-                    literals.push(expression);
-                }
-                if (ts.isArrayLiteralExpression(expression)) {
-                    walkArrayLiteral(expression);
-                }
-                if (ts.isObjectLiteralExpression(expression)) {
-                    walkObjectLiteral(expression);
-                }
-            });
-            for (const literal of literals) {
-                if (literal.text) {
-                    const classes = collectClasses(literal.text, literal.end - literal.text.length - 1 + startOffset);
-                    ctx.scopedClasses.push(...classes);
-                }
-                else {
-                    ctx.emptyClassOffsets.push(literal.end - 1 + startOffset);
-                }
-            }
-            function walkArrayLiteral(node) {
-                const { elements } = node;
-                for (const element of elements) {
-                    if (ts.isStringLiteralLike(element)) {
-                        literals.push(element);
-                    }
-                    else if (ts.isObjectLiteralExpression(element)) {
-                        walkObjectLiteral(element);
-                    }
-                }
-            }
-            function walkObjectLiteral(node) {
-                const { properties } = node;
-                for (const property of properties) {
-                    if (ts.isPropertyAssignment(property)) {
-                        const { name } = property;
-                        if (ts.isIdentifier(name)) {
-                            walkIdentifier(name);
-                        }
-                        else if (ts.isStringLiteral(name)) {
-                            literals.push(name);
-                        }
-                        else if (ts.isComputedPropertyName(name)) {
-                            const { expression } = name;
-                            if (ts.isStringLiteralLike(expression)) {
-                                literals.push(expression);
-                            }
-                        }
-                    }
-                    else if (ts.isShorthandPropertyAssignment(property)) {
-                        walkIdentifier(property.name);
-                    }
-                }
-            }
-            function walkIdentifier(node) {
-                const text = (0, scriptSetupRanges_1.getNodeText)(ts, node, ast);
-                ctx.scopedClasses.push({
-                    source: 'template',
-                    className: text,
-                    offset: node.end - text.length + startOffset
-                });
-            }
-        }
-    }
+function hasVBindAttrs(options, ctx, node) {
+    return options.vueCompilerOptions.fallthroughAttributes && ((options.inheritAttrs && ctx.singleRootNodes.has(node)) ||
+        node.props.some(prop => prop.type === CompilerDOM.NodeTypes.DIRECTIVE
+            && prop.name === 'bind'
+            && prop.exp?.loc.source === '$attrs'));
 }
 function camelizeComponentName(newName) {
     return (0, shared_1.camelize)('-' + newName);
@@ -531,41 +324,4 @@ function camelizeComponentName(newName) {
 function getTagRenameApply(oldName) {
     return oldName === (0, shared_2.hyphenateTag)(oldName) ? shared_2.hyphenateTag : undefined;
 }
-function normalizeAttributeValue(node) {
-    let offset = node.loc.start.offset;
-    let content = node.loc.source;
-    if ((content.startsWith(`'`) && content.endsWith(`'`))
-        || (content.startsWith(`"`) && content.endsWith(`"`))) {
-        offset++;
-        content = content.slice(1, -1);
-    }
-    return [content, offset];
-}
-function collectClasses(content, startOffset = 0) {
-    const classes = [];
-    let currentClassName = '';
-    let offset = 0;
-    for (const char of (content + ' ')) {
-        if (char.trim() === '') {
-            if (currentClassName !== '') {
-                classes.push({
-                    source: 'template',
-                    className: currentClassName,
-                    offset: offset + startOffset
-                });
-                offset += currentClassName.length;
-                currentClassName = '';
-            }
-            offset += char.length;
-        }
-        else {
-            currentClassName += char;
-        }
-    }
-    return classes;
-}
-// isTemplateExpression is missing in tsc
-function isTemplateExpression(node) {
-    return node.kind === 228;
-}
 //# sourceMappingURL=element.js.map

package/lib/codegen/template/elementChildren.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateElementChildren = generateElementChildren;
-const CompilerDOM = require("@vue/compiler-dom");
-const utils_1 = require("../utils");
 const templateChild_1 = require("./templateChild");
 function* generateElementChildren(options, ctx, node) {
     yield* ctx.resetDirectiveComments('end of element children start');
@@ -12,16 +10,5 @@ function* generateElementChildren(options, ctx, node) {
         prev = childNode;
     }
     yield* ctx.generateAutoImportCompletion();
-    // fix https://github.com/vuejs/language-tools/issues/932
-    if (ctx.currentComponent
-        && !ctx.hasSlotElements.has(node)
-        && node.children.length
-        && node.tagType !== CompilerDOM.ElementTypes.ELEMENT
-        && node.tagType !== CompilerDOM.ElementTypes.TEMPLATE) {
-        ctx.currentComponent.used = true;
-        yield `${ctx.currentComponent.ctxVar}.slots!.`;
-        yield* (0, utils_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=elementChildren.js.map

package/lib/codegen/template/elementDirectives.js

@@ -5,11 +5,21 @@ exports.generateModifiers = generateModifiers;
 const CompilerDOM = require("@vue/compiler-dom");
 const shared_1 = require("@vue/shared");
 const shared_2 = require("../../utils/shared");
+const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const camelized_1 = require("../utils/camelized");
 const stringLiteralKey_1 = require("../utils/stringLiteralKey");
+const elementProps_1 = require("./elementProps");
 const interpolation_1 = require("./interpolation");
 const objectProperty_1 = require("./objectProperty");
+const builtInDirectives = new Set([
+    'cloak',
+    'html',
+    'memo',
+    'once',
+    'show',
+    'text',
+]);
 function* generateElementDirectives(options, ctx, node) {
     for (const prop of node.props) {
         if (prop.type !== CompilerDOM.NodeTypes.DIRECTIVE
@@ -22,24 +32,22 @@ function* generateElementDirectives(options, ctx, node) {
             continue;
         }
         ctx.accessExternalVariable((0, shared_1.camelize)('v-' + prop.name), prop.loc.start.offset);
-        yield* (0, utils_1.wrapWith)(prop.loc.start.offset, prop.loc.end.offset, ctx.codeFeatures.verification, `__VLS_asFunctionalDirective(`, ...generateIdentifier(ctx, prop), `)(null!, { ...__VLS_directiveBindingRestFields, `, ...generateArg(options, ctx, prop), ...generateModifiers(options, ctx, prop), ...generateValue(options, ctx, prop), ` }, null!, null!)`);
+        yield* (0, utils_1.wrapWith)(prop.loc.start.offset, prop.loc.end.offset, ctx.codeFeatures.verification, `__VLS_asFunctionalDirective(`, ...generateIdentifier(options, ctx, prop), `)(null!, { ...__VLS_directiveBindingRestFields, `, ...generateArg(options, ctx, prop), ...generateModifiers(options, ctx, prop), ...generateValue(options, ctx, prop), ` }, null!, null!)`);
         yield utils_1.endOfLine;
     }
 }
-function* generateIdentifier(ctx, prop) {
+function* generateIdentifier(options, ctx, prop) {
     const rawName = 'v-' + prop.name;
-    yield* (0, utils_1.wrapWith)(prop.loc.start.offset, prop.loc.start.offset + rawName.length, ctx.codeFeatures.verification, `__VLS_directives.`, ...(0, camelized_1.generateCamelized)(rawName, prop.loc.start.offset, {
-        ...ctx.codeFeatures.all,
-        verification: false,
-        completion: {
-            // fix https://github.com/vuejs/language-tools/issues/1905
-            isAdditional: true,
-        },
+    yield* (0, utils_1.wrapWith)(prop.loc.start.offset, prop.loc.start.offset + rawName.length, ctx.codeFeatures.verification, `__VLS_directives.`, ...(0, camelized_1.generateCamelized)(rawName, prop.loc.start.offset, ctx.resolveCodeFeatures({
+        ...codeFeatures_1.codeFeatures.withoutHighlight,
+        // fix https://github.com/vuejs/language-tools/issues/1905
+        ...codeFeatures_1.codeFeatures.additionalCompletion,
+        verification: options.vueCompilerOptions.checkUnknownDirectives && !builtInDirectives.has(prop.name),
         navigation: {
             resolveRenameNewName: shared_1.camelize,
             resolveRenameEditText: getPropRenameApply(prop.name),
         },
-    }));
+    })));
 }
 function* generateArg(options, ctx, prop) {
     const { arg } = prop;
@@ -67,7 +75,7 @@ function* generateModifiers(options, ctx, prop, propertyName = 'modifiers') {
     yield* (0, utils_1.wrapWith)(startOffset, endOffset, ctx.codeFeatures.verification, propertyName);
     yield `: { `;
     for (const mod of modifiers) {
-        yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, mod.content, mod.loc.start.offset, ctx.codeFeatures.withoutNavigation);
+        yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, mod.content, mod.loc.start.offset, ctx.codeFeatures.withoutHighlightAndNavigation);
         yield `: true, `;
     }
     yield `}, `;
@@ -79,7 +87,7 @@ function* generateValue(options, ctx, prop) {
     }
     yield* (0, utils_1.wrapWith)(exp.loc.start.offset, exp.loc.end.offset, ctx.codeFeatures.verification, `value`);
     yield `: `;
-    yield* (0, utils_1.wrapWith)(exp.loc.start.offset, exp.loc.end.offset, ctx.codeFeatures.verification, ...(0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, exp.content, exp.loc.start.offset, exp.loc, `(`, `)`));
+    yield* (0, elementProps_1.generatePropExp)(options, ctx, prop, exp, ctx.codeFeatures.all);
 }
 function getPropRenameApply(oldName) {
     return oldName === (0, shared_2.hyphenateAttr)(oldName) ? shared_2.hyphenateAttr : undefined;