@vue/language-core 1.8.5 → 1.8.7

package/out/generators/script.js

@@ -37,6 +37,7 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
             emitsTypeArg: undefined,
             emitsTypeNums: 0,
             exposeRuntimeArg: undefined,
+            leadingCommentEndOffset: 0,
             importSectionEndOffset: 0,
             defineProps: undefined,
             propsAssignName: undefined,
@@ -229,7 +230,7 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
         if (!scriptSetupRanges)
             return;
         codes.push([
-            sfc.scriptSetup.content.substring(0, scriptSetupRanges.importSectionEndOffset),
+            sfc.scriptSetup.content.substring(0, Math.max(scriptSetupRanges.importSectionEndOffset, scriptSetupRanges.leadingCommentEndOffset)),
             'scriptSetup',
             0,
             language_core_1.FileRangeCapabilities.full,
@@ -270,9 +271,9 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
             }
             codes.push(`>`);
             codes.push('(\n');
-            codes.push(`__VLS_props: typeof __VLS_setup['props']`, `& import('${vueCompilerOptions.lib}').VNodeProps`, `& import('${vueCompilerOptions.lib}').AllowedComponentProps`, `& import('${vueCompilerOptions.lib}').ComponentCustomProps,\n`);
-            codes.push(`__VLS_ctx?: Pick<typeof __VLS_setup, 'attrs' | 'emit' | 'slots'>,\n`);
-            codes.push('__VLS_setup = (() => {\n');
+            codes.push(`__VLS_props: Awaited<typeof __VLS_setup>['props']`, `& import('${vueCompilerOptions.lib}').VNodeProps`, `& import('${vueCompilerOptions.lib}').AllowedComponentProps`, `& import('${vueCompilerOptions.lib}').ComponentCustomProps,\n`);
+            codes.push(`__VLS_ctx?: Pick<Awaited<typeof __VLS_setup>, 'attrs' | 'emit' | 'slots'>,\n`);
+            codes.push('__VLS_setup = (async () => {\n');
             scriptSetupGeneratedOffset = generateSetupFunction(true, 'none', definePropMirrors);
             //#region exposed
             codes.push(`const __VLS_exposed = `);
@@ -339,6 +340,7 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
                 usedHelperTypes.PropsChildren = true;
                 codes.push(` & __VLS_PropsChildren<`);
                 addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.slotsTypeArg.start, scriptSetupRanges.slotsTypeArg.end);
+                codes.push('>');
             }
             codes.push(`;\n`);
             //#endregion
@@ -366,7 +368,7 @@ function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htm
             codes.push('emit: typeof __VLS_emit');
             codes.push('};\n');
             codes.push('})(),\n');
-            codes.push(`) => ({} as import('${vueCompilerOptions.lib}').VNode & { __ctx?: typeof __VLS_setup }))`);
+            codes.push(`) => ({} as import('${vueCompilerOptions.lib}').VNode & { __ctx?: Awaited<typeof __VLS_setup> }))`);
         }
         else if (!sfc.script) {
             // no script block, generate script setup code at root

package/out/generators/template.js

@@ -585,7 +585,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
             blockConditions.push(condition);
             inScope = true;
         }
-        generateDirectives(node, var_originalComponent);
+        generateDirectives(node);
         generateElReferences(node); // <el ref="foo" />
         if (sfc.styles.some(s => s.scoped || vueCompilerOptions.experimentalResolveStyleCssClasses === 'always')) {
             generateClassScoped(node);
@@ -1019,7 +1019,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
             }
         }
     }
