@vue/language-core 3.0.0-beta.3 → 3.0.0-beta.5

package/lib/parsers/scriptRanges.js

@@ -5,6 +5,7 @@ const shared_1 = require("../utils/shared");
 const scriptSetupRanges_1 = require("./scriptSetupRanges");
 function parseScriptRanges(ts, ast, hasScriptSetup) {
     let exportDefault;
+    let classBlockEnd;
     const bindings = hasScriptSetup ? (0, scriptSetupRanges_1.parseBindingRanges)(ts, ast) : [];
     ts.forEachChild(ast, raw => {
         if (ts.isExportAssignment(raw)) {
@@ -57,9 +58,15 @@ function parseScriptRanges(ts, ast, hasScriptSetup) {
                 };
             }
         }
+        if (ts.isClassDeclaration(raw)
+            && raw.modifiers?.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword)
+            && raw.modifiers?.some(mod => mod.kind === ts.SyntaxKind.DefaultKeyword)) {
+            classBlockEnd = raw.end - 1;
+        }
     });
     return {
         exportDefault,
+        classBlockEnd,
         bindings,
     };
     function _getStartEnd(node) {

package/lib/parsers/scriptSetupRanges.js

@@ -343,8 +343,7 @@ function findBindingVars(ts, left, ast) {
     function worker(node) {
         if (ts.isIdentifier(node)) {
             vars.push((0, shared_1.getStartEnd)(ts, node, ast));
-        }
-        // { ? } = ...
+        } // { ? } = ...
         // [ ? ] = ...
         else if (ts.isObjectBindingPattern(node) || ts.isArrayBindingPattern(node)) {
             for (const property of node.elements) {
@@ -352,16 +351,13 @@ function findBindingVars(ts, left, ast) {
                     worker(property.name);
                 }
             }
-        }
-        // { foo: ? } = ...
+        } // { foo: ? } = ...
         else if (ts.isPropertyAssignment(node)) {
             worker(node.initializer);
-        }
-        // { foo } = ...
+        } // { foo } = ...
         else if (ts.isShorthandPropertyAssignment(node)) {
             vars.push((0, shared_1.getStartEnd)(ts, node.name, ast));
-        }
-        // { ...? } = ...
+        } // { ...? } = ...
         // [ ...? ] = ...
         else if (ts.isSpreadAssignment(node) || ts.isSpreadElement(node)) {
             worker(node.expression);

package/lib/parsers/vueCompilerOptions.js

@@ -13,7 +13,6 @@ function parseVueCompilerOptions(comments) {
             }
         }
         catch { }
-        ;
     })
         .filter(item => !!item);
     if (entries.length) {

package/lib/plugins/file-html.js

@@ -53,8 +53,7 @@ const plugin = ({ vueCompilerOptions }) => {
                         type: 'style',
                         lang,
                     });
-                }
-                // ignore `<script src="...">`
+                } // ignore `<script src="...">`
                 else if (tag === 'script' && !attrs.includes('src=')) {
                     let type = attrs.includes('type=') ? 'scriptSetup' : 'script';
                     sfc.descriptor[type] = {
@@ -69,7 +68,8 @@ const plugin = ({ vueCompilerOptions }) => {
                         lang,
                     };
                 }
-                templateContent = templateContent.slice(0, match.index) + ' '.repeat(matchText.length) + templateContent.slice(match.index + matchText.length);
+                templateContent = templateContent.slice(0, match.index) + ' '.repeat(matchText.length)
+                    + templateContent.slice(match.index + matchText.length);
             }
             sfc.descriptor.template = {
                 attrs: {},

package/lib/plugins/file-md.js

@@ -47,7 +47,8 @@ const plugin = ({ vueCompilerOptions }) => {
                     const matchText = match[0];
                     codes.push([matchText, undefined, match.index]);
                     codes.push('\n\n');
-                    content = content.slice(0, match.index) + ' '.repeat(matchText.length) + content.slice(match.index + matchText.length);
+                    content = content.slice(0, match.index) + ' '.repeat(matchText.length)
+                        + content.slice(match.index + matchText.length);
                 }
             }
             content = content

