From d096f8c2e7cdcf3bb84f8906116395532d8e113d Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Thu, 6 Oct 2022 12:14:59 +0800
Subject: [PATCH 1/7] fix(compiler-core): No access `this` through function
 declaration in <script setup>

---
 .../src/transforms/transformExpression.ts             | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-core/src/transforms/transformExpression.ts b/packages/compiler-core/src/transforms/transformExpression.ts
index e4311ad4f88..fec5f7f0087 100644
--- a/packages/compiler-core/src/transforms/transformExpression.ts
+++ b/packages/compiler-core/src/transforms/transformExpression.ts
@@ -199,7 +199,16 @@ export function processExpression(
     } else {
       if (type && type.startsWith('setup')) {
         // setup bindings in non-inline mode
-        return `$setup.${raw}`
+        if (
+          parent &&
+          parent.type === 'CallExpression' &&
+          (type === BindingTypes.SETUP_LET || type === BindingTypes.SETUP_CONST)
+        ) {
+          // #6822 No access `this` through function declaration in <script setup>
+          return `$setup.${raw}.bind()`
+        } else {
+          return `$setup.${raw}`
+        }
       } else if (type === BindingTypes.PROPS_ALIASED) {
         return `$props['${bindingMetadata.__propsAliases![raw]}']`
       } else if (type) {

From 4d900412b0a1e6d20084491e47ef509fdb3e7d83 Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Thu, 6 Oct 2022 16:31:35 +0800
Subject: [PATCH 2/7] test: add test case

---
 .../__tests__/transforms/transformExpressions.spec.ts | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts b/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
index 4db7aa61903..9ddc4e189b9 100644
--- a/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
@@ -492,6 +492,7 @@ describe('compiler: expression transform', () => {
       props: BindingTypes.PROPS,
       setup: BindingTypes.SETUP_MAYBE_REF,
       setupConst: BindingTypes.SETUP_CONST,
+      setupLet: BindingTypes.SETUP_LET,
       data: BindingTypes.DATA,
       options: BindingTypes.OPTIONS
     }
@@ -531,5 +532,15 @@ describe('compiler: expression transform', () => {
       expect(code).toMatch(`_ctx.options`)
       expect(code).toMatchSnapshot()
     })
+
+    // #6822
+    test('no access this through function declaration', () => {
+      const { code } = compileWithBindingMetadata(
+        `<div @click="setupConst()" @keyup="setupLet()" @keydown="setup()"></div>`
+      )
+      expect(code).toMatch(`$setup.setupConst.bind()`)
+      expect(code).toMatch(`$setup.setupLet.bind()`)
+      expect(code).not.toMatch(`$setup.setup.bind()`)
+    })
   })
 })

From 4314c786bd85fd4e609c5a281747fa341ecde474 Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Thu, 6 Oct 2022 21:10:02 +0800
Subject: [PATCH 3/7] fix(compiler-core): No access `this` through function
 declaration in <script setup>

---
 .../src/transforms/transformExpression.ts          | 14 ++++----------
 packages/compiler-core/src/transforms/vOn.ts       |  6 +++++-
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/packages/compiler-core/src/transforms/transformExpression.ts b/packages/compiler-core/src/transforms/transformExpression.ts
index fec5f7f0087..2eb9e869a04 100644
--- a/packages/compiler-core/src/transforms/transformExpression.ts
+++ b/packages/compiler-core/src/transforms/transformExpression.ts
@@ -199,16 +199,10 @@ export function processExpression(
     } else {
       if (type && type.startsWith('setup')) {
         // setup bindings in non-inline mode
-        if (
-          parent &&
-          parent.type === 'CallExpression' &&
-          (type === BindingTypes.SETUP_LET || type === BindingTypes.SETUP_CONST)
-        ) {
-          // #6822 No access `this` through function declaration in <script setup>
-          return `$setup.${raw}.bind()`
-        } else {
-          return `$setup.${raw}`
-        }
+        // #6822 No access `this` through function declaration in <script setup>
+        return parent && parent.type === 'CallExpression'
+          ? `$setup.${raw}.bind()`
+          : `$setup.${raw}`
       } else if (type === BindingTypes.PROPS_ALIASED) {
         return `$props['${bindingMetadata.__propsAliases![raw]}']`
       } else if (type) {
diff --git a/packages/compiler-core/src/transforms/vOn.ts b/packages/compiler-core/src/transforms/vOn.ts
index ed39ecee12f..c52350cb459 100644
--- a/packages/compiler-core/src/transforms/vOn.ts
+++ b/packages/compiler-core/src/transforms/vOn.ts
@@ -120,7 +120,11 @@ export const transformOn: DirectiveTransform = (
       // avoiding the need to be patched.
       if (shouldCache && isMemberExp) {
         if (exp.type === NodeTypes.SIMPLE_EXPRESSION) {
-          exp.content = `${exp.content} && ${exp.content}(...args)`
+          if (exp.content.startsWith('$setup')) {
+            exp.content = `${exp.content} && ${exp.content}.call(undefined, ...args)`
+          } else {
+            exp.content = `${exp.content} && ${exp.content}(...args)`
+          }
         } else {
           exp.children = [...exp.children, ` && `, ...exp.children, `(...args)`]
         }

From d8488e9202c8392339f54671763d8e5699bf7536 Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Thu, 6 Oct 2022 21:10:26 +0800
Subject: [PATCH 4/7] test: update test case

---
 .../__tests__/transforms/transformExpressions.spec.ts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts b/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
index 9ddc4e189b9..3fc634c258f 100644
--- a/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
@@ -540,7 +540,7 @@ describe('compiler: expression transform', () => {
       )
       expect(code).toMatch(`$setup.setupConst.bind()`)
       expect(code).toMatch(`$setup.setupLet.bind()`)
-      expect(code).not.toMatch(`$setup.setup.bind()`)
+      expect(code).toMatch(`$setup.setup.bind()`)
     })
   })
 })

