@vue/language-core 1.7.3 → 1.7.4

package/out/generators/script.d.ts

@@ -7,7 +7,7 @@ import type { ScriptRanges } from '../parsers/scriptRanges';
 import type { ScriptSetupRanges } from '../parsers/scriptSetupRanges';
 import { Sfc } from '../types';
 import type { VueCompilerOptions } from '../types';
-export declare function generate(ts: typeof import('typescript/lib/tsserverlibrary'), fileName: string, _sfc: Sfc, lang: string, scriptRanges: ScriptRanges | undefined, scriptSetupRanges: ScriptSetupRanges | undefined, htmlGen: ReturnType<typeof templateGen['generate']> | undefined, compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions, sharedTypesImport: string, codegenStack: boolean): {
+export declare function generate(ts: typeof import('typescript/lib/tsserverlibrary'), fileName: string, _sfc: Sfc, lang: string, scriptRanges: ScriptRanges | undefined, scriptSetupRanges: ScriptSetupRanges | undefined, htmlGen: ReturnType<typeof templateGen['generate']> | undefined, compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions, codegenStack: boolean): {
     codes: Segment<FileRangeCapabilities>[];
     codeStacks: SourceMaps.StackNode[];
     mirrorBehaviorMappings: SourceMaps.Mapping<[MirrorBehaviorCapabilities, MirrorBehaviorCapabilities]>[];

package/out/generators/script.js

@@ -9,7 +9,7 @@ const shared_2 = require("../utils/shared");
 const transform_1 = require("../utils/transform");
 const sharedTypes = require("../utils/directorySharedTypes");
 const muggle = require("muggle-string");
-function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htmlGen, compilerOptions, vueCompilerOptions, sharedTypesImport, codegenStack) {
+function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htmlGen, compilerOptions, vueCompilerOptions, codegenStack) {
     const [codes, codeStacks] = codegenStack ? muggle.track([]) : [[], []];
     const mirrorBehaviorMappings = [];
     //#region monkey fix: https://github.com/vuejs/language-tools/pull/2113
@@ -528,13 +528,13 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
             // fill $props
             if (scriptSetupRanges.propsTypeArg) {
                 // NOTE: defineProps is inaccurate for $props
-                codes.push(`$props: (await import('${sharedTypesImport}')).makeOptional(defineProps<`);
+                codes.push(`$props: __VLS_makeOptional(defineProps<`);
                 addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.propsTypeArg.start, scriptSetupRanges.propsTypeArg.end);
                 codes.push(`>()),\n`);
             }
             else if (scriptSetupRanges.propsRuntimeArg) {
                 // NOTE: defineProps is inaccurate for $props
-                codes.push(`$props: (await import('${sharedTypesImport}')).makeOptional(defineProps(`);
+                codes.push(`$props: __VLS_makeOptional(defineProps(`);
                 addExtraReferenceVirtualCode('scriptSetup', scriptSetupRanges.propsRuntimeArg.start, scriptSetupRanges.propsRuntimeArg.end);
                 codes.push(`)),\n`);
             }
@@ -714,15 +714,15 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
         const useGlobalThisTypeInCtx = fileName.endsWith('.html');
         codes.push(`let __VLS_ctx!: ${useGlobalThisTypeInCtx ? 'typeof globalThis &' : ''}`);
         if (sfc.scriptSetup) {
-            codes.push(`InstanceType<import('${sharedTypesImport}').PickNotAny<typeof __VLS_publicComponent, new () => {}>> & `);
+            codes.push(`InstanceType<__VLS_PickNotAny<typeof __VLS_publicComponent, new () => {}>> & `);
         }
-        codes.push(`InstanceType<import('${sharedTypesImport}').PickNotAny<typeof __VLS_internalComponent, new () => {}>> & {\n`);
+        codes.push(`InstanceType<__VLS_PickNotAny<typeof __VLS_internalComponent, new () => {}>> & {\n`);
         /* CSS Module */
         for (let i = 0; i < _sfc.styles.length; i++) {
             const style = _sfc.styles[i];
             if (!style.module)
                 continue;
-            codes.push(`${style.module}: Record<string, string> & import('${sharedTypesImport}').Prettify<{}`);
+            codes.push(`${style.module}: Record<string, string> & __VLS_Prettify<{}`);
             for (const className of style.classNames) {
                 generateCssClassProperty(i, className.text.substring(1), { start: className.offset, end: className.offset + className.text.length }, 'string', false);
             }
@@ -732,8 +732,8 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
         /* Components */
         codes.push('/* Components */\n');
         codes.push(`let __VLS_localComponents!: NonNullable<typeof __VLS_internalComponent extends { components: infer C } ? C : {}> & typeof __VLS_componentsOption & typeof __VLS_ctx;\n`);
-        codes.push(`let __VLS_otherComponents!: typeof __VLS_localComponents & import('${sharedTypesImport}').GlobalComponents;\n`);
-        codes.push(`let __VLS_own!: import('${sharedTypesImport}').SelfComponent<typeof __VLS_name, typeof __VLS_internalComponent & typeof __VLS_publicComponent & (new () => { ${(0, shared_2.getSlotsPropertyName)(vueCompilerOptions.target)}: typeof __VLS_slots })>;\n`);
+        codes.push(`let __VLS_otherComponents!: typeof __VLS_localComponents & __VLS_GlobalComponents;\n`);
+        codes.push(`let __VLS_own!: __VLS_SelfComponent<typeof __VLS_name, typeof __VLS_internalComponent & typeof __VLS_publicComponent & (new () => { ${(0, shared_2.getSlotsPropertyName)(vueCompilerOptions.target)}: typeof __VLS_slots })>;\n`);
         codes.push(`let __VLS_components!: typeof __VLS_otherComponents & Omit<typeof __VLS_own, keyof typeof __VLS_otherComponents>;\n`);
         /* Style Scoped */
         codes.push('/* Style Scoped */\n');

package/out/generators/template.d.ts

@@ -5,7 +5,7 @@ import type * as ts from 'typescript/lib/tsserverlibrary';
 import { Sfc, VueCompilerOptions } from '../types';
 import * as muggle from 'muggle-string';
 type Code = Segment<FileRangeCapabilities>;
-export declare function generate(ts: typeof import('typescript/lib/tsserverlibrary'), compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions, sourceTemplate: string, sourceLang: string, sfc: Sfc, hasScriptSetupSlots: boolean, sharedTypesImport: string, codegenStack: boolean): {
+export declare function generate(ts: typeof import('typescript/lib/tsserverlibrary'), compilerOptions: ts.CompilerOptions, vueCompilerOptions: VueCompilerOptions, sourceTemplate: string, sourceLang: string, sfc: Sfc, hasScriptSetupSlots: boolean, codegenStack: boolean): {
     codes: Code[];
     codeStacks: muggle.StackNode[];
     formatCodes: Code[];

package/out/generators/template.js

@@ -57,7 +57,7 @@ const transformContext = {
     },
     expressionPlugins: ['typescript'],
 };
-function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourceLang, sfc, hasScriptSetupSlots, sharedTypesImport, codegenStack) {
+function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourceLang, sfc, hasScriptSetupSlots, codegenStack) {
     const [codes, codeStacks] = codegenStack ? muggle.track([]) : [[], []];
     const [formatCodes, formatCodeStacks] = codegenStack ? muggle.track([]) : [[], []];
     const [cssCodes, cssCodeStacks] = codegenStack ? muggle.track([]) : [[], []];
@@ -147,7 +147,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
             if (isNamespacedTag)
                 continue;
             const varName = validTsVar.test(tagName) ? tagName : (0, shared_1.capitalize)((0, shared_1.camelize)(tagName.replace(/:/g, '-')));
-            codes.push(`& import('${sharedTypesImport}').WithComponent<'${varName}', typeof __VLS_components, `, 
+            codes.push(`& __VLS_WithComponent<'${varName}', typeof __VLS_components, `, 
             // order is important: https://github.com/vuejs/language-tools/issues/2010
             `"${(0, shared_1.capitalize)((0, shared_1.camelize)(tagName))}", `, `"${(0, shared_1.camelize)(tagName)}", `, `"${tagName}"`, '>\n');
             data[tagName] = varName;
@@ -353,7 +353,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
             codes.push([leftExpressionText, 'template', leftExpressionRange.start, capabilitiesPresets.all]);
             formatCodes.push(...createFormatCode(leftExpressionText, leftExpressionRange.start, formatBrackets.normal));
         }
-        codes.push(`] of (await import('${sharedTypesImport}')).getVForSourceType`);
+        codes.push(`] of __VLS_getVForSourceType`);
         if (source.type === 4 /* CompilerDOM.NodeTypes.SIMPLE_EXPRESSION */) {
             codes.push('(', ...createInterpolationCode(source.content, source.loc, source.loc.start.offset, capabilitiesPresets.all, '(', ')'), '!)', // #3102
             ') {\n');
@@ -414,7 +414,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         else {
             codes.push(`const ${var_originalComponent} = {} as any;\n`);
         }
-        codes.push(`const ${var_functionalComponent} = (await import('${sharedTypesImport}')).asFunctionalComponent(`, `${var_originalComponent}, `, `new ${var_originalComponent}({`, ...createPropsCode(node, props, 'extraReferences'), '}));\n');
+        codes.push(`const ${var_functionalComponent} = __VLS_asFunctionalComponent(`, `${var_originalComponent}, `, `new ${var_originalComponent}({`, ...createPropsCode(node, props, 'extraReferences'), '}));\n');
         for (const offset of tagOffsets) {
             if (isNamespacedTag) {
                 continue;
@@ -445,10 +445,10 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         // diagnostic end
         tagOffsets.length ? ['', 'template', tagOffsets[0] + tag.length, capabilitiesPresets.diagnosticOnly]
             : dynamicTagExp ? ['', 'template', startTagOffset + tag.length, capabilitiesPresets.diagnosticOnly]
-                : '', `, ...(await import('${sharedTypesImport}')).functionalComponentArgsRest(${var_functionalComponent}));\n`);
+                : '', `, ...__VLS_functionalComponentArgsRest(${var_functionalComponent}));\n`);
         if (tag !== 'template' && tag !== 'slot') {
             componentCtxVar = `__VLS_${elementIndex++}`;
-            codes.push(`const ${componentCtxVar} = (await import('${sharedTypesImport}')).pickFunctionalComponentCtx(${var_originalComponent}, ${var_componentInstance})!;\n`);
+            codes.push(`const ${componentCtxVar} = __VLS_pickFunctionalComponentCtx(${var_originalComponent}, ${var_componentInstance})!;\n`);
             parentEl = node;
         }
         //#region
@@ -466,7 +466,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         let originalConditionsNum = blockConditions.length;
         if (vScope?.type === 7 /* CompilerDOM.NodeTypes.DIRECTIVE */ && vScope.exp) {
             const scopeVar = `__VLS_${elementIndex++}`;
-            const condition = `(await import('${sharedTypesImport}')).withScope(__VLS_ctx, ${scopeVar})`;
+            const condition = `__VLS_withScope(__VLS_ctx, ${scopeVar})`;
             codes.push(`const ${scopeVar} = `);
             codes.push([
                 vScope.exp.loc.source,
@@ -511,7 +511,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                         'template',
                         slotDir.exp.loc.start.offset,
                         capabilitiesPresets.all,
-                    ], `] = (await import('${sharedTypesImport}')).getSlotParams(`);
+                    ], `] = __VLS_getSlotParams(`);
                 }
                 else {
                     codes.push('const ', [
@@ -519,7 +519,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                         'template',
                         slotDir.exp.loc.start.offset,
                         capabilitiesPresets.all,
-                    ], ` = (await import('${sharedTypesImport}')).getSlotParam(`);
+                    ], ` = __VLS_getSlotParam(`);
                 }
             }
             codes.push(['', 'template', (slotDir.arg ?? slotDir).loc.start.offset, capabilitiesPresets.diagnosticOnly], `(${componentCtxVar}.slots!)`, ...((slotDir?.arg?.type === 4 /* CompilerDOM.NodeTypes.SIMPLE_EXPRESSION */ && slotDir.arg.content)
@@ -576,7 +576,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 && prop.name === 'on'
                 && prop.arg?.type === 4 /* CompilerDOM.NodeTypes.SIMPLE_EXPRESSION */) {
                 const eventVar = `__VLS_${elementIndex++}`;
-                codes.push(`let ${eventVar} = { '${prop.arg.loc.source}': `, `(await import('${sharedTypesImport}')).pickEvent(${componentCtxVar}.emit!, '${prop.arg.loc.source}' as const, (await import('${sharedTypesImport}')).componentProps(${componentVar}, ${componentInstanceVar})`, ...createPropertyAccessCode([
+                codes.push(`let ${eventVar} = { '${prop.arg.loc.source}': `, `__VLS_pickEvent(${componentCtxVar}.emit!, '${prop.arg.loc.source}' as const, __VLS_componentProps(${componentVar}, ${componentInstanceVar})`, ...createPropertyAccessCode([
                     (0, shared_1.camelize)('on-' + prop.arg.loc.source),
                     'template',
                     [prop.arg.loc.start.offset, prop.arg.loc.end.offset],
@@ -974,7 +974,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                     'template',
                     prop.loc.start.offset,
                     capabilitiesPresets.diagnosticOnly,
-                ], `(await import('${sharedTypesImport}')).directiveFunction(__VLS_ctx.`, [
+                ], `__VLS_directiveFunction(__VLS_ctx.`, [
                     (0, shared_1.camelize)('v-' + prop.name),
                     'template',
                     [prop.loc.start.offset, prop.loc.start.offset + 'v-'.length + prop.name.length],

package/out/languageModule.js

@@ -32,10 +32,9 @@ function createLanguage(compilerOptions = {}, vueCompilerOptions = (0, ts_1.reso
                     return host.fileExists(fileName);
                 },
                 getScriptFileNames() {
-                    const fileNames = host.getScriptFileNames();
                     return [
-                        ...getSharedTypesFiles(fileNames),
-                        ...fileNames,
+                        path_1.posix.join(host.getCurrentDirectory(), sharedTypes.baseName),
+                        ...host.getScriptFileNames(),
                     ];
                 },
                 getScriptVersion(fileName) {
@@ -56,11 +55,6 @@ function createLanguage(compilerOptions = {}, vueCompilerOptions = (0, ts_1.reso
         },
     };
     return languageModule;
-    function getSharedTypesFiles(fileNames) {
-        const moduleFiles = fileNames.filter(fileName => vueCompilerOptions.extensions.some(ext => fileName.endsWith(ext)));
-        const moduleFileDirs = [...new Set(moduleFiles.map(path_1.posix.dirname))];
-        return moduleFileDirs.map(dir => path_1.posix.join(dir, sharedTypes.baseName));
-    }
 }
 exports.createLanguage = createLanguage;
 function createLanguages(compilerOptions = {}, vueCompilerOptions = (0, ts_1.resolveVueCompilerOptions)({}), ts = require('typescript'), codegenStack = false) {

package/out/plugins/vue-tsx.js

@@ -6,12 +6,10 @@ const templateGen = require("../generators/template");
 const scriptRanges_1 = require("../parsers/scriptRanges");
 const scriptSetupRanges_1 = require("../parsers/scriptSetupRanges");
 const language_core_1 = require("@volar/language-core");
-const sharedTypes = require("../utils/directorySharedTypes");
 const muggle = require("muggle-string");
 const plugin = ({ modules, vueCompilerOptions, compilerOptions, codegenStack }) => {
     const ts = modules.typescript;
     const instances = new WeakMap();
-    const sharedTypesImport = sharedTypes.getImportName(compilerOptions);
     return {
         version: 1,
         getEmbeddedFileNames(fileName, sfc) {
@@ -108,12 +106,12 @@ const plugin = ({ modules, vueCompilerOptions, compilerOptions, codegenStack })
         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, sharedTypesImport, codegenStack);
+            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, sharedTypesImport, codegenStack);
+            return (0, script_1.generate)(ts, fileName, _sfc, lang.value, scriptRanges.value, scriptSetupRanges.value, htmlGen.value, compilerOptions, vueCompilerOptions, codegenStack);
         });
         return {
             lang,

package/out/utils/directorySharedTypes.d.ts

@@ -1,6 +1,4 @@
 import { VueCompilerOptions } from '../types';
-import type * as ts from 'typescript/lib/tsserverlibrary';
 export declare const baseName = "__VLS_types.d.ts";
-export declare function getImportName(compilerOptions: ts.CompilerOptions): "./__VLS_types" | "./__VLS_types.js";
 export declare function getTypesCode(vueCompilerOptions: VueCompilerOptions): string;
 export declare function genConstructorOverloads(name?: string, nums?: number): string;

package/out/utils/directorySharedTypes.js

@@ -1,42 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genConstructorOverloads = exports.getTypesCode = exports.getImportName = exports.baseName = void 0;
+exports.genConstructorOverloads = exports.getTypesCode = exports.baseName = void 0;
 const shared_1 = require("./shared");
 exports.baseName = '__VLS_types.d.ts';
-function getImportName(compilerOptions) {
-    if (!compilerOptions.module || compilerOptions.module === 1) {
-        return './__VLS_types';
-    }
-    return './__VLS_types.js';
-}
-exports.getImportName = getImportName;
-;
 function getTypesCode(vueCompilerOptions) {
     return `
 // @ts-nocheck
-import type {
-	ObjectDirective,
-	FunctionDirective,
-	VNode,
-} from '${vueCompilerOptions.lib}';
 
-export type IntrinsicElements = PickNotAny<import('vue/jsx-runtime').JSX.IntrinsicElements, PickNotAny<JSX.IntrinsicElements, Record<string, any>>>;
-export type Element = PickNotAny<import('vue/jsx-runtime').JSX.Element, JSX.Element>;
+type __VLS_IntrinsicElements = __VLS_PickNotAny<import('vue/jsx-runtime').JSX.IntrinsicElements, __VLS_PickNotAny<JSX.IntrinsicElements, Record<string, any>>>;
+type __VLS_Element = __VLS_PickNotAny<import('vue/jsx-runtime').JSX.Element, JSX.Element>;
 
-type IsAny<T> = boolean extends (T extends never ? true : false) ? true : false;
-export type PickNotAny<A, B> = IsAny<A> extends true ? B : A;
+type __VLS_IsAny<T> = boolean extends (T extends never ? true : false) ? true : false;
+type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
 
-export type Prettify<T> = {
+type __VLS_Prettify<T> = {
 	[K in keyof T]: T[K];
 } & {};
 
-export type GlobalComponents =
+type __VLS_GlobalComponents =
 	// @ts-ignore
-	PickNotAny<import('vue').GlobalComponents, {}>
+	__VLS_PickNotAny<import('vue').GlobalComponents, {}>
 	// @ts-ignore
-	& PickNotAny<import('@vue/runtime-core').GlobalComponents, {}>
+	& __VLS_PickNotAny<import('@vue/runtime-core').GlobalComponents, {}>
 	// @ts-ignore
-	& PickNotAny<import('@vue/runtime-dom').GlobalComponents, {}>
+	& __VLS_PickNotAny<import('@vue/runtime-dom').GlobalComponents, {}>
 	& Pick<typeof import('${vueCompilerOptions.lib}'),
 		// @ts-ignore
 		'Transition'
@@ -47,44 +34,44 @@ export type GlobalComponents =
 	>;
 
 // v-for
-export declare function getVForSourceType(source: number): [number, number, number][];
-export declare function getVForSourceType(source: string): [string, number, number][];
-export declare function getVForSourceType<T extends any[]>(source: T): [
+declare function __VLS_getVForSourceType(source: number): [number, number, number][];
+declare function __VLS_getVForSourceType(source: string): [string, number, number][];
+declare function __VLS_getVForSourceType<T extends any[]>(source: T): [
 	T[number], // item
 	number, // key
 	number, // index
 ][];
-export declare function getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
+declare function __VLS_getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
 	T extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never, // item 
 	number, // key
 	undefined, // index
 ][];
-export declare function getVForSourceType<T>(source: T): [
+declare function __VLS_getVForSourceType<T>(source: T): [
 	T[keyof T], // item
 	keyof T, // key
 	number, // index
 ][];
 
-export declare function getSlotParams<T>(slot: T): Parameters<PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
-export declare function getSlotParam<T>(slot: T): Parameters<PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
-export declare function directiveFunction<T>(dir: T):
-	T extends ObjectDirective<infer E, infer V> | FunctionDirective<infer E, infer V> ? (el: E, value: V) => void
+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;
-export declare function withScope<T, K>(ctx: T, scope: K): ctx is T & K;
-export declare function makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
+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] };
 
-export type SelfComponent<N, C> = string extends N ? {} : N extends string ? { [P in N]: C } : {};
-export type WithComponent<N0 extends string, Components, N1 extends string, N2 extends string, N3 extends string> =
-	IsAny<IntrinsicElements[N0]> extends true ? (
+type __VLS_SelfComponent<N, C> = string extends N ? {} : N extends string ? { [P in N]: C } : {};
+type __VLS_WithComponent<N0 extends string, Components, N1 extends string, N2 extends string, N3 extends string> =
+	__VLS_IsAny<__VLS_IntrinsicElements[N0]> extends true ? (
 		N1 extends keyof Components ? N1 extends N0 ? Pick<Components, N0> : { [K in N0]: Components[N1] } :
 		N2 extends keyof Components ? N2 extends N0 ? Pick<Components, N0> : { [K in N0]: Components[N2] } :
 		N3 extends keyof Components ? N3 extends N0 ? Pick<Components, N0> : { [K in N0]: Components[N3] } :
 		${vueCompilerOptions.strictTemplates ? '{}' : '{ [K in N0]: any }'}
-	) : Pick<IntrinsicElements, N0>;
+	) : Pick<__VLS_IntrinsicElements, N0>;
 
-export type FillingEventArg_ParametersLength<E extends (...args: any) => any> = IsAny<Parameters<E>> extends true ? -1 : Parameters<E>['length'];
-export type FillingEventArg<E> = E extends (...args: any) => any ? FillingEventArg_ParametersLength<E> extends 0 ? ($event?: undefined) => ReturnType<E> : E : E;
-export type EmitEvent<F, E> =
+type __VLS_FillingEventArg_ParametersLength<E extends (...args: any) => any> = __VLS_IsAny<Parameters<E>> extends true ? -1 : Parameters<E>['length'];
+type __VLS_FillingEventArg<E> = E extends (...args: any) => any ? __VLS_FillingEventArg_ParametersLength<E> extends 0 ? ($event?: undefined) => ReturnType<E> : E : E;
+type __VLS_EmitEvent<F, E> =
 	F extends {
 		(event: E, ...payload: infer P): any
 	} ? (...payload: P) => void
@@ -104,7 +91,7 @@ export type EmitEvent<F, E> =
 		(...args: any): any
 	} ? (...payload: P) => void
 	: unknown | '[Type Warning] Volar could not infer $emit event more than 4 overloads without DefineComponent. see https://github.com/vuejs/language-tools/issues/60';
-export declare function asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
+declare function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
 	T extends new (...args: any) => any
 	? (props: (K extends { $props: infer Props } ? Props : any)${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: {
 		attrs?: any,
@@ -113,22 +100,22 @@ export declare function asFunctionalComponent<T, K = T extends new (...args: any
 	}) => JSX.Element & { __ctx?: typeof ctx & { props?: typeof props; expose?(exposed: K): void; } }
 	: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
 	: T extends (...args: any) => any ? T
-	: (_: T extends VNode | VNode[] | string ? {}: T & Record<string, unknown>, ctx?: any) => { __ctx?: { attrs?: unknown, expose?: unknown, slots?: unknown, emit?: unknown, props?: T & Record<string, unknown> } }; // IntrinsicElement
-declare function functionalComponentArgsRest<T extends (...args: any) => any>(t: T): Parameters<T>['length'] extends 2 ? [any] : [];
-export declare function pickEvent<Emit, K, E>(emit: Emit, emitKey: K, event: E): FillingEventArg<
-	PickNotAny<
-		AsFunctionOrAny<E>,
-		AsFunctionOrAny<EmitEvent<Emit, K>>
+	: (_: T extends import('${vueCompilerOptions.lib}').VNode | import('${vueCompilerOptions.lib}').VNode[] | string ? {}: T & Record<string, unknown>, ctx?: any) => { __ctx?: { attrs?: unknown, expose?: unknown, slots?: unknown, emit?: unknown, props?: T & Record<string, unknown> } }; // IntrinsicElement
+declare function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): Parameters<T>['length'] extends 2 ? [any] : [];
+declare function __VLS_pickEvent<Emit, K, E>(emit: Emit, emitKey: K, event: E): __VLS_FillingEventArg<
+	__VLS_PickNotAny<
+		__VLS_AsFunctionOrAny<E>,
+		__VLS_AsFunctionOrAny<__VLS_EmitEvent<Emit, K>>
 	>
 >;
-export declare function pickFunctionalComponentCtx<T, K>(comp: T, compInstance: K): PickNotAny<
+declare function __VLS_pickFunctionalComponentCtx<T, K>(comp: T, compInstance: K): __VLS_PickNotAny<
 	K extends { __ctx?: infer Ctx } ? Ctx : any,
 	T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
 >;
-type AsFunctionOrAny<F> = unknown extends F ? any : ((...args: any) => any) extends F ? F : any;
+type __VLS_AsFunctionOrAny<F> = unknown extends F ? any : ((...args: any) => any) extends F ? F : any;
 
-export declare function componentProps<T, K>(comp: T, fnReturn: K):
-	PickNotAny<K, {}> extends { __ctx: { props: infer P } } ? NonNullable<P>
+declare function __VLS_componentProps<T, K>(comp: T, fnReturn: K):
+	__VLS_PickNotAny<K, {}> extends { __ctx: { props: infer P } } ? NonNullable<P>
 	: T extends (props: infer P, ...args: any) => any ? NonNullable<P> :
 	{};
 `.trim();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.7.3",
+	"version": "1.7.4",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/vue-language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.6.3",
-		"@volar/source-map": "1.6.3",
+		"@volar/language-core": "1.6.5",
+		"@volar/source-map": "1.6.5",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/reactivity": "^3.3.0",
 		"@vue/shared": "^3.3.0",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "0afe0eb39ed144513faddbfa4fddc667e8864cdf"
+	"gitHead": "30fed93ac21d4d4fbf2351b85ebe65acb1216496"
 }