@vue/language-core 1.8.2 → 1.8.4

package/out/generators/script.js

@@ -7,7 +7,7 @@ const shared_1 = require("@vue/shared");
 const path_1 = require("path");
 const shared_2 = require("../utils/shared");
 const transform_1 = require("../utils/transform");
-const sharedTypes = require("../utils/directorySharedTypes");
+const sharedTypes = require("../utils/globalTypes");
 const muggle = require("muggle-string");
 function generate(ts, fileName, _sfc, lang, scriptRanges, scriptSetupRanges, htmlGen, compilerOptions, vueCompilerOptions, codegenStack) {
     const [codes, codeStacks] = codegenStack ? muggle.track([]) : [[], []];
@@ -730,10 +730,10 @@ declare function defineProp<T>(value?: T | (() => T), required?: boolean, rest?:
         codes.push(`};\n`);
         /* 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 & __VLS_GlobalComponents;\n`);
+        codes.push(`let __VLS_otherComponents!: NonNullable<typeof __VLS_internalComponent extends { components: infer C } ? C : {}> & typeof __VLS_componentsOption;\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`);
+        codes.push(`let __VLS_localComponents!: typeof __VLS_otherComponents & Omit<typeof __VLS_own, keyof typeof __VLS_otherComponents>;\n`);
+        codes.push(`let __VLS_components!: typeof __VLS_localComponents & __VLS_GlobalComponents & typeof __VLS_ctx;\n`); // for html completion, TS references...
         /* Style Scoped */
         codes.push('/* Style Scoped */\n');
         codes.push('type __VLS_StyleScopedClasses = {}');

package/out/generators/template.js

@@ -75,7 +75,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
     let ignoreStart;
     let expectedErrorStart;
     let expectedErrorNode;
-    const componentVars = generateComponentVars();
+    generatePreResolveComponents();
     if (sfc.templateAst) {
         visitNode(sfc.templateAst, undefined, undefined, undefined);
     }
@@ -143,31 +143,34 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         }
         codes.push('}\n');
     }
