From 2dde5e2ca0ce268e1a4b8e0bd255790e592351d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 17 Apr 2022 18:49:48 +0800
Subject: [PATCH 01/11] feat(compiler-sfc): add defineOptions marco

related RFC: https://github.com/vuejs/rfcs/discussions/430
---
 packages/compiler-sfc/src/compileScript.ts | 51 ++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index b7e4c0ea778..dd08f2c1322 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -62,6 +62,7 @@ const DEFINE_PROPS = 'defineProps'
 const DEFINE_EMITS = 'defineEmits'
 const DEFINE_EXPOSE = 'defineExpose'
 const WITH_DEFAULTS = 'withDefaults'
+const DEFINE_OPTIONS = 'defineOptions'
 
 // constants
 const DEFAULT_VAR = `__default__`
@@ -289,6 +290,7 @@ export function compileScript(
   let hasDefineExposeCall = false
   let hasDefaultExportName = false
   let hasDefaultExportRender = false
+  let hasDefineOptionsCall = false
   let propsRuntimeDecl: Node | undefined
   let propsRuntimeDefaults: ObjectExpression | undefined
   let propsDestructureDecl: Node | undefined
@@ -300,6 +302,7 @@ export function compileScript(
   let emitsTypeDecl: EmitsDeclType | undefined
   let emitsTypeDeclRaw: Node | undefined
   let emitIdentifier: string | undefined
+  let optionsRuntimeDecl: Node | undefined
   let hasAwait = false
   let hasInlinedSsrRenderFn = false
   // props/emits declared via types
@@ -666,6 +669,39 @@ export function compileScript(
     })
   }
 
