Evan You 3 лет назад
Родитель
Сommit
4c3203b9b7

+ 2 - 2
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,

+ 26 - 12
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<E>,
+  PE = Props & EmitsToProps<E>
 > = ComponentOptionsBase<
   PE,
   RawBindings,
@@ -246,7 +246,20 @@ export type ComponentOptionsWithoutProps<
 > & {
   props?: undefined
 } & ThisType<
-    CreateComponentPublicInstance<PE, RawBindings, D, C, M, Mixin, Extends, E, PE, {}, false, I>
+    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<ExtractPropTypes<PropsOptions>> & EmitsToProps<E>,
-  Defaults = ExtractDefaultPropTypes<PropsOptions>,
+  Defaults = ExtractDefaultPropTypes<PropsOptions>
 > = ComponentOptionsBase<
   Props,
   RawBindings,
@@ -415,15 +428,16 @@ type ObjectInjectOptions = Record<
   string | symbol | { from?: string | symbol; default?: unknown }
 >
 
-export type InjectToObject<T extends ComponentInjectOptions> = T extends string[]
-? {
-  [K in T[number]]?: unknown
-}
-: T extends ObjectInjectOptions
-? {
-  [K in keyof T]?: unknown
-}
-: never
+export type InjectToObject<T extends ComponentInjectOptions> =
+  T extends string[]
+    ? {
+        [K in T[number]]?: unknown
+      }
+    : T extends ObjectInjectOptions
+    ? {
+        [K in keyof T]?: unknown
+      }
+    : never
 
 interface LegacyOptions<
   Props,

+ 1 - 1
packages/runtime-core/src/componentPublicInstance.ts

@@ -153,7 +153,7 @@ export type CreateComponentPublicInstance<
   PublicM extends MethodOptions = UnwrapMixinsType<PublicMixin, 'M'> &
     EnsureNonVoid<M>,
   PublicDefaults = UnwrapMixinsType<PublicMixin, 'Defaults'> &
-    EnsureNonVoid<Defaults>,
+    EnsureNonVoid<Defaults>
 > = ComponentPublicInstance<
   PublicP,
   PublicB,