package/lib/plugins/file-vue.js

@@ -31,10 +31,9 @@ const plugin = ({ vueCompilerOptions }) => {
                 return;
             }
             const oldContent = hitBlock.content;
-            const newContent = hitBlock.content =
-                hitBlock.content.slice(0, change.start - hitBlock.loc.start.offset)
-                    + change.newText
-                    + hitBlock.content.slice(change.end - hitBlock.loc.start.offset);
+            const newContent = hitBlock.content = hitBlock.content.slice(0, change.start - hitBlock.loc.start.offset)
+                + change.newText
+                + hitBlock.content.slice(change.end - hitBlock.loc.start.offset);
             // #3449
             const endTagRegex = new RegExp(`</\\s*${hitBlock.type}\\s*>`);
             const insertedEndTag = endTagRegex.test(oldContent) !== endTagRegex.test(newContent);

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

@@ -14,8 +14,10 @@ const plugin = () => {
             return names;
         },
         resolveEmbeddedCode(_fileName, sfc, embeddedFile) {
-            const script = embeddedFile.id === 'script_raw' ? sfc.script
-                : embeddedFile.id === 'scriptsetup_raw' ? sfc.scriptSetup
+            const script = embeddedFile.id === 'script_raw'
+                ? sfc.script
+                : embeddedFile.id === 'scriptsetup_raw'
+                    ? sfc.scriptSetup
                     : undefined;
             if (script) {
                 embeddedFile.content.push([

package/lib/plugins/vue-template-html.js

@@ -171,10 +171,9 @@ const plugin = ({ modules }) => {
             function tryUpdateNodeLoc(loc) {
                 delete loc.__endOffset;
                 if (withinChangeRange(loc)) {
-                    loc.source =
-                        loc.source.slice(0, change.start - loc.start.offset)
-                            + change.newText
-                            + loc.source.slice(change.end - loc.start.offset);
+                    loc.source = loc.source.slice(0, change.start - loc.start.offset)
+                        + change.newText
+                        + loc.source.slice(change.end - loc.start.offset);
                     loc.__endOffset = loc.end.offset;
                     loc.end.offset += lengthDiff;
                     return true;

package/lib/plugins/vue-template-inline-ts.js

@@ -5,6 +5,7 @@ const elementEvents_1 = require("../codegen/template/elementEvents");
 const templateChild_1 = require("../codegen/template/templateChild");
 const vFor_1 = require("../codegen/template/vFor");
 const utils_1 = require("../codegen/utils");
+const computedSfc_1 = require("../virtualFile/computedSfc");
 const codeFeatures = {
     format: true,
 };
@@ -58,6 +59,7 @@ const plugin = ctx => {
             return data;
         }
         const templateContent = sfc.template.content;
+        const inlineTsAsts = sfc.template.ast && computedSfc_1.templateInlineTsAsts.get(sfc.template.ast);
         let i = 0;
         sfc.template.ast.children.forEach(visit);
         return data;
@@ -85,7 +87,7 @@ const plugin = ctx => {
                         && prop.exp.constType !== CompilerDOM.ConstantTypes.CAN_STRINGIFY // style='z-index: 2' will compile to {'z-index':'2'}
                     ) {
                         if (prop.name === 'on' && prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-                            const ast = (0, utils_1.createTsAst)(ctx.modules.typescript, sfc.template.ast, prop.exp.content);
+                            const ast = (0, utils_1.createTsAst)(ctx.modules.typescript, inlineTsAsts, prop.exp.content);
                             if ((0, elementEvents_1.isCompoundExpression)(ctx.modules.typescript, ast)) {
                                 addFormatCodes(prop.exp.loc.source, prop.exp.loc.start.offset, formatBrackets.event);
                             }

package/lib/plugins/vue-tsx.d.ts

@@ -11,6 +11,7 @@ export declare const tsCodegen: WeakMap<Sfc, {
             nameOption: import("../types").TextRange | undefined;
             inheritAttrsOption: string | undefined;
         }) | undefined;
+        classBlockEnd: number | undefined;
         bindings: {
             range: import("../types").TextRange;
             moduleName?: string;
@@ -167,6 +168,7 @@ export declare const tsCodegen: WeakMap<Sfc, {
             withoutSemantic: import("../types").VueCodeInformation;
         };
         resolveCodeFeatures: (features: import("../types").VueCodeInformation) => import("../types").VueCodeInformation;
+        inlineTsAsts: Map<string, import("typescript").SourceFile> | undefined;
         inVFor: boolean;
         slots: {
             name: string;

package/lib/plugins/vue-tsx.js

@@ -129,7 +129,8 @@ function createTsx(fileName, sfc, ctx, appendGlobalTypes) {
     const getSetupSlotsAssignName = (0, alien_signals_1.computed)(() => getScriptSetupRanges()?.defineSlots?.name);
     const getSetupPropsAssignName = (0, alien_signals_1.computed)(() => getScriptSetupRanges()?.defineProps?.name);
     const getSetupInheritAttrs = (0, alien_signals_1.computed)(() => {
-        const value = getScriptSetupRanges()?.defineOptions?.inheritAttrs ?? getScriptRanges()?.exportDefault?.inheritAttrsOption;
+        const value = getScriptSetupRanges()?.defineOptions?.inheritAttrs
+            ?? getScriptRanges()?.exportDefault?.inheritAttrsOption;
         return value !== 'false';
     });
     const getComponentSelfName = (0, alien_signals_1.computed)(() => {

package/lib/types.d.ts

@@ -8,7 +8,7 @@ export type { SFCParseResult } from '@vue/compiler-sfc';
 export { VueEmbeddedCode };
 export type RawVueCompilerOptions = Partial<Omit<VueCompilerOptions, 'target' | 'plugins'>> & {
     strictTemplates?: boolean;
-    target?: 'auto' | 3 | 3.3 | 3.5 | 3.6 | 99 | number;
+    target?: 'auto' | 2 | 2.7 | 3 | 3.3 | 3.5 | 3.6 | 99 | number;
     plugins?: string[];
 };
 export interface VueCodeInformation extends CodeInformation {

package/lib/utils/parseCssImports.js

@@ -7,7 +7,7 @@ function* parseCssImports(css) {
     for (const match of matches) {
         let text = match[0];
         let offset = match.index;
-        if (text.startsWith('\'') || text.startsWith('"')) {
+        if (text.startsWith("'") || text.startsWith('"')) {
             text = text.slice(1, -1);
             offset += 1;
         }

package/lib/utils/shared.d.ts

@@ -2,5 +2,6 @@ import type * as ts from 'typescript';
 import type { TextRange } from '../types';
 export { hyphenate as hyphenateTag } from '@vue/shared';
 export declare function hyphenateAttr(str: string): string;
+export declare function getSlotsPropertyName(vueVersion: number): "$scopedSlots" | "$slots";
 export declare function getStartEnd(ts: typeof import('typescript'), node: ts.Node, ast: ts.SourceFile): TextRange;
 export declare function getNodeText(ts: typeof import('typescript'), node: ts.Node, ast: ts.SourceFile): string;

package/lib/utils/shared.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hyphenateTag = void 0;
 exports.hyphenateAttr = hyphenateAttr;
+exports.getSlotsPropertyName = getSlotsPropertyName;
 exports.getStartEnd = getStartEnd;
 exports.getNodeText = getNodeText;
 const shared_1 = require("@vue/shared");
@@ -15,6 +16,9 @@ function hyphenateAttr(str) {
     }
     return hyphencase;
 }
+function getSlotsPropertyName(vueVersion) {
+    return vueVersion < 3 ? '$scopedSlots' : '$slots';
+}
 function getStartEnd(ts, node, ast) {
     return {
         start: ts.getTokenPosOfNode(node, ast),

package/lib/utils/ts.js

@@ -242,7 +242,9 @@ function getDefaultCompilerOptions(target = 99, lib = 'vue', strictTemplates = f
         ],
         dataAttributes: [],
         htmlAttributes: ['aria-*'],
-        optionsWrapper: [`(await import('${lib}')).defineComponent(`, `)`],
+        optionsWrapper: target >= 2.7
+            ? [`(await import('${lib}')).defineComponent(`, `)`]
+            : [`(await import('${lib}')).default.extend(`, `)`],
         macros: {
             defineProps: ['defineProps'],
             defineSlots: ['defineSlots'],

package/lib/utils/vue2TemplateCompiler.d.ts

@@ -0,0 +1,2 @@
+import * as CompilerDOM from '@vue/compiler-dom';
+export declare const compile: typeof CompilerDOM.compile;

package/lib/utils/vue2TemplateCompiler.js

@@ -0,0 +1,90 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.compile = void 0;
+const CompilerDOM = require("@vue/compiler-dom");
+const Vue2TemplateCompiler = require('@vue/compiler-vue2/build');
+const compile = (template, options = {}) => {
+    if (typeof template !== 'string') {
+        throw new Error(`[@vue/language-core] compile() first argument must be string.`);
+    }
+    const onError = options.onError;
+    const onWarn = options.onWarn;
+    options.onError = error => {
+        if (error.code === 33 // :key binding allowed in v-for template child in vue 2
+            || error.code === 29 // fix https://github.com/vuejs/language-tools/issues/1638
+        ) {
+            return;
+        }
+        if (onError) {
+            onError(error);
+        }
+        else {
+            throw error;
+        }
+    };
+    const vue2Result = Vue2TemplateCompiler.compile(template, { outputSourceRange: true });
+    for (const error of vue2Result.errors) {
+        onError?.({
+            code: 'vue-template-compiler',
+            name: '',
+            message: error.msg,
+            loc: {
+                source: '',
+                start: { column: -1, line: -1, offset: error.start },
+                end: { column: -1, line: -1, offset: error.end ?? error.start },
+            },
+        });
+    }
+    for (const error of vue2Result.tips) {
+        onWarn?.({
+            code: 'vue-template-compiler',
+            name: '',
+            message: error.msg,
+            loc: {
+                source: '',
+                start: { column: -1, line: -1, offset: error.start },
+                end: { column: -1, line: -1, offset: error.end ?? error.start },
+            },
+        });
+    }
+    return baseCompile(template, Object.assign({}, CompilerDOM.parserOptions, options, {
+        nodeTransforms: [
+            ...CompilerDOM.DOMNodeTransforms,
+            ...(options.nodeTransforms || []),
+        ],
+        directiveTransforms: Object.assign({}, CompilerDOM.DOMDirectiveTransforms, options.directiveTransforms || {}),
+    }));
+};
+exports.compile = compile;
+function baseCompile(template, options = {}) {
+    const onError = options.onError || (error => {
+        throw error;
+    });
+    const isModuleMode = options.mode === 'module';
+    const prefixIdentifiers = options.prefixIdentifiers === true || isModuleMode;
+    if (!prefixIdentifiers && options.cacheHandlers) {
+        onError(CompilerDOM.createCompilerError(49));
+    }
+    if (options.scopeId && !isModuleMode) {
+        onError(CompilerDOM.createCompilerError(50));
+    }
+    const ast = CompilerDOM.baseParse(template, options);
+    const [nodeTransforms, directiveTransforms] = CompilerDOM.getBaseTransformPreset(prefixIdentifiers);
+    // v-for > v-if in vue 2
+    const transformIf = nodeTransforms[1];
+    const transformFor = nodeTransforms[3];
+    nodeTransforms[1] = transformFor;
+    nodeTransforms[3] = transformIf;
+    CompilerDOM.transform(ast, Object.assign({}, options, {
+        prefixIdentifiers,
+        nodeTransforms: [
+            ...nodeTransforms,
+            ...(options.nodeTransforms || []), // user transforms
+        ],
+        directiveTransforms: Object.assign({}, directiveTransforms, options.directiveTransforms || {}),
+    }));
+    return CompilerDOM.generate(ast, Object.assign({}, options, {
+        prefixIdentifiers,
+    }));
+}
+//# sourceMappingURL=vue2TemplateCompiler.js.map

package/lib/virtualFile/computedEmbeddedCodes.js

@@ -177,7 +177,8 @@ function computedPluginEmbeddedCodes(plugins, plugin, fileName, sfc, getBlockByN
                 if (mapping.data.__combineOffset !== undefined) {
                     const offsetMapping = mappings[i - mapping.data.__combineOffset];
                     if (typeof offsetMapping === 'string' || !offsetMapping) {
-                        throw new Error('Invalid offset mapping, mappings: ' + mappings.length + ', i: ' + i + ', offset: ' + mapping.data.__combineOffset);
+                        throw new Error('Invalid offset mapping, mappings: ' + mappings.length + ', i: ' + i + ', offset: '
+                            + mapping.data.__combineOffset);
                     }
                     offsetMapping.sourceOffsets.push(...mapping.sourceOffsets);
                     offsetMapping.generatedOffsets.push(...mapping.generatedOffsets);
@@ -235,16 +236,26 @@ function fullDiffTextChangeRange(oldText, newText) {
 }
 function resolveCommonLanguageId(lang) {
     switch (lang) {
-        case 'js': return 'javascript';
-        case 'cjs': return 'javascript';
-        case 'mjs': return 'javascript';
-        case 'ts': return 'typescript';
-        case 'cts': return 'typescript';
-        case 'mts': return 'typescript';
-        case 'jsx': return 'javascriptreact';
-        case 'tsx': return 'typescriptreact';
-        case 'pug': return 'jade';
-        case 'md': return 'markdown';
+        case 'js':
+            return 'javascript';
+        case 'cjs':
+            return 'javascript';
+        case 'mjs':
+            return 'javascript';
+        case 'ts':
+            return 'typescript';
+        case 'cts':
+            return 'typescript';
+        case 'mts':
+            return 'typescript';
+        case 'jsx':
+            return 'javascriptreact';
+        case 'tsx':
+            return 'typescriptreact';
+        case 'pug':
+            return 'jade';
+        case 'md':
+            return 'markdown';
     }
     return lang;
 }

package/lib/virtualFile/computedSfc.d.ts

@@ -1,4 +1,6 @@
+import type * as CompilerDOM from '@vue/compiler-dom';
 import type { SFCParseResult } from '@vue/compiler-sfc';
 import type * as ts from 'typescript';
 import type { Sfc, VueLanguagePluginReturn } from '../types';
+export declare const templateInlineTsAsts: WeakMap<CompilerDOM.RootNode, Map<string, ts.SourceFile>>;
 export declare function computedSfc(ts: typeof import('typescript'), plugins: VueLanguagePluginReturn[], fileName: string, getSnapshot: () => ts.IScriptSnapshot, getParseResult: () => SFCParseResult | undefined): Sfc;

package/lib/virtualFile/computedSfc.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.templateInlineTsAsts = void 0;
 exports.computedSfc = computedSfc;
 const alien_signals_1 = require("alien-signals");
 const parseCssClassNames_1 = require("../utils/parseCssClassNames");
 const parseCssImports_1 = require("../utils/parseCssImports");
 const parseCssVars_1 = require("../utils/parseCssVars");
 const signals_1 = require("../utils/signals");
+exports.templateInlineTsAsts = new WeakMap();
 function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
     const getUntrackedSnapshot = () => {
         const pausedSub = (0, alien_signals_1.setCurrentSub)(undefined);
@@ -27,9 +29,15 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
     const getTemplate = computedNullableSfcBlock('template', 'html', (0, alien_signals_1.computed)(() => getParseResult()?.descriptor.template ?? undefined), (_block, base) => {
         const compiledAst = computedTemplateAst(base);
         return mergeObject(base, {
-            get ast() { return compiledAst()?.ast; },
-            get errors() { return compiledAst()?.errors; },
-            get warnings() { return compiledAst()?.warnings; },
+            get ast() {
+                return compiledAst()?.ast;
+            },
+            get errors() {
+                return compiledAst()?.errors;
+            },
+            get warnings() {
+                return compiledAst()?.warnings;
+            },
         });
     });
     const getScript = computedNullableSfcBlock('script', 'js', (0, alien_signals_1.computed)(() => getParseResult()?.descriptor.script ?? undefined), (block, base) => {
@@ -44,8 +52,12 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
             return ts.createSourceFile(fileName + '.' + base.lang, '', 99);
         });
         return mergeObject(base, {
-            get src() { return getSrc(); },
-            get ast() { return getAst(); },
+            get src() {
+                return getSrc();
+            },
+            get ast() {
+                return getAst();
+            },
         });
     });
     const getOriginalScriptSetup = computedNullableSfcBlock('scriptSetup', 'js', (0, alien_signals_1.computed)(() => getParseResult()?.descriptor.scriptSetup ?? undefined), (block, base) => {
@@ -60,15 +72,19 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
             return ts.createSourceFile(fileName + '.' + base.lang, '', 99);
         });
         return mergeObject(base, {
-            get generic() { return getGeneric(); },
-            get ast() { return getAst(); },
+            get generic() {
+                return getGeneric();
+            },
+            get ast() {
+                return getAst();
+            },
         });
     });
     const hasScript = (0, alien_signals_1.computed)(() => !!getParseResult()?.descriptor.script);
     const hasScriptSetup = (0, alien_signals_1.computed)(() => !!getParseResult()?.descriptor.scriptSetup);
     const getScriptSetup = (0, alien_signals_1.computed)(() => {
         if (!hasScript() && !hasScriptSetup()) {
-            //#region monkey fix: https://github.com/vuejs/language-tools/pull/2113
+            // #region monkey fix: https://github.com/vuejs/language-tools/pull/2113
             return {
                 content: '',
                 lang: 'ts',
@@ -94,36 +110,67 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
         const getCssVars = (0, signals_1.computedItems)(() => [...(0, parseCssVars_1.parseCssVars)(base.content)], (oldItem, newItem) => oldItem.text === newItem.text && oldItem.offset === newItem.offset);
         const getClassNames = (0, signals_1.computedItems)(() => [...(0, parseCssClassNames_1.parseCssClassNames)(base.content)], (oldItem, newItem) => oldItem.text === newItem.text && oldItem.offset === newItem.offset);
         return () => mergeObject(base, {
-            get src() { return getSrc(); },
-            get module() { return getModule(); },
-            get scoped() { return getScoped(); },
-            get imports() { return getImports(); },
-            get cssVars() { return getCssVars(); },
-            get classNames() { return getClassNames(); },
+            get src() {
+                return getSrc();
+            },
+            get module() {
+                return getModule();
+            },
+            get scoped() {
+                return getScoped();
+            },
+            get imports() {
+                return getImports();
+            },
+            get cssVars() {
+                return getCssVars();
+            },
+            get classNames() {
+                return getClassNames();
+            },
         });
     });
     const customBlocks = (0, signals_1.computedArray)((0, alien_signals_1.computed)(() => getParseResult()?.descriptor.customBlocks ?? []), (getBlock, i) => {
         const base = computedSfcBlock('custom_block_' + i, 'txt', getBlock);
         const getType = (0, alien_signals_1.computed)(() => getBlock().type);
         return () => mergeObject(base, {
-            get type() { return getType(); },
+            get type() {
+                return getType();
+            },
         });
     });
     return {
-        get content() { return getContent(); },
-        get comments() { return getComments(); },
-        get template() { return getTemplate(); },
-        get script() { return getScript(); },
-        get scriptSetup() { return getScriptSetup(); },
-        get styles() { return styles; },
-        get customBlocks() { return customBlocks; },
+        get content() {
+            return getContent();
+        },
+        get comments() {
+            return getComments();
+        },
+        get template() {
+            return getTemplate();
+        },
+        get script() {
+            return getScript();
+        },
+        get scriptSetup() {
+            return getScriptSetup();
+        },
+        get styles() {
+            return styles;
+        },
+        get customBlocks() {
+            return customBlocks;
+        },
     };
     function computedTemplateAst(base) {
         let cache;
         let inlineTsAsts;
         function updateInlineTsAsts(newAst, oldAst) {
-            const newTsAsts = newAst.__volar_inlineTsAsts ??= new Map();
-            const oldTsAsts = oldAst?.__volar_inlineTsAsts ?? inlineTsAsts;
+            let newTsAsts = exports.templateInlineTsAsts.get(newAst);
+            if (!newTsAsts) {
+                exports.templateInlineTsAsts.set(newAst, newTsAsts = new Map());
+            }
+            const oldTsAsts = oldAst && exports.templateInlineTsAsts.get(oldAst) || inlineTsAsts;
             if (oldTsAsts) {
                 for (const [text, ast] of oldTsAsts) {
                     if (!ast.__volar_used) {
@@ -238,16 +285,31 @@ function computedSfc(ts, plugins, fileName, getSnapshot, getParseResult) {
         const getStartTagEnd = (0, alien_signals_1.computed)(() => getBlock().loc.start.offset);
         const getEndTagStart = (0, alien_signals_1.computed)(() => getBlock().loc.end.offset);
         const getStart = (0, alien_signals_1.computed)(() => getUntrackedSnapshot().getText(0, getStartTagEnd()).lastIndexOf('<' + getBlock().type));
-        const getEnd = (0, alien_signals_1.computed)(() => getEndTagStart() + getUntrackedSnapshot().getText(getEndTagStart(), getUntrackedSnapshot().getLength()).indexOf('>') + 1);
+        const getEnd = (0, alien_signals_1.computed)(() => getEndTagStart()
+            + getUntrackedSnapshot().getText(getEndTagStart(), getUntrackedSnapshot().getLength()).indexOf('>') + 1);
         return {
             name,
-            get lang() { return getLang(); },
-            get attrs() { return getAttrs(); },
-            get content() { return getContent(); },
-            get startTagEnd() { return getStartTagEnd(); },
-            get endTagStart() { return getEndTagStart(); },
-            get start() { return getStart(); },
-            get end() { return getEnd(); },
+            get lang() {
+                return getLang();
+            },
+            get attrs() {
+                return getAttrs();
+            },
+            get content() {
+                return getContent();
+            },
+            get startTagEnd() {
+                return getStartTagEnd();
+            },
+            get endTagStart() {
+                return getEndTagStart();
+            },
+            get start() {
+                return getStart();
+            },
+            get end() {
+                return getEnd();
+            },
         };
     }
     function computedAttrValue(key, base, getBlock) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "3.0.0-beta.3",
+	"version": "3.0.0-beta.5",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,8 +13,9 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.14",
+		"@volar/language-core": "2.4.15",
 		"@vue/compiler-dom": "^3.5.0",
+		"@vue/compiler-vue2": "^2.7.16",
 		"@vue/shared": "^3.5.0",
 		"alien-signals": "^2.0.5",
 		"minimatch": "^10.0.1",
@@ -24,7 +25,7 @@
 	"devDependencies": {
 		"@types/node": "^22.10.4",
 		"@types/path-browserify": "^1.0.1",
-		"@volar/typescript": "2.4.14",
+		"@volar/typescript": "2.4.15",
 		"@vue/compiler-sfc": "^3.5.0"
 	},
 	"peerDependencies": {
@@ -35,5 +36,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "17e3beabc13e9eb59a82fb1a9f0252fd6685e444"
+	"gitHead": "3a4648914c60c90444d939cf762a016a4318ca09"
 }