@vonall/auth 0.1.0 → 0.1.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vonall/auth
 
+## 0.1.1
+
+### Patch Changes
+
+- The plugins a Product passes to `createAuth()` and `createAuthClient()` are part of the returned types (`auth.api.…`, `authClient.…` of the MCP endpoint's plugins).
+
 ## 0.1.0
 
 ### Minor Changes

package/dist/client/index.d.ts

@@ -1,17 +1,24 @@
+/** The better-auth client for a Product's browser code; `src/lib/auth-client.ts` creates it once. */
+import type { BetterAuthClientPlugin } from "better-auth/client";
+import { adminClient, twoFactorClient } from "better-auth/client/plugins";
 import { createAuthClient as createClient } from "better-auth/svelte";
-type ClientPlugin = NonNullable<Parameters<typeof createClient>[0]>["plugins"] extends (infer P)[] | undefined ? P : never;
-export type CreateAuthClientOptions = {
+import { ac, roles } from "../permissions.js";
+export type CreateAuthClientOptions<P extends BetterAuthClientPlugin[] = []> = {
     /** PUBLIC_ORIGIN. */
     baseURL: string;
     /** The Admin option (matches the server). */
     admin?: boolean;
-    /** More client plugins, e.g. the MCP endpoint's (`@vonall/mcp/client`). */
-    plugins?: ClientPlugin[];
+    /** More client plugins, e.g. the MCP endpoint's (`@vonall/mcp/client`); they are part of the client's type. */
+    plugins?: P;
 };
-declare function build({ baseURL, admin, plugins }: CreateAuthClientOptions): import("better-auth/svelte").SvelteAuthClient<{
+type BasePlugins = [ReturnType<typeof twoFactorClient>, ReturnType<typeof adminClient<{
+    ac: typeof ac;
+    roles: typeof roles;
+}>>];
+/** The client with this package's plugins and the Product's. */
+export type AuthClient<P extends BetterAuthClientPlugin[] = []> = ReturnType<typeof createClient<{
     baseURL: string;
-    plugins: any[];
-}>;
-export type AuthClient = ReturnType<typeof build>;
-export declare function createAuthClient(options: CreateAuthClientOptions): AuthClient;
+    plugins: [...BasePlugins, ...P];
+}>>;
+export declare function createAuthClient<P extends BetterAuthClientPlugin[] = []>({ baseURL, admin, plugins }: CreateAuthClientOptions<P>): AuthClient<P>;
 export {};

package/dist/client/index.js

@@ -1,18 +1,9 @@
-/** The better-auth client for a Product's browser code; `src/lib/auth-client.ts` creates it once. */
 import { adminClient, twoFactorClient } from "better-auth/client/plugins";
 import { createAuthClient as createClient } from "better-auth/svelte";
 import { ac, roles } from "../permissions.js";
-function build({ baseURL, admin = false, plugins = [] }) {
+export function createAuthClient({ baseURL, admin = false, plugins }) {
     return createClient({
         baseURL: baseURL || "http://localhost:5173",
-        plugins: [
-            twoFactorClient(),
-            // The admin client's types are part of the client's type whether or not the option is on
-            ...(admin ? [adminClient({ ac, roles })] : []),
-            ...plugins,
-        ],
+        plugins: [twoFactorClient(), ...(admin ? [adminClient({ ac, roles })] : []), ...(plugins ?? [])],
     });
 }
-export function createAuthClient(options) {
-    return build(options);
-}

package/dist/permissions.d.ts

@@ -1,8 +1,8 @@
 export declare const ac: {
-    newRole<const TRoleStatements extends import("better-auth/plugins").Statements>(statements: import("better-auth/plugins").RoleInput<{
+    newRole<const TRoleStatements extends import("better-auth/client").Statements>(statements: import("better-auth/client").RoleInput<{
         readonly user: readonly ["create", "list", "set-role", "ban", "impersonate", "impersonate-admins", "delete", "set-password", "set-email", "get", "update"];
         readonly session: readonly ["list", "revoke", "delete"];
-    }, TRoleStatements>): import("better-auth/plugins").Role<import("better-auth/plugins").ExactRoleStatements<TRoleStatements>, {
+    }, TRoleStatements>): import("better-auth/client").Role<import("better-auth/client").ExactRoleStatements<TRoleStatements>, {
         readonly user: readonly ["create", "list", "set-role", "ban", "impersonate", "impersonate-admins", "delete", "set-password", "set-email", "get", "update"];
         readonly session: readonly ["list", "revoke", "delete"];
     }>;
@@ -15,14 +15,14 @@ export declare const ac: {
  * The app admin manages accounts but can't act as or take over a friend's account: no impersonation, no setting a
  * password or an email, no creating accounts (signup only through an Einladung).
  */
-export declare const adminRole: import("better-auth/plugins").Role<import("better-auth/plugins").ExactRoleStatements<{
+export declare const adminRole: import("better-auth/client").Role<import("better-auth/client").ExactRoleStatements<{
     readonly user: ["list", "get", "set-role", "ban", "delete"];
     readonly session: ["list", "revoke"];
 }>, {
     readonly user: readonly ["create", "list", "set-role", "ban", "impersonate", "impersonate-admins", "delete", "set-password", "set-email", "get", "update"];
     readonly session: readonly ["list", "revoke", "delete"];
 }>;
-export declare const userRole: import("better-auth/plugins").Role<import("better-auth/plugins").ExactRoleStatements<{
+export declare const userRole: import("better-auth/client").Role<import("better-auth/client").ExactRoleStatements<{
     readonly user: [];
     readonly session: [];
 }>, {
@@ -31,14 +31,14 @@ export declare const userRole: import("better-auth/plugins").Role<import("better
 }>;
 /** The roles as better-auth's admin plugin and client take them. */
 export declare const roles: {
-    admin: import("better-auth/plugins").Role<import("better-auth/plugins").ExactRoleStatements<{
+    admin: import("better-auth/client").Role<import("better-auth/client").ExactRoleStatements<{
         readonly user: ["list", "get", "set-role", "ban", "delete"];
         readonly session: ["list", "revoke"];
     }>, {
         readonly user: readonly ["create", "list", "set-role", "ban", "impersonate", "impersonate-admins", "delete", "set-password", "set-email", "get", "update"];
         readonly session: readonly ["list", "revoke", "delete"];
     }>;
-    user: import("better-auth/plugins").Role<import("better-auth/plugins").ExactRoleStatements<{
+    user: import("better-auth/client").Role<import("better-auth/client").ExactRoleStatements<{
         readonly user: [];
         readonly session: [];
     }>, {

package/dist/server/create.d.ts

@@ -17,7 +17,7 @@ export type SocialProvider = {
     clientId: string;
     clientSecret: string;
 };
-export type CreateAuthOptions = {
+export type CreateAuthOptions<P extends BetterAuthPlugin[] = []> = {
     /** The Product's Drizzle database. */
     db: Db;
     /** The Product's tables from `authSchema()`, the same objects its `schema/` re-exports. */
@@ -39,8 +39,8 @@ export type CreateAuthOptions = {
         github?: SocialProvider | null;
         google?: SocialProvider | null;
     };
-    /** More better-auth plugins, e.g. the MCP endpoint's (`@vonall/mcp`). */
-    plugins?: BetterAuthPlugin[];
+    /** More better-auth plugins, e.g. the MCP endpoint's (`@vonall/mcp`); they are part of the instance's type. */
+    plugins?: P;
     /** More rate limit rules, by path (`@vonall/mcp` adds `/oauth2/register`). */
     rateLimitRules?: Record<string, {
         window: number;
@@ -53,12 +53,12 @@ export type CreateAuthOptions = {
  * plugin is in it whether or not the option is on, so `user.role` exists; without the option it is left out at runtime
  * and nobody has a role.
  */
-type FullPlugins = [ReturnType<typeof twoFactor>, ReturnType<typeof adminPlugin<{
+type BasePlugins = [ReturnType<typeof twoFactor>, ReturnType<typeof adminPlugin<{
     ac: typeof ac;
     roles: typeof roles;
-}>>, ReturnType<typeof sveltekitCookies>];
-export type Auth = ReturnType<typeof betterAuth<{
-    plugins: FullPlugins;
+}>>];
+export type Auth<P extends BetterAuthPlugin[] = []> = ReturnType<typeof betterAuth<{
+    plugins: [...BasePlugins, ...P, ReturnType<typeof sveltekitCookies>];
 }>>;
 /** The admin plugin's columns, named here because the plugin's type doesn't carry them into the session's user. */
 export type AdminFields = {
@@ -70,9 +70,9 @@ export type AdminFields = {
 /** The user and the session as the hooks put them into `locals` (a Product's `app.d.ts` uses these). */
 export type AuthUser = Auth["$Infer"]["Session"]["user"] & AdminFields;
 export type AuthSession = Auth["$Infer"]["Session"]["session"];
-export type CreatedAuth = {
+export type CreatedAuth<P extends BetterAuthPlugin[] = []> = {
     /** The better-auth instance: `auth.api`, `auth.handler`, `auth.$context`. */
-    auth: Auth;
+    auth: Auth<P>;
     /** The hooks handle: the session into `locals.user`/`locals.session`, and better-auth's own routes (/api/auth/*). */
     handle: Handle;
     /** For `src/routes/api/auth/[...auth]/+server.ts`: `export const GET = apiHandler, POST = apiHandler`. */
@@ -83,5 +83,5 @@ export type CreatedAuth = {
         google: boolean;
     };
 };
-export declare function createAuth(options: CreateAuthOptions): CreatedAuth;
+export declare function createAuth<P extends BetterAuthPlugin[] = []>(options: CreateAuthOptions<P>): CreatedAuth<P>;
 export {};

package/dist/server/create.js

@@ -25,7 +25,7 @@ function einladungAusCookie() {
 }
 const hasKeys = (p) => Boolean(p?.clientId && p.clientSecret && p.clientId !== "dummy");
 function build(options) {
-    const { secret, origin, appName, signupMode, admin = false, social = {}, plugins = [], rateLimitRules = {}, log = consoleLog } = options;
+    const { secret, origin, appName, signupMode, admin = false, social = {}, plugins, rateLimitRules = {}, log = consoleLog } = options;
     const baseURL = origin || "http://localhost";
     return betterAuth({
         appName,
@@ -123,12 +123,13 @@ function build(options) {
         plugins: [
             twoFactor(),
             ...(admin ? [adminPlugin({ ac, roles })] : []),
-            ...plugins,
+            ...(plugins ?? []),
             sveltekitCookies(getRequestEvent), // Ensure cookies are populated in SvelteKit
         ],
     });
 }
 export function createAuth(options) {
+    // Inside, the instance is used with this package's plugins only; the Product gets it with its own plugins' types too
     const auth = build(options);
     const { social = {} } = options;
     setRegistry({
@@ -154,5 +155,5 @@ export function createAuth(options) {
         return svelteKitHandler({ event, resolve, auth, building });
     };
     const apiHandler = ({ request }) => auth.handler(request);
-    return { auth, handle, apiHandler, providers: { github: hasKeys(social.github), google: hasKeys(social.google) } };
+    return { auth: auth, handle, apiHandler, providers: { github: hasKeys(social.github), google: hasKeys(social.google) } };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vonall/auth",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Accounts for a Web App Factory Product: better-auth with the hooks, the protected helpers, Einladungen, Konto, the auth pages and the settings; Admin as an option",
   "license": "MIT",
   "repository": {