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

package/lib/codegen/globalTypes.js

@@ -28,15 +28,15 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 	const __VLS_placeholder: any;
 
 	type __VLS_NativeElements = __VLS_SpreadMerge<SVGElementTagNameMap, HTMLElementTagNameMap>;
-	type __VLS_IntrinsicElements = ${(target >= 3.3
+	type __VLS_IntrinsicElements = ${target >= 3.3
         ? `import('${lib}/jsx-runtime').JSX.IntrinsicElements;`
-        : `globalThis.JSX.IntrinsicElements;`)}
-	type __VLS_Element = ${(target >= 3.3
+        : `globalThis.JSX.IntrinsicElements;`}
+	type __VLS_Element = ${target >= 3.3
         ? `import('${lib}/jsx-runtime').JSX.Element;`
-        : `globalThis.JSX.Element;`)}
-	type __VLS_GlobalComponents = ${(target >= 3.5
+        : `globalThis.JSX.Element;`}
+	type __VLS_GlobalComponents = ${target >= 3.5
         ? `import('${lib}').GlobalComponents;`
-        : `import('${lib}').GlobalComponents & Pick<typeof import('${lib}'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>;`)}
+        : `import('${lib}').GlobalComponents & Pick<typeof import('${lib}'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>;`}
 	type __VLS_GlobalDirectives = import('${lib}').GlobalDirectives;
 	type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
 	type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
@@ -117,7 +117,9 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 	type __VLS_ResolveEmits<
 		Comp,
 		Emits,
