theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

types: support object as props type (#3165)

Browse Source
This commit is contained in:
HcySunYang 2021-02-25 05:20:41 +08:00 committed by GitHub
parent 354966204e
commit 4a965802e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/runtime-core/src/componentProps.ts
View File

@ -56,7 +56,7 @@ interface PropOptions<T = any, D = T> {
export type PropType<T> = PropConstructor<T> | PropConstructor<T>[] export type PropType<T> = PropConstructor<T> | PropConstructor<T>[]
type PropConstructor<T = any> = type PropConstructor<T = any> =
| { new (...args: any[]): T & object } | { new (...args: any[]): T & {} }
| { (): T } | { (): T }
| PropMethod<T> | PropMethod<T>

9
test-dts/component.test-d.ts
View File

@ -39,6 +39,7 @@ describe('object props', () => {
ggg: 'foo' | 'bar' ggg: 'foo' | 'bar'
ffff: (a: number, b: string) => { a: boolean } ffff: (a: number, b: string) => { a: boolean }
validated?: string validated?: string
object?: object
} }
describe('defineComponent', () => { describe('defineComponent', () => {
@ -106,7 +107,8 @@ describe('object props', () => {
type: String, type: String,
// validator requires explicit annotation // validator requires explicit annotation
validator: (val: unknown) => val !== '' validator: (val: unknown) => val !== ''
} },
object: Object as PropType<object>
}, },
setup(props) { setup(props) {
return { return {
@ -140,6 +142,7 @@ describe('object props', () => {
expectType<ExpectedProps['ggg']>(props.ggg) expectType<ExpectedProps['ggg']>(props.ggg)
expectType<ExpectedProps['ffff']>(props.ffff) expectType<ExpectedProps['ffff']>(props.ffff)
expectType<ExpectedProps['validated']>(props.validated) expectType<ExpectedProps['validated']>(props.validated)
expectType<ExpectedProps['object']>(props.object)
// raw bindings // raw bindings
expectType<Number>(rawBindings.setupA) expectType<Number>(rawBindings.setupA)
@ -263,7 +266,8 @@ describe('object props', () => {
type: String, type: String,
// validator requires explicit annotation // validator requires explicit annotation
validator: (val: unknown) => val !== '' validator: (val: unknown) => val !== ''
} },
object: Object as PropType<object>
}, },
setup() { setup() {
@ -293,6 +297,7 @@ describe('object props', () => {
expectType<ExpectedProps['ggg']>(props.ggg) expectType<ExpectedProps['ggg']>(props.ggg)
// expectType<ExpectedProps['ffff']>(props.ffff) // todo fix // expectType<ExpectedProps['ffff']>(props.ffff) // todo fix
expectType<ExpectedProps['validated']>(props.validated) expectType<ExpectedProps['validated']>(props.validated)
expectType<ExpectedProps['object']>(props.object)
// rawBindings // rawBindings
expectType<Number>(rawBindings.setupA) expectType<Number>(rawBindings.setupA)