fix(compiler-sfc): infer TS Extract&Exclude runtime type (#7339)

closes #7337 closes #6252
vuejs · Mar 28, 2023 · 6391daf · 6391daf
1 parent 3a7572c
commit 6391daf
Show file tree

Hide file tree

Showing 3 changed files with 27 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,8 @@ export default /*#__PURE__*/_defineComponent({
  alias: { type: Array, required: true },
  method: { type: Function, required: true },
  symbol: { type: Symbol, required: true },
+ extract: { type: Number, required: true },
+ exclude: { type: [Number, Boolean], required: true },
  objectOrFn: { type: [Function, Object], required: true },
  union: { type: [String, Number], required: true },
  literalUnion: { type: String, required: true },

diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -960,6 +960,8 @@ const emit = defineEmits(['a', 'b'])
  alias: Alias
  method(): void
  symbol: symbol
+ extract: Extract<1 | 2 | boolean, 2>
+ exclude: Exclude<1 | 2 | boolean, 2>
  objectOrFn: {
  (): void
  foo: string
@@ -997,6 +999,10 @@ const emit = defineEmits(['a', 'b'])
  expect(content).toMatch(
  `objectOrFn: { type: [Function, Object], required: true },`
  )
+ expect(content).toMatch(`extract: { type: Number, required: true }`)
+ expect(content).toMatch(
+ `exclude: { type: [Number, Boolean], required: true }`
+ )
  expect(content).toMatch(
  `union: { type: [String, Number], required: true }`
  )
@@ -1031,6 +1037,8 @@ const emit = defineEmits(['a', 'b'])
  method: BindingTypes.PROPS,
  symbol: BindingTypes.PROPS,
  objectOrFn: BindingTypes.PROPS,
+ extract: BindingTypes.PROPS,
+ exclude: 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
@@ -2057,11 +2057,26 @@ function inferRuntimeType(
  case 'Readonly':
  case 'Pick':
  case 'Omit':
- case 'Exclude':
- case 'Extract':
  case 'Required':
  case 'InstanceType':
  return ['Object']
+
+ case 'Extract':
+ if (node.typeParameters && node.typeParameters.params[1]) {
+ return inferRuntimeType(
+ node.typeParameters.params[1],
+ declaredTypes
+ )
+ }
+ return ['null']
+ case 'Exclude':
+ if (node.typeParameters && node.typeParameters.params[0]) {
+ return inferRuntimeType(
+ node.typeParameters.params[0],
+ declaredTypes
+ )
+ }
+ return ['null']
  }
  }
  return [`null`]