-    function generateDirectives(node, componentVar) {
+    function generateDirectives(node) {
         for (const prop of node.props) {
             if (prop.type === 7 /* CompilerDOM.NodeTypes.DIRECTIVE */
                 && prop.name !== 'slot'
@@ -1052,7 +1052,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                             apply: getRenameApply(prop.name),
                         },
                     },
-                ], ')', '(', ['', 'template', prop.loc.start.offset, capabilitiesPresets.diagnosticOnly], componentVar, vueCompilerOptions.strictTemplates ? '' : ' as any', ['', 'template', prop.loc.start.offset + 'v-'.length + prop.name.length, capabilitiesPresets.diagnosticOnly], ', ');
+                ], ')', '(');
                 if (prop.exp?.type === 4 /* CompilerDOM.NodeTypes.SIMPLE_EXPRESSION */) {
                     codes.push(['', 'template', prop.exp.loc.start.offset, capabilitiesPresets.diagnosticOnly], ...createInterpolationCode(prop.exp.content, prop.exp.loc, prop.exp.loc.start.offset, capabilitiesPresets.all, '(', ')'), ['', 'template', prop.exp.loc.end.offset, capabilitiesPresets.diagnosticOnly]);
                     formatCodes.push(...createFormatCode(prop.exp.content, prop.exp.loc.start.offset, formatBrackets.normal));

package/out/index.d.ts

@@ -8,5 +8,6 @@ export * from './utils/ts';
 export * from './utils/parseSfc';
 export * as scriptRanges from './parsers/scriptRanges';
 export * as sharedTypes from './utils/globalTypes';
+export { tsCodegen } from './plugins/vue-tsx';
 export * from '@volar/language-core';
 export * from '@volar/source-map';

package/out/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sharedTypes = exports.scriptRanges = void 0;
+exports.tsCodegen = exports.sharedTypes = exports.scriptRanges = void 0;
 __exportStar(require("./generators/template"), exports);
 __exportStar(require("./languageModule"), exports);
 __exportStar(require("./parsers/scriptSetupRanges"), exports);
@@ -25,6 +25,8 @@ __exportStar(require("./utils/ts"), exports);
 __exportStar(require("./utils/parseSfc"), exports);
 exports.scriptRanges = require("./parsers/scriptRanges");
 exports.sharedTypes = require("./utils/globalTypes");
+var vue_tsx_1 = require("./plugins/vue-tsx");
+Object.defineProperty(exports, "tsCodegen", { enumerable: true, get: function () { return vue_tsx_1.tsCodegen; } });
 __exportStar(require("@volar/language-core"), exports);
 __exportStar(require("@volar/source-map"), exports);
 //# sourceMappingURL=index.js.map

package/out/languageModule.d.ts

@@ -2,5 +2,8 @@ import type { Language } from '@volar/language-core';
 import { VueFile } from './sourceFile';
 import { VueCompilerOptions } from './types';
 import type * as ts from 'typescript/lib/tsserverlibrary';
-export declare function createLanguage(compilerOptions?: ts.CompilerOptions, _vueCompilerOptions?: Partial<VueCompilerOptions>, ts?: typeof import('typescript/lib/tsserverlibrary'), codegenStack?: boolean): Language<VueFile>;
+export declare function createVueLanguage(ts: typeof import('typescript/lib/tsserverlibrary'), compilerOptions?: ts.CompilerOptions, _vueCompilerOptions?: Partial<VueCompilerOptions>, codegenStack?: boolean): Language<VueFile>;
+/**
+ * @deprecated planed to remove in 2.0, please use getOrCreateVueLanguage instead of
+ */
 export declare function createLanguages(compilerOptions?: ts.CompilerOptions, vueCompilerOptions?: Partial<VueCompilerOptions>, ts?: typeof import('typescript/lib/tsserverlibrary'), codegenStack?: boolean): Language[];

package/out/languageModule.js

@@ -1,21 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLanguages = exports.createLanguage = void 0;
+exports.createLanguages = exports.createVueLanguage = void 0;
 const path_1 = require("path");
 const plugins_1 = require("./plugins");
 const sourceFile_1 = require("./sourceFile");
 const sharedTypes = require("./utils/globalTypes");
 const ts_1 = require("./utils/ts");
-function createLanguage(compilerOptions = {}, _vueCompilerOptions = {}, ts = require('typescript'), codegenStack = false) {
+const fileRegistries = [];
+function getVueFileRegistry(key, plugins) {
+    let fileRegistry = fileRegistries.find(r => r.key === key
+        && r.plugins.length === plugins.length
+        && r.plugins.every(plugin => plugins.includes(plugin)))?.files;
+    if (!fileRegistry) {
+        fileRegistry = new Map();
+        fileRegistries.push({
+            key: key,
+            plugins: plugins,
+            files: fileRegistry,
+        });
+    }
+    return fileRegistry;
+}
+function createVueLanguage(ts, compilerOptions = {}, _vueCompilerOptions = {}, codegenStack = false) {
     const vueCompilerOptions = (0, ts_1.resolveVueCompilerOptions)(_vueCompilerOptions);
-    patchResolveModuleNames(ts, vueCompilerOptions);
-    const vueLanguagePlugin = (0, plugins_1.getDefaultVueLanguagePlugins)(ts, compilerOptions, vueCompilerOptions, codegenStack);
-    const languageModule = {
+    const plugins = (0, plugins_1.getDefaultVueLanguagePlugins)(ts, compilerOptions, vueCompilerOptions, codegenStack);
+    const keys = [
+        ...Object.keys(vueCompilerOptions)
+            .sort()
+            .filter(key => key !== 'plugins')
+            .map(key => [key, vueCompilerOptions[key]]),
+        [...new Set(plugins.map(plugin => plugin.requiredCompilerOptions ?? []).flat())]
+            .sort()
+            .map(key => [key, compilerOptions[key]]),
+    ];
+    const fileRegistry = getVueFileRegistry(JSON.stringify(keys), _vueCompilerOptions.plugins ?? []);
+    const allowLanguageIds = new Set(['vue']);
+    if (vueCompilerOptions.extensions.includes('.md')) {
+        allowLanguageIds.add('markdown');
+    }
+    if (vueCompilerOptions.extensions.includes('.html')) {
+        allowLanguageIds.add('html');
+    }
+    return {
         createVirtualFile(fileName, snapshot, languageId) {
-            if (languageId === 'vue'
-                || (!languageId
-                    && vueCompilerOptions.extensions.some(ext => fileName.endsWith(ext)))) {
-                return new sourceFile_1.VueFile(fileName, snapshot, vueCompilerOptions, vueLanguagePlugin, ts, codegenStack);
+            if ((languageId && allowLanguageIds.has(languageId))
+                || (!languageId && vueCompilerOptions.extensions.some(ext => fileName.endsWith(ext)))) {
+                if (fileRegistry.has(fileName)) {
+                    const reusedVueFile = fileRegistry.get(fileName);
+                    reusedVueFile.update(snapshot);
+                    return reusedVueFile;
+                }
+                const vueFile = new sourceFile_1.VueFile(fileName, snapshot, vueCompilerOptions, plugins, ts, codegenStack);
+                fileRegistry.set(fileName, vueFile);
+                return vueFile;
             }
         },
         updateVirtualFile(sourceFile, snapshot) {
@@ -26,6 +63,12 @@ function createLanguage(compilerOptions = {}, _vueCompilerOptions = {}, ts = req
             const sharedTypesFileName = path_1.posix.join(host.rootPath, sharedTypes.baseName);
             return {
                 ...host,
+                resolveModuleName(moduleName, impliedNodeFormat) {
+                    if (impliedNodeFormat === ts.ModuleKind.ESNext && vueCompilerOptions.extensions.some(ext => moduleName.endsWith(ext))) {
+                        return `${moduleName}.js`;
+                    }
+                    return host.resolveModuleName?.(moduleName, impliedNodeFormat) ?? moduleName;
+                },
                 getScriptFileNames() {
                     return [
                         sharedTypesFileName,
@@ -41,32 +84,16 @@ function createLanguage(compilerOptions = {}, _vueCompilerOptions = {}, ts = req
             };
         },
     };
-    return languageModule;
 }
-exports.createLanguage = createLanguage;
+exports.createVueLanguage = createVueLanguage;
+/**
+ * @deprecated planed to remove in 2.0, please use getOrCreateVueLanguage instead of
+ */
 function createLanguages(compilerOptions = {}, vueCompilerOptions = {}, ts = require('typescript'), codegenStack = false) {
     return [
-        createLanguage(compilerOptions, vueCompilerOptions, ts, codegenStack),
+        createVueLanguage(ts, compilerOptions, vueCompilerOptions, codegenStack),
         ...vueCompilerOptions.experimentalAdditionalLanguageModules?.map(module => require(module)) ?? [],
     ];
 }
 exports.createLanguages = createLanguages;
-function patchResolveModuleNames(ts, vueCompilerOptions) {
-    try {
-        // from https://github.com/vuejs/language-tools/pull/1543
-        if (!(ts.__vuePatchResolveModuleNames)) {
-            ts.__vuePatchResolveModuleNames = true;
-            const resolveModuleNames = ts.resolveModuleName;
-            ts.resolveModuleName = (...args) => {
-                if (args[6] === ts.ModuleKind.ESNext && vueCompilerOptions.extensions.some(ext => args[0].endsWith(ext))) {
-                    args[6] = ts.ModuleKind.CommonJS;
-                }
-                return resolveModuleNames(...args);
-            };
-        }
-    }
-    catch (e) {
-        // console.warn('[volar] patchResolveModuleNames failed', e);
-    }
-}
 //# sourceMappingURL=languageModule.js.map

package/out/parsers/scriptSetupRanges.d.ts

@@ -3,6 +3,7 @@ import type { VueCompilerOptions, TextRange } from '../types';
 export interface ScriptSetupRanges extends ReturnType<typeof parseScriptSetupRanges> {
 }
 export declare function parseScriptSetupRanges(ts: typeof import('typescript/lib/tsserverlibrary'), ast: ts.SourceFile, vueCompilerOptions: VueCompilerOptions): {
+    leadingCommentEndOffset: number;
     importSectionEndOffset: number;
     bindings: TextRange[];
     withDefaultsArg: TextRange | undefined;

package/out/parsers/scriptSetupRanges.js

@@ -19,6 +19,8 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     const definePropProposalB = vueCompilerOptions.experimentalDefinePropProposal === 'johnsonEdition' || ast.getFullText().trimStart().startsWith('// @experimentalDefinePropProposal=johnsonEdition');
     const defineProp = [];
     const bindings = parseBindingRanges(ts, ast, false);
+    const text = ast.getFullText();
+    const leadingCommentEndOffset = ts.getLeadingCommentRanges(text, 0)?.reverse()[0].end ?? 0;
     ast.forEachChild(node => {
         const isTypeExport = (ts.isTypeAliasDeclaration(node) || ts.isInterfaceDeclaration(node)) && node.modifiers?.some(mod => mod.kind === ts.SyntaxKind.ExportKeyword);
         if (!foundNonImportExportNode
@@ -27,7 +29,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
             && !ts.isEmptyStatement(node)
             // fix https://github.com/vuejs/language-tools/issues/1223
             && !ts.isImportEqualsDeclaration(node)) {
-            const commentRanges = ts.getLeadingCommentRanges(ast.getFullText(), node.getFullStart());
+            const commentRanges = ts.getLeadingCommentRanges(text, node.getFullStart());
             if (commentRanges?.length) {
                 const commentRange = commentRanges.sort((a, b) => a.pos - b.pos)[0];
                 importSectionEndOffset = commentRange.pos;
@@ -40,6 +42,7 @@ function parseScriptSetupRanges(ts, ast, vueCompilerOptions) {
     });
     ast.forEachChild(child => visitNode(child, ast));
     return {
+        leadingCommentEndOffset,
         importSectionEndOffset,
         bindings,
         withDefaultsArg,

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

@@ -1,3 +1,58 @@
-import { VueLanguagePlugin } from '../types';
+import { Sfc, VueLanguagePlugin } from '../types';
+import * as muggle from 'muggle-string';
+import * as ts from 'typescript/lib/tsserverlibrary';
+export declare const tsCodegen: WeakMap<Sfc, {
+    scriptRanges: import("@vue/reactivity").ComputedRef<{
+        exportDefault: (import("../types").TextRange & {
+            expression: import("../types").TextRange;
+            args: import("../types").TextRange;
+            argsNode: ts.ObjectLiteralExpression | undefined;
+            componentsOption: import("../types").TextRange | undefined;
+            componentsOptionNode: ts.ObjectLiteralExpression | undefined;
+            nameOption: import("../types").TextRange | undefined;
+        }) | undefined;
+        bindings: import("../types").TextRange[];
+    } | undefined>;
+    scriptSetupRanges: import("@vue/reactivity").ComputedRef<{
+        leadingCommentEndOffset: number;
+        importSectionEndOffset: number;
+        bindings: import("../types").TextRange[];
+        withDefaultsArg: import("../types").TextRange | undefined;
+        defineProps: import("../types").TextRange | undefined;
+        propsAssignName: string | undefined;
+        propsRuntimeArg: import("../types").TextRange | undefined;
+        propsTypeArg: import("../types").TextRange | undefined;
+        slotsTypeArg: import("../types").TextRange | undefined;
+        emitsAssignName: string | undefined;
+        emitsRuntimeArg: import("../types").TextRange | undefined;
+        emitsTypeArg: import("../types").TextRange | undefined;
+        emitsTypeNums: number;
+        exposeRuntimeArg: import("../types").TextRange | undefined;
+        defineProp: {
+            name: import("../types").TextRange | undefined;
+            nameIsString: boolean;
+            type: import("../types").TextRange | undefined;
+            defaultValue: import("../types").TextRange | undefined;
+            required: boolean;
+        }[];
+    } | undefined>;
+    lang: import("@vue/reactivity").ComputedRef<string>;
+    tsxGen: import("@vue/reactivity").ComputedRef<{
+        codes: muggle.Segment<import("@volar/language-core").FileRangeCapabilities>[];
+        codeStacks: muggle.StackNode[];
+        mirrorBehaviorMappings: import("@volar/source-map").Mapping<[import("@volar/language-core").MirrorBehaviorCapabilities, import("@volar/language-core").MirrorBehaviorCapabilities]>[];
+    }>;
+    htmlGen: import("@vue/reactivity").ComputedRef<{
+        codes: (string | [string, string | undefined, number | [number, number], import("@volar/language-core").FileRangeCapabilities])[];
+        codeStacks: muggle.StackNode[];
+        formatCodes: (string | [string, string | undefined, number | [number, number], import("@volar/language-core").FileRangeCapabilities])[];
+        formatCodeStacks: muggle.StackNode[];
+        cssCodes: (string | [string, string | undefined, number | [number, number], import("@volar/language-core").FileRangeCapabilities])[];
+        cssCodeStacks: muggle.StackNode[];
+        tagNames: Record<string, number[]>;
+        identifiers: Set<string>;
+        hasSlot: boolean;
+    } | undefined>;
+}>;
 declare const plugin: VueLanguagePlugin;
 export default plugin;

package/out/plugins/vue-tsx.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.tsCodegen = void 0;
 const reactivity_1 = require("@vue/reactivity");
 const script_1 = require("../generators/script");
 const templateGen = require("../generators/template");
@@ -7,13 +8,17 @@ const scriptRanges_1 = require("../parsers/scriptRanges");
 const scriptSetupRanges_1 = require("../parsers/scriptSetupRanges");
 const language_core_1 = require("@volar/language-core");
 const muggle = require("muggle-string");
+const ts = require("typescript/lib/tsserverlibrary");
 const templateFormatReg = /^\.template_format\.ts$/;
 const templateStyleCssReg = /^\.template_style\.css$/;
-const plugin = ({ modules, vueCompilerOptions, compilerOptions, codegenStack }) => {
-    const ts = modules.typescript;
-    const instances = new WeakMap();
+exports.tsCodegen = new WeakMap();
+const plugin = (ctx) => {
     return {
         version: 1,
+        requiredCompilerOptions: [
+            'noPropertyAccessFromIndexSignature',
+            'exactOptionalPropertyTypes',
+        ],
         getEmbeddedFileNames(fileName, sfc) {
             const tsx = useTsx(fileName, sfc);
             const fileNames = [];
@@ -39,7 +44,7 @@ const plugin = ({ modules, vueCompilerOptions, compilerOptions, codegenStack })
                 };
                 const tsx = _tsx.tsxGen.value;
                 if (tsx) {
-                    const [content, contentStacks] = codegenStack ? muggle.track([...tsx.codes], [...tsx.codeStacks]) : [[...tsx.codes], [...tsx.codeStacks]];
+                    const [content, contentStacks] = ctx.codegenStack ? muggle.track([...tsx.codes], [...tsx.codeStacks]) : [[...tsx.codes], [...tsx.codeStacks]];
                     embeddedFile.content = content;
                     embeddedFile.contentStacks = contentStacks;
                     embeddedFile.mirrorBehaviorMappings = [...tsx.mirrorBehaviorMappings];
@@ -56,7 +61,7 @@ const plugin = ({ modules, vueCompilerOptions, compilerOptions, codegenStack })
                     inlayHint: false,
                 };
                 if (_tsx.htmlGen.value) {
-                    const [content, contentStacks] = codegenStack ? muggle.track([..._tsx.htmlGen.value.formatCodes], [..._tsx.htmlGen.value.formatCodeStacks]) : [[..._tsx.htmlGen.value.formatCodes], [..._tsx.htmlGen.value.formatCodeStacks]];
+                    const [content, contentStacks] = ctx.codegenStack ? muggle.track([..._tsx.htmlGen.value.formatCodes], [..._tsx.htmlGen.value.formatCodeStacks]) : [[..._tsx.htmlGen.value.formatCodes], [..._tsx.htmlGen.value.formatCodeStacks]];
                     embeddedFile.content = content;
                     embeddedFile.contentStacks = contentStacks;
                 }
@@ -77,7 +82,7 @@ const plugin = ({ modules, vueCompilerOptions, compilerOptions, codegenStack })
             else if (suffix.match(templateStyleCssReg)) {
                 embeddedFile.parentFileName = fileName + '.template.' + sfc.template?.lang;
                 if (_tsx.htmlGen.value) {
-                    const [content, contentStacks] = codegenStack ? muggle.track([..._tsx.htmlGen.value.cssCodes], [..._tsx.htmlGen.value.cssCodeStacks]) : [[..._tsx.htmlGen.value.cssCodes], [..._tsx.htmlGen.value.cssCodeStacks]];
+                    const [content, contentStacks] = ctx.codegenStack ? muggle.track([..._tsx.htmlGen.value.cssCodes], [..._tsx.htmlGen.value.cssCodeStacks]) : [[..._tsx.htmlGen.value.cssCodes], [..._tsx.htmlGen.value.cssCodeStacks]];
                     embeddedFile.content = content;
                     embeddedFile.contentStacks = contentStacks;
                 }
@@ -87,40 +92,42 @@ const plugin = ({ modules, vueCompilerOptions, compilerOptions, codegenStack })
         },
     };
     function useTsx(fileName, sfc) {
-        if (!instances.has(sfc)) {
-            instances.set(sfc, createTsx(fileName, sfc));
+        if (!exports.tsCodegen.has(sfc)) {
+            exports.tsCodegen.set(sfc, createTsx(fileName, sfc, ctx));
         }
-        return instances.get(sfc);
-    }
-    function createTsx(fileName, _sfc) {
-        const lang = (0, reactivity_1.computed)(() => {
-            return !_sfc.script && !_sfc.scriptSetup ? 'ts'
-                : _sfc.scriptSetup && _sfc.scriptSetup.lang !== 'js' ? _sfc.scriptSetup.lang
-                    : _sfc.script && _sfc.script.lang !== 'js' ? _sfc.script.lang
-                        : 'js';
-        });
-        const scriptRanges = (0, reactivity_1.computed)(() => _sfc.scriptAst
-            ? (0, scriptRanges_1.parseScriptRanges)(ts, _sfc.scriptAst, !!_sfc.scriptSetup, false)
-            : undefined);
-        const scriptSetupRanges = (0, reactivity_1.computed)(() => _sfc.scriptSetupAst
-            ? (0, scriptSetupRanges_1.parseScriptSetupRanges)(ts, _sfc.scriptSetupAst, vueCompilerOptions)
-            : undefined);
-        const htmlGen = (0, reactivity_1.computed)(() => {
-            if (!_sfc.templateAst)
-                return;
-            return templateGen.generate(ts, compilerOptions, vueCompilerOptions, _sfc.template?.content ?? '', _sfc.template?.lang ?? 'html', _sfc, hasScriptSetupSlots.value, codegenStack);
-        });
-        const hasScriptSetupSlots = (0, reactivity_1.shallowRef)(false); // remove when https://github.com/vuejs/core/pull/5912 merged
-        const tsxGen = (0, reactivity_1.computed)(() => {
-            hasScriptSetupSlots.value = !!scriptSetupRanges.value?.slotsTypeArg;
-            return (0, script_1.generate)(ts, fileName, _sfc, lang.value, scriptRanges.value, scriptSetupRanges.value, htmlGen.value, compilerOptions, vueCompilerOptions, codegenStack);
-        });
-        return {
-            lang,
-            tsxGen,
-            htmlGen,
-        };
+        return exports.tsCodegen.get(sfc);
     }
 };
 exports.default = plugin;
+function createTsx(fileName, _sfc, { vueCompilerOptions, compilerOptions, codegenStack }) {
+    const lang = (0, reactivity_1.computed)(() => {
+        return !_sfc.script && !_sfc.scriptSetup ? 'ts'
+            : _sfc.scriptSetup && _sfc.scriptSetup.lang !== 'js' ? _sfc.scriptSetup.lang
+                : _sfc.script && _sfc.script.lang !== 'js' ? _sfc.script.lang
+                    : 'js';
+    });
+    const scriptRanges = (0, reactivity_1.computed)(() => _sfc.scriptAst
+        ? (0, scriptRanges_1.parseScriptRanges)(ts, _sfc.scriptAst, !!_sfc.scriptSetup, false)
+        : undefined);
+    const scriptSetupRanges = (0, reactivity_1.computed)(() => _sfc.scriptSetupAst
+        ? (0, scriptSetupRanges_1.parseScriptSetupRanges)(ts, _sfc.scriptSetupAst, vueCompilerOptions)
+        : undefined);
+    const htmlGen = (0, reactivity_1.computed)(() => {
+        if (!_sfc.templateAst)
+            return;
+        return templateGen.generate(ts, compilerOptions, vueCompilerOptions, _sfc.template?.content ?? '', _sfc.template?.lang ?? 'html', _sfc, hasScriptSetupSlots.value, codegenStack);
+    });
+    const hasScriptSetupSlots = (0, reactivity_1.shallowRef)(false); // remove when https://github.com/vuejs/core/pull/5912 merged
+    const tsxGen = (0, reactivity_1.computed)(() => {
+        hasScriptSetupSlots.value = !!scriptSetupRanges.value?.slotsTypeArg;
+        return (0, script_1.generate)(ts, fileName, _sfc, lang.value, scriptRanges.value, scriptSetupRanges.value, htmlGen.value, compilerOptions, vueCompilerOptions, codegenStack);
+    });
+    return {
+        scriptRanges,
+        scriptSetupRanges,
+        lang,
+        tsxGen,
+        htmlGen,
+    };
+}
 //# sourceMappingURL=vue-tsx.js.map

package/out/plugins.d.ts

@@ -5,6 +5,7 @@ export declare function getDefaultVueLanguagePlugins(ts: typeof import('typescri
     version: 1;
     name?: string | undefined;
     order?: number | undefined;
+    requiredCompilerOptions?: string[] | undefined;
     parseSFC?(fileName: string, content: string): import("@vue/compiler-sfc").SFCParseResult | undefined;
     updateSFC?(oldResult: import("@vue/compiler-sfc").SFCParseResult, textChange: {
         start: number;

package/out/sourceFile.d.ts

@@ -67,6 +67,7 @@ export declare class VueFile implements VirtualFile {
     _embeddedFiles: ComputedRef<VirtualFile[]>;
     constructor(fileName: string, snapshot: ts.IScriptSnapshot, vueCompilerOptions: VueCompilerOptions, plugins: ReturnType<VueLanguagePlugin>[], ts: typeof import('typescript/lib/tsserverlibrary'), codegenStack: boolean);
     update(newScriptSnapshot: ts.IScriptSnapshot): void;
+    onUpdate(): void;
     parseSfc(): SFCParseResult | undefined;
     parseTemplateBlock(block: SFCTemplateBlock): NonNullable<Sfc['template']>;
     parseScriptBlock(block: SFCScriptBlock): NonNullable<Sfc['script']>;

package/out/sourceFile.js

@@ -331,10 +331,15 @@ class VueFile {
                 }
             }
         });
-        this.update(snapshot);
+        this.onUpdate();
     }
     update(newScriptSnapshot) {
+        if (newScriptSnapshot === this.snapshot)
+            return;
         this.snapshot = newScriptSnapshot;
+        this.onUpdate();
+    }
+    onUpdate() {
         const parsedSfc = this.parseSfc();
         updateObj(this.sfc, {
             template: parsedSfc?.descriptor.template ? this.parseTemplateBlock(parsedSfc.descriptor.template) : null,

package/out/types.d.ts

@@ -45,6 +45,7 @@ export type VueLanguagePlugin = (ctx: {
     version: 1;
     name?: string;
     order?: number;
+    requiredCompilerOptions?: string[];
     parseSFC?(fileName: string, content: string): SFCParseResult | undefined;
     updateSFC?(oldResult: SFCParseResult, textChange: {
         start: number;

package/out/utils/globalTypes.js

@@ -51,7 +51,7 @@ declare function __VLS_getVForSourceType<T>(source: T): [
 declare function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
 declare function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
 declare function __VLS_directiveFunction<T>(dir: T):
-	T extends import('${vueCompilerOptions.lib}').ObjectDirective<infer E, infer V> | import('${vueCompilerOptions.lib}').FunctionDirective<infer E, infer V> ? (el: E, value: V) => void
+	T extends import('${vueCompilerOptions.lib}').ObjectDirective<infer E, infer V> | import('${vueCompilerOptions.lib}').FunctionDirective<infer E, infer V> ? (value: V) => void
 	: T;
 declare function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
 declare function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };

package/out/utils/transform.js

@@ -106,7 +106,7 @@ function walkIdentifiers(ts, node, cb, localVars, blockVars = [], isRoot = true)
         if (node.initializer)
             walkIdentifiers(ts, node.initializer, cb, localVars, blockVars, false);
     }
-    else if (ts.isArrowFunction(node)) {
+    else if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) {
         const functionArgs = [];
         for (const param of node.parameters) {
             colletVars(ts, param.name, functionArgs);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.8.5",
+	"version": "1.8.7",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/vue-language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "~1.9.0",
-		"@volar/source-map": "~1.9.0",
+		"@volar/language-core": "~1.10.0",
+		"@volar/source-map": "~1.10.0",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/reactivity": "^3.3.0",
 		"@vue/shared": "^3.3.0",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "971820b55ea42cb7e8c8ba7c35c8998d5572b420"
+	"gitHead": "2b888901897fc9155bc12eb30ddae41afed5d942"
 }