From 73873533107b3ca1acfc62d8034c939c1b18b1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B5=D0=B9=20=D0=9A=D1=80?= =?UTF-8?q?=D1=8F=D0=B6=D0=B5=D0=B2?= Date: Mon, 25 Dec 2023 13:34:48 +0300 Subject: [PATCH] fix type tests --- packages/imask/src/masked/factory.ts | 8 ++++---- packages/imask/test/controls/input.types.ts | 5 ++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/packages/imask/src/masked/factory.ts b/packages/imask/src/masked/factory.ts index d157b6f7..eb7d974d 100644 --- a/packages/imask/src/masked/factory.ts +++ b/packages/imask/src/masked/factory.ts @@ -143,8 +143,8 @@ type UpdateInstanceOpts = M extends MaskedDate ? MaskedDateOptions : M extends MaskedNumber ? MaskedNumberOptions : M extends MaskedDynamic ? MaskedDynamicOptions : - M extends MaskedRange ? MaskedRangeOptions & { mask: MaskedRange } : - M extends MaskedEnum ? MaskedEnumOptions & { mask: MaskedEnum } : + M extends MaskedRange ? MaskedRangeOptions : + M extends MaskedEnum ? MaskedEnumOptions : M extends MaskedPattern ? MaskedPatternOptions : AnyOpts ; @@ -153,8 +153,8 @@ export type UpdateConstructorOpts = M extends { mask: typeof MaskedDate } ? MaskedDateOptions : M extends { mask: typeof MaskedNumber } ? MaskedNumberOptions : - M extends { mask: typeof MaskedEnum } ? MaskedEnumOptions & { mask: typeof MaskedEnum } : - M extends { mask: typeof MaskedRange } ? MaskedRangeOptions & { mask: typeof MaskedRange } : + M extends { mask: typeof MaskedEnum } ? MaskedEnumOptions : + M extends { mask: typeof MaskedRange } ? MaskedRangeOptions : M extends { mask: typeof MaskedRegExp } ? MaskedRegExpOptions : M extends { mask: typeof MaskedFunction } ? MaskedFunctionOptions : M extends { mask: typeof MaskedPattern } ? MaskedPatternOptions : diff --git a/packages/imask/test/controls/input.types.ts b/packages/imask/test/controls/input.types.ts index 2fa499b1..64cd5c39 100644 --- a/packages/imask/test/controls/input.types.ts +++ b/packages/imask/test/controls/input.types.ts @@ -26,7 +26,6 @@ class MyMasked extends Masked { declare skipInvalid?: boolean | undefined; } - type cases = [ Check['updateOptions']>, [Partial]>>, Check['updateOptions']>, [Partial]>>, @@ -57,11 +56,11 @@ type cases = [ Check['updateOptions']>, [Partial]>>, Check['updateOptions']>, [Partial]>>, - Check['updateOptions']>, [Partial]>>, + Check['updateOptions']>, [Partial]>>, Check['updateOptions']>, [Partial]>>, Check['updateOptions']>, [Partial]>>, Check['updateOptions']>, [Partial]>>, - Check['updateOptions']>, [Partial]>>, + Check['updateOptions']>, [Partial]>>, Check['updateOptions']>, [Partial]>>, Check['updateOptions']>, [Partial>]>>, ];