8000 types(slots): Add typed slots by pikax · Pull Request #2693 · vuejs/core · GitHub
[go: up one dir, main page]
Skip to content

types(slots): Add typed slots #2693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

types(slots): Add typed slots #2693

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e0a1656
types(slots): Add typed slots
pikax Nov 30, 2020
b4dc05f
chore: fix tests
pikax Nov 30, 2020
53379a1
Merge branch 'upstream' into feat/typed_slots
pikax Mar 13, 2021
d729fba
chore: added support for `h`
pikax Mar 13, 2021
5300104
chore: Merge branch 'master-upstream' into feat/typed_slots
pikax Aug 20, 2021
8437736
Merge branch 'main' into feat/typed_slots
pikax Feb 20, 2023
53adc92
rollback props test implementation defineComponent test
pikax Feb 20, 2023
cc7e1c1
fix some errors
pikax Feb 20, 2023
479aaf1
improve
pikax Feb 21, 2023
3785f75
minor improvements to the type
pikax Feb 21, 2023
1fdac74
feat(compiler): added macros defineSlots
pikax Feb 21, 2023
e1eafb6
remove lingering code
pikax Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rollback props test implementation defineComponent test
  • Loading branch information
@pikax
pikax committed Feb 20, 2023
commit 53adc923fff34457d0bba8ff9830dc2f2aa64373
188 changes: 92 additions & 96 deletions packages/dts-test/defineComponent.test-d.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ import {
SetupContext,
h
} from 'vue'
import {
describe,
expectType,
IsUnion,
} from './utils'
import { describe, expectType, IsUnion } from './utils'

describe('with object props', () => {
interface ExpectedProps {
Expand Down Expand Up @@ -50,96 +46,98 @@ describe('with object props', () => {

type GT = string & { __brand: unknown }

const MyComponent = defineComponent({
props: {
a: Number,
// required should make property non-void
b: {
type: String,
required: true
},
e: Function,
h: Boolean,
j: Function as PropType<undefined | (() => string | undefined)>,
// default value should infer type and make it non-void
bb: {
default: 'hello'
},
bbb: {
// Note: default function value requires arrow syntax + explicit
// annotation
default: (props: any) => (props.bb as string) || 'foo'
},
bbbb: {
type: String,
default: undefined
},
bbbbb: {
type: String,
default: () => undefined
},
// explicit type casting
cc: Array as PropType<string[]>,
// required + type casting
dd: {
type: Object as PropType<{ n: 1 }>,
required: true
},
// return type
ee: Function as PropType<() => string>,
// arguments + object return
ff: Function as PropType<(a: number, b: string) => { a: boolean }>,
// explicit type casting with constructor
ccc: Array as () => string[],
// required + contructor type casting
ddd: {
type: Array as () => string[],
required: true
},
// required + object return
eee: {
type: Function as PropType<() => { a: string }>,
required: true
},
// required + arguments + object return
fff: {
type: Function as PropType<(a: number, b: string) => { a: boolean }>,
required: true
},
hhh: {
type: Boolean,
required: true
},
// default + type casting
ggg: {
type: String as PropType<'foo' | 'bar'>,
default: 'foo'
},
// default + function
ffff: {
type: Function as PropType<(a: number, b: string) => { a: boolean }>,
default: (a: number, b: string) => ({ a: a > +b })
},
// union + function with different return types
iii: Function as PropType<(() => string) | (() => number)>,
// union + function with different args & same return type
jjj: {
8000 type: Function as PropType<
((arg1: string) => string) | ((arg1: string, arg2: string) => string)
>,
required: true
},
kkk: null,
validated: {
type: String,
// validator requires explicit annotation
validator: (val: unknown) => val !== ''
},
date: Date,
l: [Date],
ll: [Date, Number],
lll: [String, Number]
const props = {
a: Number,
// required should make property non-void
b: {
type: String,
required: true
},
e: Function,
h: Boolean,
j: Function as PropType<undefined | (() => string | undefined)>,
// default value should infer type and make it non-void
bb: {
default: 'hello'
},
bbb: {
// Note: default function value requires arrow syntax + explicit
// annotation
default: (props: any) => (props.bb as string) || 'foo'
},
bbbb: {
type: String,
default: undefined
},
bbbbb: {
type: String,
default: () => undefined
},
// explicit type casting
cc: Array as PropType<string[]>,
// required + type casting
dd: {
type: Object as PropType<{ n: 1 }>,
required: true
},
// return type
ee: Function as PropType<() => string>,
// arguments + object return
ff: Function as PropType<(a: number, b: string) => { a: boolean }>,
// explicit type casting with constructor
ccc: Array as () => string[],
// required + contructor type casting
ddd: {
type: Array as () => string[],
required: true
},
// required + object return
eee: {
type: Function as PropType<() => { a: string }>,
required: true
},
// required + arguments + object return
fff: {
type: Function as PropType<(a: number, b: string) => { a: boolean }>,
required: true
},
hhh: {
type: Boolean,
required: true
},
// default + type casting
ggg: {
type: String as PropType<'foo' | 'bar'>,
default: 'foo'
},
// default + function
ffff: {
type: Function as PropType<(a: number, b: string) => { a: boolean }>,
default: (a: number, b: string) => ({ a: a > +b })
},
// union + function with different return types
iii: Function as PropType<(() => string) | (() => number)>,
// union + function with different args & same return type
jjj: {
type: Function as PropType<
((arg1: string) => string) | ((arg1: string, arg2: string) => string)
>,
required: true
},
kkk: null,
validated: {
type: String,
// validator requires explicit annotation
validator: (val: unknown) => val !== ''
},
date: Date,
l: [Date],
ll: [Date, Number],
lll: [String, Number]
}

const MyComponent = defineComponent({
props,
setup(props) {
// type assertion. See https://github.com/SamVerschueren/tsd
expectType<ExpectedProps['a']>(props.a)
Expand Down Expand Up @@ -1252,7 +1250,6 @@ describe('prop starting with `on*` is broken', () => {
})
})


describe('typed slots', () => {
const Comp = defineComponent({
slots: {
Expand Down Expand Up @@ -1368,4 +1365,3 @@ declare const MyButton: DefineComponent<
{}
>
;<MyButton class="x" />

0