From e213c0720c4312aaa7d1aa8beb6008afece141db Mon Sep 17 00:00:00 2001 From: Evan You Date: Tue, 8 Nov 2022 14:25:48 +0800 Subject: [PATCH] chore: run prettier --- .../runtime-core/src/apiDefineComponent.ts | 4 +- packages/runtime-core/src/componentOptions.ts | 38 +++++++++++++------ .../src/componentPublicInstance.ts | 2 +- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/packages/runtime-core/src/apiDefineComponent.ts b/packages/runtime-core/src/apiDefineComponent.ts index 10f4f69acab..c10ac74e4a9 100644 --- a/packages/runtime-core/src/apiDefineComponent.ts +++ b/packages/runtime-core/src/apiDefineComponent.ts @@ -138,7 +138,7 @@ export function defineComponent< E extends EmitsOptions = {}, EE extends string = string, I extends ComponentInjectOptions = {}, - II extends string = string, + II extends string = string >( options: ComponentOptionsWithArrayProps< PropNames, @@ -180,7 +180,7 @@ export function defineComponent< E extends EmitsOptions = {}, EE extends string = string, I extends ComponentInjectOptions = {}, - II extends string = string, + II extends string = string >( options: ComponentOptionsWithObjectProps< PropsOptions, diff --git a/packages/runtime-core/src/componentOptions.ts b/packages/runtime-core/src/componentOptions.ts index 5275a747db9..ea70d41a904 100644 --- a/packages/runtime-core/src/componentOptions.ts +++ b/packages/runtime-core/src/componentOptions.ts @@ -229,7 +229,7 @@ export type ComponentOptionsWithoutProps< EE extends string = string, I extends ComponentInjectOptions = {}, II extends string = string, - PE = Props & EmitsToProps, + PE = Props & EmitsToProps > = ComponentOptionsBase< PE, RawBindings, @@ -246,7 +246,20 @@ export type ComponentOptionsWithoutProps< > & { props?: undefined } & ThisType< - CreateComponentPublicInstance + CreateComponentPublicInstance< + PE, + RawBindings, + D, + C, + M, + Mixin, + Extends, + E, + PE, + {}, + false, + I + > > export type ComponentOptionsWithArrayProps< @@ -307,7 +320,7 @@ export type ComponentOptionsWithObjectProps< I extends ComponentInjectOptions = {}, II extends string = string, Props = Readonly> & EmitsToProps, - Defaults = ExtractDefaultPropTypes, + Defaults = ExtractDefaultPropTypes > = ComponentOptionsBase< Props, RawBindings, @@ -415,15 +428,16 @@ type ObjectInjectOptions = Record< string | symbol | { from?: string | symbol; default?: unknown } > -export type InjectToObject = T extends string[] -? { - [K in T[number]]?: unknown -} -: T extends ObjectInjectOptions -? { - [K in keyof T]?: unknown -} -: never +export type InjectToObject = + T extends string[] + ? { + [K in T[number]]?: unknown + } + : T extends ObjectInjectOptions + ? { + [K in keyof T]?: unknown + } + : never interface LegacyOptions< Props, diff --git a/packages/runtime-core/src/componentPublicInstance.ts b/packages/runtime-core/src/componentPublicInstance.ts index 4d6f1d05916..8f24b8dace4 100644 --- a/packages/runtime-core/src/componentPublicInstance.ts +++ b/packages/runtime-core/src/componentPublicInstance.ts @@ -153,7 +153,7 @@ export type CreateComponentPublicInstance< PublicM extends MethodOptions = UnwrapMixinsType & EnsureNonVoid, PublicDefaults = UnwrapMixinsType & - EnsureNonVoid, + EnsureNonVoid > = ComponentPublicInstance< PublicP, PublicB,