@vue/language-core 3.3.5 → 3.3.6

package/lib/codegen/template/context.js

@@ -34,304 +34,91 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTemplateCodegenContext = createTemplateCodegenContext;
+const language_core_1 = require("@volar/language-core");
 const CompilerDOM = __importStar(require("@vue/compiler-dom"));
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const boundary_1 = require("../utils/boundary");
-const commentDirectiveRegex = /^<!--\s*@vue-(?<name>[-\w]+)\b(?<content>[\s\S]*)-->$/;
-/**
- * Creates and returns a Context object used for generating type-checkable TS code
- * from the template section of a .vue file.
- *
- * ## Implementation Notes for supporting `@vue-ignore`, `@vue-expect-error`, and `@vue-skip` directives.
- *
- * Vue language tooling supports a number of directives for suppressing diagnostics within
- * Vue templates (https://github.com/vuejs/language-tools/pull/3215)
- *
- * Here is an overview for how support for how @vue-expect-error is implemented within this file
- * (@vue-expect-error is the most complicated directive to support due to its behavior of raising
- * a diagnostic when it is annotating a piece of code that doesn't actually have any errors/warning/diagnostics).
- *
- * Given .vue code:
- *
- * ```vue
- *   <script setup lang="ts">
- *   defineProps<{
- *     knownProp1: string;
- *     knownProp2: string;
- *     knownProp3: string;
- *     knownProp4_will_trigger_unused_expect_error: string;
- *   }>();
- *   </script>
- *
- *   <template>
- *     {{ knownProp1 }}
- *     {{ error_unknownProp }} <!-- ERROR: Property 'error_unknownProp' does not exist on type [...] -->
- *     {{ knownProp2 }}
- *     <!-- @vue-expect-error This suppresses an Unknown Property Error -->
- *     {{ suppressed_error_unknownProp }}
- *     {{ knownProp3 }}
- *     <!-- @vue-expect-error This will trigger Unused '@ts-expect-error' directive.ts(2578) -->
- *     {{ knownProp4_will_trigger_unused_expect_error }}
- *   </template>
- * ```
- *
- * The above code should raise two diagnostics:
- *
- * 1. Property 'error_unknownProp' does not exist on type [...]
- * 2. Unused '@ts-expect-error' directive.ts(2578) -- this is the bottom `@vue-expect-error` directive
- *    that covers code that doesn't actually raise an error -- note that all `@vue-...` directives
- *    will ultimately translate into `@ts-...` diagnostics.
- *
- * The above code will produce the following type-checkable TS code (note: omitting asterisks
- * to prevent VSCode syntax double-greying out double-commented code).
- *
- * ```ts
- *   ( __VLS_ctx.knownProp1 );
- *   ( __VLS_ctx.error_unknownProp ); // ERROR: Property 'error_unknownProp' does not exist on type [...]
- *   ( __VLS_ctx.knownProp2 );
- *   // @vue-expect-error start
- *   ( __VLS_ctx.suppressed_error_unknownProp );
- *   // @ts-expect-error __VLS_TS_EXPECT_ERROR
- *   ;
- *   // @vue-expect-error end of INTERPOLATION
- *   ( __VLS_ctx.knownProp3 );
- *   // @vue-expect-error start
- *   ( __VLS_ctx.knownProp4_will_trigger_unused_expect_error );
- *   // @ts-expect-error __VLS_TS_EXPECT_ERROR
- *   ;
- *   // @vue-expect-error end of INTERPOLATION
- * ```
- *
- * In the generated code, there are actually 3 diagnostic errors that'll be raised in the first
- * pass on this generated code (but through cleverness described below, not all of them will be
- * propagated back to the original .vue file):
- *
- * 1. Property 'error_unknownProp' does not exist on type [...]
- * 2. Unused '@ts-expect-error' directive.ts(2578) from the 1st `@ts-expect-error __VLS_TS_EXPECT_ERROR`
- * 3. Unused '@ts-expect-error' directive.ts(2578) from the 2nd `@ts-expect-error __VLS_TS_EXPECT_ERROR`
- *
- * Be sure to pay careful attention to the mixture of `@vue-expect-error` and `@ts-expect-error`;
- * Within the TS file, the only "real" directives recognized by TS are going to be prefixed with `@ts-`;
- * any `@vue-` prefixed directives in the comments are only for debugging purposes.
- *
- * As mentioned above, there are 3 diagnostics errors that'll be generated for the above code, but
- * only 2 should be propagated back to the original .vue file.
- *
- * (The reason we structure things this way is somewhat complicated, but in short it allows us
- * to lean on TS as much as possible to generate actual `unused @ts-expect-error directive` errors
- * while covering a number of edge cases.)
- *
- * So, we need a way to dynamically decide whether each of the `@ts-expect-error __VLS_TS_EXPECT_ERROR`
- * directives should be reported as an unused directive or not.
- *
- * To do this, we'll make use of the `shouldReport` callback that'll optionally be provided to the
- * `verification` property of the `CodeInformation` object attached to the mapping between source .vue
- * and generated .ts code. The `verification` property determines whether "verification" (which includes
- * semantic diagnostics) should be performed on the generated .ts code, and `shouldReport`, if provided,
- * can be used to determine whether a given diagnostic should be reported back "upwards" to the original
- * .vue file or not.
- *
- * See the comments in the code below for how and where we use this hook to keep track of whether
- * an error/diagnostic was encountered for a region of code covered by a `@vue-expect-error` directive,
- * and additionally how we use that to determine whether to propagate diagnostics back upward.
- */
+const directiveCommentRE = /^<!--\s*@vue-(?<name>[-\w]+)\b(?<content>[\s\S]*)-->$/;
 function createTemplateCodegenContext() {
-    let variableId = 0;
-    const scopes = [];
-    const components = [];
-    const hoistVars = new Map();
-    const dollarVars = new Set();
-    const componentAccessMap = new Map();
-    const slots = [];
-    const dynamicSlots = [];
-    const blockConditions = [];
-    const inlayHints = [];
-    const inheritedAttrVars = new Set();
-    const templateRefs = new Map();
+    // directive comments ---------------------------------------------------------
     const stack = [];
     const commentBuffer = [];
-    return {
-        generatedTypes: new Set(),
-        get currentInfo() {
-            return stack[stack.length - 1];
-        },
-        resolveCodeFeatures,
-        inVFor: false,
-        slots,
-        dynamicSlots,
-        dollarVars,
-        componentAccessMap,
-        blockConditions,
-        inlayHints,
-        inheritedAttrVars,
-        templateRefs,
-        singleRootElTypes: new Set(),
-        singleRootNodes: new Set(),
-        addTemplateRef(name, typeExp, offset) {
-            let refs = templateRefs.get(name);
-            if (!refs) {
-                templateRefs.set(name, refs = []);
-            }
-            refs.push({ typeExp, offset });
-        },
-        recordComponentAccess(source, name, offset) {
-            let map = componentAccessMap.get(name);
-            if (!map) {
-                componentAccessMap.set(name, map = new Map());
-            }
-            let arr = map.get(source);
-            if (!arr) {
-                map.set(source, arr = new Set());
-            }
-            if (offset !== undefined) {
-                arr.add(offset);
-            }
-        },
-        scopes,
-        components,
-        declare(...varNames) {
-            const scope = scopes.at(-1);
-            for (const varName of varNames) {
-                scope.add(varName);
-            }
-        },
-        startScope() {
-            const scope = new Set();
-            scopes.push(scope);
-            return () => {
-                scopes.pop();
-                return generateAutoImport();
-            };
-        },
-        getInternalVariable() {
-            return `__VLS_${variableId++}`;
-        },
-        getHoistVariable(originalVar) {
-            let name = hoistVars.get(originalVar);
-            if (name === undefined) {
-                hoistVars.set(originalVar, name = `__VLS_${variableId++}`);
-            }
-            return name;
-        },
-        *generateHoistVariables() {
-            // trick to avoid TS 4081 (#5186)
-            if (hoistVars.size) {
-                yield `// @ts-ignore${utils_1.newLine}`;
-                yield `var `;
-                for (const [originalVar, hoistVar] of hoistVars) {
-                    yield `${hoistVar} = ${originalVar}, `;
-                }
-                yield utils_1.endOfLine;
-            }
-        },
-        *generateConditionGuards() {
-            for (const condition of blockConditions) {
-                yield `if (!${condition}) return${utils_1.endOfLine}`;
-            }
-        },
-        enter(node) {
-            if (node.type === CompilerDOM.NodeTypes.COMMENT) {
-                commentBuffer.push(node);
-                return false;
-            }
-            const data = {};
-            const comments = [...commentBuffer];
-            commentBuffer.length = 0;
-            for (const comment of comments) {
-                const match = comment.loc.source.match(commentDirectiveRegex);
-                if (match) {
-                    const { name, content } = match.groups;
-                    switch (name) {
-                        case 'skip': {
-                            return false;
-                        }
-                        case 'ignore': {
-                            data.ignoreError = true;
-                            break;
-                        }
-                        case 'expect-error': {
-                            data.expectError = {
-                                token: 0,
-                                node: comment,
+    function getCommentInfo() {
+        return stack[stack.length - 1];
+    }
+    function enter(node) {
+        if (node.type === CompilerDOM.NodeTypes.COMMENT) {
+            commentBuffer.push(node);
+            return false;
+        }
+        const info = {};
+        const comments = [...commentBuffer];
+        commentBuffer.length = 0;
+        for (const comment of comments) {
+            const match = comment.loc.source.match(directiveCommentRE);
+            if (match) {
+                const { name, content } = match.groups;
+                switch (name) {
+                    case 'skip': {
+                        return false;
+                    }
+                    case 'ignore': {
+                        info.ignoreError = true;
+                        break;
+                    }
+                    case 'expect-error': {
+                        info.expectError = {
+                            token: 0,
+                            node: comment,
+                        };
+                        break;
+                    }
+                    case 'generic': {
+                        const text = content.trim();
+                        if (text.startsWith('{') && text.endsWith('}')) {
+                            info.generic = {
+                                content: text.slice(1, -1),
+                                offset: comment.loc.start.offset + comment.loc.source.indexOf('{') + 1,
                             };
-                            break;
-                        }
-                        case 'generic': {
-                            const text = content.trim();
-                            if (text.startsWith('{') && text.endsWith('}')) {
-                                data.generic = {
-                                    content: text.slice(1, -1),
-                                    offset: comment.loc.start.offset + comment.loc.source.indexOf('{') + 1,
-                                };
-                            }
-                            break;
                         }
+                        break;
                     }
                 }
             }
-            stack.push(data);
-            return true;
-        },
-        *exit() {
-            const data = stack.pop();
-            commentBuffer.length = 0;
-            if (data.expectError !== undefined) {
-                const token = yield* (0, boundary_1.startBoundary)('template', data.expectError.node.loc.start.offset, {
-                    verification: {
-                        // If no errors/warnings/diagnostics were reported within the region of code covered
-                        // by the @vue-expect-error directive, then we should allow any `unused @ts-expect-error`
-                        // diagnostics to be reported upward.
-                        shouldReport: () => data.expectError.token === 0,
-                    },
-                });
-                yield `// @ts-expect-error`;
-                yield (0, boundary_1.endBoundary)(token, data.expectError.node.loc.end.offset);
-                yield `${utils_1.newLine}${utils_1.endOfLine}`;
-            }
-        },
-    };
-    function* generateAutoImport() {
-        const all = [...componentAccessMap.entries()];
-        if (!all.some(([, offsets]) => offsets.size)) {
-            return;
         }
-        yield `// @ts-ignore${utils_1.newLine}`; // #2304
-        yield `[`;
-        for (const [varName, map] of all) {
-            for (const [source, offsets] of map) {
-                for (const offset of offsets) {
-                    yield [varName, source, offset, codeFeatures_1.codeFeatures.importCompletionOnly];
-                    yield `,`;
-                }
-                offsets.clear();
-            }
+        stack.push(info);
+        return true;
+    }
+    function* exit() {
+        const info = stack.pop();
+        commentBuffer.length = 0;
+        if (info.expectError !== undefined) {
+            const boundary = yield* boundary_1.Boundary.start('template', info.expectError.node.loc.start.offset, {
+                verification: {
+                    shouldReport: () => info.expectError.token === 0,
+                },
+            });
+            yield `// @ts-expect-error`;
+            yield boundary.end(info.expectError.node.loc.end.offset);
+            yield `${utils_1.newLine}${utils_1.endOfLine}`;
         }
-        yield `]${utils_1.endOfLine}`;
     }
     function resolveCodeFeatures(features) {
         if (features.verification && stack.length) {
             const data = stack[stack.length - 1];
             if (data.ignoreError) {
-                // We are currently in a region of code covered by a @vue-ignore directive, so don't
-                // even bother performing any type-checking: set verification to false.
                 return {
                     ...features,
                     verification: false,
                 };
             }
             if (data.expectError !== undefined) {
-                // We are currently in a region of code covered by a @vue-expect-error directive. We need to
-                // keep track of the number of errors encountered within this region so that we can know whether
-                // we will need to propagate an "unused ts-expect-error" diagnostic back to the original
-                // .vue file or not.
                 return {
                     ...features,
                     verification: {
                         shouldReport: (source, code) => {
-                            if (typeof features.verification !== 'object'
-                                || !features.verification.shouldReport
-                                || features.verification.shouldReport(source, code) === true) {
+                            if ((0, language_core_1.shouldReportDiagnostics)(features, source, code)) {
                                 data.expectError.token++;
                             }
                             return false;
@@ -342,5 +129,136 @@ function createTemplateCodegenContext() {
         }
         return features;
     }
+    // internal variables ---------------------------------------------------------
+    let variableId = 0;
+    function getInternalVariable() {
+        return `__VLS_${variableId++}`;
+    }
+    // scopes ---------------------------------------------------------------------
+    class Scope extends Set {
+        declare(...variables) {
+            for (const name of variables) {
+                this.add(name);
+            }
+        }
+        end() {
+            scopes.pop();
+            return generateAutoImport();
+        }
+    }
+    const scopes = [];
+    function scope() {
+        const scope = new Scope();
+        scopes.push(scope);
+        return scope;
+    }
+    // context accesses -----------------------------------------------------------
+    const contextAccesses = new Map();
+    function accessVariable(source, name, offset) {
+        let map = contextAccesses.get(name);
+        if (!map) {
+            contextAccesses.set(name, map = new Map());
+        }
+        let arr = map.get(source);
+        if (!arr) {
+            map.set(source, arr = new Set());
+        }
+        if (offset !== undefined) {
+            arr.add(offset);
+        }
+    }
+    function* generateAutoImport() {
+        const all = [...contextAccesses.entries()];
+        if (!all.some(([, offsets]) => offsets.size)) {
+            return;
+        }
+        yield `// @ts-ignore${utils_1.newLine}`; // #2304
+        yield `[`;
+        for (const [varName, map] of all) {
+            for (const [source, offsets] of map) {
+                for (const offset of offsets) {
+                    yield [varName, source, offset, codeFeatures_1.codeFeatures.importCompletionOnly];
+                    yield `,`;
+                }
+                offsets.clear();
+            }
+        }
+        yield `]${utils_1.endOfLine}`;
+    }
+    // conditions -----------------------------------------------------------------
+    const conditions = [];
+    function* generateConditionGuards() {
+        for (const condition of conditions) {
+            yield `if (!${condition}) throw 0${utils_1.endOfLine}`;
+        }
+    }
+    // hoist vars -----------------------------------------------------------------
+    const hoistVars = new Map();
+    function getHoistVariable(originalVar) {
+        let name = hoistVars.get(originalVar);
+        if (name === undefined) {
+            hoistVars.set(originalVar, name = `__VLS_${variableId++}`);
+        }
+        return name;
+    }
+    function* generateHoistVariables() {
+        // trick to avoid TS 4081 (#5186)
+        if (hoistVars.size) {
+            yield `// @ts-ignore${utils_1.newLine}`;
+            yield `var `;
+            for (const [originalVar, hoistVar] of hoistVars) {
+                yield `${hoistVar} = ${originalVar}, `;
+            }
+            yield utils_1.endOfLine;
+        }
+    }
+    // template refs --------------------------------------------------------------
+    const templateRefs = new Map();
+    function addTemplateRef(name, typeExp, offset) {
+        let refs = templateRefs.get(name);
+        if (!refs) {
+            templateRefs.set(name, refs = []);
+        }
+        refs.push({ typeExp, offset });
+    }
+    // others ---------------------------------------------------------------------
+    const components = [];
+    const dollarVars = new Set();
+    const inlayHints = [];
+    const generatedTypes = new Set();
+    const inheritedAttrVars = new Set();
+    const singleRootElTypes = new Set();
+    const singleRootNodes = new Set();
+    const slots = [];
+    const dynamicSlots = [];
+    return {
+        getCommentInfo,
+        enter,
+        exit,
+        resolveCodeFeatures,
+        getInternalVariable,
+        scopes,
+        scope,
+        contextAccesses,
+        accessVariable,
+        generateAutoImport,
+        conditions,
+        generateConditionGuards,
+        hoistVars,
+        getHoistVariable,
+        generateHoistVariables,
+        templateRefs,
+        addTemplateRef,
+        components,
+        dollarVars,
+        inlayHints,
+        generatedTypes,
+        inheritedAttrVars,
+        singleRootElTypes,
+        singleRootNodes,
+        slots,
+        dynamicSlots,
+        inVFor: false,
+    };
 }
 //# sourceMappingURL=context.js.map

package/lib/codegen/template/element.js

@@ -130,7 +130,7 @@ function* generateComponent(options, ctx, node) {
                     : codeFeatures_1.codeFeatures.doNotReportTs2339AndTs2551,
             });
             yield `]${utils_1.endOfLine}`;
-            if (utils_1.identifierRegex.test((0, shared_1.camelize)(tag))) {
+            if (utils_1.identifierRE.test((0, shared_1.camelize)(tag))) {
                 // navigation support
                 yield `/** @ts-ignore @type {`;
                 for (const offset of [startTagOffset, endTagOffset]) {
@@ -173,21 +173,22 @@ function* generateComponent(options, ctx, node) {
     yield propsStr;
     yield `}))${utils_1.endOfLine}`;
     yield `const `;
-    const token = yield* (0, boundary_1.startBoundary)('template', node.loc.start.offset, codeFeatures_1.codeFeatures.doNotReportTs6133);
+    const boundary = yield* boundary_1.Boundary.start('template', node.loc.start.offset, codeFeatures_1.codeFeatures.doNotReportTs6133);
     yield vnodeVar;
-    yield (0, boundary_1.endBoundary)(token, node.loc.end.offset);
+    yield boundary.end(node.loc.end.offset);
     yield ` = ${functionalVar}`;
-    if (ctx.currentInfo.generic) {
-        const { content, offset } = ctx.currentInfo.generic;
-        const token = yield* (0, boundary_1.startBoundary)('template', offset, codeFeatures_1.codeFeatures.verification);
+    const commentInfo = ctx.getCommentInfo();
+    if (commentInfo.generic) {
+        const { content, offset } = commentInfo.generic;
+        const boundary = yield* boundary_1.Boundary.start('template', offset, codeFeatures_1.codeFeatures.verification);
         yield `<`;
         yield [content, 'template', offset, codeFeatures_1.codeFeatures.all];
         yield `>`;
-        yield (0, boundary_1.endBoundary)(token, offset + content.length);
+        yield boundary.end(offset + content.length);
     }
     const shouldInheritAttrs = hasVBindAttrs(options, ctx, node);
     yield `(`;
-    const token2 = yield* (0, boundary_1.startBoundary)('template', startTagOffset, shouldInheritAttrs && options.vueCompilerOptions.checkRequiredFallthroughAttributes
+    const boundary2 = yield* boundary_1.Boundary.start('template', startTagOffset, shouldInheritAttrs && options.vueCompilerOptions.checkRequiredFallthroughAttributes
         ? {}
         : codeFeatures_1.codeFeatures.verification);
     yield `{`;
@@ -195,7 +196,7 @@ function* generateComponent(options, ctx, node) {
     yield utils_1.newLine;
     yield* propCodes;
     yield `}`;
-    yield (0, boundary_1.endBoundary)(token2, startTagOffset + tag.length);
+    yield boundary2.end(startTagOffset + tag.length);
     yield `, ...${names_1.names.functionalComponentArgsRest}(${functionalVar}))${utils_1.endOfLine}`;
     yield* generateFailedExpressions(options, ctx, failedPropExps);
     yield* (0, elementEvents_1.generateElementEvents)(options, ctx, node, componentVar, getCtxVar, getPropsVar);
@@ -234,10 +235,10 @@ function* generateComponent(options, ctx, node) {
         yield* (0, vSlot_1.generateVSlot)(options, ctx, node, slotDir, getCtxVar());
     }
     if (isCtxVarUsed) {
-        yield `var ${ctxVar}!: ${names_1.names.FunctionalComponentCtx}<typeof ${componentVar}, typeof ${vnodeVar}>${utils_1.endOfLine}`;
+        yield `var ${ctxVar}!: ${names_1.names.ExtractComponentContext}<typeof ${componentVar}, typeof ${vnodeVar}>${utils_1.endOfLine}`;
     }
     if (isPropsVarUsed) {
-        yield `var ${propsVar}!: ${names_1.names.FunctionalComponentProps}<typeof ${componentVar}, typeof ${vnodeVar}>${utils_1.endOfLine}`;
+        yield `var ${propsVar}!: ${names_1.names.ExtractComponentProps}<typeof ${componentVar}, typeof ${vnodeVar}>${utils_1.endOfLine}`;
     }
     ctx.components.pop();
 }
@@ -252,11 +253,11 @@ function* generateElement(options, ctx, node) {
         yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, endTagOffset, codeFeatures_1.codeFeatures.withoutHighlightAndCompletion);
     }
     yield `)(`;
-    const token = yield* (0, boundary_1.startBoundary)('template', startTagOffset, codeFeatures_1.codeFeatures.verification);
+    const boundary = yield* boundary_1.Boundary.start('template', startTagOffset, codeFeatures_1.codeFeatures.verification);
     yield `{${utils_1.newLine}`;
     yield* (0, elementProps_1.generateElementProps)(options, ctx, node, node.props, options.vueCompilerOptions.checkUnknownProps, failedPropExps);
     yield `}`;
-    yield (0, boundary_1.endBoundary)(token, startTagOffset + node.tag.length);
+    yield boundary.end(startTagOffset + node.tag.length);
     yield `)${utils_1.endOfLine}`;
     yield* generateFailedExpressions(options, ctx, failedPropExps);
     yield* (0, elementDirectives_1.generateElementDirectives)(options, ctx, node);
@@ -284,11 +285,11 @@ function* generateFragment(options, ctx, node) {
     // special case for <template v-for="..." :key="..." />
     if (node.props.length) {
         yield `__VLS_asFunctionalElement(__VLS_intrinsics.template)(`;
-        const token = yield* (0, boundary_1.startBoundary)('template', startTagOffset, codeFeatures_1.codeFeatures.verification);
+        const boundary = yield* boundary_1.Boundary.start('template', startTagOffset, codeFeatures_1.codeFeatures.verification);
         yield `{${utils_1.newLine}`;
         yield* (0, elementProps_1.generateElementProps)(options, ctx, node, node.props, options.vueCompilerOptions.checkUnknownProps);
         yield `}`;
-        yield (0, boundary_1.endBoundary)(token, startTagOffset + node.tag.length);
+        yield boundary.end(startTagOffset + node.tag.length);
         yield `)${utils_1.endOfLine}`;
     }
     for (const child of node.children) {

package/lib/codegen/template/elementDirectives.js

@@ -55,7 +55,7 @@ function* generateElementDirectives(options, ctx, node) {
             || prop.name === 'bind') {
             continue;
         }
-        const token = yield* (0, boundary_1.startBoundary)('template', prop.loc.start.offset, codeFeatures_1.codeFeatures.verification);
+        const boundary = yield* boundary_1.Boundary.start('template', prop.loc.start.offset, codeFeatures_1.codeFeatures.verification);
         yield `${names_1.names.asFunctionalDirective}(`;
         yield* generateIdentifier(options, ctx, prop);
         yield `, {} as import('${options.vueCompilerOptions.lib}').ObjectDirective)(null!, { ...${names_1.names.directiveBindingRestFields}, `;
@@ -63,14 +63,14 @@ function* generateElementDirectives(options, ctx, node) {
         yield* generateModifiers(options, ctx, prop);
         yield* generateValue(options, ctx, prop);
         yield ` }, null!, null!)`;
-        yield (0, boundary_1.endBoundary)(token, prop.loc.end.offset);
+        yield boundary.end(prop.loc.end.offset);
         yield utils_1.endOfLine;
     }
 }
 function* generateIdentifier(options, ctx, prop) {
     const rawName = 'v-' + prop.name;
     const startOffset = prop.loc.start.offset;
-    const token = yield* (0, boundary_1.startBoundary)('template', startOffset, codeFeatures_1.codeFeatures.verification);
+    const boundary = yield* boundary_1.Boundary.start('template', startOffset, codeFeatures_1.codeFeatures.verification);
     yield names_1.names.directives;
     yield `.`;
     yield* (0, camelized_1.generateCamelized)(rawName, 'template', prop.loc.start.offset, {
@@ -78,9 +78,9 @@ function* generateIdentifier(options, ctx, prop) {
         verification: options.vueCompilerOptions.checkUnknownDirectives && !(0, shared_1.isBuiltInDirective)(prop.name),
     });
     if (!(0, shared_1.isBuiltInDirective)(prop.name)) {
-        ctx.recordComponentAccess('template', (0, shared_1.camelize)(rawName), prop.loc.start.offset);
+        ctx.accessVariable('template', (0, shared_1.camelize)(rawName), prop.loc.start.offset);
     }
-    yield (0, boundary_1.endBoundary)(token, startOffset + rawName.length);
+    yield boundary.end(startOffset + rawName.length);
 }
 function* generateArg(options, ctx, prop) {
     const { arg } = prop;
@@ -88,9 +88,9 @@ function* generateArg(options, ctx, prop) {
         return;
     }
     const startOffset = arg.loc.start.offset + arg.loc.source.indexOf(arg.content);
-    const token = yield* (0, boundary_1.startBoundary)('template', startOffset, codeFeatures_1.codeFeatures.verification);
+    const boundary = yield* boundary_1.Boundary.start('template', startOffset, codeFeatures_1.codeFeatures.verification);
     yield `arg`;
-    yield (0, boundary_1.endBoundary)(token, startOffset + arg.content.length);
+    yield boundary.end(startOffset + arg.content.length);
     yield `: `;
     if (arg.isStatic) {
         yield* (0, stringLiteralKey_1.generateStringLiteralKey)(arg.content, startOffset, codeFeatures_1.codeFeatures.all);
@@ -107,9 +107,9 @@ function* generateModifiers(options, ctx, prop, propertyName = 'modifiers') {
     }
     const startOffset = modifiers[0].loc.start.offset - 1;
     const endOffset = modifiers.at(-1).loc.end.offset;
-    const token = yield* (0, boundary_1.startBoundary)('template', startOffset, codeFeatures_1.codeFeatures.verification);
+    const boundary = yield* boundary_1.Boundary.start('template', startOffset, codeFeatures_1.codeFeatures.verification);
     yield propertyName;
-    yield (0, boundary_1.endBoundary)(token, endOffset);
+    yield boundary.end(endOffset);
     yield `: { `;
     for (const mod of modifiers) {
         yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, mod.content, mod.loc.start.offset, codeFeatures_1.codeFeatures.withoutHighlight);
@@ -122,9 +122,9 @@ function* generateValue(options, ctx, prop) {
     if (exp?.type !== CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
         return;
     }
-    const token = yield* (0, boundary_1.startBoundary)('template', exp.loc.start.offset, codeFeatures_1.codeFeatures.verification);
+    const boundary = yield* boundary_1.Boundary.start('template', exp.loc.start.offset, codeFeatures_1.codeFeatures.verification);
     yield `value`;
-    yield (0, boundary_1.endBoundary)(token, exp.loc.end.offset);
+    yield boundary.end(exp.loc.end.offset);
     yield `: `;
     yield* (0, elementProps_1.generatePropExp)(options, ctx, prop, exp);
 }