@vue/language-core 3.3.3 → 3.3.5

package/lib/codegen/names.d.ts

@@ -56,7 +56,6 @@ declare const raw: {
     FunctionalComponentProps: string;
     IsAny: string;
     IsFunction: string;
-    NormalizeComponentEvent: string;
     NormalizeEmits: string;
     OverloadUnion: string;
     OverloadUnionInner: string;
@@ -64,6 +63,7 @@ declare const raw: {
     PrettifyGlobal: string;
     ResolveDirectives: string;
     ResolveEmits: string;
+    ResolveEvent: string;
     ShortEmits: string;
     ShortEmitsToObject: string;
     SpreadMerge: string;

package/lib/codegen/names.js

@@ -60,7 +60,6 @@ const raw = {
     FunctionalComponentProps: '',
     IsAny: '',
     IsFunction: '',
-    NormalizeComponentEvent: '',
     NormalizeEmits: '',
     OverloadUnion: '',
     OverloadUnionInner: '',
@@ -68,6 +67,7 @@ const raw = {
     PrettifyGlobal: '',
     ResolveDirectives: '',
     ResolveEmits: '',
+    ResolveEvent: '',
     ShortEmits: '',
     ShortEmitsToObject: '',
     SpreadMerge: '',

package/lib/codegen/template/element.js

@@ -219,9 +219,14 @@ function* generateComponent(options, ctx, node) {
         }
     }
     if (shouldInheritAttrs) {
-        const restsVar = ctx.getInternalVariable();
-        yield `var ${restsVar} = ${names_1.names.omit}(${getPropsVar()}, {\n${propsStr}})${utils_1.endOfLine}`;
-        ctx.inheritedAttrVars.add(restsVar);
+        if (options.vueCompilerOptions.checkRequiredFallthroughAttributes) {
+            const restsVar = ctx.getInternalVariable();
+            yield `var ${restsVar} = ${names_1.names.omit}(${getPropsVar()}, {\n${propsStr}})${utils_1.endOfLine}`;
+            ctx.inheritedAttrVars.add(restsVar);
+        }
+        else {
+            ctx.inheritedAttrVars.add(getPropsVar());
+        }
     }
     yield* generateStyleScopedClassReferences(options, node);
     const slotDir = node.props.find(CompilerDOM.isVSlot);

package/lib/codegen/template/elementEvents.js

@@ -47,7 +47,7 @@ const boundary_1 = require("../utils/boundary");
 const camelized_1 = require("../utils/camelized");
 const interpolation_1 = require("./interpolation");
 function* generateElementEvents(options, ctx, node, componentOriginalVar, getCtxVar, getPropsVar) {
-    let emitsVar;
+    const definitions = {};
     for (const prop of node.props) {
         if (prop.type === CompilerDOM.NodeTypes.DIRECTIVE
             && (prop.name === 'on'
@@ -55,12 +55,8 @@ function* generateElementEvents(options, ctx, node, componentOriginalVar, getCtx
                 || options.vueCompilerOptions.strictVModel
                     && prop.name === 'model'
                     && (!prop.arg || prop.arg.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic))) {
-            if (!emitsVar) {
-                emitsVar = ctx.getInternalVariable();
-                yield `let ${emitsVar}!: ${names_1.names.ResolveEmits}<typeof ${componentOriginalVar}, typeof ${getCtxVar()}.emit>${utils_1.endOfLine}`;
-            }
             let source = prop.arg?.loc.source ?? 'model-value';
-            let start = prop.arg?.loc.start.offset;
+            let offset = prop.arg?.loc.start.offset;
             let propPrefix = 'on-';
             let emitPrefix = '';
             if (prop.name === 'model') {
@@ -69,22 +65,46 @@ function* generateElementEvents(options, ctx, node, componentOriginalVar, getCtx
             }
             else if (source.startsWith('vue:')) {
                 source = source.slice('vue:'.length);
-                start = start + 'vue:'.length;
+                offset = offset + 'vue:'.length;
                 propPrefix = 'onVnode-';
                 emitPrefix = 'vnode-';
             }
             const propName = (0, shared_1.camelize)(propPrefix + source);
             const emitName = emitPrefix + source;
-            const camelizedEmitName = (0, shared_1.camelize)(emitName);
-            yield `const ${ctx.getInternalVariable()}: ${names_1.names.NormalizeComponentEvent}<typeof ${getPropsVar()}, typeof ${emitsVar}, '${propName}', '${emitName}', '${camelizedEmitName}'> = (${utils_1.newLine}`;
+            const key = [
+                prop.name,
+                propName,
+                ...prop.modifiers.map(modifier => modifier.content),
+            ].join('+');
+            definitions[key] ??= {
+                propPrefix,
+                emitPrefix,
+                propName,
+                emitName,
+                items: [],
+            };
+            definitions[key].items.push({
+                prop,
+                source,
+                offset,
+            });
+        }
+    }
+    if (!Object.keys(definitions).length) {
+        return;
+    }
+    const emitsVar = ctx.getInternalVariable();
+    yield `let ${emitsVar}!: ${names_1.names.ResolveEmits}<typeof ${componentOriginalVar}, typeof ${getCtxVar()}.emit>${utils_1.endOfLine}`;
+    for (const { propPrefix, emitPrefix, propName, emitName, items } of Object.values(definitions)) {
+        yield `const ${ctx.getInternalVariable()}: ${names_1.names.ResolveEvent}<typeof ${getPropsVar()}, typeof ${emitsVar}, '${propName}', '${emitName}', '${(0, shared_1.camelize)(emitName)}'> = {${utils_1.newLine}`;
+        for (const { prop, source, offset } of items) {
             if (prop.name === 'on') {
-                yield `{ `;
-                yield* generateEventArg(options, source, start, emitPrefix.slice(0, -1), codeFeatures_1.codeFeatures.navigation);
-                yield `: {} as any } as typeof ${emitsVar},${utils_1.newLine}`;
+                yield `/** @type {typeof ${emitsVar}.`;
+                yield* generateEventArg(options, source, offset, emitPrefix.slice(0, -1), codeFeatures_1.codeFeatures.navigation);
+                yield `} */${utils_1.newLine}`;
             }
-            yield `{ `;
             if (prop.name === 'on') {
-                yield* generateEventArg(options, source, start, propPrefix.slice(0, -1));
+                yield* generateEventArg(options, source, offset, propPrefix.slice(0, -1));
                 yield `: `;
                 yield* generateEventExpression(options, ctx, prop);
             }
@@ -92,8 +112,9 @@ function* generateElementEvents(options, ctx, node, componentOriginalVar, getCtx
                 yield `'${propName}': `;
                 yield* generateModelEventExpression(options, ctx, prop);
             }
-            yield `})${utils_1.endOfLine}`;
+            yield `,${utils_1.newLine}`;
         }
+        yield `}${utils_1.endOfLine}`;
     }
 }
 function* generateEventArg(options, name, start, directive = 'on', features) {

package/lib/codegen/template/elementProps.js

@@ -239,7 +239,8 @@ function getShouldCamelize(options, node, prop, propName) {
         || node.tagType === CompilerDOM.ElementTypes.SLOT) && (prop.type !== CompilerDOM.NodeTypes.DIRECTIVE
         || prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic)
         && (0, shared_2.hyphenateAttr)(propName) === propName
-        && !options.vueCompilerOptions.htmlAttributes.some(pattern => (0, picomatch_1.isMatch)(propName, pattern));
+        && (node.tagType === CompilerDOM.ElementTypes.SLOT
+            || !options.vueCompilerOptions.htmlAttributes.some(pattern => (0, picomatch_1.isMatch)(propName, pattern)));
 }
 function getPropsCodeFeatures(checkUnknownProps) {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "3.3.3",
+	"version": "3.3.5",
 	"license": "MIT",
 	"files": [
 		"index.d.ts",
@@ -34,5 +34,5 @@
 		"@volar/typescript": "2.4.28",
 		"@vue/compiler-sfc": "^3.5.0"
 	},
-	"gitHead": "5c41b5f8637c29551e7f3f1e0674606e5963cd0a"
+	"gitHead": "2fe255ca6d5809c93b71ec8185ec14562cff5945"
 }

package/types/template-helpers.d.ts

@@ -54,7 +54,7 @@ declare global {
 			: true
 		: false
 		: false;
-	type __VLS_NormalizeComponentEvent<
+	type __VLS_ResolveEvent<
 		Props,
 		Emits,
 		onEvent extends keyof Props,