From a63bc220cb9dcf658a136efa017e80fb246e719c Mon Sep 17 00:00:00 2001
From: linzhe141 <1572213544@qq.com>
Date: Wed, 28 Aug 2024 17:06:51 +0800
Subject: [PATCH 01/18] fix(compiler-core): renderExp should not use parameters

---
 packages/compiler-core/src/transforms/vFor.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index ec1c21ff8..554d244ad 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -236,7 +236,7 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
         } else {
           renderExp.arguments.push(
             createFunctionExpression(
-              createForLoopParams(forNode.parseResult),
+              [],
               childBlock,
               true /* force newline */,
             ) as ForIteratorExpression,

From ab0f81d2a626dd9e03a7e39cf0685029d1d1d122 Mon Sep 17 00:00:00 2001
From: linzhe141 <1572213544@qq.com>
Date: Wed, 28 Aug 2024 17:58:31 +0800
Subject: [PATCH 02/18] chore: update

---
 packages/compiler-core/src/errors.ts          |  2 ++
 packages/compiler-core/src/transforms/vFor.ts | 28 +++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-core/src/errors.ts b/packages/compiler-core/src/errors.ts
index 58e113ab1..3aa0b7308 100644
--- a/packages/compiler-core/src/errors.ts
+++ b/packages/compiler-core/src/errors.ts
@@ -77,6 +77,7 @@ export enum ErrorCodes {
   X_V_FOR_NO_EXPRESSION,
   X_V_FOR_MALFORMED_EXPRESSION,
   X_V_FOR_TEMPLATE_KEY_PLACEMENT,
+  X_V_FOR_PARAMS,
   X_V_BIND_NO_EXPRESSION,
   X_V_ON_NO_EXPRESSION,
   X_V_SLOT_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET,
@@ -159,6 +160,7 @@ export const errorMessages: Record<ErrorCodes, string> = {
   [ErrorCodes.X_V_FOR_NO_EXPRESSION]: `v-for is missing expression.`,
   [ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION]: `v-for has invalid expression.`,
   [ErrorCodes.X_V_FOR_TEMPLATE_KEY_PLACEMENT]: `<template v-for> key should be placed on the <template> tag.`,
+  [ErrorCodes.X_V_FOR_PARAMS]: `<template v-for> the parameter name cannot be the same as the current component name.`,
   [ErrorCodes.X_V_BIND_NO_EXPRESSION]: `v-bind is missing expression.`,
   [ErrorCodes.X_V_BIND_INVALID_SAME_NAME_ARGUMENT]: `v-bind with same-name shorthand only allows static argument.`,
   [ErrorCodes.X_V_ON_NO_EXPRESSION]: `v-on is missing expression.`,
diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index 554d244ad..39f44fb72 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -4,7 +4,9 @@ import {
   createStructuralDirectiveTransform,
 } from '../transform'
 import {
+  type BaseElementNode,
   type BlockCodegenNode,
+  type CompoundExpressionNode,
   ConstantTypes,
   type DirectiveNode,
   type ElementNode,
@@ -206,7 +208,29 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
             helper(getVNodeHelper(context.inSSR, childBlock.isComponent))
           }
         }
-
+        if (__DEV__ || !__BROWSER__) {
+          if (
+            (forNode.parseResult.value as SimpleExpressionNode).content ===
+            (forNode.children[0] as BaseElementNode).tag
+          ) {
+            context.onError(
+              createCompilerError(ErrorCodes.X_V_FOR_PARAMS, childBlock.loc),
+            )
+          }
+          const identifiers: CompoundExpressionNode['identifiers'] = (
+            forNode.parseResult.value as CompoundExpressionNode
+          ).identifiers
+          if (
+            identifiers &&
+            identifiers.some(
+              i => i === (forNode.children[0] as BaseElementNode).tag,
+            )
+          ) {
+            context.onError(
+              createCompilerError(ErrorCodes.X_V_FOR_PARAMS, childBlock.loc),
+            )
+          }
+        }
         if (memo) {
           const loop = createFunctionExpression(
             createForLoopParams(forNode.parseResult, [
@@ -236,7 +260,7 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
         } else {
           renderExp.arguments.push(
             createFunctionExpression(
-              [],
+              createForLoopParams(forNode.parseResult),
               childBlock,
               true /* force newline */,
             ) as ForIteratorExpression,

From f4023a2044a39e813e2844227af39c3a9df81872 Mon Sep 17 00:00:00 2001
From: linzhe141 <1572213544@qq.com>
Date: Wed, 28 Aug 2024 18:10:45 +0800
Subject: [PATCH 03/18] chore: update

---
 packages/compiler-core/src/transforms/vFor.ts | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index 39f44fb72..42ee0a326 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -209,22 +209,33 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
           }
         }
         if (__DEV__ || !__BROWSER__) {
+          let currentTag = ''
+          if (forNode.children[0]) {
+            currentTag = (forNode.children[0] as BaseElementNode).tag
+          }
           if (
+            currentTag &&
+            forNode.parseResult.value &&
             (forNode.parseResult.value as SimpleExpressionNode).content ===
-            (forNode.children[0] as BaseElementNode).tag
+              currentTag
           ) {
             context.onError(
               createCompilerError(ErrorCodes.X_V_FOR_PARAMS, childBlock.loc),
             )
           }
-          const identifiers: CompoundExpressionNode['identifiers'] = (
-            forNode.parseResult.value as CompoundExpressionNode
-          ).identifiers
+          let identifiers: CompoundExpressionNode['identifiers'] = []
           if (
+            forNode.parseResult.value &&
+            (forNode.parseResult.value as CompoundExpressionNode).identifiers
+          ) {
+            identifiers = (forNode.parseResult.value as CompoundExpressionNode)
+              .identifiers
+          }
+
+          if (
+            currentTag &&
             identifiers &&
-            identifiers.some(
-              i => i === (forNode.children[0] as BaseElementNode).tag,
-            )
+            identifiers.some(i => i === currentTag)
           ) {
             context.onError(
               createCompilerError(ErrorCodes.X_V_FOR_PARAMS, childBlock.loc),

From 11d4d21004080e7b9b83f4e8e62ac074acc3a11c Mon Sep 17 00:00:00 2001
From: linzhe <linzhe141@qq.com>
Date: Wed, 28 Aug 2024 19:58:47 +0800
Subject: [PATCH 04/18] chore: update

---
 packages/compiler-dom/src/errors.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-dom/src/errors.ts b/packages/compiler-dom/src/errors.ts
index b47624840..5bffa4e53 100644
--- a/packages/compiler-dom/src/errors.ts
+++ b/packages/compiler-dom/src/errors.ts
@@ -21,7 +21,7 @@ export function createDOMCompilerError(
 }
 
 export enum DOMErrorCodes {
-  X_V_HTML_NO_EXPRESSION = 53 /* ErrorCodes.__EXTEND_POINT__ */,
+  X_V_HTML_NO_EXPRESSION = 54 /* ErrorCodes.__EXTEND_POINT__ */,
   X_V_HTML_WITH_CHILDREN,
   X_V_TEXT_NO_EXPRESSION,
   X_V_TEXT_WITH_CHILDREN,

From 2d406c7503bb8c8e2c3874f8ff12c4530f9128f8 Mon Sep 17 00:00:00 2001
From: linzhe <linzhe141@qq.com>
Date: Wed, 28 Aug 2024 20:28:28 +0800
Subject: [PATCH 05/18] chore: update test

---
 .../compiler-core/__tests__/transforms/vFor.spec.ts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/compiler-core/__tests__/transforms/vFor.spec.ts b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
index d0e95fcbc..504302244 100644
--- a/packages/compiler-core/__tests__/transforms/vFor.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
@@ -316,6 +316,19 @@ describe('compiler: v-for', () => {
       )
       expect(onError).toHaveBeenCalledTimes(1)
     })
+
+    test('the parameter name is the same as the current component name', () => {
+      const onError = vi.fn()
+      parseWithForTransform('<Comp v-for="Comp of list" />', {
+        onError: onError,
+      })
+      expect(onError).toHaveBeenCalledTimes(1)
+      expect(onError).toHaveBeenCalledWith(
+        expect.objectContaining({
+          code: ErrorCodes.X_V_FOR_PARAMS,
+        }),
+      )
+    })
   })
 
   describe('source location', () => {

From c61783af69bdcfc348566bc9560ca4981ea8c8c3 Mon Sep 17 00:00:00 2001
From: linzhe <linzhe141@qq.com>
Date: Wed, 28 Aug 2024 20:52:27 +0800
Subject: [PATCH 06/18] chore: update

---
 packages/compiler-core/src/errors.ts          |  2 +-
 packages/compiler-core/src/transforms/vFor.ts | 19 ++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/packages/compiler-core/src/errors.ts b/packages/compiler-core/src/errors.ts
index 3aa0b7308..e0aefb1eb 100644
--- a/packages/compiler-core/src/errors.ts
+++ b/packages/compiler-core/src/errors.ts
@@ -160,7 +160,7 @@ export const errorMessages: Record<ErrorCodes, string> = {
   [ErrorCodes.X_V_FOR_NO_EXPRESSION]: `v-for is missing expression.`,
   [ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION]: `v-for has invalid expression.`,
   [ErrorCodes.X_V_FOR_TEMPLATE_KEY_PLACEMENT]: `<template v-for> key should be placed on the <template> tag.`,
-  [ErrorCodes.X_V_FOR_PARAMS]: `<template v-for> the parameter name cannot be the same as the current component name.`,
+  [ErrorCodes.X_V_FOR_PARAMS]: `<template v-for> the value in binding metadata cannot be used as a parameter.`,
   [ErrorCodes.X_V_BIND_NO_EXPRESSION]: `v-bind is missing expression.`,
   [ErrorCodes.X_V_BIND_INVALID_SAME_NAME_ARGUMENT]: `v-bind with same-name shorthand only allows static argument.`,
   [ErrorCodes.X_V_ON_NO_EXPRESSION]: `v-on is missing expression.`,
diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index 42ee0a326..42af796ba 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -4,7 +4,6 @@ import {
   createStructuralDirectiveTransform,
 } from '../transform'
 import {
-  type BaseElementNode,
   type BlockCodegenNode,
   type CompoundExpressionNode,
   ConstantTypes,
@@ -209,20 +208,18 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
           }
         }
         if (__DEV__ || !__BROWSER__) {
-          let currentTag = ''
-          if (forNode.children[0]) {
-            currentTag = (forNode.children[0] as BaseElementNode).tag
-          }
+          const bindingMetadata = context.bindingMetadata
           if (
-            currentTag &&
             forNode.parseResult.value &&
-            (forNode.parseResult.value as SimpleExpressionNode).content ===
-              currentTag
+            bindingMetadata[
+              (forNode.parseResult.value as SimpleExpressionNode).content
+            ]
           ) {
             context.onError(
               createCompilerError(ErrorCodes.X_V_FOR_PARAMS, childBlock.loc),
             )
           }
+
           let identifiers: CompoundExpressionNode['identifiers'] = []
           if (
             forNode.parseResult.value &&
@@ -232,11 +229,7 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
               .identifiers
           }
 
-          if (
-            currentTag &&
-            identifiers &&
-            identifiers.some(i => i === currentTag)
-          ) {
+          if (identifiers!.some(i => bindingMetadata[i])) {
             context.onError(
               createCompilerError(ErrorCodes.X_V_FOR_PARAMS, childBlock.loc),
             )

From 0a25651439f209fcfd372e1fe6c82aa283236228 Mon Sep 17 00:00:00 2001
From: linzhe <linzhe141@qq.com>
Date: Wed, 28 Aug 2024 20:58:39 +0800
Subject: [PATCH 07/18] chore: update

---
 packages/compiler-core/__tests__/transforms/vFor.spec.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-core/__tests__/transforms/vFor.spec.ts b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
index 504302244..e708a4481 100644
--- a/packages/compiler-core/__tests__/transforms/vFor.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
@@ -16,7 +16,7 @@ import {
   type SimpleExpressionNode,
 } from '../../src/ast'
 import { ErrorCodes } from '../../src/errors'
-import { type CompilerOptions, generate } from '../../src'
+import { BindingTypes, type CompilerOptions, generate } from '../../src'
 import { FRAGMENT, RENDER_LIST, RENDER_SLOT } from '../../src/runtimeHelpers'
 import { PatchFlags } from '@vue/shared'
 import { createObjectMatcher } from '../testUtils'
@@ -317,10 +317,13 @@ describe('compiler: v-for', () => {
       expect(onError).toHaveBeenCalledTimes(1)
     })
 
-    test('the parameter name is the same as the current component name', () => {
+    test('the value in binding metadata cannot be used as a parameter.', () => {
       const onError = vi.fn()
       parseWithForTransform('<Comp v-for="Comp of list" />', {
         onError: onError,
+        bindingMetadata: {
+          Comp: BindingTypes.SETUP_CONST,
+        },
       })
       expect(onError).toHaveBeenCalledTimes(1)
       expect(onError).toHaveBeenCalledWith(

From 966b490be368eef20a55bc9e0587cc958d4f69e2 Mon Sep 17 00:00:00 2001
From: linzhe141 <1572213544@qq.com>
Date: Thu, 29 Aug 2024 10:56:04 +0800
Subject: [PATCH 08/18] chore: update

---
 packages/compiler-core/src/errors.ts          |  2 +-
 packages/compiler-core/src/transforms/vFor.ts | 28 +++++++++++++++----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/packages/compiler-core/src/errors.ts b/packages/compiler-core/src/errors.ts
index e0aefb1eb..1566b6ecc 100644
--- a/packages/compiler-core/src/errors.ts
+++ b/packages/compiler-core/src/errors.ts
@@ -160,7 +160,7 @@ export const errorMessages: Record<ErrorCodes, string> = {
   [ErrorCodes.X_V_FOR_NO_EXPRESSION]: `v-for is missing expression.`,
   [ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION]: `v-for has invalid expression.`,
   [ErrorCodes.X_V_FOR_TEMPLATE_KEY_PLACEMENT]: `<template v-for> key should be placed on the <template> tag.`,
-  [ErrorCodes.X_V_FOR_PARAMS]: `<template v-for> the value in binding metadata cannot be used as a parameter.`,
+  [ErrorCodes.X_V_FOR_PARAMS]: `<template v-for> the parameter name cannot be the same as the component name.`,
   [ErrorCodes.X_V_BIND_NO_EXPRESSION]: `v-bind is missing expression.`,
   [ErrorCodes.X_V_BIND_INVALID_SAME_NAME_ARGUMENT]: `v-bind with same-name shorthand only allows static argument.`,
   [ErrorCodes.X_V_ON_NO_EXPRESSION]: `v-on is missing expression.`,
diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index 42af796ba..da6d11b4c 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -20,6 +20,7 @@ import {
   type RenderSlotCall,
   type SimpleExpressionNode,
   type SlotOutletNode,
+  type TemplateChildNode,
   type VNodeCall,
   createBlockStatement,
   createCallExpression,
@@ -208,12 +209,12 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
           }
         }
         if (__DEV__ || !__BROWSER__) {
-          const bindingMetadata = context.bindingMetadata
           if (
             forNode.parseResult.value &&
-            bindingMetadata[
-              (forNode.parseResult.value as SimpleExpressionNode).content
-            ]
+            findTag(
+              childBlock as VNodeCall,
+              (forNode.parseResult.value as SimpleExpressionNode).content,
+            )
           ) {
             context.onError(
               createCompilerError(ErrorCodes.X_V_FOR_PARAMS, childBlock.loc),
@@ -229,7 +230,7 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
               .identifiers
           }
 
-          if (identifiers!.some(i => bindingMetadata[i])) {
+          if (identifiers!.some(i => !!findTag(childBlock as VNodeCall, i))) {
             context.onError(
               createCompilerError(ErrorCodes.X_V_FOR_PARAMS, childBlock.loc),
             )
@@ -275,6 +276,23 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
   },
 )
 
+function findTag(
+  node: VNodeCall | ElementNode,
+  name: string,
+): VNodeCall | ElementNode | undefined {
+  if (node.tag === name) return node
+  if (node.children) {
+    const children = node.children as TemplateChildNode[]
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i]
+      if ((child as ElementNode).tag) {
+        const targetTag = findTag(child as ElementNode, name)
+        if (targetTag) return targetTag
+      }
+    }
+  }
+}
+
 // target-agnostic transform used for both Client and SSR
 export function processFor(
   node: ElementNode,

From a87987c23fff673401d5be4594b23ae0e31aa4d8 Mon Sep 17 00:00:00 2001
From: linzhe141 <1572213544@qq.com>
Date: Thu, 29 Aug 2024 11:15:10 +0800
Subject: [PATCH 09/18] chore: update

---
 .../__tests__/transforms/vFor.spec.ts         | 19 +++++++++++++++----
 packages/compiler-core/src/transforms/vFor.ts |  3 ++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/packages/compiler-core/__tests__/transforms/vFor.spec.ts b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
index e708a4481..da8a89eda 100644
--- a/packages/compiler-core/__tests__/transforms/vFor.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
@@ -318,15 +318,26 @@ describe('compiler: v-for', () => {
     })
 
     test('the value in binding metadata cannot be used as a parameter.', () => {
-      const onError = vi.fn()
+      const onError1 = vi.fn()
       parseWithForTransform('<Comp v-for="Comp of list" />', {
-        onError: onError,
+        onError: onError1,
         bindingMetadata: {
           Comp: BindingTypes.SETUP_CONST,
         },
       })
-      expect(onError).toHaveBeenCalledTimes(1)
-      expect(onError).toHaveBeenCalledWith(
+      expect(onError1).toHaveBeenCalledTimes(1)
+      expect(onError1).toHaveBeenCalledWith(
+        expect.objectContaining({
+          code: ErrorCodes.X_V_FOR_PARAMS,
+        }),
+      )
+
+      const onError2 = vi.fn()
+      parseWithForTransform('<Comp v-for="Comp of list" />', {
+        onError: onError2,
+      })
+      expect(onError2).toHaveBeenCalledTimes(1)
+      expect(onError2).toHaveBeenCalledWith(
         expect.objectContaining({
           code: ErrorCodes.X_V_FOR_PARAMS,
         }),
diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index da6d11b4c..0979f17b2 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -280,7 +280,8 @@ function findTag(
   node: VNodeCall | ElementNode,
   name: string,
 ): VNodeCall | ElementNode | undefined {
-  if (node.tag === name) return node
+  if (node.tag === `$setup["${name}"]` || node.tag === `_component_${name}`)
+    return node
   if (node.children) {
     const children = node.children as TemplateChildNode[]
     for (let i = 0; i < children.length; i++) {

From d5c9c13ea1c77914620fb5374c770430a6aececc Mon Sep 17 00:00:00 2001
From: linzhe141 <1572213544@qq.com>
Date: Thu, 29 Aug 2024 11:20:09 +0800
Subject: [PATCH 10/18] chore: update

---
 .../__tests__/transforms/vFor.spec.ts         | 20 ++++++++++++++++++-
 packages/compiler-core/src/transforms/vFor.ts |  6 +++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-core/__tests__/transforms/vFor.spec.ts b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
index da8a89eda..bae78707d 100644
--- a/packages/compiler-core/__tests__/transforms/vFor.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
@@ -317,7 +317,7 @@ describe('compiler: v-for', () => {
       expect(onError).toHaveBeenCalledTimes(1)
     })
 
-    test('the value in binding metadata cannot be used as a parameter.', () => {
+    test('the parameter name cannot be the same as the component name.', () => {
       const onError1 = vi.fn()
       parseWithForTransform('<Comp v-for="Comp of list" />', {
         onError: onError1,
@@ -342,6 +342,24 @@ describe('compiler: v-for', () => {
           code: ErrorCodes.X_V_FOR_PARAMS,
         }),
       )
+
+      const onError3 = vi.fn()
+      parseWithForTransform(
+        `<div v-for="Comp of list">
+    <div>
+      <Comp>{{ Comp }}</Comp>
+    </div>
+  </div>`,
+        {
+          onError: onError3,
+        },
+      )
+      expect(onError3).toHaveBeenCalledTimes(1)
+      expect(onError3).toHaveBeenCalledWith(
+        expect.objectContaining({
+          code: ErrorCodes.X_V_FOR_PARAMS,
+        }),
+      )
     })
   })
 
diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index 0979f17b2..0aca6ae3e 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -280,7 +280,11 @@ function findTag(
   node: VNodeCall | ElementNode,
   name: string,
 ): VNodeCall | ElementNode | undefined {
-  if (node.tag === `$setup["${name}"]` || node.tag === `_component_${name}`)
+  if (
+    node.tag === name ||
+    node.tag === `$setup["${name}"]` ||
+    node.tag === `_component_${name}`
+  )
     return node
   if (node.children) {
     const children = node.children as TemplateChildNode[]

From d4a872770b15aa6909d54758aa5c3043a613040a Mon Sep 17 00:00:00 2001
From: linzhe141 <1572213544@qq.com>
Date: Thu, 29 Aug 2024 11:38:20 +0800
Subject: [PATCH 11/18] chore: update

---
 packages/compiler-core/src/transforms/vFor.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index 0aca6ae3e..bc3722772 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -217,7 +217,10 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
             )
           ) {
             context.onError(
-              createCompilerError(ErrorCodes.X_V_FOR_PARAMS, childBlock.loc),
+              createCompilerError(
+                ErrorCodes.X_V_FOR_PARAMS,
+                forNode.parseResult.value.loc,
+              ),
             )
           }
 
@@ -232,7 +235,10 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
 
           if (identifiers!.some(i => !!findTag(childBlock as VNodeCall, i))) {
             context.onError(
-              createCompilerError(ErrorCodes.X_V_FOR_PARAMS, childBlock.loc),
+              createCompilerError(
+                ErrorCodes.X_V_FOR_PARAMS,
+                forNode.parseResult.value!.loc,
+              ),
             )
           }
         }

From 2b7efb3bc1ba7eca7327fccb426c105db8712c3a Mon Sep 17 00:00:00 2001
From: linzhe141 <1572213544@qq.com>
Date: Thu, 29 Aug 2024 17:46:12 +0800
Subject: [PATCH 12/18] chore: update

---
 .../__tests__/transforms/vFor.spec.ts         |  8 ++--
 .../__tests__/transforms/vSlot.spec.ts        | 39 +++++++++++++++++++
 packages/compiler-core/src/errors.ts          |  4 +-
 packages/compiler-core/src/transforms/vFor.ts | 29 +++-----------
 .../compiler-core/src/transforms/vSlot.ts     | 25 ++++++++++++
 packages/compiler-core/src/utils.ts           | 22 +++++++++++
 6 files changed, 97 insertions(+), 30 deletions(-)

diff --git a/packages/compiler-core/__tests__/transforms/vFor.spec.ts b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
index bae78707d..11be60e33 100644
--- a/packages/compiler-core/__tests__/transforms/vFor.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
@@ -317,7 +317,7 @@ describe('compiler: v-for', () => {
       expect(onError).toHaveBeenCalledTimes(1)
     })
 
-    test('the parameter name cannot be the same as the component name.', () => {
+    test('v-for + the parameter name cannot be the same as the component name.', () => {
       const onError1 = vi.fn()
       parseWithForTransform('<Comp v-for="Comp of list" />', {
         onError: onError1,
@@ -328,7 +328,7 @@ describe('compiler: v-for', () => {
       expect(onError1).toHaveBeenCalledTimes(1)
       expect(onError1).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_V_FOR_PARAMS,
+          code: ErrorCodes.X_DIRECTIVE_PARAMS,
         }),
       )
 
@@ -339,7 +339,7 @@ describe('compiler: v-for', () => {
       expect(onError2).toHaveBeenCalledTimes(1)
       expect(onError2).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_V_FOR_PARAMS,
+          code: ErrorCodes.X_DIRECTIVE_PARAMS,
         }),
       )
 
@@ -357,7 +357,7 @@ describe('compiler: v-for', () => {
       expect(onError3).toHaveBeenCalledTimes(1)
       expect(onError3).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_V_FOR_PARAMS,
+          code: ErrorCodes.X_DIRECTIVE_PARAMS,
         }),
       )
     })
diff --git a/packages/compiler-core/__tests__/transforms/vSlot.spec.ts b/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
index 4766c2ca9..687c5c376 100644
--- a/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
@@ -928,6 +928,45 @@ describe('compiler: transform component slots', () => {
         },
       })
     })
+
+    test('v-slot + the parameter name cannot be the same as the component name.', () => {
+      const onError1 = vi.fn()
+      parseWithSlots(
+        `<CompB>
+          <template #default="Comp">
+            <Comp>{{Comp1}}</Comp>
+          </template>
+        </CompB>`,
+        {
+          onError: onError1,
+        },
+      )
+      expect(onError1).toHaveBeenCalledTimes(1)
+      expect(onError1).toHaveBeenCalledWith(
+        expect.objectContaining({
+          code: ErrorCodes.X_DIRECTIVE_PARAMS,
+        }),
+      )
+
+      const onError2 = vi.fn()
+      parseWithSlots(
+        `<CompB>
+          <template #default="{ Comp }">
+            <Comp>{{Comp1}}</Comp>
+          </template>
+        </CompB>`,
+        {
+          onError: onError2,
+          prefixIdentifiers: true,
+        },
+      )
+      expect(onError2).toHaveBeenCalledTimes(1)
+      expect(onError2).toHaveBeenCalledWith(
+        expect.objectContaining({
+          code: ErrorCodes.X_DIRECTIVE_PARAMS,
+        }),
+      )
+    })
   })
 
   describe(`with whitespace: 'preserve'`, () => {
diff --git a/packages/compiler-core/src/errors.ts b/packages/compiler-core/src/errors.ts
index 1566b6ecc..8ae170dd8 100644
--- a/packages/compiler-core/src/errors.ts
+++ b/packages/compiler-core/src/errors.ts
@@ -69,6 +69,7 @@ export enum ErrorCodes {
   X_MISSING_INTERPOLATION_END,
   X_MISSING_DIRECTIVE_NAME,
   X_MISSING_DYNAMIC_DIRECTIVE_ARGUMENT_END,
+  X_DIRECTIVE_PARAMS,
 
   // transform errors
   X_V_IF_NO_EXPRESSION,
@@ -77,7 +78,6 @@ export enum ErrorCodes {
   X_V_FOR_NO_EXPRESSION,
   X_V_FOR_MALFORMED_EXPRESSION,
   X_V_FOR_TEMPLATE_KEY_PLACEMENT,
-  X_V_FOR_PARAMS,
   X_V_BIND_NO_EXPRESSION,
   X_V_ON_NO_EXPRESSION,
   X_V_SLOT_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET,
@@ -152,6 +152,7 @@ export const errorMessages: Record<ErrorCodes, string> = {
     'End bracket for dynamic directive argument was not found. ' +
     'Note that dynamic directive argument cannot contain spaces.',
   [ErrorCodes.X_MISSING_DIRECTIVE_NAME]: 'Legal directive name was expected.',
+  [ErrorCodes.X_DIRECTIVE_PARAMS]: `the parameter name cannot be the same as the component name.`,
 
   // transform errors
   [ErrorCodes.X_V_IF_NO_EXPRESSION]: `v-if/v-else-if is missing expression.`,
@@ -160,7 +161,6 @@ export const errorMessages: Record<ErrorCodes, string> = {
   [ErrorCodes.X_V_FOR_NO_EXPRESSION]: `v-for is missing expression.`,
   [ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION]: `v-for has invalid expression.`,
   [ErrorCodes.X_V_FOR_TEMPLATE_KEY_PLACEMENT]: `<template v-for> key should be placed on the <template> tag.`,
-  [ErrorCodes.X_V_FOR_PARAMS]: `<template v-for> the parameter name cannot be the same as the component name.`,
   [ErrorCodes.X_V_BIND_NO_EXPRESSION]: `v-bind is missing expression.`,
   [ErrorCodes.X_V_BIND_INVALID_SAME_NAME_ARGUMENT]: `v-bind with same-name shorthand only allows static argument.`,
   [ErrorCodes.X_V_ON_NO_EXPRESSION]: `v-on is missing expression.`,
diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index bc3722772..b28629458 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -37,6 +37,7 @@ import { ErrorCodes, createCompilerError } from '../errors'
 import {
   findDir,
   findProp,
+  findTag,
   injectProp,
   isSlotOutlet,
   isTemplateNode,
@@ -208,6 +209,7 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
             helper(getVNodeHelper(context.inSSR, childBlock.isComponent))
           }
         }
+
         if (__DEV__ || !__BROWSER__) {
           if (
             forNode.parseResult.value &&
@@ -218,7 +220,7 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
           ) {
             context.onError(
               createCompilerError(
-                ErrorCodes.X_V_FOR_PARAMS,
+                ErrorCodes.X_DIRECTIVE_PARAMS,
                 forNode.parseResult.value.loc,
               ),
             )
@@ -236,12 +238,13 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
           if (identifiers!.some(i => !!findTag(childBlock as VNodeCall, i))) {
             context.onError(
               createCompilerError(
-                ErrorCodes.X_V_FOR_PARAMS,
+                ErrorCodes.X_DIRECTIVE_PARAMS,
                 forNode.parseResult.value!.loc,
               ),
             )
           }
         }
+
         if (memo) {
           const loop = createFunctionExpression(
             createForLoopParams(forNode.parseResult, [
@@ -282,28 +285,6 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
   },
 )
 
-function findTag(
-  node: VNodeCall | ElementNode,
-  name: string,
-): VNodeCall | ElementNode | undefined {
-  if (
-    node.tag === name ||
-    node.tag === `$setup["${name}"]` ||
-    node.tag === `_component_${name}`
-  )
-    return node
-  if (node.children) {
-    const children = node.children as TemplateChildNode[]
-    for (let i = 0; i < children.length; i++) {
-      const child = children[i]
-      if ((child as ElementNode).tag) {
-        const targetTag = findTag(child as ElementNode, name)
-        if (targetTag) return targetTag
-      }
-    }
-  }
-}
-
 // target-agnostic transform used for both Client and SSR
 export function processFor(
   node: ElementNode,
diff --git a/packages/compiler-core/src/transforms/vSlot.ts b/packages/compiler-core/src/transforms/vSlot.ts
index db367f39c..858f6ee88 100644
--- a/packages/compiler-core/src/transforms/vSlot.ts
+++ b/packages/compiler-core/src/transforms/vSlot.ts
@@ -1,5 +1,6 @@
 import {
   type CallExpression,
+  type CompoundExpressionNode,
   type ConditionalExpression,
   type DirectiveNode,
   type ElementNode,
@@ -9,6 +10,7 @@ import {
   NodeTypes,
   type ObjectExpression,
   type Property,
+  type SimpleExpressionNode,
   type SlotsExpression,
   type SourceLocation,
   type TemplateChildNode,
@@ -25,6 +27,7 @@ import { ErrorCodes, createCompilerError } from '../errors'
 import {
   assert,
   findDir,
+  findTag,
   hasScopeRef,
   isStaticExp,
   isTemplateNode,
@@ -175,6 +178,28 @@ export function buildSlots(
       continue
     }
 
+    if (__DEV__ || !__BROWSER__) {
+      if (
+        slotDir.exp &&
+        (slotDir.exp as SimpleExpressionNode).content &&
+        findTag(slotElement, (slotDir.exp as SimpleExpressionNode).content)
+      ) {
+        context.onError(
+          createCompilerError(ErrorCodes.X_DIRECTIVE_PARAMS, slotDir.exp.loc),
+        )
+      }
+
+      let identifiers: CompoundExpressionNode['identifiers'] = []
+      if (slotDir.exp && (slotDir.exp as CompoundExpressionNode).identifiers) {
+        identifiers = (slotDir.exp as CompoundExpressionNode).identifiers
+      }
+      if (slotDir.exp && identifiers!.some(i => !!findTag(slotElement, i))) {
+        context.onError(
+          createCompilerError(ErrorCodes.X_DIRECTIVE_PARAMS, slotDir.exp.loc),
+        )
+      }
+    }
+
     if (onComponentSlot) {
       // already has on-component slot - this is incorrect usage.
       context.onError(
diff --git a/packages/compiler-core/src/utils.ts b/packages/compiler-core/src/utils.ts
index 5b29a117c..caee296e6 100644
--- a/packages/compiler-core/src/utils.ts
+++ b/packages/compiler-core/src/utils.ts
@@ -564,3 +564,25 @@ export function getMemoedVNodeCall(
 }
 
 export const forAliasRE: RegExp = /([\s\S]*?)\s+(?:in|of)\s+(\S[\s\S]*)/
+
+export function findTag(
+  node: VNodeCall | ElementNode,
+  name: string,
+): VNodeCall | ElementNode | undefined {
+  if (
+    node.tag === name ||
+    node.tag === `$setup["${name}"]` ||
+    node.tag === `_component_${name}`
+  )
+    return node
+  if (node.children) {
+    const children = node.children as TemplateChildNode[]
+    for (let i = 0; i < children.length; i++) {
+      const child = children[i]
+      if ((child as ElementNode).tag) {
+        const targetTag = findTag(child as ElementNode, name)
+        if (targetTag) return targetTag
+      }
+    }
+  }
+}

From ebcada2fb073a75f9722eefc8c338f4069489eaa Mon Sep 17 00:00:00 2001
From: linzhe141 <1572213544@qq.com>
Date: Thu, 29 Aug 2024 17:46:32 +0800
Subject: [PATCH 13/18] chore: update

---
 packages/compiler-core/src/transforms/vFor.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index b28629458..3bb2880c2 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -20,7 +20,6 @@ import {
   type RenderSlotCall,
   type SimpleExpressionNode,
   type SlotOutletNode,
-  type TemplateChildNode,
   type VNodeCall,
   createBlockStatement,
   createCallExpression,

From a88efe71b12124ae3c12bf9986d622a46426c413 Mon Sep 17 00:00:00 2001
From: linzhe <linzhe141@qq.com>
Date: Thu, 29 Aug 2024 19:58:43 +0800
Subject: [PATCH 14/18] chore: update

---
 packages/compiler-core/src/transforms/vFor.ts  | 10 +++++++---
 packages/compiler-core/src/transforms/vSlot.ts | 12 +++++++++---
 packages/compiler-core/src/utils.ts            |  4 ++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index 3bb2880c2..c821ff75a 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -34,9 +34,9 @@ import {
 } from '../ast'
 import { ErrorCodes, createCompilerError } from '../errors'
 import {
+  findComponentTagNode,
   findDir,
   findProp,
-  findTag,
   injectProp,
   isSlotOutlet,
   isTemplateNode,
@@ -212,7 +212,7 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
         if (__DEV__ || !__BROWSER__) {
           if (
             forNode.parseResult.value &&
-            findTag(
+            findComponentTagNode(
               childBlock as VNodeCall,
               (forNode.parseResult.value as SimpleExpressionNode).content,
             )
@@ -234,7 +234,11 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
               .identifiers
           }
 
-          if (identifiers!.some(i => !!findTag(childBlock as VNodeCall, i))) {
+          if (
+            identifiers!.some(
+              i => !!findComponentTagNode(childBlock as VNodeCall, i),
+            )
+          ) {
             context.onError(
               createCompilerError(
                 ErrorCodes.X_DIRECTIVE_PARAMS,
diff --git a/packages/compiler-core/src/transforms/vSlot.ts b/packages/compiler-core/src/transforms/vSlot.ts
index 858f6ee88..17976f0a0 100644
--- a/packages/compiler-core/src/transforms/vSlot.ts
+++ b/packages/compiler-core/src/transforms/vSlot.ts
@@ -26,8 +26,8 @@ import type { NodeTransform, TransformContext } from '../transform'
 import { ErrorCodes, createCompilerError } from '../errors'
 import {
   assert,
+  findComponentTagNode,
   findDir,
-  findTag,
   hasScopeRef,
   isStaticExp,
   isTemplateNode,
@@ -182,7 +182,10 @@ export function buildSlots(
       if (
         slotDir.exp &&
         (slotDir.exp as SimpleExpressionNode).content &&
-        findTag(slotElement, (slotDir.exp as SimpleExpressionNode).content)
+        findComponentTagNode(
+          slotElement,
+          (slotDir.exp as SimpleExpressionNode).content,
+        )
       ) {
         context.onError(
           createCompilerError(ErrorCodes.X_DIRECTIVE_PARAMS, slotDir.exp.loc),
@@ -193,7 +196,10 @@ export function buildSlots(
       if (slotDir.exp && (slotDir.exp as CompoundExpressionNode).identifiers) {
         identifiers = (slotDir.exp as CompoundExpressionNode).identifiers
       }
-      if (slotDir.exp && identifiers!.some(i => !!findTag(slotElement, i))) {
+      if (
+        slotDir.exp &&
+        identifiers!.some(i => !!findComponentTagNode(slotElement, i))
+      ) {
         context.onError(
           createCompilerError(ErrorCodes.X_DIRECTIVE_PARAMS, slotDir.exp.loc),
         )
diff --git a/packages/compiler-core/src/utils.ts b/packages/compiler-core/src/utils.ts
index caee296e6..acdba3c52 100644
--- a/packages/compiler-core/src/utils.ts
+++ b/packages/compiler-core/src/utils.ts
@@ -565,7 +565,7 @@ export function getMemoedVNodeCall(
 
 export const forAliasRE: RegExp = /([\s\S]*?)\s+(?:in|of)\s+(\S[\s\S]*)/
 
-export function findTag(
+export function findComponentTagNode(
   node: VNodeCall | ElementNode,
   name: string,
 ): VNodeCall | ElementNode | undefined {
@@ -580,7 +580,7 @@ export function findTag(
     for (let i = 0; i < children.length; i++) {
       const child = children[i]
       if ((child as ElementNode).tag) {
-        const targetTag = findTag(child as ElementNode, name)
+        const targetTag = findComponentTagNode(child as ElementNode, name)
         if (targetTag) return targetTag
       }
     }

From f3941b7b744a5d1ae21a954d0f586f8670072548 Mon Sep 17 00:00:00 2001
From: linzhe <linzhe141@qq.com>
Date: Thu, 29 Aug 2024 20:01:55 +0800
Subject: [PATCH 15/18] chore: update

---
 packages/compiler-core/src/errors.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-core/src/errors.ts b/packages/compiler-core/src/errors.ts
index 8ae170dd8..a66c247e6 100644
--- a/packages/compiler-core/src/errors.ts
+++ b/packages/compiler-core/src/errors.ts
@@ -152,7 +152,7 @@ export const errorMessages: Record<ErrorCodes, string> = {
     'End bracket for dynamic directive argument was not found. ' +
     'Note that dynamic directive argument cannot contain spaces.',
   [ErrorCodes.X_MISSING_DIRECTIVE_NAME]: 'Legal directive name was expected.',
-  [ErrorCodes.X_DIRECTIVE_PARAMS]: `the parameter name cannot be the same as the component name.`,
+  [ErrorCodes.X_DIRECTIVE_PARAMS]: `avoid using component name as parameter name.`,
 
   // transform errors
   [ErrorCodes.X_V_IF_NO_EXPRESSION]: `v-if/v-else-if is missing expression.`,

From d33866f4be54147570a2b6cb5023510d70f8c39d Mon Sep 17 00:00:00 2001
From: linzhe <linzhe141@qq.com>
Date: Fri, 30 Aug 2024 07:10:17 +0800
Subject: [PATCH 16/18] chore: update

---
 .../__tests__/transforms/vFor.spec.ts         |  6 +--
 .../__tests__/transforms/vSlot.spec.ts        |  4 +-
 packages/compiler-core/src/errors.ts          |  4 +-
 packages/compiler-core/src/transforms/vFor.ts | 44 +++----------------
 .../compiler-core/src/transforms/vSlot.ts     | 30 +------------
 packages/compiler-core/src/utils.ts           | 28 ++++++++++++
 6 files changed, 43 insertions(+), 73 deletions(-)

diff --git a/packages/compiler-core/__tests__/transforms/vFor.spec.ts b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
index 11be60e33..2db6e8356 100644
--- a/packages/compiler-core/__tests__/transforms/vFor.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
@@ -328,7 +328,7 @@ describe('compiler: v-for', () => {
       expect(onError1).toHaveBeenCalledTimes(1)
       expect(onError1).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_DIRECTIVE_PARAMS,
+          code: ErrorCodes.X_DIRECTIVE_PARAMETER_NAME,
         }),
       )
 
@@ -339,7 +339,7 @@ describe('compiler: v-for', () => {
       expect(onError2).toHaveBeenCalledTimes(1)
       expect(onError2).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_DIRECTIVE_PARAMS,
+          code: ErrorCodes.X_DIRECTIVE_PARAMETER_NAME,
         }),
       )
 
@@ -357,7 +357,7 @@ describe('compiler: v-for', () => {
       expect(onError3).toHaveBeenCalledTimes(1)
       expect(onError3).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_DIRECTIVE_PARAMS,
+          code: ErrorCodes.X_DIRECTIVE_PARAMETER_NAME,
         }),
       )
     })
diff --git a/packages/compiler-core/__tests__/transforms/vSlot.spec.ts b/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
index 687c5c376..927648cac 100644
--- a/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
@@ -944,7 +944,7 @@ describe('compiler: transform component slots', () => {
       expect(onError1).toHaveBeenCalledTimes(1)
       expect(onError1).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_DIRECTIVE_PARAMS,
+          code: ErrorCodes.X_DIRECTIVE_PARAMETER_NAME,
         }),
       )
 
@@ -963,7 +963,7 @@ describe('compiler: transform component slots', () => {
       expect(onError2).toHaveBeenCalledTimes(1)
       expect(onError2).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_DIRECTIVE_PARAMS,
+          code: ErrorCodes.X_DIRECTIVE_PARAMETER_NAME,
         }),
       )
     })
diff --git a/packages/compiler-core/src/errors.ts b/packages/compiler-core/src/errors.ts
index a66c247e6..043e2a50a 100644
--- a/packages/compiler-core/src/errors.ts
+++ b/packages/compiler-core/src/errors.ts
@@ -69,7 +69,7 @@ export enum ErrorCodes {
   X_MISSING_INTERPOLATION_END,
   X_MISSING_DIRECTIVE_NAME,
   X_MISSING_DYNAMIC_DIRECTIVE_ARGUMENT_END,
-  X_DIRECTIVE_PARAMS,
+  X_DIRECTIVE_PARAMETER_NAME,
 
   // transform errors
   X_V_IF_NO_EXPRESSION,
@@ -152,7 +152,7 @@ export const errorMessages: Record<ErrorCodes, string> = {
     'End bracket for dynamic directive argument was not found. ' +
     'Note that dynamic directive argument cannot contain spaces.',
   [ErrorCodes.X_MISSING_DIRECTIVE_NAME]: 'Legal directive name was expected.',
-  [ErrorCodes.X_DIRECTIVE_PARAMS]: `avoid using component name as parameter name.`,
+  [ErrorCodes.X_DIRECTIVE_PARAMETER_NAME]: `avoid using component name as parameter name.`,
 
   // transform errors
   [ErrorCodes.X_V_IF_NO_EXPRESSION]: `v-if/v-else-if is missing expression.`,
diff --git a/packages/compiler-core/src/transforms/vFor.ts b/packages/compiler-core/src/transforms/vFor.ts
index c821ff75a..ea21c3cb2 100644
--- a/packages/compiler-core/src/transforms/vFor.ts
+++ b/packages/compiler-core/src/transforms/vFor.ts
@@ -5,7 +5,6 @@ import {
 } from '../transform'
 import {
   type BlockCodegenNode,
-  type CompoundExpressionNode,
   ConstantTypes,
   type DirectiveNode,
   type ElementNode,
@@ -34,7 +33,7 @@ import {
 } from '../ast'
 import { ErrorCodes, createCompilerError } from '../errors'
 import {
-  findComponentTagNode,
+  checkParameterName,
   findDir,
   findProp,
   injectProp,
@@ -210,42 +209,11 @@ export const transformFor: NodeTransform = createStructuralDirectiveTransform(
         }
 
         if (__DEV__ || !__BROWSER__) {
-          if (
-            forNode.parseResult.value &&
-            findComponentTagNode(
-              childBlock as VNodeCall,
-              (forNode.parseResult.value as SimpleExpressionNode).content,
-            )
-          ) {
-            context.onError(
-              createCompilerError(
-                ErrorCodes.X_DIRECTIVE_PARAMS,
-                forNode.parseResult.value.loc,
-              ),
-            )
-          }
-
-          let identifiers: CompoundExpressionNode['identifiers'] = []
-          if (
-            forNode.parseResult.value &&
-            (forNode.parseResult.value as CompoundExpressionNode).identifiers
-          ) {
-            identifiers = (forNode.parseResult.value as CompoundExpressionNode)
-              .identifiers
-          }
-
-          if (
-            identifiers!.some(
-              i => !!findComponentTagNode(childBlock as VNodeCall, i),
-            )
-          ) {
-            context.onError(
-              createCompilerError(
-                ErrorCodes.X_DIRECTIVE_PARAMS,
-                forNode.parseResult.value!.loc,
-              ),
-            )
-          }
+          checkParameterName(
+            forNode.parseResult.value,
+            childBlock as VNodeCall,
+            context,
+          )
         }
 
         if (memo) {
diff --git a/packages/compiler-core/src/transforms/vSlot.ts b/packages/compiler-core/src/transforms/vSlot.ts
index 17976f0a0..0dfea181b 100644
--- a/packages/compiler-core/src/transforms/vSlot.ts
+++ b/packages/compiler-core/src/transforms/vSlot.ts
@@ -1,6 +1,5 @@
 import {
   type CallExpression,
-  type CompoundExpressionNode,
   type ConditionalExpression,
   type DirectiveNode,
   type ElementNode,
@@ -10,7 +9,6 @@ import {
   NodeTypes,
   type ObjectExpression,
   type Property,
-  type SimpleExpressionNode,
   type SlotsExpression,
   type SourceLocation,
   type TemplateChildNode,
@@ -26,7 +24,7 @@ import type { NodeTransform, TransformContext } from '../transform'
 import { ErrorCodes, createCompilerError } from '../errors'
 import {
   assert,
-  findComponentTagNode,
+  checkParameterName,
   findDir,
   hasScopeRef,
   isStaticExp,
@@ -179,31 +177,7 @@ export function buildSlots(
     }
 
     if (__DEV__ || !__BROWSER__) {
-      if (
-        slotDir.exp &&
-        (slotDir.exp as SimpleExpressionNode).content &&
-        findComponentTagNode(
-          slotElement,
-          (slotDir.exp as SimpleExpressionNode).content,
-        )
-      ) {
-        context.onError(
-          createCompilerError(ErrorCodes.X_DIRECTIVE_PARAMS, slotDir.exp.loc),
-        )
-      }
-
-      let identifiers: CompoundExpressionNode['identifiers'] = []
-      if (slotDir.exp && (slotDir.exp as CompoundExpressionNode).identifiers) {
-        identifiers = (slotDir.exp as CompoundExpressionNode).identifiers
-      }
-      if (
-        slotDir.exp &&
-        identifiers!.some(i => !!findComponentTagNode(slotElement, i))
-      ) {
-        context.onError(
-          createCompilerError(ErrorCodes.X_DIRECTIVE_PARAMS, slotDir.exp.loc),
-        )
-      }
+      checkParameterName(slotDir.exp, slotElement, context)
     }
 
     if (onComponentSlot) {
diff --git a/packages/compiler-core/src/utils.ts b/packages/compiler-core/src/utils.ts
index acdba3c52..048821f9d 100644
--- a/packages/compiler-core/src/utils.ts
+++ b/packages/compiler-core/src/utils.ts
@@ -2,6 +2,7 @@ import {
   type BlockCodegenNode,
   type CacheExpression,
   type CallExpression,
+  type CompoundExpressionNode,
   type DirectiveNode,
   type ElementNode,
   ElementTypes,
@@ -42,6 +43,7 @@ import type { PropsExpression } from './transforms/transformElement'
 import { parseExpression } from '@babel/parser'
 import type { Expression, Node } from '@babel/types'
 import { unwrapTSNode } from './babelUtils'
+import { ErrorCodes, createCompilerError } from './errors'
 
 export const isStaticExp = (p: JSChildNode): p is SimpleExpressionNode =>
   p.type === NodeTypes.SIMPLE_EXPRESSION && p.isStatic
@@ -586,3 +588,29 @@ export function findComponentTagNode(
     }
   }
 }
+
+export function checkParameterName(
+  exp: ExpressionNode | undefined,
+  blockNode: VNodeCall | ElementNode,
+  context: TransformContext,
+): void {
+  if (
+    exp &&
+    findComponentTagNode(blockNode, (exp as SimpleExpressionNode).content)
+  ) {
+    context.onError(
+      createCompilerError(ErrorCodes.X_DIRECTIVE_PARAMETER_NAME, exp.loc),
+    )
+  }
+
+  let identifiers: CompoundExpressionNode['identifiers'] = []
+  if (exp && (exp as CompoundExpressionNode).identifiers) {
+    identifiers = (exp as CompoundExpressionNode).identifiers
+  }
+
+  if (identifiers!.some(i => !!findComponentTagNode(blockNode, i))) {
+    context.onError(
+      createCompilerError(ErrorCodes.X_DIRECTIVE_PARAMETER_NAME, exp!.loc),
+    )
+  }
+}

From 6a6eb2a55249a24bc03b81975f33486d25796e20 Mon Sep 17 00:00:00 2001
From: linzhe141 <1572213544@qq.com>
Date: Fri, 30 Aug 2024 10:03:42 +0800
Subject: [PATCH 17/18] chore:  X_DIRECTIVE_PARAMETER_NAME ->
 X_INVALID_PARAMETER_NAME  [ci skip]

---
 packages/compiler-core/__tests__/transforms/vFor.spec.ts  | 6 +++---
 packages/compiler-core/__tests__/transforms/vSlot.spec.ts | 4 ++--
 packages/compiler-core/src/errors.ts                      | 4 ++--
 packages/compiler-core/src/utils.ts                       | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/compiler-core/__tests__/transforms/vFor.spec.ts b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
index 2db6e8356..de46990fd 100644
--- a/packages/compiler-core/__tests__/transforms/vFor.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
@@ -328,7 +328,7 @@ describe('compiler: v-for', () => {
       expect(onError1).toHaveBeenCalledTimes(1)
       expect(onError1).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_DIRECTIVE_PARAMETER_NAME,
+          code: ErrorCodes.X_INVALID_PARAMETER_NAME,
         }),
       )
 
@@ -339,7 +339,7 @@ describe('compiler: v-for', () => {
       expect(onError2).toHaveBeenCalledTimes(1)
       expect(onError2).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_DIRECTIVE_PARAMETER_NAME,
+          code: ErrorCodes.X_INVALID_PARAMETER_NAME,
         }),
       )
 
@@ -357,7 +357,7 @@ describe('compiler: v-for', () => {
       expect(onError3).toHaveBeenCalledTimes(1)
       expect(onError3).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_DIRECTIVE_PARAMETER_NAME,
+          code: ErrorCodes.X_INVALID_PARAMETER_NAME,
         }),
       )
     })
diff --git a/packages/compiler-core/__tests__/transforms/vSlot.spec.ts b/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
index 927648cac..289f55996 100644
--- a/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
@@ -944,7 +944,7 @@ describe('compiler: transform component slots', () => {
       expect(onError1).toHaveBeenCalledTimes(1)
       expect(onError1).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_DIRECTIVE_PARAMETER_NAME,
+          code: ErrorCodes.X_INVALID_PARAMETER_NAME,
         }),
       )
 
@@ -963,7 +963,7 @@ describe('compiler: transform component slots', () => {
       expect(onError2).toHaveBeenCalledTimes(1)
       expect(onError2).toHaveBeenCalledWith(
         expect.objectContaining({
-          code: ErrorCodes.X_DIRECTIVE_PARAMETER_NAME,
+          code: ErrorCodes.X_INVALID_PARAMETER_NAME,
         }),
       )
     })
diff --git a/packages/compiler-core/src/errors.ts b/packages/compiler-core/src/errors.ts
index 043e2a50a..1c60dfe42 100644
--- a/packages/compiler-core/src/errors.ts
+++ b/packages/compiler-core/src/errors.ts
@@ -69,7 +69,7 @@ export enum ErrorCodes {
   X_MISSING_INTERPOLATION_END,
   X_MISSING_DIRECTIVE_NAME,
   X_MISSING_DYNAMIC_DIRECTIVE_ARGUMENT_END,
-  X_DIRECTIVE_PARAMETER_NAME,
+  X_INVALID_PARAMETER_NAME,
 
   // transform errors
   X_V_IF_NO_EXPRESSION,
@@ -152,7 +152,7 @@ export const errorMessages: Record<ErrorCodes, string> = {
     'End bracket for dynamic directive argument was not found. ' +
     'Note that dynamic directive argument cannot contain spaces.',
   [ErrorCodes.X_MISSING_DIRECTIVE_NAME]: 'Legal directive name was expected.',
-  [ErrorCodes.X_DIRECTIVE_PARAMETER_NAME]: `avoid using component name as parameter name.`,
+  [ErrorCodes.X_INVALID_PARAMETER_NAME]: `avoid using component name as parameter name.`,
 
   // transform errors
   [ErrorCodes.X_V_IF_NO_EXPRESSION]: `v-if/v-else-if is missing expression.`,
diff --git a/packages/compiler-core/src/utils.ts b/packages/compiler-core/src/utils.ts
index 048821f9d..56fa76602 100644
--- a/packages/compiler-core/src/utils.ts
+++ b/packages/compiler-core/src/utils.ts
@@ -599,7 +599,7 @@ export function checkParameterName(
     findComponentTagNode(blockNode, (exp as SimpleExpressionNode).content)
   ) {
     context.onError(
-      createCompilerError(ErrorCodes.X_DIRECTIVE_PARAMETER_NAME, exp.loc),
+      createCompilerError(ErrorCodes.X_INVALID_PARAMETER_NAME, exp.loc),
     )
   }
 
@@ -610,7 +610,7 @@ export function checkParameterName(
 
   if (identifiers!.some(i => !!findComponentTagNode(blockNode, i))) {
     context.onError(
-      createCompilerError(ErrorCodes.X_DIRECTIVE_PARAMETER_NAME, exp!.loc),
+      createCompilerError(ErrorCodes.X_INVALID_PARAMETER_NAME, exp!.loc),
     )
   }
 }

From bbea42f522718060b40b5196e3d6c929fca8a9da Mon Sep 17 00:00:00 2001
From: linzhe141 <1572213544@qq.com>
Date: Fri, 30 Aug 2024 10:07:37 +0800
Subject: [PATCH 18/18] chore: update

---
 packages/compiler-core/__tests__/transforms/vFor.spec.ts  | 2 +-
 packages/compiler-core/__tests__/transforms/vSlot.spec.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-core/__tests__/transforms/vFor.spec.ts b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
index de46990fd..b2176679d 100644
--- a/packages/compiler-core/__tests__/transforms/vFor.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vFor.spec.ts
@@ -317,7 +317,7 @@ describe('compiler: v-for', () => {
       expect(onError).toHaveBeenCalledTimes(1)
     })
 
-    test('v-for + the parameter name cannot be the same as the component name.', () => {
+    test('v-for + the parameter name is the same as the component name.', () => {
       const onError1 = vi.fn()
       parseWithForTransform('<Comp v-for="Comp of list" />', {
         onError: onError1,
diff --git a/packages/compiler-core/__tests__/transforms/vSlot.spec.ts b/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
index 289f55996..c02e81686 100644
--- a/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vSlot.spec.ts
@@ -929,7 +929,7 @@ describe('compiler: transform component slots', () => {
       })
     })
 
-    test('v-slot + the parameter name cannot be the same as the component name.', () => {
+    test('v-slot + the parameter name is the same as the component name.', () => {
       const onError1 = vi.fn()
       parseWithSlots(
         `<CompB>