LukeParke/better-auth
1
0
Fork 0
mirror of https://github.com/LukeHagar/better-auth.git synced 2025-12-10 04:19:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: should infer types correctly when empty list of plugins is provided (#4612)

Browse Source
This commit is contained in:
Fraol Lemecha
2025-09-12 21:36:55 +03:00
committed by GitHub
parent ef4509af45
commit 08fa1f89c3
5 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/better-auth/src/db/field.ts
View File

@@ -274,19 +274,21 @@ export type InferFieldsFromPlugins<
Options extends BetterAuthOptions, Options extends BetterAuthOptions,
Key extends string, Key extends string,
Format extends "output" | "input" = "output", Format extends "output" | "input" = "output",
> = Options["plugins"] extends Array<infer T> > = Options["plugins"] extends []
? T extends { ? {}
schema: { : Options["plugins"] extends Array<infer T>
[key in Key]: { ? T extends {
fields: infer Field; schema: {
[key in Key]: {
fields: infer Field;
};
}; };
}; }
} ? Format extends "output"
? Format extends "output" ? InferFieldsOutput<Field>
? InferFieldsOutput<Field> : InferFieldsInput<Field>
: InferFieldsInput<Field> : {}
: {} : {};
: {};
export type InferFieldsFromOptions< export type InferFieldsFromOptions<
Options extends BetterAuthOptions, Options extends BetterAuthOptions,

2
packages/better-auth/src/test-utils/index.ts
View File

@@ -93,7 +93,7 @@ export async function getTestInstanceMemory<
...options?.advanced, ...options?.advanced,
}, },
plugins: [bearer(), ...(options?.plugins || [])], plugins: [bearer(), ...(options?.plugins || [])],
} as O extends undefined ? typeof opts : O & typeof opts); } as unknown as O extends undefined ? typeof opts : O & typeof opts);
const testUser = { const testUser = {
email: "test@test.com", email: "test@test.com",

2
packages/better-auth/src/test-utils/test-instance.ts
View File

@@ -109,7 +109,7 @@ export async function getTestInstance<
...options?.advanced, ...options?.advanced,
}, },
plugins: [bearer(), ...(options?.plugins || [])], plugins: [bearer(), ...(options?.plugins || [])],
} as O extends undefined ? typeof opts : O & typeof opts); } as unknown as O extends undefined ? typeof opts : O & typeof opts);
const testUser = { const testUser = {
email: "test@test.com", email: "test@test.com",

2
packages/better-auth/src/types/options.ts
View File

@@ -291,7 +291,7 @@ export type BetterAuthOptions = {
/** /**
* List of Better Auth plugins * List of Better Auth plugins
*/ */
plugins?: BetterAuthPlugin[]; plugins?: [] | BetterAuthPlugin[];
/** /**
* User configuration * User configuration
*/ */

22
packages/better-auth/src/types/types.test.ts
View File

@@ -55,4 +55,26 @@ describe("general types", async (it) => {
activeOrganizationId?: string | undefined | null; activeOrganizationId?: string | undefined | null;
}>(); }>();
}); });
it("should infer the same types for empty plugins and no plugins", async () => {
const { auth: authWithEmptyPlugins } = await getTestInstance({
plugins: [],
secret: "test-secret",
emailAndPassword: {
enabled: true,
},
});
const { auth: authWithoutPlugins } = await getTestInstance({
secret: "test-secret",
emailAndPassword: {
enabled: true,
},
});
type SessionWithEmptyPlugins = typeof authWithEmptyPlugins.$Infer;
type SessionWithoutPlugins = typeof authWithoutPlugins.$Infer;
expectTypeOf<SessionWithEmptyPlugins>().toEqualTypeOf<SessionWithoutPlugins>();
});
}); });