From: 三咲智子 Kevin Deng <sxzz@sxzz.moe>
Date: Tue, 28 Mar 2023 03:59:21 +0000 (+0800)
Subject: fix(compiler-sfc): infer function prop type from type literal w/ callable signature... 
X-Git-Tag: v3.3.0-alpha.6~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a7572cdb2074c5cac2231e4525296104141411c;p=thirdparty%2Fvuejs%2Fcore.git

fix(compiler-sfc): infer function prop type from type literal w/ callable signature (#7119)
---

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index 4615b20fe7..473ebd4e0b 100644
--- 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
index 27c3e26c42..7616c58f27 100644
--- 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
index 9722174f29..3cca3c2f43 100644
--- 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':