style: 💄 superfluous intersecetion, cleanup respones types

hapijs · Aug 13, 2024 · 1af8547 · 1af8547
1 parent 9109151
commit 1af8547
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/lib/types/request.d.ts b/lib/types/request.d.ts
@@ -307,7 +307,7 @@ export type MergeType<T, U> = {
     [K in keyof T]: K extends keyof U
         ? U[K]
         : T[K];
-} & U;
+};
 
 export type MergeRefs<T extends ReqRef> = MergeType<ReqRefDefaults, T>;
 

diff --git a/lib/types/response.d.ts b/lib/types/response.d.ts
@@ -6,7 +6,6 @@ import {
     UserCredentials,
     AppCredentials,
     AuthArtifacts,
-    MergeType,
     AuthCredentials,
     ReqRef,
     ReqRefDefaults,
@@ -391,7 +390,7 @@ export interface AuthenticationData<
     CredentialsExtra = Record<string, unknown>,
     ArtifactsExtra = AuthArtifacts
 > {
-    credentials: MergeType<CredentialsExtra, AuthCredentials<AuthUser, AuthApp>>;
+    credentials: AuthCredentials<AuthUser, AuthApp> & CredentialsExtra;
     artifacts?: ArtifactsExtra | undefined;
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -307,7 +307,7 @@ export type MergeType<T, U> = { @@
         [K in keyof T]: K extends keyof U
             ? U[K]
             : T[K];
-    } & U;
+    };
     export type MergeRefs<T extends ReqRef> = MergeType<ReqRefDefaults, T>;
@@ Expand Down @@