fix(compiler-sfc): infer function prop type from type literal w/ call…

…able signature (#7119)
vuejs · Mar 28, 2023 · 3a7572c · 3a7572c
1 parent 701b95f
commit 3a7572c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -1619,6 +1619,7 @@ export default /*#__PURE__*/_defineComponent({
  alias: { type: Array, required: true },
  method: { type: Function, required: true },
  symbol: { type: Symbol, required: true },
+ objectOrFn: { type: [Function, Object], required: true },
  union: { type: [String, Number], required: true },
  literalUnion: { type: String, required: true },
  literalUnionNumber: { type: Number, required: true },

diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -960,6 +960,10 @@ const emit = defineEmits(['a', 'b'])
  alias: Alias
  method(): void
  symbol: symbol
+ objectOrFn: {
+ (): void
+ foo: string
+ }
 
  union: string | number
  literalUnion: 'foo' | 'bar'
@@ -990,6 +994,9 @@ const emit = defineEmits(['a', 'b'])
  expect(content).toMatch(`alias: { type: Array, required: true }`)
  expect(content).toMatch(`method: { type: Function, required: true }`)
  expect(content).toMatch(`symbol: { type: Symbol, required: true }`)
+ expect(content).toMatch(
+ `objectOrFn: { type: [Function, Object], required: true },`
+ )
  expect(content).toMatch(
  `union: { type: [String, Number], required: true }`
  )
@@ -1023,6 +1030,7 @@ const emit = defineEmits(['a', 'b'])
  alias: BindingTypes.PROPS,
  method: BindingTypes.PROPS,
  symbol: BindingTypes.PROPS,
+ objectOrFn: BindingTypes.PROPS,
  union: BindingTypes.PROPS,
  literalUnion: BindingTypes.PROPS,
  literalUnionNumber: BindingTypes.PROPS,

diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
@@ -2001,9 +2001,21 @@ function inferRuntimeType(
  return ['Boolean']
  case 'TSObjectKeyword':
  return ['Object']
- case 'TSTypeLiteral':
+ case 'TSTypeLiteral': {
  // TODO (nice to have) generate runtime property validation
- return ['Object']
+ const types = new Set<string>()
+ for (const m of node.members) {
+ switch (m.type) {
+ case 'TSCallSignatureDeclaration':
+ case 'TSConstructSignatureDeclaration':
+ types.add('Function')
+ break
+ default:
+ types.add('Object')
+ }
+ }
+ return Array.from(types)
+ }
  case 'TSFunctionType':
  return ['Function']
  case 'TSArrayType':