From 0130918996afac75907937a679615c198425346c Mon Sep 17 00:00:00 2001
From: yangchangtao <yangchangtao@kuaishou.com>
Date: Wed, 21 Aug 2024 16:19:14 +0800
Subject: [PATCH 1/4] fix(compiler-sfc): setup binding has a higher priority
 than data

---
 packages/compiler-sfc/src/script/analyzeScriptBindings.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-sfc/src/script/analyzeScriptBindings.ts b/packages/compiler-sfc/src/script/analyzeScriptBindings.ts
index ae544f640..cbc97dbd2 100644
--- a/packages/compiler-sfc/src/script/analyzeScriptBindings.ts
+++ b/packages/compiler-sfc/src/script/analyzeScriptBindings.ts
@@ -87,10 +87,11 @@ function analyzeBindingsFromOptions(node: ObjectExpression): BindingMetadata {
           bodyItem.argument.type === 'ObjectExpression'
         ) {
           for (const key of getObjectExpressionKeys(bodyItem.argument)) {
-            bindings[key] =
-              property.key.name === 'setup'
+            bindings[key] = !bindings[key]
+              ? property.key.name === 'setup'
                 ? BindingTypes.SETUP_MAYBE_REF
                 : BindingTypes.DATA
+              : BindingTypes.SETUP_MAYBE_REF
           }
         }
       }

From 70b5671fba522e134a27078db77b2ad39b284800 Mon Sep 17 00:00:00 2001
From: yangchangtao <yangchangtao@kuaishou.com>
Date: Wed, 21 Aug 2024 16:24:31 +0800
Subject: [PATCH 2/4] chore: test case

---
 .../__tests__/compileScript.spec.ts           | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index efc5af522..4d4048ec0 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -1121,6 +1121,36 @@ describe('SFC analyze <script> bindings', () => {
     })
   })
 
+  it('recognizes data/setup return', () => {
+    const { bindings } = compile(`
+      <script>
+        const bar = 2
+        const foo = 2
+        const msg = 2
+        const hello = 2
+        export default {
+          setup() {
+            return {
+              foo: 1,
+              hello: numm
+            }
+          },
+          data() {
+            return {
+              foo: null,
+              msg: null
+            }
+          }
+        }
+      </script>
+    `)
+    expect(bindings).toStrictEqual({
+      foo: BindingTypes.SETUP_MAYBE_REF,
+      msg: BindingTypes.DATA,
+      hello: BindingTypes.SETUP_MAYBE_REF,
+    })
+  })
+
   it('recognizes methods', () => {
     const { bindings } = compile(`
       <script>

From 7704d78a34f91dced0cb40953c4b07cb1d00540d Mon Sep 17 00:00:00 2001
From: yangchangtao <yangchangtao@kuaishou.com>
Date: Wed, 21 Aug 2024 16:34:26 +0800
Subject: [PATCH 3/4] chore: update

---
 packages/compiler-sfc/src/script/analyzeScriptBindings.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/compiler-sfc/src/script/analyzeScriptBindings.ts b/packages/compiler-sfc/src/script/analyzeScriptBindings.ts
index cbc97dbd2..adede0911 100644
--- a/packages/compiler-sfc/src/script/analyzeScriptBindings.ts
+++ b/packages/compiler-sfc/src/script/analyzeScriptBindings.ts
@@ -87,11 +87,12 @@ function analyzeBindingsFromOptions(node: ObjectExpression): BindingMetadata {
           bodyItem.argument.type === 'ObjectExpression'
         ) {
           for (const key of getObjectExpressionKeys(bodyItem.argument)) {
-            bindings[key] = !bindings[key]
-              ? property.key.name === 'setup'
+            // use variables in setup first, consistent with runtime
+            if (bindings[key] === BindingTypes.SETUP_MAYBE_REF) continue
+            bindings[key] =
+              property.key.name === 'setup'
                 ? BindingTypes.SETUP_MAYBE_REF
                 : BindingTypes.DATA
-              : BindingTypes.SETUP_MAYBE_REF
           }
         }
       }

From 3e21461ca00b5d0ca50f26509edd7af116e08cc8 Mon Sep 17 00:00:00 2001
From: xieyuschen <xieyuschen@gmail.com>
Date: Wed, 21 Aug 2024 18:01:33 +0800
Subject: [PATCH 4/4] fix(runtime-core): test cases for mixing
 composition/options api

---
 packages/runtime-core/apiMixed.spec.ts | 86 ++++++++++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 packages/runtime-core/apiMixed.spec.ts

diff --git a/packages/runtime-core/apiMixed.spec.ts b/packages/runtime-core/apiMixed.spec.ts
new file mode 100644
index 000000000..3f8267819
--- /dev/null
+++ b/packages/runtime-core/apiMixed.spec.ts
@@ -0,0 +1,86 @@
+import { defineComponent, h, renderToString } from '@vue/runtime-test'
+
+describe('api: options', () => {
+  test('mix api options: setup and data with created', () => {
+    const mixinA = defineComponent({
+      setup() {
+        return {
+          a: 'from setup',
+        }
+      },
+      data() {
+        return {
+          a: 'from data',
+        }
+      },
+      created(this: any) {
+        this.a = 'from created'
+      },
+      render() {
+        return `${this.a}`
+      },
+    })
+    expect(renderToString(h(mixinA))).toBe(`from created`)
+  })
+
+  test('mix api options: data and setup with created', () => {
+    const mixinA = defineComponent({
+      data() {
+        return {
+          a: 'from data',
+        }
+      },
+      setup() {
+        return {
+          a: 'from setup',
+        }
+      },
+      created(this: any) {
+        this.a = 'from created'
+      },
+      render() {
+        return `${this.a}`
+      },
+    })
+    expect(renderToString(h(mixinA))).toBe(`from created`)
+  })
+
+  test('mix api options: data and setup', () => {
+    const mixinA = defineComponent({
+      data() {
+        return {
+          a: 'from data',
+        }
+      },
+      setup() {
+        return {
+          a: 'from setup',
+        }
+      },
+      created(this: any) {},
+      render() {
+        return `${this.a}`
+      },
+    })
+    expect(renderToString(h(mixinA))).toBe(`from setup`)
+  })
+
+  test('mix api options: setup and data', () => {
+    const mixinA = defineComponent({
+      setup() {
+        return {
+          a: 'from setup',
+        }
+      },
+      data() {
+        return {
+          a: 'from data',
+        }
+      },
+      render() {
+        return `${this.a}`
+      },
+    })
+    expect(renderToString(h(mixinA))).toBe(`from setup`)
+  })
+})