Skip to content

Commit 18da56d

Browse files
committed
wip
1 parent 40b1360 commit 18da56d

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

packages/runtime-core/src/apiDefineComponent.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ type InferComponentOptions<T> = T &
129129
> &
130130
TypeProps &
131131
EmitsToProps<
132-
// CompleteEmits
132+
// ResolvedEmits
133133
ExtractMixinEmits<Mixin> &
134134
ExtractMixinEmits<Extends> &
135135
(unknown extends TypeEmits
@@ -155,7 +155,7 @@ type InferComponentOptions<T> = T &
155155
ExtractMixinMethods<Mixin> &
156156
ExtractMixinMethods<Extends> &
157157
Methods & {},
158-
// CompleteEmits
158+
// ResolvedEmits
159159
ExtractMixinEmits<Mixin> &
160160
ExtractMixinEmits<Extends> &
161161
(unknown extends TypeEmits
@@ -294,7 +294,7 @@ export function defineComponent<
294294
? { [K in Keys]: null }
295295
: PropsOptions
296296
: {}),
297-
CompleteEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
297+
ResolvedEmits extends ObjectEmitsOptions = ExtractMixinEmits<Mixin> &
298298
ExtractMixinEmits<Extends> &
299299
(unknown extends TypeEmits
300300
? string[] extends RuntimeEmitsOptions
@@ -304,13 +304,13 @@ export function defineComponent<
304304
: RuntimeEmitsOptions
305305
: {}) &
306306
TypeEmitsToOptions<TypeEmits & {}>,
307-
CompleteEmits_Internal extends EmitsOptions = unknown extends TypeEmits
307+
ResolvedEmits_Internal extends EmitsOptions = unknown extends TypeEmits
308308
? string[] extends RuntimeEmitsOptions
309309
? string[]
310-
: CompleteEmits
311-
: CompleteEmits,
310+
: ResolvedEmits
311+
: ResolvedEmits,
312312
InferredProps = Readonly<
313-
ExtractPropTypes<ResolvedProps> & TypeProps & EmitsToProps<CompleteEmits>
313+
ExtractPropTypes<ResolvedProps> & TypeProps & EmitsToProps<ResolvedEmits>
314314
>,
315315
InternalInstance = ComponentPublicInstance<
316316
InferredProps,
@@ -320,7 +320,7 @@ export function defineComponent<
320320
ExtractMixinData<Mixin> & ExtractMixinData<Extends> & EnsureNonVoid<Data>,
321321
ExtractMixinComputed<Mixin> & ExtractMixinComputed<Extends> & Computed,
322322
ExtractMixinMethods<Mixin> & ExtractMixinMethods<Extends> & Methods,
323-
CompleteEmits_Internal,
323+
ResolvedEmits_Internal,
324324
{}, // PublicProps
325325
{}, // Defaults
326326
false,
@@ -353,7 +353,7 @@ export function defineComponent<
353353
setup?: (
354354
this: void,
355355
props: NoInfer<LooseRequired<InferredProps>>,
356-
ctx: NoInfer<SetupContext<CompleteEmits_Internal, Slots>>,
356+
ctx: NoInfer<SetupContext<ResolvedEmits_Internal, Slots>>,
357357
) => Promise<SetupBindings> | SetupBindings | RenderFunction | void
358358
data?: (vm: NoInfer<InternalInstance>) => Data
359359
/**

0 commit comments

Comments
 (0)