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

package/lib/codegen/template/element.js

@@ -19,7 +19,7 @@ const propertyAccess_1 = require("./propertyAccess");
 const styleScopedClasses_1 = require("./styleScopedClasses");
 const vSlot_1 = require("./vSlot");
 const colonReg = /:/g;
-function* generateComponent(options, ctx, node, isVForChild) {
+function* generateComponent(options, ctx, node) {
     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);
@@ -35,9 +35,11 @@ function* generateComponent(options, ctx, node, isVForChild) {
     const componentVNodeVar = ctx.getInternalVariable();
     const componentCtxVar = ctx.getInternalVariable();
     const isComponentTag = node.tag.toLowerCase() === 'component';
+    ctx.currentComponent?.childTypes.push(`typeof ${componentVNodeVar}`);
     ctx.currentComponent = {
         ctxVar: componentCtxVar,
-        used: false
+        childTypes: [],
+        used: false,
     };
     let props = node.props;
     let dynamicTagInfo;
@@ -159,7 +161,7 @@ function* generateComponent(options, ctx, node, isVForChild) {
     yield* (0, wrapWith_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);
-    yield* (0, elementEvents_1.generateElementEvents)(options, ctx, node, componentFunctionalVar, componentVNodeVar, componentCtxVar);
+    yield* (0, elementEvents_1.generateElementEvents)(options, ctx, node, componentOriginalVar, 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);
@@ -168,15 +170,12 @@ function* generateComponent(options, ctx, node, isVForChild) {
         const componentInstanceVar = ctx.getInternalVariable();
         ctx.currentComponent.used = true;
         yield `var ${componentInstanceVar} = {} as (Parameters<NonNullable<typeof ${componentCtxVar}['expose']>>[0] | null)`;
-        if (isVForChild) {
+        if (ctx.inVFor) {
             yield `[]`;
         }
         yield `${utils_1.endOfLine}`;
         if (refName && offset) {
-            ctx.templateRefs.set(refName, {
-                typeExp: `typeof ${ctx.getHoistVariable(componentInstanceVar)}`,
-                offset
-            });
+            ctx.addTemplateRef(refName, `typeof ${ctx.getHoistVariable(componentInstanceVar)}`, offset);
         }
         if (isRootNode) {
             ctx.singleRootElTypes.push(`NonNullable<typeof ${componentInstanceVar}>['$el']`);
@@ -189,24 +188,18 @@ function* generateComponent(options, ctx, node, isVForChild) {
     }
     (0, styleScopedClasses_1.collectStyleScopedClassReferences)(options, ctx, node);
     const slotDir = node.props.find(p => p.type === CompilerDOM.NodeTypes.DIRECTIVE && p.name === 'slot');
-    if (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);
-    }
+    yield* (0, vSlot_1.generateVSlot)(options, ctx, node, slotDir);
     if (ctx.currentComponent.used) {
-        yield `var ${componentCtxVar}!: __VLS_PickFunctionalComponentCtx<typeof ${componentOriginalVar}, typeof ${componentVNodeVar}>${utils_1.endOfLine}`;
+        yield `var ${componentCtxVar}!: __VLS_FunctionalComponentCtx<typeof ${componentOriginalVar}, typeof ${componentVNodeVar}>${utils_1.endOfLine}`;
     }
 }
-function* generateElement(options, ctx, node, isVForChild) {
+function* generateElement(options, ctx, node) {
     const startTagOffset = node.loc.start.offset + options.template.content.slice(node.loc.start.offset).indexOf(node.tag);
     const endTagOffset = !node.isSelfClosing && options.template.lang === 'html'
         ? node.loc.start.offset + node.loc.source.lastIndexOf(node.tag)
         : undefined;
     const failedPropExps = [];
+    ctx.currentComponent?.childTypes.push(`__VLS_NativeElements['${node.tag}']`);
     yield `__VLS_asFunctionalElement(__VLS_elements`;
     yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, startTagOffset, ctx.codeFeatures.withoutHighlightAndCompletion);
     if (endTagOffset !== undefined) {
@@ -221,13 +214,10 @@ function* generateElement(options, ctx, node, isVForChild) {
     const [refName, offset] = yield* generateElementReference(options, ctx, node);
     if (refName && offset) {
         let typeExp = `__VLS_NativeElements['${node.tag}']`;
-        if (isVForChild) {
+        if (ctx.inVFor) {
             typeExp += `[]`;
         }
-        ctx.templateRefs.set(refName, {
-            typeExp,
-            offset
-        });
+        ctx.addTemplateRef(refName, typeExp, offset);
     }
     if (ctx.singleRootNodes.has(node)) {
         ctx.singleRootElTypes.push(`__VLS_NativeElements['${node.tag}']`);
@@ -236,7 +226,10 @@ function* generateElement(options, ctx, node, isVForChild) {
         ctx.inheritedAttrVars.add(`__VLS_elements.${node.tag}`);
     }
     (0, styleScopedClasses_1.collectStyleScopedClassReferences)(options, ctx, node);
-    yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node);
+    const { currentComponent } = ctx;
+    ctx.currentComponent = undefined;
+    yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node.children);
+    ctx.currentComponent = currentComponent;
 }
 function* generateFailedPropExps(options, ctx, failedPropExps) {
     for (const failedExp of failedPropExps) {
@@ -271,8 +264,8 @@ function* generateCanonicalComponentName(tagText, offset, features) {
     }
 }
 function* generateComponentGeneric(ctx) {
-    if (ctx.lastGenericComment) {
-        const { content, offset } = ctx.lastGenericComment;
+    if (ctx.currentInfo.generic) {
+        const { content, offset } = ctx.currentInfo.generic;
         yield* (0, wrapWith_1.wrapWith)(offset, offset + content.length, ctx.codeFeatures.verification, `<`, [
             content,
             'template',
@@ -280,7 +273,6 @@ function* generateComponentGeneric(ctx) {
             ctx.codeFeatures.all
         ], `>`);
     }
-    ctx.lastGenericComment = undefined;
 }
 function* generateElementReference(options, ctx, node) {
     for (const prop of node.props) {

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

@@ -2,4 +2,4 @@ import * as CompilerDOM from '@vue/compiler-dom';
 import type { Code } from '../../types';
 import type { TemplateCodegenContext } from './context';
 import type { TemplateCodegenOptions } from './index';
-export declare function generateElementChildren(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode): Generator<Code>;
+export declare function generateElementChildren(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, children: (CompilerDOM.TemplateChildNode | CompilerDOM.SimpleExpressionNode)[], enterNode?: boolean): Generator<Code>;

package/lib/codegen/template/elementChildren.js

@@ -2,12 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateElementChildren = generateElementChildren;
 const templateChild_1 = require("./templateChild");
-function* generateElementChildren(options, ctx, node) {
-    yield* ctx.resetDirectiveComments('end of element children start');
-    let prev;
-    for (const childNode of node.children) {
-        yield* (0, templateChild_1.generateTemplateChild)(options, ctx, childNode, prev);
-        prev = childNode;
+function* generateElementChildren(options, ctx, children, enterNode = true) {
+    yield* ctx.generateAutoImportCompletion();
+    for (const childNode of children) {
+        yield* (0, templateChild_1.generateTemplateChild)(options, ctx, childNode, enterNode);
     }
     yield* ctx.generateAutoImportCompletion();
 }

package/lib/codegen/template/elementDirectives.js

@@ -39,9 +39,7 @@ function* generateElementDirectives(options, ctx, node) {
 function* generateIdentifier(options, ctx, prop) {
     const rawName = 'v-' + prop.name;
     yield* (0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.start.offset + rawName.length, ctx.codeFeatures.verification, `__VLS_directives.`, ...(0, camelized_1.generateCamelized)(rawName, 'template', prop.loc.start.offset, ctx.resolveCodeFeatures({
-        ...codeFeatures_1.codeFeatures.withoutHighlight,
-        // fix https://github.com/vuejs/language-tools/issues/1905
-        ...codeFeatures_1.codeFeatures.additionalCompletion,
+        ...codeFeatures_1.codeFeatures.withoutHighlightAndCompletion,
         verification: options.vueCompilerOptions.checkUnknownDirectives && !builtInDirectives.has(prop.name),
     })));
 }

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

@@ -3,7 +3,7 @@ import type * as ts from 'typescript';
 import type { Code } from '../../types';
 import type { TemplateCodegenContext } from './context';
 import type { TemplateCodegenOptions } from './index';
-export declare function generateElementEvents(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode, componentFunctionalVar: string, componentVNodeVar: string, componentCtxVar: string): Generator<Code>;
+export declare function generateElementEvents(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode, componentOriginalVar: string, componentFunctionalVar: string, componentVNodeVar: string, componentCtxVar: string): Generator<Code>;
 export declare function generateEventArg(ctx: TemplateCodegenContext, name: string, start: number, directive?: string): Generator<Code>;
 export declare function generateEventExpression(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, prop: CompilerDOM.DirectiveNode): Generator<Code>;
 export declare function generateModelEventExpression(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, prop: CompilerDOM.DirectiveNode): Generator<Code>;

package/lib/codegen/template/elementEvents.js

@@ -11,9 +11,9 @@ const utils_1 = require("../utils");
 const camelized_1 = require("../utils/camelized");
 const wrapWith_1 = require("../utils/wrapWith");
 const interpolation_1 = require("./interpolation");
-function* generateElementEvents(options, ctx, node, componentFunctionalVar, componentVNodeVar, componentCtxVar) {
-    let emitVar;
-    let eventsVar;
+const objectProperty_1 = require("./objectProperty");
+function* generateElementEvents(options, ctx, node, componentOriginalVar, componentFunctionalVar, componentVNodeVar, componentCtxVar) {
+    let emitsVar;
     let propsVar;
     for (const prop of node.props) {
         if (prop.type === CompilerDOM.NodeTypes.DIRECTIVE
@@ -23,12 +23,10 @@ function* generateElementEvents(options, ctx, node, componentFunctionalVar, comp
                     && prop.name === 'model'
                     && (!prop.arg || prop.arg.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic))) {
             ctx.currentComponent.used = true;
-            if (!emitVar) {
-                emitVar = ctx.getInternalVariable();
-                eventsVar = ctx.getInternalVariable();
+            if (!emitsVar) {
+                emitsVar = ctx.getInternalVariable();
                 propsVar = ctx.getInternalVariable();
-                yield `let ${emitVar}!: typeof ${componentCtxVar}.emit${utils_1.endOfLine}`;
-                yield `let ${eventsVar}!: __VLS_NormalizeEmits<typeof ${emitVar}>${utils_1.endOfLine}`;
+                yield `let ${emitsVar}!: __VLS_ResolveEmits<typeof ${componentOriginalVar}, typeof ${componentCtxVar}.emit>${utils_1.endOfLine}`;
                 yield `let ${propsVar}!: __VLS_FunctionalComponentProps<typeof ${componentFunctionalVar}, typeof ${componentVNodeVar}>${utils_1.endOfLine}`;
             }
             let source = prop.arg?.loc.source ?? 'model-value';
@@ -45,7 +43,13 @@ function* generateElementEvents(options, ctx, node, componentFunctionalVar, comp
                 propPrefix = 'onVnode-';
                 emitPrefix = 'vnode-';
             }
-            yield `(): __VLS_NormalizeComponentEvent<typeof ${propsVar}, typeof ${eventsVar}, '${(0, shared_1.camelize)(propPrefix + source)}', '${emitPrefix + source}', '${(0, shared_1.camelize)(emitPrefix + source)}'> => ({${utils_1.newLine}`;
+            yield `(): __VLS_NormalizeComponentEvent<typeof ${propsVar}, typeof ${emitsVar}, '${(0, shared_1.camelize)(propPrefix + source)}', '${emitPrefix + source}', '${(0, shared_1.camelize)(emitPrefix + source)}'> => (${utils_1.newLine}`;
+            if (prop.name === 'on') {
+                yield `{ `;
+                yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, emitPrefix + source, start, ctx.codeFeatures.navigation, undefined, true);
+                yield `: {} as any } as typeof ${emitsVar},${utils_1.newLine}`;
+            }
+            yield `{ `;
             if (prop.name === 'on') {
                 yield* generateEventArg(ctx, source, start, propPrefix.slice(0, -1));
                 yield `: `;
@@ -108,7 +112,6 @@ function* generateEventExpression(options, ctx, prop) {
         if (_isCompoundExpression) {
             ctx.removeLocalVariable('$event');
             yield utils_1.endOfLine;
-            yield* ctx.generateAutoImportCompletion();
             yield `}`;
         }
     }

package/lib/codegen/template/elementProps.js

@@ -83,7 +83,7 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             }
             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))];
+                    : (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, ctx.codeFeatures.all, enableCodeFeatures)))];
             if (enableCodeFeatures) {
                 yield* codes;
             }

package/lib/codegen/template/index.js

@@ -32,10 +32,9 @@ function* generateTemplate(options) {
         ctx.dollarVars.add('$el');
     }
     if (options.template.ast) {
-        yield* (0, templateChild_1.generateTemplateChild)(options, ctx, options.template.ast, undefined);
+        yield* (0, templateChild_1.generateTemplateChild)(options, ctx, options.template.ast);
     }
     yield* (0, styleScopedClasses_1.generateStyleScopedClassReferences)(ctx);
-    yield* ctx.generateAutoImportCompletion();
     yield* ctx.generateHoistVariables();
     const speicalTypes = [
         [slotsPropertyName, yield* generateSlots(options, ctx)],
@@ -93,12 +92,26 @@ function* generateInheritedAttrs(options, ctx) {
     return `import('${options.vueCompilerOptions.lib}').ComponentPublicInstance['$attrs'] & Partial<__VLS_InheritedAttrs>`;
 }
 function* generateTemplateRefs(options, ctx) {
-    yield `type __VLS_TemplateRefs = {${utils_1.newLine}`;
-    for (const [name, { typeExp, offset }] of ctx.templateRefs) {
-        yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, name, offset, ctx.codeFeatures.navigationAndCompletion);
-        yield `: ${typeExp},${utils_1.newLine}`;
+    yield `type __VLS_TemplateRefs = {}`;
+    for (const [name, refs] of ctx.templateRefs) {
+        yield `${utils_1.newLine}& `;
+        if (refs.length >= 2) {
+            yield `(`;
+        }
+        for (let i = 0; i < refs.length; i++) {
+            const { typeExp, offset } = refs[i];
+            if (i) {
+                yield ` | `;
+            }
+            yield `{ `;
+            yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, name, offset, ctx.codeFeatures.navigation);
+            yield `: ${typeExp} }`;
+        }
+        if (refs.length >= 2) {
+            yield `)`;
+        }
     }
-    yield `}${utils_1.endOfLine}`;
+    yield utils_1.endOfLine;
     return `__VLS_TemplateRefs`;
 }
 function* generateRootEl(ctx) {

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

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

package/lib/codegen/template/interpolation.js

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

package/lib/codegen/template/slotOutlet.js

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

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

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

package/lib/codegen/template/templateChild.js

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

package/lib/codegen/template/vFor.js

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

package/lib/codegen/template/vIf.js

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