Skip to content

Commit 0516c43

Browse files
authored
fix(types): preserve defineModel inference with factory defaults (#15097)
close #15096
1 parent 37bf752 commit 0516c43

2 files changed

Lines changed: 22 additions & 4 deletions

File tree

‎packages-private/dts-test/setupHelpers.test-d.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
type PropType,
23
type Ref,
34
type Slots,
45
type VNode,
@@ -421,6 +422,18 @@ describe('defineModel', () => {
421422
const countDefault = defineModel<number>('count', { default: 1 })
422423
expectType<Ref<number>>(countDefault)
423424

425+
const inferredNamedArrayDefault = defineModel('items', {
426+
type: Array as PropType<string[]>,
427+
default: () => [],
428+
})
429+
expectType<Ref<string[]>>(inferredNamedArrayDefault)
430+
431+
const inferredArrayDefault = defineModel({
432+
type: Array as PropType<string[]>,
433+
default: () => [],
434+
})
435+
expectType<Ref<string[]>>(inferredArrayDefault)
436+
424437
const arrayDefault = defineModel<number[]>({ default: () => [] })
425438
expectType<Ref<number[]>>(arrayDefault)
426439

@@ -468,6 +481,11 @@ describe('defineModel', () => {
468481

469482
// @ts-expect-error type / default mismatch
470483
defineModel<string>({ default: 123 })
484+
// @ts-expect-error runtime type / default mismatch
485+
defineModel('items', {
486+
type: Array as PropType<string[]>,
487+
default: () => [1],
488+
})
471489
// @ts-expect-error raw array defaults must use a factory
472490
defineModel<number[]>({ default: [] })
473491
// @ts-expect-error raw object defaults must use a factory

‎packages/runtime-core/src/apiSetupHelpers.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ type DefineModelDefault<T> = InferDefault<Data, T>
309309
* ```
310310
*/
311311
export function defineModel<T, M extends PropertyKey = string, G = T, S = T>(
312-
options: ({ default: DefineModelDefault<T> } | { required: true }) &
313-
DefineModelRuntimeOptions<T, G, S>,
312+
options: DefineModelRuntimeOptions<T, G, S> &
313+
({ default: DefineModelDefault<T> } | { required: true }),
314314
): ModelRef<T, M, G, S>
315315

316316
export function defineModel<T, M extends PropertyKey = string, G = T, S = T>(
@@ -319,8 +319,8 @@ export function defineModel<T, M extends PropertyKey = string, G = T, S = T>(
319319

320320
export function defineModel<T, M extends PropertyKey = string, G = T, S = T>(
321321
name: string,
322-
options: ({ default: DefineModelDefault<T> } | { required: true }) &
323-
DefineModelRuntimeOptions<T, G, S>,
322+
options: DefineModelRuntimeOptions<T, G, S> &
323+
({ default: DefineModelDefault<T> } | { required: true }),
324324
): ModelRef<T, M, G, S>
325325

326326
export function defineModel<T, M extends PropertyKey = string, G = T, S = T>(

0 commit comments

Comments
 (0)