From 0abab9ccefa48cefaef17a21e7452711d0fc37fb Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Thu, 6 Oct 2022 21:49:42 +0800
Subject: [PATCH 5/7] Empty-Commit


From ff87325f52e65085066406bef37b987b88aa1405 Mon Sep 17 00:00:00 2001
From: Travis <godxiaoji@163.com>
Date: Thu, 6 Oct 2022 22:59:37 +0800
Subject: [PATCH 6/7] test: add test case

---
 .../__tests__/transforms/vOn.spec.ts          | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-core/__tests__/transforms/vOn.spec.ts b/packages/compiler-core/__tests__/transforms/vOn.spec.ts
index 8f943a7491f..b1d7cb38a2d 100644
--- a/packages/compiler-core/__tests__/transforms/vOn.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vOn.spec.ts
@@ -8,7 +8,8 @@ import {
   NodeTypes,
   ObjectExpression,
   transform,
-  VNodeCall
+  VNodeCall,
+  BindingTypes
 } from '../../src'
 import { transformOn } from '../../src/transforms/vOn'
 import { transformElement } from '../../src/transforms/transformElement'
@@ -666,5 +667,30 @@ describe('compiler: transform v-on', () => {
         }
       })
     })
+
+    test('variable function handler ', () => {
+      const { node } = parseWithVOn(`<div v-on:click="foo" />`, {
+        prefixIdentifiers: true,
+        cacheHandlers: true,
+        bindingMetadata: {
+          foo: BindingTypes.SETUP_LET
+        }
+      })
+      const vnodeCall = node.codegenNode as VNodeCall
+      expect(
+        (vnodeCall.props as ObjectExpression).properties[0].value
+      ).toMatchObject({
+        type: NodeTypes.JS_CACHE_EXPRESSION,
+        index: 0,
+        value: {
+          type: NodeTypes.COMPOUND_EXPRESSION,
+          children: [
+            `(...args) => (`,
+            { content: `$setup.foo && $setup.foo.call(undefined, ...args)` },
+            `)`
+          ]
+        }
+      })
+    })
   })
 })

From 6ebd836e33619f4071f738553abd1d71817d03ac Mon Sep 17 00:00:00 2001
From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com>
Date: Tue, 22 Oct 2024 07:29:21 +0000
Subject: [PATCH 7/7] [autofix.ci] apply automated fixes

---
 .../transforms/transformExpressions.spec.ts        |  4 ++--
 .../compiler-core/__tests__/transforms/vOn.spec.ts | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts b/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
index eac08a510af..f57b4c26fed 100644
--- a/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
@@ -662,13 +662,13 @@ describe('compiler: expression transform', () => {
     // #6822
     test('no access this through function declaration', () => {
       const { code } = compileWithBindingMetadata(
-        `<div @click="setupConst()" @keyup="setupLet()" @keydown="setup()"></div>`
+        `<div @click="setupConst()" @keyup="setupLet()" @keydown="setup()"></div>`,
       )
       expect(code).toMatch(`$setup.setupConst.bind()`)
       expect(code).toMatch(`$setup.setupLet.bind()`)
       expect(code).toMatch(`$setup.setup.bind()`)
     })
-    
+
     test('literal const handling', () => {
       const { code } = compileWithBindingMetadata(`<div>{{ literal }}</div>`, {
         inline: true,
diff --git a/packages/compiler-core/__tests__/transforms/vOn.spec.ts b/packages/compiler-core/__tests__/transforms/vOn.spec.ts
index 4c8d3253151..e7e662b516d 100644
--- a/packages/compiler-core/__tests__/transforms/vOn.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/vOn.spec.ts
@@ -1,4 +1,5 @@
 import {
+  BindingTypes,
   type CompilerOptions,
   type ElementNode,
   ErrorCodes,
@@ -9,7 +10,6 @@ import {
   helperNameMap,
   baseParse as parse,
   transform,
-  BindingTypes,
 } from '../../src'
 import { transformFor } from '../../src/transforms/vFor'
 import { transformOn } from '../../src/transforms/vOn'
@@ -767,12 +767,12 @@ describe('compiler: transform v-on', () => {
         prefixIdentifiers: true,
         cacheHandlers: true,
         bindingMetadata: {
-          foo: BindingTypes.SETUP_LET
-        }
+          foo: BindingTypes.SETUP_LET,
+        },
       })
       const vnodeCall = node.codegenNode as VNodeCall
       expect(
-        (vnodeCall.props as ObjectExpression).properties[0].value
+        (vnodeCall.props as ObjectExpression).properties[0].value,
       ).toMatchObject({
         type: NodeTypes.JS_CACHE_EXPRESSION,
         index: 0,
@@ -781,9 +781,9 @@ describe('compiler: transform v-on', () => {
           children: [
             `(...args) => (`,
             { content: `$setup.foo && $setup.foo.call(undefined, ...args)` },
-            `)`
-          ]
-        }
+            `)`,
+          ],
+        },
       })
     })
   })