@koine/utils 2.0.0-beta.22 → 2.0.0-beta.23

package/package.json

@@ -587,5 +587,5 @@
     }
   },
   "dependencies": {},
-  "version": "2.0.0-beta.22"
+  "version": "2.0.0-beta.23"
 }

package/typings.d.ts

@@ -2,31 +2,18 @@
  * List here the global variables used by third party scripts supported within
  * the `koine` ecosystem.
  */
-/**
- * List here the global variables used by third party scripts supported within
- * the `koine` ecosystem.
- */
 
 // as in type-fest start
 type Simplify<T> = { [KeyType in keyof T]: T[KeyType] };
-type IsEqual<A, B> = (<G>() => G extends A ? 1 : 2) extends <G>() => G extends B
-  ? 1
-  : 2
-  ? true
-  : false;
-type Filter<KeyType, ExcludeType> = IsEqual<KeyType, ExcludeType> extends true
-  ? never
-  : KeyType extends ExcludeType
-  ? never
-  : KeyType;
-type Except<ObjectType, KeysType extends keyof ObjectType> = {
-  [KeyType in keyof ObjectType as Filter<
-    KeyType,
-    KeysType
-  >]: ObjectType[KeyType];
-};
 // as in type-fest end
 
+type NotNullProperties<T> = {
+  [P in keyof T]: NonNullable<T[P]>;
+};
+
+type RequiredNotNullable<T, K extends keyof T> = T &
+  Required<NotNullProperties<Pick<T, K>>>;
+
 /**
  * Tweak a model by making some properties required (not `optional` and not `nullable`)
  *
@@ -35,23 +22,10 @@ type Except<ObjectType, KeysType extends keyof ObjectType> = {
 declare type Tweak<
   TModel extends object,
   TRequiredKeys extends keyof TModel | false,
-  TReplacements extends Partial<Record<keyof TModel, unknown>> | false = false,
-> = TReplacements extends false
-  ? Simplify<
-      TRequiredKeys extends false ? TModel :
-        Except<TModel, TRequiredKeys> &
-          Required<{
-            [K in TRequiredKeys]: NonNullable<TModel[K]>;
-          }>
-    >
-  : Simplify<
-      TRequiredKeys extends false ? TModel & TReplacements : 
-        Omit<
-          Except<TModel, TRequiredKeys> &
-            Required<{
-              [K in TRequiredKeys]: NonNullable<TModel[K]>;
-            }>,
-            keyof TReplacements
-          >
-      & TReplacements
-    >;
+  TReplacements extends Partial<Record<keyof TModel, unknown>> | false,
+> = Simplify<
+  TReplacements extends Partial<Record<keyof TModel, unknown>>
+    ? Omit<RequiredNotNullable<TModel, TRequiredKeys>, keyof TReplacements> &
+        TReplacements
+    : RequiredNotNullable<TModel, TRequiredKeys>
+>;