-    function generateComponentVars() {
-        const data = {};
-        codes.push(`let __VLS_templateComponents!: {}\n`);
+    function toCanonicalComponentName(tagText) {
+        return validTsVar.test(tagText) ? tagText : (0, shared_1.capitalize)((0, shared_1.camelize)(tagText.replace(/:/g, '-')));
+    }
+    function getPossibleOriginalComponentName(tagText) {
+        return [...new Set([
+                // order is important: https://github.com/vuejs/language-tools/issues/2010
+                (0, shared_1.capitalize)((0, shared_1.camelize)(tagText)),
+                (0, shared_1.camelize)(tagText),
+                tagText,
+            ])];
+    }
+    function generatePreResolveComponents() {
+        codes.push(`let __VLS_resolvedLocalAndGlobalComponents!: {}\n`);
         for (const tagName in tagNames) {
             if (nativeTags.has(tagName))
                 continue;
             const isNamespacedTag = tagName.indexOf('.') >= 0;
             if (isNamespacedTag)
                 continue;
-            const validName = validTsVar.test(tagName) ? tagName : (0, shared_1.capitalize)((0, shared_1.camelize)(tagName.replace(/:/g, '-')));
-            codes.push(`& __VLS_WithComponent<'${validName}', typeof __VLS_components, `, 
+            codes.push(`& __VLS_WithComponent<'${toCanonicalComponentName(tagName)}', typeof __VLS_localComponents, `, 
             // 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] = validName;
         }
         codes.push(`;\n`);
         for (const tagName in tagNames) {
             const tagOffsets = tagNames[tagName];
             const tagRanges = tagOffsets.map(offset => [offset, offset + tagName.length]);
-            const names = new Set(nativeTags.has(tagName) ? [tagName] : [
-                // 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,
-            ]);
+            const names = nativeTags.has(tagName) ? [tagName] : getPossibleOriginalComponentName(tagName);
             for (const name of names) {
                 for (const tagRange of tagRanges) {
                     codes.push(nativeTags.has(tagName) ? '({} as __VLS_IntrinsicElements)' : '__VLS_components', ...createPropertyAccessCode([
@@ -185,28 +188,30 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 }
             }
             codes.push('\n');
-            const validName = data[tagName];
-            if (validName) {
-                codes.push('// @ts-ignore\n', // #2304
-                '[');
-                for (const tagRange of tagRanges) {
-                    codes.push([
-                        validName,
-                        'template',
-                        tagRange,
-                        {
-                            completion: {
-                                additional: true,
-                                autoImportOnly: true,
-                            },
+            if (nativeTags.has(tagName))
+                continue;
+            const isNamespacedTag = tagName.indexOf('.') >= 0;
+            if (isNamespacedTag)
+                continue;
+            codes.push('// @ts-ignore\n', // #2304
+            '[');
+            const validName = toCanonicalComponentName(tagName);
+            for (const tagRange of tagRanges) {
+                codes.push([
+                    validName,
+                    'template',
+                    tagRange,
+                    {
+                        completion: {
+                            additional: true,
+                            autoImportOnly: true,
                         },
-                    ]);
-                    codes.push(',');
-                }
-                codes.push(`];\n`);
+                    },
+                ]);
+                codes.push(',');
             }
+            codes.push(`];\n`);
         }
-        return data;
     }
     function collectTagOffsets() {
         const tagOffsetsMap = {};
@@ -492,11 +497,12 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         else if (dynamicTagExp) {
             codes.push(`const ${var_originalComponent} = `, ...createInterpolationCode(dynamicTagExp.loc.source, dynamicTagExp.loc, dynamicTagExp.loc.start.offset, capabilitiesPresets.all, '(', ')'), ';\n');
         }
-        else if (componentVars[tag]) {
-            codes.push(`const ${var_originalComponent} = __VLS_templateComponents['${componentVars[tag]}'];\n`);
-        }
         else {
-            codes.push(`const ${var_originalComponent} = {} as any;\n`);
+            codes.push(`let ${var_originalComponent}!: `);
+            for (const componentName of getPossibleOriginalComponentName(tag)) {
+                codes.push(`'${componentName}' extends keyof typeof __VLS_ctx ? typeof __VLS_ctx${validTsVar.test(componentName) ? `.${componentName}` : `['${componentName}']`} : `);
+            }
+            codes.push(`typeof __VLS_resolvedLocalAndGlobalComponents['${toCanonicalComponentName(tag)}'];\n`);
         }
         codes.push(`const ${var_functionalComponent} = __VLS_asFunctionalComponent(`, `${var_originalComponent}, `);
         if (isIntrinsicElement) {
@@ -507,21 +513,26 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         }
         codes.push(');\n');
         for (const offset of tagOffsets) {
-            if (isNamespacedTag) {
+            if (isNamespacedTag || dynamicTagExp) {
                 continue;
             }
-            else if (dynamicTagExp) {
-                continue;
+            else if (isIntrinsicElement) {
+                codes.push(`({} as __VLS_IntrinsicElements).`);
+                codes.push([
+                    tag,
+                    'template',
+                    [offset, offset + tag.length],
+                    {
+                        ...capabilitiesPresets.tagHover,
+                        ...capabilitiesPresets.diagnosticOnly,
+                    },
+                ], ';\n');
             }
             else {
-                if (isIntrinsicElement) {
-                    codes.push(`({} as __VLS_IntrinsicElements).`);
-                }
-                else {
-                    codes.push(`__VLS_templateComponents.`);
-                }
+                const key = toCanonicalComponentName(tag);
+                codes.push(`({} as { ${key}: typeof ${var_originalComponent} }).`);
                 codes.push([
-                    componentVars[tag] ?? tag,
+                    key,
                     'template',
                     [offset, offset + tag.length],
                     {

package/out/index.d.ts

@@ -7,6 +7,6 @@ export * from './types';
 export * from './utils/ts';
 export * from './utils/parseSfc';
 export * as scriptRanges from './parsers/scriptRanges';
-export * as sharedTypes from './utils/directorySharedTypes';
+export * as sharedTypes from './utils/globalTypes';
 export * from '@volar/language-core';
 export * from '@volar/source-map';

package/out/index.js

@@ -24,7 +24,7 @@ __exportStar(require("./types"), exports);
 __exportStar(require("./utils/ts"), exports);
 __exportStar(require("./utils/parseSfc"), exports);
 exports.scriptRanges = require("./parsers/scriptRanges");
-exports.sharedTypes = require("./utils/directorySharedTypes");
+exports.sharedTypes = require("./utils/globalTypes");
 __exportStar(require("@volar/language-core"), exports);
 __exportStar(require("@volar/source-map"), exports);
 //# sourceMappingURL=index.js.map

package/out/languageModule.js

@@ -4,7 +4,7 @@ exports.createLanguages = exports.createLanguage = void 0;
 const path_1 = require("path");
 const plugins_1 = require("./plugins");
 const sourceFile_1 = require("./sourceFile");
-const sharedTypes = require("./utils/directorySharedTypes");
+const sharedTypes = require("./utils/globalTypes");
 const ts_1 = require("./utils/ts");
 function createLanguage(compilerOptions = {}, _vueCompilerOptions = {}, ts = require('typescript'), codegenStack = false) {
     const vueCompilerOptions = (0, ts_1.resolveVueCompilerOptions)(_vueCompilerOptions);

package/out/utils/globalTypes.d.ts

@@ -0,0 +1,4 @@
+import { VueCompilerOptions } from '../types';
+export declare const baseName = "__VLS_types.d.ts";
+export declare function getTypesCode(vueCompilerOptions: VueCompilerOptions): string;
+export declare function genConstructorOverloads(name?: string, nums?: number): string;

package/out/utils/globalTypes.js

@@ -0,0 +1,153 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.genConstructorOverloads = exports.getTypesCode = exports.baseName = void 0;
+const shared_1 = require("./shared");
+exports.baseName = '__VLS_types.d.ts';
+function getTypesCode(vueCompilerOptions) {
+    return `
+// @ts-nocheck
+
+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 __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
+type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
+
+type __VLS_Prettify<T> = {
+	[K in keyof T]: T[K];
+} & {};
+
+type __VLS_GlobalComponents =
+	__VLS_PickNotAny<import('vue').GlobalComponents, {}>
+	& __VLS_PickNotAny<import('@vue/runtime-core').GlobalComponents, {}>
+	& __VLS_PickNotAny<import('@vue/runtime-dom').GlobalComponents, {}>
+	& Pick<typeof import('${vueCompilerOptions.lib}'),
+		'Transition'
+		| 'TransitionGroup'
+		| 'KeepAlive'
+		| 'Suspense'
+		| 'Teleport'
+	>;
+
+// v-for
+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
+][];
+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
+][];
+declare function __VLS_getVForSourceType<T>(source: T): [
+	T[keyof T], // item
+	keyof T, // key
+	number, // index
+][];
+
+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;
+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] };
+
+type __VLS_SelfComponent<N, C> = string extends N ? {} : N extends string ? { [P in N]: C } : {};
+type __VLS_WithComponent<N0 extends string, LocalComponents, N1 extends string, N2 extends string, N3 extends string> =
+	N1 extends keyof LocalComponents ? N1 extends N0 ? Pick<LocalComponents, N0> : { [K in N0]: LocalComponents[N1] } :
+	N2 extends keyof LocalComponents ? N2 extends N0 ? Pick<LocalComponents, N0> : { [K in N0]: LocalComponents[N2] } :
+	N3 extends keyof LocalComponents ? N3 extends N0 ? Pick<LocalComponents, N0> : { [K in N0]: LocalComponents[N3] } :
+	N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0> : { [K in N0]: __VLS_GlobalComponents[N1] } :
+	N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0> : { [K in N0]: __VLS_GlobalComponents[N2] } :
+	N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0> : { [K in N0]: __VLS_GlobalComponents[N3] } :
+	${vueCompilerOptions.strictTemplates ? '{}' : '{ [K in N0]: unknown }'}
+
+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
+	: F extends {
+		(event: E, ...payload: infer P): any
+		(...args: any): any
+	} ? (...payload: P) => void
+	: F extends {
+		(event: E, ...payload: infer P): any
+		(...args: any): any
+		(...args: any): any
+	} ? (...payload: P) => void
+	: F extends {
+		(event: E, ...payload: infer P): any
+		(...args: any): any
+		(...args: any): any
+		(...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';
+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,
+		slots?: K extends { ${(0, shared_1.getSlotsPropertyName)(vueCompilerOptions.target)}: infer Slots } ? Slots : any,
+		emit?: K extends { $emit: infer Emit } ? Emit : 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 import('${vueCompilerOptions.lib}').VNode | import('${vueCompilerOptions.lib}').VNode[] | string ? {}: T${vueCompilerOptions.strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: T${vueCompilerOptions.strictTemplates ? '' : ' & 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>>
+	>
+> | undefined;
+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 __VLS_AsFunctionOrAny<F> = unknown extends F ? any : ((...args: any) => any) extends F ? F : any;
+
+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();
+}
+exports.getTypesCode = getTypesCode;
+// TODO: not working for overloads > n (n = 8)
+// see: https://github.com/vuejs/language-tools/issues/60
+function genConstructorOverloads(name = 'ConstructorOverloads', nums) {
+    let code = '';
+    code += `type ${name}<T> =\n`;
+    if (nums === undefined) {
+        for (let i = 8; i >= 1; i--) {
+            gen(i);
+        }
+    }
+    else if (nums > 0) {
+        gen(nums);
+    }
+    code += `// 0\n`;
+    code += `{};\n`;
+    return code;
+    function gen(i) {
+        code += `// ${i}\n`;
+        code += `T extends {\n`;
+        for (let j = 1; j <= i; j++) {
+            code += `(event: infer E${j}, ...payload: infer P${j}): void;\n`;
+        }
+        code += `} ? (\n`;
+        for (let j = 1; j <= i; j++) {
+            if (j > 1)
+                code += '& ';
+            code += `(E${j} extends string ? { [K${j} in E${j}]: (...payload: P${j}) => void } : {})\n`;
+        }
+        code += `) :\n`;
+    }
+}
+exports.genConstructorOverloads = genConstructorOverloads;
+//# sourceMappingURL=globalTypes.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.8.2",
+	"version": "1.8.4",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/vue-language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.7.9",
-		"@volar/source-map": "1.7.9",
+		"@volar/language-core": "~1.8.0",
+		"@volar/source-map": "~1.8.0",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/reactivity": "^3.3.0",
 		"@vue/shared": "^3.3.0",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "de0fb3f1be30b495d17e2999aee24fb9ea3e7e0e"
+	"gitHead": "a62aa882911de149ae65f4c28eddfd93e1dee99d"
 }