@vue/language-core 3.1.1 → 3.1.3

package/lib/codegen/globalTypes.js

@@ -25,17 +25,14 @@ function generateGlobalTypes(options) {
 	const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any };
 	const __VLS_unref: typeof import('${lib}').unref;
 	const __VLS_placeholder: any;
+	const __VLS_intrinsics: ${target >= 3.3
+        ? `import('${lib}/jsx-runtime').JSX.IntrinsicElements`
+        : `globalThis.JSX.IntrinsicElements`};
 
-	type __VLS_NativeElements = __VLS_SpreadMerge<SVGElementTagNameMap, HTMLElementTagNameMap>;
-	type __VLS_IntrinsicElements = ${target >= 3.3
-        ? `import('${lib}/jsx-runtime').JSX.IntrinsicElements;`
-        : `globalThis.JSX.IntrinsicElements;`}
-	type __VLS_Element = ${target >= 3.3
-        ? `import('${lib}/jsx-runtime').JSX.Element;`
-        : `globalThis.JSX.Element;`}
+	type __VLS_Elements = __VLS_SpreadMerge<SVGElementTagNameMap, HTMLElementTagNameMap>;
 	type __VLS_GlobalComponents = ${target >= 3.5
-        ? `import('${lib}').GlobalComponents;`
-        : `import('${lib}').GlobalComponents & Pick<typeof import('${lib}'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>;`}
+        ? `import('${lib}').GlobalComponents`
+        : `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;
@@ -57,7 +54,9 @@ function generateGlobalTypes(options) {
 		? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
 		: T extends (props: infer P, ...args: any) => any ? P
 		: {};
-	type __VLS_FunctionalComponent<T> = (props: ${fnPropsType}, ctx?: any) => __VLS_Element & {
+	type __VLS_FunctionalComponent<T> = (props: ${fnPropsType}, ctx?: any) => ${target >= 3.3
+        ? `import('${lib}/jsx-runtime').JSX.Element`
+        : `globalThis.JSX.Element`} & {
 		__ctx?: {
 			attrs?: any;
 			slots?: T extends { $slots: infer Slots } ? Slots : Record<string, any>;

package/lib/codegen/script/component.js

@@ -91,7 +91,7 @@ function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasE
     if (options.templateCodegen?.inheritedAttrVars.size) {
         let attrsType = `__VLS_InheritedAttrs`;
         if (hasEmitsOption) {
-            attrsType = `Omit<${attrsType}, \`on\${string}\`>`;
+            attrsType = `Omit<${attrsType}, keyof __VLS_EmitProps>`;
         }
         getOptionCodes.push(() => {
             const propsType = `__VLS_PickNotAny<${ctx.localTypes.OmitIndexSignature}<${attrsType}>, {}>`;

package/lib/codegen/script/scriptSetup.js

@@ -65,7 +65,7 @@ function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
             emitTypes.push(`typeof __VLS_modelEmit`);
         }
         yield `return {} as {${utils_1.newLine}`
-            + `	props: ${ctx.localTypes.PrettifyLocal}<${propTypes.join(` & `)}> & ${options.vueCompilerOptions.target >= 3.4
+            + `	props: ${propTypes.length ? `${ctx.localTypes.PrettifyLocal}<${propTypes.join(` & `)}> & ` : ``}${options.vueCompilerOptions.target >= 3.4
                 ? `import('${options.vueCompilerOptions.lib}').PublicProps`
                 : options.vueCompilerOptions.target >= 3
                     ? `import('${options.vueCompilerOptions.lib}').VNodeProps`

package/lib/codegen/script/template.js

@@ -15,7 +15,6 @@ function* generateTemplate(options, ctx) {
     ctx.generatedTemplate = true;
     yield* generateSelf(options);
     yield* generateTemplateCtx(options, ctx);
-    yield* generateTemplateElements();
     yield* generateTemplateComponents(options);
     yield* generateTemplateDirectives(options);
     yield* generateTemplateBody(options, ctx);
@@ -93,9 +92,6 @@ function* generateTemplateCtx(options, ctx) {
     yield* (0, merge_1.generateSpreadMerge)(exps);
     yield utils_1.endOfLine;
 }
-function* generateTemplateElements() {
-    yield `let __VLS_elements!: __VLS_IntrinsicElements${utils_1.endOfLine}`;
-}
 function* generateTemplateComponents(options) {
     const types = [`typeof __VLS_ctx`];
     if (options.sfc.script && options.scriptRanges?.componentOptions?.components) {

package/lib/codegen/template/element.js

@@ -182,10 +182,10 @@ function* generateComponent(options, ctx, node) {
 function* generateElement(options, ctx, node) {
     const [startTagOffset, endTagOffset] = (0, shared_2.getElementTagOffsets)(node, options.template);
     const failedPropExps = [];
-    yield `__VLS_asFunctionalElement(__VLS_elements`;
+    yield `__VLS_asFunctionalElement(__VLS_intrinsics`;
     yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, startTagOffset, codeFeatures_1.codeFeatures.withoutHighlightAndCompletion);
     if (endTagOffset !== undefined) {
-        yield `, __VLS_elements`;
+        yield `, __VLS_intrinsics`;
         yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, node.tag, endTagOffset, codeFeatures_1.codeFeatures.withoutHighlightAndCompletion);
     }
     yield `)(`;
@@ -195,17 +195,17 @@ function* generateElement(options, ctx, node) {
     yield* (0, elementDirectives_1.generateElementDirectives)(options, ctx, node);
     const reference = yield* generateElementReference(options, ctx, node);
     if (reference) {
-        let typeExp = `__VLS_NativeElements['${node.tag}']`;
+        let typeExp = `__VLS_Elements['${node.tag}']`;
         if (ctx.inVFor) {
             typeExp += `[]`;
         }
         ctx.addTemplateRef(reference.name, typeExp, reference.offset);
     }
     if (ctx.singleRootNodes.has(node)) {
-        ctx.singleRootElTypes.push(`__VLS_NativeElements['${node.tag}']`);
+        ctx.singleRootElTypes.push(`__VLS_Elements['${node.tag}']`);
     }
     if (hasVBindAttrs(options, ctx, node)) {
-        ctx.inheritedAttrVars.add(`__VLS_elements.${node.tag}`);
+        ctx.inheritedAttrVars.add(`__VLS_intrinsics.${node.tag}`);
     }
     (0, styleScopedClasses_1.collectStyleScopedClassReferences)(options, ctx, node);
     const { currentComponent } = ctx;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "3.1.1",
+	"version": "3.1.3",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -36,5 +36,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "3ea27dacce47613f49ae83e96e3aa271ee54746e"
+	"gitHead": "0d7edee43568f1d90adae6e8fcda0f7f565b3f6a"
 }