kitcn 0.27.5 → 0.28.0

package/dist/{convex-plugin-DfOhBU9g.js → convex-plugin-Dic0l-k8.js}

@@ -2,16 +2,9 @@ import { r as omit } from "./upstream-BCgGZX6q.js";
 import { createAuthEndpoint, createAuthMiddleware, sessionMiddleware } from "better-auth/api";
 import { bearer } from "better-auth/plugins/bearer";
 import { jwt } from "better-auth/plugins/jwt";
-import { oidcProvider } from "better-auth/plugins/oidc-provider";
 
 //#region src/auth/internal/convex-plugin.ts
 const JWT_COOKIE_NAME = "convex_jwt";
-const normalizeAfterHooks = (hooks) => {
-	return hooks.map((hook) => ({
-		...hook,
-		matcher: (ctx) => Boolean(hook.matcher(ctx))
-	}));
-};
 const getJwksAlg = (authProvider) => {
 	const isCustomJwt = "type" in authProvider && authProvider.type === "customJwt";
 	if (isCustomJwt && authProvider.algorithm !== "RS256") throw new Error("Only RS256 is supported for custom JWT with Better Auth");
@@ -28,27 +21,53 @@ const parseAuthConfig = (authConfig, opts) => {
 	if (!isDataUriJwks && opts.jwks) console.warn("Static JWKS provided to Convex plugin, but not to auth config. This adds an unnecessary network request for token verification.");
 	return providerConfig;
 };
-const oidcProviderCache = /* @__PURE__ */ new Map();
-const getOidcProvider = (basePath) => {
+const createOpenIdConfig = (basePath, signingAlgorithm) => {
 	const siteUrl = `${process.env.CONVEX_SITE_URL}`;
-	const key = `${siteUrl}|${basePath}`;
-	const cached = oidcProviderCache.get(key);
-	if (cached) return cached;
-	const oidcProvider$1 = oidcProvider({
-		loginPage: "/not-used",
-		metadata: {
-			issuer: siteUrl,
-			jwks_uri: `${siteUrl}${basePath}/convex/jwks`
-		},
-		__skipDeprecationWarning: true
-	});
-	oidcProviderCache.set(key, oidcProvider$1);
-	return oidcProvider$1;
+	const baseUrl = `${siteUrl}${basePath}`;
+	return {
+		issuer: siteUrl,
+		authorization_endpoint: `${baseUrl}/oauth2/authorize`,
+		token_endpoint: `${baseUrl}/oauth2/token`,
+		userinfo_endpoint: `${baseUrl}/oauth2/userinfo`,
+		jwks_uri: `${baseUrl}/convex/jwks`,
+		registration_endpoint: `${baseUrl}/oauth2/register`,
+		end_session_endpoint: `${baseUrl}/oauth2/endsession`,
+		scopes_supported: [
+			"openid",
+			"profile",
+			"email",
+			"offline_access"
+		],
+		response_types_supported: ["code"],
+		response_modes_supported: ["query"],
+		grant_types_supported: ["authorization_code", "refresh_token"],
+		acr_values_supported: ["urn:mace:incommon:iap:silver", "urn:mace:incommon:iap:bronze"],
+		subject_types_supported: ["public"],
+		id_token_signing_alg_values_supported: [signingAlgorithm],
+		token_endpoint_auth_methods_supported: [
+			"client_secret_basic",
+			"client_secret_post",
+			"none"
+		],
+		code_challenge_methods_supported: ["S256"],
+		claims_supported: [
+			"sub",
+			"iss",
+			"aud",
+			"exp",
+			"nbf",
+			"iat",
+			"jti",
+			"email",
+			"email_verified",
+			"name"
+		]
+	};
 };
 const convex = (opts) => {
 	const jwtExpirationSeconds = opts.jwt?.expirationSeconds ?? opts.jwtExpirationSeconds ?? 900;
-	const oidcProvider = getOidcProvider(opts.options?.basePath ?? "/api/auth");
-	const providerConfig = parseAuthConfig(opts.authConfig, opts);
+	const signingAlgorithm = getJwksAlg(parseAuthConfig(opts.authConfig, opts));
+	const openIdConfig = createOpenIdConfig(opts.options?.basePath ?? "/api/auth", signingAlgorithm);
 	const jwtOptions = {
 		jwt: {
 			issuer: `${process.env.CONVEX_SITE_URL}`,
@@ -63,7 +82,7 @@ const convex = (opts) => {
 				iat: Math.floor(Date.now() / 1e3)
 			})
 		},
-		jwks: { keyPairConfig: { alg: getJwksAlg(providerConfig) } }
+		jwks: { keyPairConfig: { alg: signingAlgorithm } }
 	};
 	const jwks = opts.jwks ? JSON.parse(opts.jwks) : void 0;
 	const jwt$1 = jwt({
@@ -123,13 +142,14 @@ const convex = (opts) => {
 					};
 					ctx.context.internalAdapter.deleteSession = async (..._args) => {};
 					const knownSafePaths = ["/api-key/list", "/api-key/get"];
-					const noopWrite = (method) => {
+					const noopWrite = (method, result = 0) => {
 						return async (..._args) => {
 							if (ctx.path && !knownSafePaths.includes(ctx.path)) console.warn(`[convex-better-auth] Write operation "${method}" skipped in query context for ${ctx.path}`);
-							return 0;
+							return result;
 						};
 					};
 					ctx.context.adapter.create = noopWrite("create");
+					ctx.context.adapter.incrementOne = noopWrite("incrementOne", {});
 					ctx.context.adapter.update = noopWrite("update");
 					ctx.context.adapter.updateMany = noopWrite("updateMany");
 					ctx.context.adapter.delete = noopWrite("delete");
@@ -137,53 +157,42 @@ const convex = (opts) => {
 					return { context: ctx };
 				})
 			}],
-			after: [
-				...normalizeAfterHooks(oidcProvider.hooks.after),
-				{
-					matcher: (ctx) => {
-						return Boolean(ctx.path?.startsWith("/sign-in") || ctx.path?.startsWith("/sign-up") || ctx.path?.startsWith("/callback") || ctx.path?.startsWith("/oauth2/callback") || ctx.path?.startsWith("/magic-link/verify") || ctx.path?.startsWith("/email-otp/verify-email") || ctx.path?.startsWith("/phone-number/verify") || ctx.path?.startsWith("/siwe/verify") || ctx.path?.startsWith("/update-session") || ctx.path?.startsWith("/get-session") && ctx.context.session);
-					},
-					handler: createAuthMiddleware(async (ctx) => {
-						const originalSession = ctx.context.session;
-						try {
-							ctx.context.session = ctx.context.session ?? ctx.context.newSession;
-							const { token } = await jwt$1.endpoints.getToken({
-								...ctx,
-								asResponse: false,
-								headers: {},
-								method: "GET",
-								returnHeaders: false,
-								returnStatus: false
-							});
-							const jwtCookie = ctx.context.createAuthCookie(JWT_COOKIE_NAME, { maxAge: jwtExpirationSeconds });
-							ctx.setCookie(jwtCookie.name, token, jwtCookie.attributes);
-						} catch (_error) {}
-						ctx.context.session = originalSession;
-					})
+			after: [{
+				matcher: (ctx) => {
+					return Boolean(ctx.path?.startsWith("/sign-in") || ctx.path?.startsWith("/sign-up") || ctx.path?.startsWith("/callback") || ctx.path?.startsWith("/oauth2/callback") || ctx.path?.startsWith("/magic-link/verify") || ctx.path?.startsWith("/email-otp/verify-email") || ctx.path?.startsWith("/phone-number/verify") || ctx.path?.startsWith("/siwe/verify") || ctx.path?.startsWith("/update-session") || ctx.path?.startsWith("/get-session") && ctx.context.session);
 				},
-				{
-					matcher: (ctx) => {
-						return Boolean(ctx.path?.startsWith("/sign-out") || ctx.path?.startsWith("/delete-user") || ctx.path?.startsWith("/get-session") && !ctx.context.session);
-					},
-					handler: createAuthMiddleware(async (ctx) => {
-						const jwtCookie = ctx.context.createAuthCookie(JWT_COOKIE_NAME, { maxAge: 0 });
-						ctx.setCookie(jwtCookie.name, "", jwtCookie.attributes);
-					})
-				}
-			]
+				handler: createAuthMiddleware(async (ctx) => {
+					const originalSession = ctx.context.session;
+					try {
+						ctx.context.session = ctx.context.session ?? ctx.context.newSession;
+						const { token } = await jwt$1.endpoints.getToken({
+							...ctx,
+							asResponse: false,
+							headers: {},
+							method: "GET",
+							returnHeaders: false,
+							returnStatus: false
+						});
+						const jwtCookie = ctx.context.createAuthCookie(JWT_COOKIE_NAME, { maxAge: jwtExpirationSeconds });
+						ctx.setCookie(jwtCookie.name, token, jwtCookie.attributes);
+					} catch (_error) {}
+					ctx.context.session = originalSession;
+				})
+			}, {
+				matcher: (ctx) => {
+					return Boolean(ctx.path?.startsWith("/sign-out") || ctx.path?.startsWith("/delete-user") || ctx.path?.startsWith("/get-session") && !ctx.context.session);
+				},
+				handler: createAuthMiddleware(async (ctx) => {
+					const jwtCookie = ctx.context.createAuthCookie(JWT_COOKIE_NAME, { maxAge: 0 });
+					ctx.setCookie(jwtCookie.name, "", jwtCookie.attributes);
+				})
+			}]
 		},
 		endpoints: {
 			getOpenIdConfig: createAuthEndpoint("/convex/.well-known/openid-configuration", {
 				method: "GET",
 				metadata: { isAction: false }
-			}, async (ctx) => {
-				return await oidcProvider.endpoints.getOpenIdConfig({
-					...ctx,
-					asResponse: false,
-					returnHeaders: false,
-					returnStatus: false
-				});
-			}),
+			}, async () => openIdConfig),
 			getJwks: createAuthEndpoint("/convex/jwks", {
 				method: "GET",
 				metadata: { openapi: {

package/dist/{create-schema-DqhLA_UF.js → create-schema-ojI-OH_9.js}

@@ -111,8 +111,20 @@ const mergedIndexFields = (tables) => Object.fromEntries(Object.entries(tables).
 		if (resolved.length === index.length) indexes.push(resolved);
 		return indexes;
 	}, []) || [];
-	const specialFieldIndexes = Object.keys(specialFields(tables)[key] || {}).filter((index) => !manualIndexes.some((m) => Array.isArray(m) ? m[0] === index : m === index));
-	return [key, manualIndexes.concat(specialFieldIndexes)];
+	const declaredIndexes = (table.indexes ?? []).reduce((indexes, index) => {
+		const resolved = index.fields.map((fieldKey) => resolveIndexField(fieldKey)).filter((fieldName) => fieldName !== null);
+		if (resolved.length === index.fields.length) indexes.push(resolved.length === 1 ? resolved[0] : resolved);
+		return indexes;
+	}, []);
+	const explicitIndexes = manualIndexes.concat(declaredIndexes);
+	const specialFieldIndexes = Object.keys(specialFields(tables)[key] || {}).filter((index) => !explicitIndexes.some((m) => Array.isArray(m) ? m[0] === index : m === index));
+	const seen = /* @__PURE__ */ new Set();
+	return [key, explicitIndexes.concat(specialFieldIndexes).filter((index) => {
+		const key = (Array.isArray(index) ? index : [index]).join("\0");
+		if (seen.has(key)) return false;
+		seen.add(key);
+		return true;
+	})];
 }));
 const createSchema = async ({ exportName = "tables", file, regenerateCommand, tables }) => {
 	const path = await import(Buffer.from("cGF0aA==", "base64").toString());
@@ -143,7 +155,7 @@ export const ${exportName} = {
 			}[type];
 		}
 		const indexes = mergedIndexFields(tables)[tableKey]?.map((index) => {
-			const indexArray = Array.isArray(index) ? index.sort() : [index];
+			const indexArray = Array.isArray(index) ? index : [index];
 			return `.index("${indexArray.join("_")}", ${JSON.stringify(indexArray)})`;
 		}) || [];
 		const schema = `${modelName}: defineTable({

package/dist/{create-schema-orm-C3y6GLwQ.js → create-schema-orm-HcJzGCxj.js}

@@ -1,4 +1,4 @@
-import { augmentBetterAuthTables, indexFields } from "./create-schema-DqhLA_UF.js";
+import { augmentBetterAuthTables, indexFields } from "./create-schema-ojI-OH_9.js";
 
 //#region src/auth/create-schema-orm.ts
 const specialFields = (tables) => Object.fromEntries(Object.entries(tables).map(([key, table]) => {
@@ -24,8 +24,20 @@ const mergedIndexFields = (tables) => Object.fromEntries(Object.entries(tables).
 		if (resolved.length === index.length) indexes.push(resolved);
 		return indexes;
 	}, []) || [];
-	const specialFieldIndexes = Object.entries(tableSpecialFields).filter(([, fieldMeta]) => fieldMeta.unique !== true).map(([fieldName]) => fieldName).filter((index) => !manualIndexes.some((m) => Array.isArray(m) ? m[0] === index : m === index));
-	return [key, manualIndexes.concat(specialFieldIndexes)];
+	const declaredIndexes = (table.indexes ?? []).reduce((indexes, index) => {
+		const resolved = index.fields.map((fieldKey) => resolveIndexField(fieldKey)).filter((fieldName) => fieldName !== null);
+		if (resolved.length === index.fields.length) indexes.push(resolved.length === 1 ? resolved[0] : resolved);
+		return indexes;
+	}, []);
+	const explicitIndexes = manualIndexes.concat(declaredIndexes);
+	const specialFieldIndexes = Object.entries(tableSpecialFields).filter(([, fieldMeta]) => fieldMeta.unique !== true).map(([fieldName]) => fieldName).filter((index) => !explicitIndexes.some((m) => Array.isArray(m) ? m[0] === index : m === index));
+	const seen = /* @__PURE__ */ new Set();
+	return [key, explicitIndexes.concat(specialFieldIndexes).filter((index) => {
+		const key = (Array.isArray(index) ? index : [index]).join("\0");
+		if (seen.has(key)) return false;
+		seen.add(key);
+		return true;
+	})];
 }));
 const VALID_IDENTIFIER_REGEX = /^[$A-Z_][0-9A-Z_$]*$/i;
 const LEADING_DIGIT_REGEX = /^[0-9]/;
@@ -175,11 +187,19 @@ const renderSchemaOrmFile = async ({ extensionKey, exportName, file, mode, regen
 			return `    ${key}: ${expression},`;
 		});
 		const indexes = mergedIndexFields(tables)[entry.key]?.map((indexSpec) => {
-			const indexArray = Array.isArray(indexSpec) ? [...indexSpec].sort() : [indexSpec];
+			const indexArray = Array.isArray(indexSpec) ? indexSpec : [indexSpec];
 			const indexName = indexArray.join("_");
-			state.ormImports.add("index");
+			const indexFactory = (entry.table.indexes ?? []).some((index) => {
+				if (!index.unique) return false;
+				const resolvedFields = index.fields.map((fieldKey) => {
+					const field = entry.table.fields[fieldKey];
+					return field ? field.fieldName ?? fieldKey : null;
+				}).filter((fieldName) => fieldName !== null);
+				return resolvedFields.length === index.fields.length && resolvedFields.join("\0") === indexArray.join("\0");
+			}) ? "uniqueIndex" : "index";
+			state.ormImports.add(indexFactory);
 			const fieldsCall = indexArray.map((fieldName) => renderPropertyAccess(entry.varName, fieldName)).join(", ");
-			return `index(${JSON.stringify(indexName)}).on(${fieldsCall})`;
+			return `${indexFactory}(${JSON.stringify(indexName)}).on(${fieldsCall})`;
 		}) || [];
 		const extraConfig = indexes.length > 0 ? `,\n  (${entry.varName}) => [\n    ${indexes.join(",\n    ")},\n  ]` : "";
 		tableBlocks.push(`export const ${entry.varName} = convexTable(\n  ${JSON.stringify(entry.modelName)},\n  {\n${fieldLines.join("\n")}\n  }${extraConfig}\n);`);

package/dist/{generated-contract-disabled-BEc4d98x.d.ts → generated-contract-disabled-Btfy2opW.d.ts}

@@ -113,6 +113,16 @@ declare const updateOneHandler: (ctx: any, args: {
   tableTriggers?: RuntimeTableTriggers;
   triggerCtx?: unknown;
 }, schema: Schema, betterAuthSchema: any) => Promise<any>;
+declare const incrementOneHandler: (ctx: any, args: {
+  input: {
+    increment: Record<string, number>;
+    model: string;
+    set?: Record<string, unknown>;
+    where?: any[];
+  };
+  tableTriggers?: RuntimeTableTriggers;
+  triggerCtx?: unknown;
+}, schema: Schema, betterAuthSchema: any) => Promise<any>;
 declare const updateManyHandler: (ctx: any, args: {
   input: {
     model: string;
@@ -130,14 +140,16 @@ declare const updateManyHandler: (ctx: any, args: {
   splitCursor?: convex_server0.Cursor | null;
   pageStatus?: "SplitRecommended" | "SplitRequired" | null;
 }>;
-declare const deleteOneHandler: (ctx: any, args: {
+type DeleteOneArgs = {
   input: {
     model: string;
     where?: any[];
   };
   tableTriggers?: RuntimeTableTriggers;
   triggerCtx?: unknown;
-}, schema: Schema, betterAuthSchema: any) => Promise<Record<string, unknown> | undefined>;
+};
+declare const deleteOneHandler: (ctx: any, args: DeleteOneArgs, schema: Schema, betterAuthSchema: any) => Promise<Record<string, unknown> | undefined>;
+declare const consumeOneHandler: (ctx: any, args: DeleteOneArgs, schema: Schema, betterAuthSchema: any) => Promise<convex_server0.GenericDocument | null>;
 declare const deleteManyHandler: (ctx: any, args: {
   input: {
     model: string;
@@ -166,6 +178,20 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
   triggers?: GenericAuthTriggers<DataModel, Schema, TriggerCtx> | ((ctx: TriggerCtx) => GenericAuthTriggers<DataModel, Schema, TriggerCtx> | undefined); /** Validate input validators against auth table schemas. Defaults to false for smaller generated types. */
   validateInput?: boolean;
 }) => {
+  consumeOne: convex_server0.RegisteredMutation<"internal", {
+    input: {
+      where?: {
+        connector?: "AND" | "OR" | undefined;
+        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
+        field: string;
+        value: string | number | boolean | string[] | number[] | null;
+      }[] | undefined;
+      model: string;
+    } | {
+      where?: any[] | undefined;
+      model: string;
+    };
+  }, Promise<convex_server0.GenericDocument | null>>;
   create: convex_server0.RegisteredMutation<"internal", {
     select?: string[] | undefined;
     input: {
@@ -185,8 +211,8 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
       where?: {
         connector?: "AND" | "OR" | undefined;
         operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        value: string | number | boolean | string[] | number[] | null;
         field: string;
+        value: string | number | boolean | string[] | number[] | null;
       }[] | undefined;
       model: string;
     } | {
@@ -214,8 +240,8 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
       where?: {
         connector?: "AND" | "OR" | undefined;
         operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        value: string | number | boolean | string[] | number[] | null;
         field: string;
+        value: string | number | boolean | string[] | number[] | null;
       }[] | undefined;
       model: string;
     } | {
@@ -224,15 +250,15 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     };
   }, Promise<Record<string, unknown> | undefined>>;
   findMany: convex_server0.RegisteredQuery<"internal", {
+    limit?: number | undefined;
     join?: any;
     where?: {
       mode?: "sensitive" | "insensitive" | undefined;
       connector?: "AND" | "OR" | undefined;
       operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      value: string | number | boolean | string[] | number[] | null;
       field: string;
+      value: string | number | boolean | string[] | number[] | null;
     }[] | undefined;
-    limit?: number | undefined;
     offset?: number | undefined;
     sortBy?: {
       field: string;
@@ -250,25 +276,39 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
   }, Promise<PaginationResult<convex_server0.GenericDocument>>>;
   findOne: convex_server0.RegisteredQuery<"internal", {
     join?: any;
-    select?: string[] | undefined;
     where?: {
       mode?: "sensitive" | "insensitive" | undefined;
       connector?: "AND" | "OR" | undefined;
       operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-      value: string | number | boolean | string[] | number[] | null;
       field: string;
+      value: string | number | boolean | string[] | number[] | null;
     }[] | undefined;
+    select?: string[] | undefined;
     model: string;
   }, Promise<convex_server0.GenericDocument | null>>;
   getLatestJwks: convex_server0.RegisteredAction<"internal", {}, Promise<unknown>>;
+  incrementOne: convex_server0.RegisteredMutation<"internal", {
+    input: {
+      set?: Record<string, any> | undefined;
+      where?: {
+        mode?: "sensitive" | "insensitive" | undefined;
+        connector?: "AND" | "OR" | undefined;
+        operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
+        field: string;
+        value: string | number | boolean | string[] | number[] | null;
+      }[] | undefined;
+      model: string;
+      increment: Record<string, number>;
+    };
+  }, Promise<any>>;
   rotateKeys: convex_server0.RegisteredAction<"internal", {}, Promise<unknown>>;
   updateMany: convex_server0.RegisteredMutation<"internal", {
     input: {
       where?: {
         connector?: "AND" | "OR" | undefined;
         operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        value: string | number | boolean | string[] | number[] | null;
         field: string;
+        value: string | number | boolean | string[] | number[] | null;
       }[] | undefined;
       model: string;
       update: {
@@ -302,8 +342,8 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
       where?: {
         connector?: "AND" | "OR" | undefined;
         operator?: "lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined;
-        value: string | number | boolean | string[] | number[] | null;
         field: string;
+        value: string | number | boolean | string[] | number[] | null;
       }[] | undefined;
       model: string;
       update: {
@@ -321,11 +361,13 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
 //#endregion
 //#region src/auth/create-client.d.ts
 type AuthFunctions = {
+  consumeOne: FunctionReference<'mutation', 'internal', Record<string, any>>;
   create: FunctionReference<'mutation', 'internal', Record<string, any>>;
   deleteMany: FunctionReference<'mutation', 'internal', Record<string, any>>;
   deleteOne: FunctionReference<'mutation', 'internal', Record<string, any>>;
   findMany: FunctionReference<'query', 'internal', Record<string, any>>;
   findOne: FunctionReference<'query', 'internal', Record<string, any>>;
+  incrementOne: FunctionReference<'mutation', 'internal', Record<string, any>>;
   updateMany: FunctionReference<'mutation', 'internal', Record<string, any>>;
   updateOne: FunctionReference<'mutation', 'internal', Record<string, any>>;
 };
@@ -366,4 +408,4 @@ declare const createDisabledAuthRuntime: <DataModel extends GenericDataModel, Sc
   reason?: string;
 }) => AuthRuntime<DataModel, Schema, TriggerCtx, GenericCtx, AuthOptions>;
 //#endregion
-export { defineAuth as S, GenericAuthBeforeResult as _, AuthFunctions as a, GenericAuthTriggerHandlers as b, createApi as c, deleteOneHandler as d, findManyHandler as f, BetterAuthOptionsWithoutDatabase as g, updateOneHandler as h, getGeneratedAuthDisabledReason as i, createHandler as l, updateManyHandler as m, GeneratedAuthDisabledReasonKind as n, Triggers as o, findOneHandler as p, createDisabledAuthRuntime as r, createClient as s, AuthRuntime as t, deleteManyHandler as u, GenericAuthDefinition as v, GenericAuthTriggers as x, GenericAuthTriggerChange as y };
+export { GenericAuthTriggers as C, GenericAuthTriggerHandlers as S, updateOneHandler as _, AuthFunctions as a, GenericAuthDefinition as b, consumeOneHandler as c, deleteManyHandler as d, deleteOneHandler as f, updateManyHandler as g, incrementOneHandler as h, getGeneratedAuthDisabledReason as i, createApi as l, findOneHandler as m, GeneratedAuthDisabledReasonKind as n, Triggers as o, findManyHandler as p, createDisabledAuthRuntime as r, createClient as s, AuthRuntime as t, createHandler as u, BetterAuthOptionsWithoutDatabase as v, defineAuth as w, GenericAuthTriggerChange as x, GenericAuthBeforeResult as y };

package/dist/{generated-contract-disabled-CZa0iyV0.js → generated-contract-disabled-_1Mjg9pW.js}

@@ -34,11 +34,13 @@ const createDisabledAuthRuntime = (config) => {
 			throw new Error(`${message} (auth)`);
 		} }),
 		getAuth: createDisabledError(message, "getAuth"),
+		consumeOne: createDisabledRuntimeExport(message, "consumeOne"),
 		create: createDisabledRuntimeExport(message, "create"),
 		deleteMany: createDisabledRuntimeExport(message, "deleteMany"),
 		deleteOne: createDisabledRuntimeExport(message, "deleteOne"),
 		findMany: createDisabledRuntimeExport(message, "findMany"),
 		findOne: createDisabledRuntimeExport(message, "findOne"),
+		incrementOne: createDisabledRuntimeExport(message, "incrementOne"),
 		updateMany: createDisabledRuntimeExport(message, "updateMany"),
 		updateOne: createDisabledRuntimeExport(message, "updateOne"),
 		getLatestJwks: createDisabledRuntimeExport(message, "getLatestJwks"),

package/dist/orm/index.d.ts

@@ -1,5 +1,5 @@
 import { $n as BinaryExpression, $t as OrmLifecycleOperation, A as DatabaseWithMutations, An as ConvexCheckConfig, Ar as AnyColumn, At as VectorQueryConfig, B as RlsContext, Bn as ConvexTextBuilderInitial, Br as IsUnique, Bt as RelationsBuilderColumnConfig, C as MigrationTableName, Cn as aggregateIndex, Cr as notBetween, Ct as OrderDirection, D as defineMigrationSet, Dn as uniqueIndex, Dt as ReturningResult, E as defineMigration, En as searchIndex, Er as startsWith, Et as ReturningAll, Fn as ConvexUniqueConstraintConfig, Fr as ColumnBuilderWithTableName, Ft as ExtractTablesWithRelations, Gt as defineRelations, H as EdgeMetadata, In as check, Ir as ColumnDataType, It as ManyConfig, Jt as ConvexDeletionConfig, Kt as defineRelationsPart, Ln as foreignKey, Lr as DrizzleEntity, Lt as OneConfig, M as OrmReader$1, Mn as ConvexForeignKeyConfig, Mr as ColumnBuilderBaseConfig, Mt as unsetToken, N as OrmWriter$1, Nn as ConvexUniqueConstraintBuilder, Nr as ColumnBuilderRuntimeConfig, O as detectMigrationDrift, On as vectorIndex, Or as SystemFields, Ot as ReturningSelection, Pn as ConvexUniqueConstraintBuilderOn, Pr as ColumnBuilderTypeConfig, Pt as ExtractTablesFromSchema, Qn as TableName, Qt as OrmLifecycleChange, Rn as unique, Rr as HasDefault, Rt as RelationsBuilder, S as MigrationStep, Sn as ConvexVectorIndexConfig, Sr as not, St as OrderByClause, T as buildMigrationPlan, Tn as rankIndex, Tr as or, Tt as PredicateWhereIndexConfig, U as extractRelationsConfig, Un as Brand, Ut as TableRelationalConfig, V as RlsMode, Vn as text, Vr as NotNull, Wn as Columns, Wt as TablesRelationalConfig, Xn as OrmSchemaRelations, Xt as ConvexTableWithColumns, Yn as OrmSchemaExtensions, Yt as ConvexTable, Zn as OrmSchemaTriggers, Zt as DiscriminatorBuilderConfig, _ as MigrationMigrateOne, _n as ConvexSearchIndexBuilder, _r as isNull, _t as MutationPaginateConfig, an as RlsPolicyConfig, ar as and, at as CountConfig, b as MigrationSet, bn as ConvexVectorIndexBuilder, br as lte, bt as MutationReturning, cn as RlsRole, cr as endsWith, ct as FilterOperators, d as MigrationDefinition, dn as ConvexAggregateIndexBuilder, dr as gt, dt as InferModelFromColumns, en as TableConfig, er as ExpressionVisitor, et as AggregateConfig, f as MigrationDirection, fn as ConvexAggregateIndexBuilderOn, fr as gte, ft as InferSelectModel, g as MigrationManifestEntry, gn as ConvexRankIndexBuilderOn, gr as isNotNull, gt as MutationExecutionMode, h as MigrationDriftIssue, hn as ConvexRankIndexBuilder, hr as isFieldReference, ht as MutationExecuteResult, i as OrmMigrationCapability, in as RlsPolicy, ir as UnaryExpression, it as BuildRelationResult, j as DatabaseWithQuery, jn as ConvexForeignKeyBuilder, jr as ColumnBuilder, jt as VectorSearchProvider, kn as ConvexCheckBuilder, kt as UpdateSet, ln as RlsRoleConfig, lr as eq, lt as GetColumnData, m as MigrationDocContext, mn as ConvexIndexBuilderOn, mr as inArray, mt as MutationExecuteConfig, n as OrmCapabilities, nn as deletion, nr as FilterExpression, nt as AggregateResult, on as RlsPolicyToOption, or as between, ot as CountResult, p as MigrationDoc, pn as ConvexIndexBuilder, pr as ilike, pt as InsertValue, qn as OrmSchemaExtensionTables, qt as ConvexDeletionBuilder, r as OrmCapability, rn as discriminator, rr as LogicalExpression, rt as BuildQueryResult, sn as rlsPolicy, sr as contains, st as DBQueryConfig, t as OrmAggregateCapability, tn as convexTable, tr as FieldReference, tt as AggregateFieldValue, u as MigrationAppliedState, un as rlsRole, ur as fieldRef, ut as InferInsertModel, v as MigrationPlan, vn as ConvexSearchIndexBuilderOn, vr as like, vt as MutationPaginatedResult, w as MigrationWriteMode, wn as index, wr as notInArray, wt as PaginatedResult, x as MigrationStateMap, xn as ConvexVectorIndexBuilderOn, xr as ne, xt as MutationRunMode, y as MigrationRunStatus, yn as ConvexSearchIndexConfig, yr as lt, yt as MutationResult, zn as ConvexTextBuilder, zr as IsPrimaryKey, zt as RelationsBuilderColumnBase } from "../capabilities-DkfnnNp7.js";
-import { $ as OrmClientWithApi$1, A as ConvexDateMode, B as ConvexBytesBuilderInitial, C as ConvexNumberBuilderInitial, D as id, E as ConvexIdBuilderInitial, F as custom, G as ConvexBigIntBuilder, H as ConvexBooleanBuilder, I as json, J as CreateOrmOptions, K as ConvexBigIntBuilderInitial, L as objectOf, M as ConvexCustomBuilder, N as ConvexCustomBuilderInitial, O as ConvexDateBuilder, P as arrayOf, Q as OrmClientBase$1, R as unionOf, S as ConvexNumberBuilder, St as defineTriggers, T as ConvexIdBuilder, U as ConvexBooleanBuilderInitial, V as bytes, W as boolean, X as GenericOrmCtx$1, Y as GenericOrm$1, Z as OrmApiResult, _ as ConvexTimestampMode, _t as OrmBeforeResult, a as requireSchemaRelations, at as ScheduledMutationBatchArgs, b as ConvexTextEnumBuilderInitial, bt as OrmTriggerContext, c as TableConfigResult, ct as scheduledDeleteFactory, d as OrmNotFoundError, et as OrmFunctions, f as ConvexVectorBuilder, g as ConvexTimestampBuilderInitial, gt as defineSchemaExtension, h as ConvexTimestampBuilder, ht as SchemaExtension, i as getSchemaTriggers, it as createOrm, j as date, k as ConvexDateBuilderInitial, l as getTableColumns, m as vector, n as defineSchema, nt as OrmWriterCtx, o as asc, ot as scheduledMutationBatchFactory, p as ConvexVectorBuilderInitial, q as bigint, r as getSchemaRelations, rt as ResolveOrmSchema, s as desc, st as ScheduledDeleteArgs, t as WhereClauseResult, tt as OrmReaderCtx, u as getTableConfig, v as timestamp, vt as OrmTableTriggers, w as integer, x as textEnum, xt as OrmTriggers, y as ConvexTextEnumBuilder, yt as OrmTriggerChange, z as ConvexBytesBuilder } from "../where-clause-compiler-DuC8Nr7e.js";
+import { $ as OrmClientWithApi$1, A as ConvexDateMode, B as ConvexBytesBuilderInitial, C as ConvexNumberBuilderInitial, D as id, E as ConvexIdBuilderInitial, F as custom, G as ConvexBigIntBuilder, H as ConvexBooleanBuilder, I as json, J as CreateOrmOptions, K as ConvexBigIntBuilderInitial, L as objectOf, M as ConvexCustomBuilder, N as ConvexCustomBuilderInitial, O as ConvexDateBuilder, P as arrayOf, Q as OrmClientBase$1, R as unionOf, S as ConvexNumberBuilder, St as defineTriggers, T as ConvexIdBuilder, U as ConvexBooleanBuilderInitial, V as bytes, W as boolean, X as GenericOrmCtx$1, Y as GenericOrm$1, Z as OrmApiResult, _ as ConvexTimestampMode, _t as OrmBeforeResult, a as requireSchemaRelations, at as ScheduledMutationBatchArgs, b as ConvexTextEnumBuilderInitial, bt as OrmTriggerContext, c as TableConfigResult, ct as scheduledDeleteFactory, d as OrmNotFoundError, et as OrmFunctions, f as ConvexVectorBuilder, g as ConvexTimestampBuilderInitial, gt as defineSchemaExtension, h as ConvexTimestampBuilder, ht as SchemaExtension, i as getSchemaTriggers, it as createOrm, j as date, k as ConvexDateBuilderInitial, l as getTableColumns, m as vector, n as defineSchema, nt as OrmWriterCtx, o as asc, ot as scheduledMutationBatchFactory, p as ConvexVectorBuilderInitial, q as bigint, r as getSchemaRelations, rt as ResolveOrmSchema, s as desc, st as ScheduledDeleteArgs, t as WhereClauseResult, tt as OrmReaderCtx, u as getTableConfig, v as timestamp, vt as OrmTableTriggers, w as integer, x as textEnum, xt as OrmTriggers, y as ConvexTextEnumBuilder, yt as OrmTriggerChange, z as ConvexBytesBuilder } from "../where-clause-compiler-CETRjurp.js";
 import { i as pretendRequired, n as deprecated, r as pretend } from "../validators-wOIjhkfN.js";
 import { a as QueryCtxWithPreferredOrmQueryTable, i as QueryCtxWithOrmQueryTable, n as LookupByIdResultByCtx, o as getByIdWithOrmQueryFallback, r as QueryCtxWithOptionalOrmQueryTable, t as DocByCtx } from "../query-context-DJONf8X5.js";
 import { DefineSchemaOptions, GenericDatabaseReader, GenericDatabaseWriter, GenericSchema, SchemaDefinition } from "convex/server";

package/dist/orm/migrations/index.d.ts

@@ -1,3 +1,3 @@
 import { C as MigrationTableName, D as defineMigrationSet, E as defineMigration, O as detectMigrationDrift, S as MigrationStep, T as buildMigrationPlan, _ as MigrationMigrateOne, a as MigrationCancelArgs, b as MigrationSet, c as MigrationStatusArgs, d as MigrationDefinition, f as MigrationDirection, g as MigrationManifestEntry, h as MigrationDriftIssue, l as createMigrationHandlers, m as MigrationDocContext, o as MigrationRunArgs, p as MigrationDoc, s as MigrationRunChunkArgs, u as MigrationAppliedState, v as MigrationPlan, w as MigrationWriteMode, x as MigrationStateMap, y as MigrationRunStatus } from "../../capabilities-DkfnnNp7.js";
-import { Ct as migrationCapability, dt as MIGRATION_STORAGE_TABLE_NAMES, ft as injectMigrationStorageTables, lt as MIGRATION_RUN_TABLE, mt as migrationStorageTables, pt as migrationExtension, ut as MIGRATION_STATE_TABLE } from "../../where-clause-compiler-DuC8Nr7e.js";
+import { Ct as migrationCapability, dt as MIGRATION_STORAGE_TABLE_NAMES, ft as injectMigrationStorageTables, lt as MIGRATION_RUN_TABLE, mt as migrationStorageTables, pt as migrationExtension, ut as MIGRATION_STATE_TABLE } from "../../where-clause-compiler-CETRjurp.js";
 export { MIGRATION_RUN_TABLE, MIGRATION_STATE_TABLE, MIGRATION_STORAGE_TABLE_NAMES, type MigrationAppliedState, type MigrationCancelArgs, type MigrationDefinition, type MigrationDirection, type MigrationDoc, type MigrationDocContext, type MigrationDriftIssue, type MigrationManifestEntry, type MigrationMigrateOne, type MigrationPlan, type MigrationRunArgs, type MigrationRunChunkArgs, type MigrationRunStatus, type MigrationSet, type MigrationStateMap, type MigrationStatusArgs, type MigrationStep, type MigrationTableName, type MigrationWriteMode, buildMigrationPlan, createMigrationHandlers, defineMigration, defineMigrationSet, detectMigrationDrift, injectMigrationStorageTables, migrationCapability, migrationExtension, migrationStorageTables };

package/dist/solid/index.d.ts

@@ -8,8 +8,6 @@ import { BetterAuthClientPlugin } from "better-auth/client";
 import { createAuthClient } from "better-auth/solid";
 import * as better_auth0 from "better-auth";
 import { Session, User } from "better-auth";
-import * as better_auth_api0 from "better-auth/api";
-import * as better_auth_plugins_oidc_provider0 from "better-auth/plugins/oidc-provider";
 import * as jose from "jose";
 import { BetterAuthOptions } from "better-auth/minimal";
 
@@ -977,18 +975,15 @@ declare const convex$1: (opts: {
   hooks: {
     before: ({
       matcher(context: better_auth0.HookEndpointContext): boolean;
-      handler: (inputContext: better_auth0.MiddlewareInputContext<better_auth0.MiddlewareOptions>) => Promise<{
+      handler: better_auth0.Middleware<better_auth0.MiddlewareOptions, (inputContext: better_auth0.MiddlewareInputContext<better_auth0.MiddlewareOptions>) => Promise<{
         context: {
           headers: Headers;
         };
-      } | undefined>;
+      } | undefined>>;
     } | {
       matcher: (ctx: better_auth0.HookEndpointContext) => boolean;
-      handler: (inputContext: better_auth0.MiddlewareInputContext<better_auth0.MiddlewareOptions>) => Promise<{
-        context: better_auth0.MiddlewareContext<better_auth0.MiddlewareOptions, {
-          returned?: unknown | undefined;
-          responseHeaders?: Headers | undefined;
-        } & better_auth0.PluginContext<BetterAuthOptions> & better_auth0.InfoContext & {
+      handler: better_auth0.Middleware<better_auth0.MiddlewareOptions, (inputContext: better_auth0.MiddlewareInputContext<better_auth0.MiddlewareOptions>) => Promise<{
+        context: better_auth0.MiddlewareContext<better_auth0.MiddlewareOptions, better_auth0.PluginContext<BetterAuthOptions> & better_auth0.InfoContext & {
           options: BetterAuthOptions;
           trustedOrigins: string[];
           trustedProviders: string[];
@@ -1080,6 +1075,7 @@ declare const convex$1: (opts: {
             updateAge: number;
             expiresIn: number;
             freshAge: number;
+            cookieCacheSigner?: better_auth0.CookieCacheSigner | undefined;
             cookieRefreshCache: false | {
               enabled: true;
               updateAge: number;
@@ -1113,12 +1109,15 @@ declare const convex$1: (opts: {
           skipCSRFCheck: boolean;
           runInBackground: (promise: Promise<unknown>) => void;
           runInBackgroundOrAwait: (promise: Promise<unknown> | void) => better_auth0.Awaitable<unknown>;
+        } & {
+          returned?: unknown | undefined;
+          responseHeaders?: Headers | undefined;
         }>;
-      }>;
+      }>>;
     })[];
     after: {
-      matcher: (context: better_auth0.HookEndpointContext) => boolean;
-      handler: better_auth_api0.AuthMiddleware;
+      matcher: (ctx: better_auth0.HookEndpointContext) => boolean;
+      handler: better_auth0.Middleware<better_auth0.MiddlewareOptions, (inputContext: better_auth0.MiddlewareInputContext<better_auth0.MiddlewareOptions>) => Promise<void>>;
     }[];
   };
   endpoints: {
@@ -1127,7 +1126,25 @@ declare const convex$1: (opts: {
       metadata: {
         isAction: false;
       };
-    }, better_auth_plugins_oidc_provider0.OIDCMetadata>;
+    }, {
+      issuer: string;
+      authorization_endpoint: string;
+      token_endpoint: string;
+      userinfo_endpoint: string;
+      jwks_uri: string;
+      registration_endpoint: string;
+      end_session_endpoint: string;
+      scopes_supported: string[];
+      response_types_supported: string[];
+      response_modes_supported: string[];
+      grant_types_supported: string[];
+      acr_values_supported: string[];
+      subject_types_supported: string[];
+      id_token_signing_alg_values_supported: string[];
+      token_endpoint_auth_methods_supported: string[];
+      code_challenge_methods_supported: string[];
+      claims_supported: string[];
+    }>;
     getJwks: better_auth0.StrictEndpoint<"/convex/jwks", {
       method: "GET";
       metadata: {
@@ -1164,7 +1181,7 @@ declare const convex$1: (opts: {
     getToken: better_auth0.StrictEndpoint<"/convex/token", {
       method: "GET";
       requireHeaders: true;
-      use: ((inputContext: better_auth0.MiddlewareInputContext<better_auth0.MiddlewareOptions>) => Promise<{
+      use: better_auth0.Middleware<better_auth0.MiddlewareOptions, (inputContext: better_auth0.MiddlewareInputContext<better_auth0.MiddlewareOptions>) => Promise<{
         session: {
           session: Record<string, any> & {
             id: string;
@@ -1186,7 +1203,7 @@ declare const convex$1: (opts: {
             image?: string | null | undefined;
           };
         };
-      }>)[];
+      }>>[];
       metadata: {
         openapi: {
           description: string;
@@ -1215,6 +1232,14 @@ declare const convex$1: (opts: {
           type: "date";
           required: false;
         };
+        alg: {
+          type: "string";
+          required: false;
+        };
+        crv: {
+          type: "string";
+          required: false;
+        };
       };
     };
     user: {
@@ -1288,7 +1313,10 @@ type SolidAuthProviderClient = {
 type AuthClientWithPlugins<Plugins extends BetterAuthClientPlugin[]> = ReturnType<typeof createAuthClient<{
   plugins: Plugins;
 }>>;
-type SolidAuthClient = AuthClientWithPlugins<PluginsWithCrossDomain> | AuthClientWithPlugins<PluginsWithoutCrossDomain>;
+type HydratableAuthClient<Plugins extends BetterAuthClientPlugin[]> = Omit<AuthClientWithPlugins<Plugins>, 'hydrateSession'> & {
+  hydrateSession(session: Parameters<AuthClientWithPlugins<Plugins>['hydrateSession']>[0]): void;
+};
+type SolidAuthClient = HydratableAuthClient<PluginsWithCrossDomain> | HydratableAuthClient<PluginsWithoutCrossDomain>;
 //#endregion
 //#region src/solid/convex-auth-provider.d.ts
 type ConvexAuthProviderProps = {

package/dist/{token-DcV_0fkF.js → token-B0NKKxqP.js}

@@ -1,4 +1,4 @@
-import { t as JWT_COOKIE_NAME } from "./convex-plugin-DfOhBU9g.js";
+import { t as JWT_COOKIE_NAME } from "./convex-plugin-Dic0l-k8.js";
 import { betterFetch } from "@better-fetch/fetch";
 import { getSessionCookie } from "better-auth/cookies";
 import * as jose from "jose";