-		TypeEmits = ${target >= 3.6 ? `Comp extends { __typeEmits?: infer T } ? unknown extends T ? {} : import('${lib}').ShortEmitsToObject<T> : {}` : `{}`},
+		TypeEmits = ${target >= 3.6
+        ? `Comp extends { __typeEmits?: infer T } ? unknown extends T ? {} : import('${lib}').ShortEmitsToObject<T> : {}`
+        : `{}`},
 		NormalizedEmits = __VLS_NormalizeEmits<Emits> extends infer E ? string extends keyof E ? {} : E : never,
 	> = __VLS_SpreadMerge<NormalizedEmits, TypeEmits>;
 	type __VLS_ResolveDirectives<T> = {
@@ -160,5 +162,4 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 `;
     return text;
 }
-;
 //# sourceMappingURL=globalTypes.js.map

package/lib/codegen/localTypes.js

@@ -63,13 +63,27 @@ type __VLS_TypePropsToOption<T> = {
         getUsedNames() {
             return used;
         },
-        get PrettifyLocal() { return PrettifyLocal.name; },
-        get OmitKeepDiscriminatedUnion() { return OmitKeepDiscriminatedUnion.name; },
-        get WithDefaults() { return WithDefaults.name; },
-        get WithSlots() { return WithSlots.name; },
-        get PropsChildren() { return PropsChildren.name; },
-        get TypePropsToOption() { return TypePropsToOption.name; },
-        get OmitIndexSignature() { return OmitIndexSignature.name; },
+        get PrettifyLocal() {
+            return PrettifyLocal.name;
+        },
+        get OmitKeepDiscriminatedUnion() {
+            return OmitKeepDiscriminatedUnion.name;
+        },
+        get WithDefaults() {
+            return WithDefaults.name;
+        },
+        get WithSlots() {
+            return WithSlots.name;
+        },
+        get PropsChildren() {
+            return PropsChildren.name;
+        },
+        get TypePropsToOption() {
+            return TypePropsToOption.name;
+        },
+        get OmitIndexSignature() {
+            return OmitIndexSignature.name;
+        },
     };
     function* generate(names) {
         const generated = new Set();

package/lib/codegen/script/component.js

@@ -7,7 +7,8 @@ exports.generatePropsOption = generatePropsOption;
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
-    if (options.sfc.script && options.scriptRanges?.exportDefault && options.scriptRanges.exportDefault.expression.start !== options.scriptRanges.exportDefault.args.start) {
+    if (options.sfc.script && options.scriptRanges?.exportDefault
+        && options.scriptRanges.exportDefault.expression.start !== options.scriptRanges.exportDefault.args.start) {
         // use defineComponent() from user space code if it exist
         yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, options.scriptRanges.exportDefault.expression.start, options.scriptRanges.exportDefault.args.start, codeFeatures_1.codeFeatures.all);
         yield `{${utils_1.newLine}`;

package/lib/codegen/script/scriptSetup.js

@@ -149,15 +149,17 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
             callExp.start,
             callExp.start,
         ], [
-            arg ? [
-                ` as Omit<__VLS_StyleModules, '$style'>[`,
-                (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.all),
-                `])`,
-            ] : [
-                ` as __VLS_StyleModules[`,
-                ...(0, wrapWith_1.wrapWith)(exp.start, exp.end, scriptSetup.name, codeFeatures_1.codeFeatures.verification, `'$style'`),
-                `])`,
-            ],
+            arg
+                ? [
+                    ` as Omit<__VLS_StyleModules, '$style'>[`,
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.all),
+                    `])`,
+                ]
+                : [
+                    ` as __VLS_StyleModules[`,
+                    ...(0, wrapWith_1.wrapWith)(exp.start, exp.end, scriptSetup.name, codeFeatures_1.codeFeatures.verification, `'$style'`),
+                    `])`,
+                ],
             callExp.end,
             callExp.end,
         ]);
@@ -277,11 +279,15 @@ function* generateMacros(options, ctx) {
 }
 function* generateDefineWithType(scriptSetup, statement, callExp, typeArg, name, defaultName, typeName) {
     if (typeArg) {
-        yield [[
+        yield [
+            [
                 `type ${typeName} = `,
                 (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.start, typeArg.end, codeFeatures_1.codeFeatures.all),
                 utils_1.endOfLine,
-            ], statement.start, statement.start];
+            ],
+            statement.start,
+            statement.start,
+        ];
         yield [[typeName], typeArg.start, typeArg.end];
     }
     if (!name) {
@@ -289,25 +295,37 @@ function* generateDefineWithType(scriptSetup, statement, callExp, typeArg, name,
             yield [[`const ${defaultName} = `], callExp.start, callExp.start];
         }
         else if (typeArg) {
-            yield [[
+            yield [
+                [
                     `const ${defaultName} = `,
                     (0, utils_1.generateSfcBlockSection)(scriptSetup, callExp.start, typeArg.start, codeFeatures_1.codeFeatures.all),
-                ], statement.start, typeArg.start];
-            yield [[
+                ],
+                statement.start,
+                typeArg.start,
+            ];
+            yield [
+                [
                     (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.end, callExp.end, codeFeatures_1.codeFeatures.all),
                     utils_1.endOfLine,
                     (0, utils_1.generateSfcBlockSection)(scriptSetup, statement.start, callExp.start, codeFeatures_1.codeFeatures.all),
                     defaultName,
-                ], typeArg.end, callExp.end];
+                ],
+                typeArg.end,
+                callExp.end,
+            ];
         }
         else {
-            yield [[
+            yield [
+                [
                     `const ${defaultName} = `,
                     (0, utils_1.generateSfcBlockSection)(scriptSetup, callExp.start, callExp.end, codeFeatures_1.codeFeatures.all),
                     utils_1.endOfLine,
                     (0, utils_1.generateSfcBlockSection)(scriptSetup, statement.start, callExp.start, codeFeatures_1.codeFeatures.all),
                     defaultName,
-                ], statement.start, callExp.end];
+                ],
+                statement.start,
+                callExp.end,
+            ];
         }
     }
 }
@@ -415,7 +433,7 @@ function* generateDefineModelType(scriptSetup, propName, localName, defineModel)
         yield getRangeText(scriptSetup, defineModel.type);
     }
     else if (defineModel.runtimeType && localName) {
-        // Infer from actual prop declaration code 
+        // Infer from actual prop declaration code
         yield `typeof ${localName}['value']`;
     }
     else if (defineModel.defaultValue && propName) {

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

@@ -100,7 +100,7 @@ export type TemplateCodegenContext = ReturnType<typeof createTemplateCodegenCont
  * 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.
  */
-export declare function createTemplateCodegenContext(options: Pick<TemplateCodegenOptions, 'scriptSetupBindingNames'>): {
+export declare function createTemplateCodegenContext(options: Pick<TemplateCodegenOptions, 'scriptSetupBindingNames'>, templateAst?: CompilerDOM.RootNode): {
     readonly currentInfo: {
         ignoreError?: boolean;
         expectError?: {
@@ -132,6 +132,7 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
         withoutSemantic: VueCodeInformation;
     };
     resolveCodeFeatures: (features: VueCodeInformation) => VueCodeInformation;
+    inlineTsAsts: Map<string, import("typescript").SourceFile> | undefined;
     inVFor: boolean;
     slots: {
         name: string;

package/lib/codegen/template/context.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTemplateCodegenContext = createTemplateCodegenContext;
 const CompilerDOM = require("@vue/compiler-dom");
+const computedSfc_1 = require("../../virtualFile/computedSfc");
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const wrapWith_1 = require("../utils/wrapWith");
@@ -103,7 +104,7 @@ const commentDirectiveRegex = /^<!--\s*@vue-(?<name>[-\w]+)\b(?<content>[\s\S]*)
  * 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.
  */
-function createTemplateCodegenContext(options) {
+function createTemplateCodegenContext(options, templateAst) {
     let variableId = 0;
     function resolveCodeFeatures(features) {
         if (features.verification && stack.length) {
@@ -160,6 +161,7 @@ function createTemplateCodegenContext(options) {
             },
         }),
         resolveCodeFeatures,
+        inlineTsAsts: templateAst && computedSfc_1.templateInlineTsAsts.get(templateAst),
         inVFor: false,
         slots,
         dynamicSlots,

package/lib/codegen/template/element.js

@@ -161,7 +161,8 @@ function* generateComponent(options, ctx, node) {
     yield* (0, elementDirectives_1.generateElementDirectives)(options, ctx, node);
     const [refName, offset] = yield* generateElementReference(options, ctx, node);
     const tag = (0, shared_2.hyphenateTag)(node.tag);
-    const isRootNode = ctx.singleRootNodes.has(node) && !options.vueCompilerOptions.fallthroughComponentNames.includes(tag);
+    const isRootNode = ctx.singleRootNodes.has(node)
+        && !options.vueCompilerOptions.fallthroughComponentNames.includes(tag);
     if (refName || isRootNode) {
         const componentInstanceVar = ctx.getInternalVariable();
         ctx.currentComponent.used = true;
@@ -190,7 +191,8 @@ function* generateComponent(options, ctx, node) {
     }
 }
 function* generateElement(options, ctx, node) {
-    const startTagOffset = node.loc.start.offset + options.template.content.slice(node.loc.start.offset).indexOf(node.tag);
+    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;
@@ -289,8 +291,8 @@ function* generateElementReference(options, ctx, node) {
     return [];
 }
 function hasVBindAttrs(options, ctx, node) {
-    return options.vueCompilerOptions.fallthroughAttributes && ((options.inheritAttrs && ctx.singleRootNodes.has(node)) ||
-        node.props.some(prop => prop.type === CompilerDOM.NodeTypes.DIRECTIVE
+    return options.vueCompilerOptions.fallthroughAttributes && ((options.inheritAttrs && ctx.singleRootNodes.has(node))
+        || node.props.some(prop => prop.type === CompilerDOM.NodeTypes.DIRECTIVE
             && prop.name === 'bind'
             && prop.exp?.loc.source === '$attrs'));
 }

package/lib/codegen/template/elementEvents.js

@@ -86,7 +86,7 @@ function* generateEventExpression(options, ctx, prop) {
         let prefix = `(`;
         let suffix = `)`;
         let isFirstMapping = true;
-        const ast = (0, utils_1.createTsAst)(options.ts, options.template.ast, prop.exp.content);
+        const ast = (0, utils_1.createTsAst)(options.ts, ctx.inlineTsAsts, prop.exp.content);
         const isCompound = isCompoundExpression(options.ts, ast);
         if (isCompound) {
             ctx.addLocalVariable('$event');

package/lib/codegen/template/index.js

@@ -10,7 +10,7 @@ const objectProperty_1 = require("./objectProperty");
 const styleScopedClasses_1 = require("./styleScopedClasses");
 const templateChild_1 = require("./templateChild");
 function* generateTemplate(options) {
-    const ctx = (0, context_1.createTemplateCodegenContext)(options);
+    const ctx = (0, context_1.createTemplateCodegenContext)(options, options.template.ast);
     if (options.slotsAssignName) {
         ctx.addLocalVariable(options.slotsAssignName);
     }

package/lib/codegen/template/interpolation.js

@@ -8,8 +8,7 @@ const utils_1 = require("../utils");
 const isLiteralWhitelisted = /*@__PURE__*/ (0, shared_1.makeMap)('true,false,null,this');
 function* generateInterpolation(options, ctx, source, data, code, start, prefix = '', suffix = '') {
     const { ts, destructuredPropNames, templateRefNames, } = options;
-    const template = 'template' in options ? options.template : options.sfc.template;
-    for (let [section, offset, type] of forEachInterpolationSegment(ts, template, destructuredPropNames, templateRefNames, ctx, code, start, prefix, suffix)) {
+    for (let [section, offset, type] of forEachInterpolationSegment(ts, ctx.inlineTsAsts, destructuredPropNames, templateRefNames, ctx, code, start, prefix, suffix)) {
         if (offset === undefined) {
             yield section;
         }
@@ -36,7 +35,9 @@ function* generateInterpolation(options, ctx, source, data, code, start, prefix
                         start + offset,
                         type === 'errorMappingOnly'
                             ? ctx.codeFeatures.verification
-                            : typeof data === 'function' ? data(start + offset) : data,
+                            : typeof data === 'function'
+                                ? data(start + offset)
+                                : data,
                     ];
                 }
                 else {
@@ -47,8 +48,7 @@ function* generateInterpolation(options, ctx, source, data, code, start, prefix
         }
     }
 }
-;
-function* forEachInterpolationSegment(ts, template, destructuredPropNames, templateRefNames, ctx, originalCode, start, prefix, suffix) {
+function* forEachInterpolationSegment(ts, inlineTsAsts, destructuredPropNames, templateRefNames, ctx, originalCode, start, prefix, suffix) {
     const code = prefix + originalCode + suffix;
     const offset = start !== undefined ? start - prefix.length : undefined;
     let ctxVars = [];
@@ -59,7 +59,7 @@ function* forEachInterpolationSegment(ts, template, destructuredPropNames, templ
         });
     }
     else {
-        const ast = (0, utils_1.createTsAst)(ts, template?.ast, code);
+        const ast = (0, utils_1.createTsAst)(ts, inlineTsAsts, code);
         const varCb = (id, isShorthand) => {
             const text = (0, shared_2.getNodeText)(ts, id, ast);
             if (!shouldIdentifierSkipped(ctx, text, destructuredPropNames)) {
@@ -152,17 +152,14 @@ function walkIdentifiers(ts, node, ast, cb, ctx, blockVars = [], isRoot = true)
                     walkIdentifiers(ts, prop.name.expression, ast, cb, ctx, blockVars, false);
                 }
                 walkIdentifiers(ts, prop.initializer, ast, cb, ctx, blockVars, false);
-            }
-            // fix https://github.com/vuejs/language-tools/issues/1156
+            } // fix https://github.com/vuejs/language-tools/issues/1156
             else if (ts.isShorthandPropertyAssignment(prop)) {
                 walkIdentifiers(ts, prop, ast, cb, ctx, blockVars, false);
-            }
-            // fix https://github.com/vuejs/language-tools/issues/1148#issuecomment-1094378126
+            } // fix https://github.com/vuejs/language-tools/issues/1148#issuecomment-1094378126
             else if (ts.isSpreadAssignment(prop)) {
                 // TODO: cannot report "Spread types may only be created from object types.ts(2698)"
                 walkIdentifiers(ts, prop.expression, ast, cb, ctx, blockVars, false);
-            }
-            // fix https://github.com/vuejs/language-tools/issues/4604
+            } // fix https://github.com/vuejs/language-tools/issues/4604
             else if (ts.isFunctionLike(prop) && prop.body) {
                 processFunction(ts, prop, ast, cb, ctx);
             }

package/lib/codegen/template/slotOutlet.js

@@ -10,7 +10,8 @@ const elementProps_1 = require("./elementProps");
 const interpolation_1 = require("./interpolation");
 const propertyAccess_1 = require("./propertyAccess");
 function* generateSlotOutlet(options, ctx, node) {
-    const startTagOffset = node.loc.start.offset + options.template.content.slice(node.loc.start.offset).indexOf(node.tag);
+    const startTagOffset = node.loc.start.offset
+        + options.template.content.slice(node.loc.start.offset).indexOf(node.tag);
     const startTagEndOffset = startTagOffset + node.tag.length;
     const propsVar = ctx.getInternalVariable();
     const nameProp = node.props.find(prop => {

package/lib/codegen/template/styleScopedClasses.js

@@ -67,8 +67,8 @@ function collectStyleScopedClassReferences(options, ctx, node) {
             const ast = ts.createSourceFile('', content, 99);
             const literals = [];
             ts.forEachChild(ast, node => {
-                if (!ts.isExpressionStatement(node) ||
-                    !isTemplateExpression(node.expression)) {
+                if (!ts.isExpressionStatement(node)
+                    || !isTemplateExpression(node.expression)) {
                     return;
                 }
                 const expression = node.expression.templateSpans[0].expression;

package/lib/codegen/template/templateChild.js

@@ -173,7 +173,8 @@ function parseInterpolationNode(node, template) {
         start--;
         content = leftCharacter + content;
     }
-    while ((rightCharacter = template.slice(start + content.length, start + content.length + 1)).trim() === '' && rightCharacter.length) {
+    while ((rightCharacter = template.slice(start + content.length, start + content.length + 1)).trim() === ''
+        && rightCharacter.length) {
         content = content + rightCharacter;
     }
     return [

package/lib/codegen/template/vFor.js

@@ -12,7 +12,7 @@ function* generateVFor(options, ctx, node) {
     const forBlockVars = [];
     yield `for (const [`;
     if (leftExpressionRange && leftExpressionText) {
-        const collectAst = (0, utils_1.createTsAst)(options.ts, options.template.ast, `const [${leftExpressionText}]`);
+        const collectAst = (0, utils_1.createTsAst)(options.ts, ctx.inlineTsAsts, `const [${leftExpressionText}]`);
         (0, utils_1.collectVars)(options.ts, collectAst, collectAst, forBlockVars);
         yield [
             leftExpressionText,

package/lib/codegen/template/vSlot.js

@@ -35,7 +35,7 @@ function* generateVSlot(options, ctx, node, slotDir) {
         yield `: ${slotVar} } = ${ctx.currentComponent.ctxVar}.slots!${utils_1.endOfLine}`;
     }
     if (slotDir?.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-        const slotAst = (0, utils_1.createTsAst)(options.ts, options.template.ast, `(${slotDir.exp.content}) => {}`);
+        const slotAst = (0, utils_1.createTsAst)(options.ts, ctx.inlineTsAsts, `(${slotDir.exp.content}) => {}`);
         (0, utils_1.collectVars)(options.ts, slotAst, slotAst, slotBlockVars);
         yield* generateSlotParameters(options, ctx, slotAst, slotDir.exp, slotVar);
     }

package/lib/codegen/utils/escaped.d.ts

@@ -1,2 +1,2 @@
-import type { Code, VueCodeInformation } from "../../types";
+import type { Code, VueCodeInformation } from '../../types';
 export declare function generateEscaped(text: string, source: string, offset: number, features: VueCodeInformation, escapeTarget: RegExp): Generator<Code>;

package/lib/codegen/utils/index.d.ts

@@ -16,5 +16,5 @@ export declare function collectIdentifiers(ts: typeof import('typescript'), node
     initializer: ts.Expression | undefined;
 }[];
 export declare function normalizeAttributeValue(node: CompilerDOM.TextNode): [string, number];
-export declare function createTsAst(ts: typeof import('typescript'), templateAst: CompilerDOM.RootNode | undefined, text: string): ts.SourceFile;
+export declare function createTsAst(ts: typeof import('typescript'), inlineTsAsts: Map<string, ts.SourceFile> | undefined, text: string): ts.SourceFile;
 export declare function generateSfcBlockSection(block: SfcBlock, start: number, end: number, features: VueCodeInformation): Code;

package/lib/codegen/utils/index.js

@@ -49,8 +49,7 @@ function normalizeAttributeValue(node) {
     }
     return [content, offset];
 }
-function createTsAst(ts, templateAst, text) {
-    const inlineTsAsts = templateAst?.__volar_inlineTsAsts;
+function createTsAst(ts, inlineTsAsts, text) {
     let ast = inlineTsAsts?.get(text);
     if (!ast) {
         ast = ts.createSourceFile('/a.ts', text, 99);

package/lib/codegen/utils/wrapWith.d.ts

@@ -1,3 +1,3 @@
-import type { Code, VueCodeInformation } from "../../types";
+import type { Code, VueCodeInformation } from '../../types';
 export declare function wrapWith(startOffset: number, endOffset: number, features: VueCodeInformation, ...codes: Code[]): Generator<Code>;
 export declare function wrapWith(startOffset: number, endOffset: number, source: string, features: VueCodeInformation, ...codes: Code[]): Generator<Code>;

package/lib/languagePlugin.js

@@ -88,9 +88,12 @@ function createVueLanguagePlugin(ts, compilerOptions, vueCompilerOptions, asFile
                         return {
                             code,
                             extension: '.' + lang,
-                            scriptKind: lang === 'js' ? ts.ScriptKind.JS
-                                : lang === 'jsx' ? ts.ScriptKind.JSX
-                                    : lang === 'tsx' ? ts.ScriptKind.TSX
+                            scriptKind: lang === 'js'
+                                ? ts.ScriptKind.JS
+                                : lang === 'jsx'
+                                    ? ts.ScriptKind.JSX
+                                    : lang === 'tsx'
+                                        ? ts.ScriptKind.TSX
                                         : ts.ScriptKind.TS,
                         };
                     }

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

@@ -167,6 +167,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/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/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.4",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -13,7 +13,7 @@
 		"directory": "packages/language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "2.4.14",
+		"@volar/language-core": "2.4.15",
 		"@vue/compiler-dom": "^3.5.0",
 		"@vue/shared": "^3.5.0",
 		"alien-signals": "^2.0.5",
@@ -24,7 +24,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 +35,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "17e3beabc13e9eb59a82fb1a9f0252fd6685e444"
+	"gitHead": "5cb41faacbfe2d9e2d64637c6c1ae8769d9cba3f"
 }