Skip to content

fix(types): propagate type parameter constraints for TypeScript 4.8 #6351

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

Merged
merged 2 commits into from
Jul 9, 2023
Merged

fix(types): propagate type parameter constraints for TypeScript 4.8 #6351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a78e6a
fix(types): propagate type parameter constraints for TypeScript 4.8
DanielRosenwasser Jul 25, 2022
2b7e91c
fix: add more constraints
sxzz Jun 12, 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
4 changes: 2 additions & 2 deletions packages/runtime-core/src/apiCreateApp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
ComponentPublicInstance
} from './componentPublicInstance'
import { Directive, validateDirectiveName } from './directives'
import { RootRenderFunction } from './renderer'
import { RendererElement, RootRenderFunction } from './renderer'
import { InjectionKey } from './apiInject'
import { warn } from './warning'
import { createVNode, cloneVNode, VNode } from './vnode'
Expand Down Expand Up @@ -196,7 +196,7 @@ export type CreateAppFunction<HostElement> = (

let uid = 0

export function createAppAPI<HostElement>(
export function createAppAPI<HostElement extends RendererElement>(
render: RootRenderFunction<HostElement>,
hydrate?: RootHydrateFunction
): CreateAppFunction<HostElement> {
Expand Down
16 changes: 12 additions & 4 deletions packages/runtime-core/src/directives.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { ComponentPublicInstance } from './componentPublicInstance'
import { mapCompatDirectiveHook } from './compat/customDirective'
import { pauseTracking, resetTracking } from '@vue/reactivity'
import { traverse } from './apiWatch'
import { RendererElement } from './renderer'

export interface DirectiveBinding<V = any> {
instance: ComponentPublicInstance | null
Expand All @@ -31,7 +32,11 @@ export interface DirectiveBinding<V = any> {
dir: ObjectDirective<any, V>
}

export type DirectiveHook<T = any, Prev = VNode<any, T> | null, V = any> = (
export type DirectiveHook<
T extends RendererElement = any,
Prev = VNode<any, T> | null,
V = any
> = (
el: T,
binding: DirectiveBinding<V>,
vnode: VNode<any, T>,
Expand All @@ -43,7 +48,7 @@ export type SSRDirectiveHook = (
vnode: VNode
) => Data | undefined

export interface ObjectDirective<T = any, V = any> {
export interface ObjectDirective<T extends RendererElement = any, V = any> {
created?: DirectiveHook<T, null, V>
beforeMount?: DirectiveHook<T, null, V>
mounted?: DirectiveHook<T, null, V>
Expand All @@ -55,9 +60,12 @@ export interface ObjectDirective<T = any, V = any> {
deep?: boolean
}

export type FunctionDirective<T = any, V = any> = DirectiveHook<T, any, V>
export type FunctionDirective<
T extends RendererElement = any,
V = any
> = DirectiveHook<T, any, V>

export type Directive<T = any, V = any> =
export type Directive<T extends RendererElement = any, V = any> =
| ObjectDirective<T, V>
| FunctionDirective<T, V>

Expand Down
8 changes: 4 additions & 4 deletions packages/runtime-core/src/renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ export type RootRenderFunction<HostElement = RendererElement> = (

export interface RendererOptions<
HostNode = RendererNode,
HostElement = RendererElement
HostElement extends RendererElement = RendererElement
> {
patchProp(
el: HostElement,
Expand Down Expand Up @@ -145,7 +145,7 @@ export interface RendererElement extends RendererNode {}
// to optimize bundle size.
export interface RendererInternals<
HostNode = RendererNode,
HostElement = RendererElement
HostElement extends RendererElement = RendererElement
> {
p: PatchFn
um: UnmountFn
Expand Down Expand Up @@ -295,7 +295,7 @@ export const queuePostRenderEffect = __FEATURE_SUSPENSE__
*/
export function createRenderer<
HostNode = RendererNode,
HostElement = RendererElement
HostElement extends RendererElement = RendererElement
>(options: RendererOptions<HostNode, HostElement>) {
return baseCreateRenderer<HostNode, HostElement>(options)
}
Expand All @@ -312,7 +312,7 @@ export function createHydrationRenderer(
// overload 1: no hydration
function baseCreateRenderer<
HostNode = RendererNode,
HostElement = RendererElement
HostElement extends RendererElement = RendererElement
>(options: RendererOptions<HostNode, HostElement>): Renderer<HostElement>

// overload 2: with hydration
Expand Down
4 changes: 2 additions & 2 deletions packages/runtime-core/src/vnode.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export type VNodeNormalizedChildren =

export interface VNode<
HostNode = RendererNode,
HostElement = RendererElement,
HostElement extends RendererElement = RendererElement,
ExtraProps = { [key: string]: any }
> {
/**
Expand Down Expand Up @@ -613,7 +613,7 @@ export function guardReactiveProps(props: (Data & VNodeProps) | null) {
: props
}

export function cloneVNode<T, U>(
export function cloneVNode<T extends RendererNode, U extends RendererElement>(
vnode: VNode<T, U>,
extraProps?: (Data & VNodeProps) | null,
mergeRef = false
Expand Down