+  function processDefineOptions(node: Node): boolean {
+    if (!isCallOf(node, DEFINE_OPTIONS)) {
+      return false
+    }
+    if (hasDefineOptionsCall) {
+      error(`duplicate ${DEFINE_OPTIONS}() call`, node)
+    }
+    if (script) {
+      error(`cannot be used, with both script and script-setup`, node)
+    }
+    if (node.typeParameters) {
+      error(`${DEFINE_OPTIONS}() cannot accept type arguments`, node)
+    }
+
+    hasDefineOptionsCall = true
+    optionsRuntimeDecl = node.arguments[0]
+    if (optionsRuntimeDecl.type !== 'ObjectExpression') {
+      error(`${DEFINE_OPTIONS}() argument must be an object`, node)
+    }
+
+    const hasPropOrEmits = optionsRuntimeDecl.properties.some(
+      prop =>
+        (prop.type === 'ObjectProperty' || prop.type === 'ObjectMethod') &&
+        prop.key.type === 'Identifier' &&
+        (prop.key.name === 'props' || prop.key.name === 'emits')
+    )
+    if (hasPropOrEmits) {
+      error(`${DEFINE_OPTIONS}() use defineProps or defineEmits instead.`, node)
+    }
+
+    return true
+  }
+
   function resolveQualifiedType(
     node: Node,
     qualifier: (node: Node) => boolean
@@ -1194,6 +1230,7 @@ export function compileScript(
       if (
         processDefineProps(node.expression) ||
         processDefineEmits(node.expression) ||
+        processDefineOptions(node.expression) ||
         processWithDefaults(node.expression)
       ) {
         s.remove(node.start! + startOffset, node.end! + startOffset)
@@ -1214,6 +1251,14 @@ export function compileScript(
       for (let i = 0; i < total; i++) {
         const decl = node.declarations[i]
         if (decl.init) {
+          if (processDefineOptions(decl.init)) {
+            error(
+              `${DEFINE_OPTIONS}() A has no return value, ` +
+                `it cannot be assigned a value.`,
+              node
+            )
+          }
+
           // defineProps / defineEmits
           const isDefineProps =
             processDefineProps(decl.init, decl.id, node.kind) ||
@@ -1358,6 +1403,7 @@ export function compileScript(
   checkInvalidScopeReference(propsRuntimeDefaults, DEFINE_PROPS)
   checkInvalidScopeReference(propsDestructureDecl, DEFINE_PROPS)
   checkInvalidScopeReference(emitsRuntimeDecl, DEFINE_EMITS)
+  checkInvalidScopeReference(optionsRuntimeDecl, DEFINE_OPTIONS)
 
   // 6. remove non-script content
   if (script) {
@@ -1644,6 +1690,11 @@ export function compileScript(
   } else if (emitsTypeDecl) {
     runtimeOptions += genRuntimeEmits(typeDeclaredEmits)
   }
+  if (optionsRuntimeDecl) {
+    runtimeOptions = `\n  ...${scriptSetup.content
+      .slice(optionsRuntimeDecl.start!, optionsRuntimeDecl.end!)
+      .trim()},${runtimeOptions}`
+  }
 
   // <script setup> components are closed by default. If the user did not
   // explicitly call `defineExpose`, call expose() with no args.

From d9d451cba73175ec9b6f74fcf69d4a1c58431c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 17 Apr 2022 19:16:02 +0800
Subject: [PATCH 02/11] test: add tests

---
 .../__snapshots__/compileScript.spec.ts.snap  |  14 +++
 .../__tests__/compileScript.spec.ts           | 106 ++++++++++++++++++
 packages/compiler-sfc/src/compileScript.ts    |   5 +-
 3 files changed, 124 insertions(+), 1 deletion(-)

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index 649b92d17f0..26e95709f98 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -628,6 +628,20 @@ exports[`SFC compile <script setup> > defineExpose() 1`] = `
 
 expose({ foo: 123 })
 
+return {  }
+}
+
+}"
+`;
+
+exports[`SFC compile <script setup> > defineOptions() > basic usage 1`] = `
+"export default {
+  ...{ name: 'FooApp' },
+  setup(__props, { expose }) {
+  expose();
+
+
+
 return {  }
 }
 
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index 3ea7632f68b..a7af93ecd2d 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -172,6 +172,112 @@ const myEmit = defineEmits(['foo', 'bar'])
     expect(content).toMatch(`emits: ['a'],`)
   })
 
+  describe('defineOptions()', () => {
+    test('basic usage', () => {
+      const { content } = compile(`
+<script setup>
+defineOptions({ name: 'FooApp' })
+</script>
+  `)
+      assertCode(content)
+      // should remove defineOptions import and call
+      expect(content).not.toMatch('defineOptions')
+      // should include context options in default export
+      expect(content).toMatch(`export default {
+  ...{ name: 'FooApp' },`)
+    })
+
+    it('should report an error with two defineProps', () => {
+      expect(() =>
+        compile(`
+        <script setup>
+        defineOptions({ name: 'FooApp' })
+        defineOptions({ name: 'BarApp' })
+        </script>
+        `)
+      ).toThrowError('[@vue/compiler-sfc] duplicate defineOptions() call')
+    })
+
+    it('should report an error with props or emits property', () => {
+      expect(() =>
+        compile(`
+        <script setup>
+        defineOptions({ props: { foo: String } })
+        </script>
+        `)
+      ).toThrowError(
+        '[@vue/compiler-sfc] defineOptions() use defineProps or defineEmits instead.'
+      )
+
+      expect(() =>
+        compile(`
+        <script setup>
+        defineOptions({ emits: ['update'] })
+        </script>
+      `)
+      ).toThrowError(
+        '[@vue/compiler-sfc] defineOptions() use defineProps or defineEmits instead.'
+      )
+    })
+
+    it('should report an error with type generic', () => {
+      expect(() =>
+        compile(`
+        <script setup lang="ts">
+        defineOptions<{ name: 'FooApp' }>()
+        </script>
+        `)
+      ).toThrowError(
+        '[@vue/compiler-sfc] defineOptions() cannot accept type arguments'
+      )
+    })
+
+    it('should report an error with both normal script and script setup', () => {
+      expect(() =>
+        compile(`
+        <script>
+        export default { name: 'FooApp' }
+        </script>
+        <script setup>
+        defineOptions({ name: 'BarApp' })
+        </script>
+        `)
+      ).toThrowError(
+        '[@vue/compiler-sfc] defineOptions() cannot be used, with both script and script-setup'
+      )
+    })
+
+    it('should report an error with a wrong argument', () => {
+      expect(() =>
+        compile(`
+        <script setup>
+        defineOptions('str')
+        </script>
+        `)
+      ).toThrowError(
+        '[@vue/compiler-sfc] defineOptions() argument must be an object'
+      )
+      expect(() =>
+        compile(`
+        <script setup>
+        defineOptions(123)
+        </script>
+        `)
+      ).toThrowError(
+        '[@vue/compiler-sfc] defineOptions() argument must be an object'
+      )
+      expect(() =>
+        compile(`
+        <script setup>
+        defineOptions(true)
+        </script>
+        `)
+      ).toThrowError(
+        '[@vue/compiler-sfc] defineOptions() argument must be an object'
+      )
+    })
+  })
+
   test('defineExpose()', () => {
     const { content } = compile(`
 <script setup>
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index dd08f2c1322..921c3c15b69 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -677,7 +677,10 @@ export function compileScript(
       error(`duplicate ${DEFINE_OPTIONS}() call`, node)
     }
     if (script) {
-      error(`cannot be used, with both script and script-setup`, node)
+      error(
+        `${DEFINE_OPTIONS}() cannot be used, with both script and script-setup`,
+        node
+      )
     }
     if (node.typeParameters) {
       error(`${DEFINE_OPTIONS}() cannot accept type arguments`, node)

From a23402e4b6d9ffaff1c80691de8ad0dec1da1e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sun, 24 Apr 2022 18:37:38 +0800
Subject: [PATCH 03/11] add: typings

---
 packages/runtime-core/src/apiSetupHelpers.ts | 33 ++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/packages/runtime-core/src/apiSetupHelpers.ts b/packages/runtime-core/src/apiSetupHelpers.ts
index 71ac1191a31..981e8d60a6a 100644
--- a/packages/runtime-core/src/apiSetupHelpers.ts
+++ b/packages/runtime-core/src/apiSetupHelpers.ts
@@ -7,6 +7,12 @@ import {
   unsetCurrentInstance
 } from './component'
 import { EmitFn, EmitsOptions } from './componentEmits'
+import {
+  ComponentOptionsMixin,
+  ComponentOptionsWithoutProps,
+  ComputedOptions,
+  MethodOptions
+} from './componentOptions'
 import {
   ComponentPropsOptions,
   ComponentObjectPropsOptions,
@@ -143,6 +149,33 @@ export function defineExpose<
   }
 }
 
+export function defineOptions<
+  RawBindings = {},
+  D = {},
+  C extends ComputedOptions = {},
+  M extends MethodOptions = {},
+  Mixin extends ComponentOptionsMixin = ComponentOptionsMixin,
+  Extends extends ComponentOptionsMixin = ComponentOptionsMixin,
+  E extends EmitsOptions = EmitsOptions,
+  EE extends string = string
+>(
+  options?: ComponentOptionsWithoutProps<
+    {},
+    RawBindings,
+    D,
+    C,
+    M,
+    Mixin,
+    Extends,
+    E,
+    EE
+  > & { emits?: undefined }
+): void {
+  if (__DEV__) {
+    warnRuntimeUsage(`defineOptions`)
+  }
+}
+
 type NotUndefined<T> = T extends undefined ? never : T
 
 type InferDefaults<T> = {

From dce7a2ac008d3d3e90c26fb430ce077192c474a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Mon, 13 Jun 2022 08:18:05 +0800
Subject: [PATCH 04/11] fix: typo

---
 packages/compiler-sfc/__tests__/compileScript.spec.ts | 2 +-
 packages/compiler-sfc/src/compileScript.ts            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index a7af93ecd2d..98b6c51b2d7 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -243,7 +243,7 @@ defineOptions({ name: 'FooApp' })
         </script>
         `)
       ).toThrowError(
-        '[@vue/compiler-sfc] defineOptions() cannot be used, with both script and script-setup'
+        '[@vue/compiler-sfc] defineOptions() cannot be used, with both <script> and <script setup>'
       )
     })
 
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 921c3c15b69..649972bf221 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -678,7 +678,7 @@ export function compileScript(
     }
     if (script) {
       error(
-        `${DEFINE_OPTIONS}() cannot be used, with both script and script-setup`,
+        `${DEFINE_OPTIONS}() cannot be used, with both <script> and <script setup>`,
         node
       )
     }

From d00909014ca9f43188c457355a38b4b074c263cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 27 Aug 2022 16:34:47 +0800
Subject: [PATCH 05/11] refactor: remove some limitations

---
 packages/compiler-sfc/src/compileScript.ts | 23 ++++++++--------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 649972bf221..3ef72a4e631 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -676,28 +676,21 @@ export function compileScript(
     if (hasDefineOptionsCall) {
       error(`duplicate ${DEFINE_OPTIONS}() call`, node)
     }
-    if (script) {
-      error(
-        `${DEFINE_OPTIONS}() cannot be used, with both <script> and <script setup>`,
-        node
-      )
-    }
     if (node.typeParameters) {
       error(`${DEFINE_OPTIONS}() cannot accept type arguments`, node)
     }
 
     hasDefineOptionsCall = true
     optionsRuntimeDecl = node.arguments[0]
-    if (optionsRuntimeDecl.type !== 'ObjectExpression') {
-      error(`${DEFINE_OPTIONS}() argument must be an object`, node)
-    }
 
-    const hasPropOrEmits = optionsRuntimeDecl.properties.some(
-      prop =>
-        (prop.type === 'ObjectProperty' || prop.type === 'ObjectMethod') &&
-        prop.key.type === 'Identifier' &&
-        (prop.key.name === 'props' || prop.key.name === 'emits')
-    )
+    const hasPropOrEmits =
+      optionsRuntimeDecl.type === 'ObjectExpression' &&
+      optionsRuntimeDecl.properties.some(
+        prop =>
+          (prop.type === 'ObjectProperty' || prop.type === 'ObjectMethod') &&
+          prop.key.type === 'Identifier' &&
+          (prop.key.name === 'props' || prop.key.name === 'emits')
+      )
     if (hasPropOrEmits) {
       error(`${DEFINE_OPTIONS}() use defineProps or defineEmits instead.`, node)
     }

From e5eb9fb449f93d763681540a114b83cf9afa170f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 27 Aug 2022 16:43:12 +0800
Subject: [PATCH 06/11] refactor: don't use spread when not TS

---
 .../__snapshots__/compileScript.spec.ts.snap  |  5 +-
 .../__tests__/compileScript.spec.ts           | 50 ++-----------------
 packages/compiler-sfc/src/compileScript.ts    | 18 +++++--
 3 files changed, 18 insertions(+), 55 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index 26e95709f98..2813a0be788 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -635,8 +635,7 @@ return {  }
 `;
 
 exports[`SFC compile <script setup> > defineOptions() > basic usage 1`] = `
-"export default {
-  ...{ name: 'FooApp' },
+"export default /*#__PURE__*/Object.assign({ name: 'FooApp' }, {
   setup(__props, { expose }) {
   expose();
 
@@ -645,7 +644,7 @@ exports[`SFC compile <script setup> > defineOptions() > basic usage 1`] = `
 return {  }
 }
 
-}"
+})"
 `;
 
 exports[`SFC compile <script setup> > defineProps w/ external definition 1`] = `
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index 98b6c51b2d7..ad49195417d 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -183,8 +183,9 @@ defineOptions({ name: 'FooApp' })
       // should remove defineOptions import and call
       expect(content).not.toMatch('defineOptions')
       // should include context options in default export
-      expect(content).toMatch(`export default {
-  ...{ name: 'FooApp' },`)
+      expect(content).toMatch(
+        `export default /*#__PURE__*/Object.assign({ name: 'FooApp' }, `
+      )
     })
 
     it('should report an error with two defineProps', () => {
@@ -231,51 +232,6 @@ defineOptions({ name: 'FooApp' })
         '[@vue/compiler-sfc] defineOptions() cannot accept type arguments'
       )
     })
-
-    it('should report an error with both normal script and script setup', () => {
-      expect(() =>
-        compile(`
-        <script>
-        export default { name: 'FooApp' }
-        </script>
-        <script setup>
-        defineOptions({ name: 'BarApp' })
-        </script>
-        `)
-      ).toThrowError(
-        '[@vue/compiler-sfc] defineOptions() cannot be used, with both <script> and <script setup>'
-      )
-    })
-
-    it('should report an error with a wrong argument', () => {
-      expect(() =>
-        compile(`
-        <script setup>
-        defineOptions('str')
-        </script>
-        `)
-      ).toThrowError(
-        '[@vue/compiler-sfc] defineOptions() argument must be an object'
-      )
-      expect(() =>
-        compile(`
-        <script setup>
-        defineOptions(123)
-        </script>
-        `)
-      ).toThrowError(
-        '[@vue/compiler-sfc] defineOptions() argument must be an object'
-      )
-      expect(() =>
-        compile(`
-        <script setup>
-        defineOptions(true)
-        </script>
-        `)
-      ).toThrowError(
-        '[@vue/compiler-sfc] defineOptions() argument must be an object'
-      )
-    })
   })
 
   test('defineExpose()', () => {
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 3ef72a4e631..7a04925e1fa 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -1686,10 +1686,12 @@ export function compileScript(
   } else if (emitsTypeDecl) {
     runtimeOptions += genRuntimeEmits(typeDeclaredEmits)
   }
+
+  let definedOptions = ''
   if (optionsRuntimeDecl) {
-    runtimeOptions = `\n  ...${scriptSetup.content
+    definedOptions = scriptSetup.content
       .slice(optionsRuntimeDecl.start!, optionsRuntimeDecl.end!)
-      .trim()},${runtimeOptions}`
+      .trim()
   }
 
   // <script setup> components are closed by default. If the user did not
@@ -1703,7 +1705,9 @@ export function compileScript(
     // we have to use object spread for types to be merged properly
     // user's TS setting should compile it down to proper targets
     // export default defineComponent({ ...__default__, ... })
-    const def = defaultExport ? `\n  ...${DEFAULT_VAR},` : ``
+    const def =
+      (defaultExport ? `\n  ...${DEFAULT_VAR},` : ``) +
+      (definedOptions ? `\n  ...${definedOptions},` : '')
     s.prependLeft(
       startOffset,
       `\nexport default /*#__PURE__*/${helper(
@@ -1714,12 +1718,16 @@ export function compileScript(
     )
     s.appendRight(endOffset, `})`)
   } else {
-    if (defaultExport) {
+    if (defaultExport || definedOptions) {
       // without TS, can't rely on rest spread, so we use Object.assign
       // export default Object.assign(__default__, { ... })
       s.prependLeft(
         startOffset,
-        `\nexport default /*#__PURE__*/Object.assign(${DEFAULT_VAR}, {${runtimeOptions}\n  ` +
+        `\nexport default /*#__PURE__*/Object.assign(${
+          defaultExport ? DEFAULT_VAR : ''
+        }${defaultExport && definedOptions ? ', ' : ''}${
+          definedOptions ? definedOptions : ''
+        }, {${runtimeOptions}\n  ` +
           `${hasAwait ? `async ` : ``}setup(${args}) {\n${exposeCall}`
       )
       s.appendRight(endOffset, `})`)

From fd2b05c63141055b0bbdb722aeaf31e14e19aaf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Sat, 27 Aug 2022 21:52:55 +0800
Subject: [PATCH 07/11] refactor: improve

---
 packages/compiler-sfc/src/compileScript.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 7a04925e1fa..83cd2c7aa2b 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -1724,10 +1724,8 @@ export function compileScript(
       s.prependLeft(
         startOffset,
         `\nexport default /*#__PURE__*/Object.assign(${
-          defaultExport ? DEFAULT_VAR : ''
-        }${defaultExport && definedOptions ? ', ' : ''}${
-          definedOptions ? definedOptions : ''
-        }, {${runtimeOptions}\n  ` +
+          defaultExport ? `${DEFAULT_VAR}, ` : ''
+        }${definedOptions ? `${definedOptions}, ` : ''}{${runtimeOptions}\n  ` +
           `${hasAwait ? `async ` : ``}setup(${args}) {\n${exposeCall}`
       )
       s.appendRight(endOffset, `})`)

From 7406e1e39984dc829882522e5e9f9ada7b5fb1ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90?= <sxzz@sxzz.moe>
Date: Fri, 7 Oct 2022 14:50:20 +0800
Subject: [PATCH 08/11] test: rename

---
 packages/compiler-sfc/__tests__/compileScript.spec.ts | 6 +++---
 packages/compiler-sfc/src/compileScript.ts            | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index ad49195417d..d061526096e 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -188,7 +188,7 @@ defineOptions({ name: 'FooApp' })
       )
     })
 
-    it('should report an error with two defineProps', () => {
+    it('should emit an error with two defineProps', () => {
       expect(() =>
         compile(`
         <script setup>
@@ -199,7 +199,7 @@ defineOptions({ name: 'FooApp' })
       ).toThrowError('[@vue/compiler-sfc] duplicate defineOptions() call')
     })
 
-    it('should report an error with props or emits property', () => {
+    it('should emit an error with props or emits property', () => {
       expect(() =>
         compile(`
         <script setup>
@@ -221,7 +221,7 @@ defineOptions({ name: 'FooApp' })
       )
     })
 
-    it('should report an error with type generic', () => {
+    it('should emit an error with type generic', () => {
       expect(() =>
         compile(`
         <script setup lang="ts">
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 83cd2c7aa2b..54bfb37a985 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -1249,8 +1249,7 @@ export function compileScript(
         if (decl.init) {
           if (processDefineOptions(decl.init)) {
             error(
-              `${DEFINE_OPTIONS}() A has no return value, ` +
-                `it cannot be assigned a value.`,
+              `${DEFINE_OPTIONS}() has no returning value, it cannot be assigned.`,
               node
             )
           }

From 7bc330c374ac25dda7a00ce6fe75a211472e3013 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 28 Mar 2023 10:01:35 +0800
Subject: [PATCH 09/11] types: add defineOptions global type

---
 packages/runtime-core/types/scriptSetupHelpers.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/runtime-core/types/scriptSetupHelpers.d.ts b/packages/runtime-core/types/scriptSetupHelpers.d.ts
index 4d168212c54..ba4ca79fc59 100644
--- a/packages/runtime-core/types/scriptSetupHelpers.d.ts
+++ b/packages/runtime-core/types/scriptSetupHelpers.d.ts
@@ -3,11 +3,13 @@
 type _defineProps = typeof defineProps
 type _defineEmits = typeof defineEmits
 type _defineExpose = typeof defineExpose
+type _defineOptions = typeof defineOptions
 type _withDefaults = typeof withDefaults
 
 declare global {
   const defineProps: _defineProps
   const defineEmits: _defineEmits
   const defineExpose: _defineExpose
+  const defineOptions: _defineOptions
   const withDefaults: _withDefaults
 }

From 7251e14f66cc763e1aeebfe55310a8bb6b45c7c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?=
 <sxzz@sxzz.moe>
Date: Tue, 28 Mar 2023 10:39:24 +0800
Subject: [PATCH 10/11] fix: export defineOptions

---
 packages/runtime-core/src/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/runtime-core/src/index.ts b/packages/runtime-core/src/index.ts
index 622f5ecc57e..06f9a2affd4 100644
--- a/packages/runtime-core/src/index.ts
+++ b/packages/runtime-core/src/index.ts
@@ -68,6 +68,7 @@ export {
   defineProps,
   defineEmits,
   defineExpose,
+  defineOptions,
   withDefaults,
   // internal
   mergeDefaults,

From 52bfac2fc030974290ee7a95e6394a8ac575f977 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 28 Mar 2023 10:39:27 +0800
Subject: [PATCH 11/11] feat: improve defineOptions props/emits error message

---
 .../__tests__/compileScript.spec.ts           |  7 ++---
 packages/compiler-sfc/src/compileScript.ts    | 31 ++++++++++++++-----
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index d061526096e..94d622037e1 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -207,7 +207,7 @@ defineOptions({ name: 'FooApp' })
         </script>
         `)
       ).toThrowError(
-        '[@vue/compiler-sfc] defineOptions() use defineProps or defineEmits instead.'
+        '[@vue/compiler-sfc] defineOptions() cannot be used to declare props. Use defineProps() instead.'
       )
 
       expect(() =>
@@ -217,7 +217,7 @@ defineOptions({ name: 'FooApp' })
         </script>
       `)
       ).toThrowError(
-        '[@vue/compiler-sfc] defineOptions() use defineProps or defineEmits instead.'
+        '[@vue/compiler-sfc] defineOptions() cannot be used to declare emits. Use defineEmits() instead.'
       )
     })
 
@@ -1198,7 +1198,7 @@ const emit = defineEmits(['a', 'b'])
       `)
       assertCode(content)
     })
-    
+
     // #7111
     test('withDefaults (static) w/ production mode', () => {
       const { content } = compile(
@@ -1339,7 +1339,6 @@ const emit = defineEmits(['a', 'b'])
       expect(content).toMatch(`emits: ["foo", "bar"]`)
     })
 
-    
     test('defineEmits w/ type from normal script', () => {
       const { content } = compile(`
       <script lang="ts">
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 54bfb37a985..1a8d3fc02af 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -683,16 +683,31 @@ export function compileScript(
     hasDefineOptionsCall = true
     optionsRuntimeDecl = node.arguments[0]
 
-    const hasPropOrEmits =
-      optionsRuntimeDecl.type === 'ObjectExpression' &&
-      optionsRuntimeDecl.properties.some(
-        prop =>
+    let propsOption = undefined
+    let emitsOption = undefined
+    if (optionsRuntimeDecl.type === 'ObjectExpression') {
+      for (const prop of optionsRuntimeDecl.properties) {
+        if (
           (prop.type === 'ObjectProperty' || prop.type === 'ObjectMethod') &&
-          prop.key.type === 'Identifier' &&
-          (prop.key.name === 'props' || prop.key.name === 'emits')
+          prop.key.type === 'Identifier'
+        ) {
+          if (prop.key.name === 'props') propsOption = prop
+          if (prop.key.name === 'emits') emitsOption = prop
+        }
+      }
+    }
+
+    if (propsOption) {
+      error(
+        `${DEFINE_OPTIONS}() cannot be used to declare props. Use ${DEFINE_PROPS}() instead.`,
+        propsOption
+      )
+    }
+    if (emitsOption) {
+      error(
+        `${DEFINE_OPTIONS}() cannot be used to declare emits. Use ${DEFINE_EMITS}() instead.`,
+        emitsOption
       )
-    if (hasPropOrEmits) {
-      error(`${DEFINE_OPTIONS}() use defineProps or defineEmits instead.`, node)
     }
 
     return true