enh: Change hasProperty test to use new Util

eythaann · Oct 2, 2023 · 5a09fcf · 5a09fcf
1 parent 174d70b
commit 5a09fcf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/modules/objects/infrastructure.d.ts b/lib/modules/objects/infrastructure.d.ts
@@ -153,7 +153,7 @@ export type OptionalKeys<Type> = {
  * type U = HasProperty<{ a?: 'a'; b?: 'b'; c: 'c' }, 'c'>
  * //   ^? true
  */
-export type HasProperty<T, K extends KeyOfObject> = K extends KeysOfUnion<T> ? true : false;
+export type HasProperty<T, K> = K extends KeysOfUnion<T> ? true : false;
 
 /**
  * Convert specific properties of an object `T` to readonly.

diff --git a/lib/readable-test-types/index.d.ts b/lib/readable-test-types/index.d.ts
@@ -25,6 +25,7 @@ import {
   IsFalse,
   AnyObject,
   Opaque,
+  HasProperty,
 } from '../modules/infrastructure';
 import { FailMsgs } from './messages';
 
@@ -120,7 +121,7 @@ interface IValidationsPublic<T, I extends boolean = false> {
   toBePromise: propertyCallableOnPass<IsPromise<T>, I, 'promise'>;
 
   /** Type should has the property passed */
-  toHaveProperty: <U extends InvertIf<I, Not<IsUnknown<ForceExtract<T, U>>>> extends true ? Readonly<string> : FAIL<FailMsgs<I>['property']>>(v?: U) => void;
+  toHaveProperty: <U extends InvertIf<I, HasProperty<T, U>> extends true ? Readonly<string> : FAIL<FailMsgs<I>['property']>>(v?: U) => void;
 }
 
 type IValidationsInternal<T> = IValidationsPublic<T> & {