kitcn 0.27.4 → 0.28.0

package/dist/orm/index.js

@@ -4,9 +4,9 @@ import { a as pretendRequired, i as pretend, n as deprecated } from "../validato
 import { t as id } from "../id-CuSfWa5q.js";
 import { A as or, C as matchLikePattern, D as notIlike, E as notBetween, O as notInArray, S as lte, T as not, _ as isFieldReference, a as between, b as like, c as endsWith, d as filterValueInList, f as filterValuesEqual, g as inArray, h as ilike, i as arrayOverlaps, j as startsWith, k as notLike, l as eq, m as gte, n as arrayContained, o as column, p as gt, r as arrayContains, s as contains, t as and, u as fieldRef, v as isNotNull, w as ne, x as lt, y as isNull } from "../filter-expression-Dydt8wS0.js";
 import { a as indexKeyWithinBounds, c as streamIndexRange, i as getIndexFields, l as isUnsetToken, n as EmptyStream, o as mergedStream, r as QueryStream, s as stream, t as getByIdWithOrmQueryFallback, u as unsetToken } from "../query-context-DOm5Xm3H.js";
-import { $ as resolveOrmRuntimeDefaults, A as enforceUniqueIndexes, B as getMutationAsyncDelayMs, C as collectPrimaryIdLookupRows, Ct as usesSystemCreatedAtAlias, D as enforceCheckConstraints, E as encodeUndefinedDeep, F as evaluateFilter, G as getTableDeleteConfig, H as getMutationExecutionMode, I as extractPrimaryIdLookup, J as hardDeleteRow, K as getTableName, L as getChecks, M as ensureNonNullValues, N as ensureNullableColumns, O as enforceForeignKeys, P as evaluateCheckConstraintTriState, Q as patchReferencingRows, R as getColumnName$1, S as collectMutationRowsBounded, St as PUBLIC_CREATED_AT_FIELD, T as deserializeFilterExpression, U as getOrmContext, V as getMutationCollectionLimits, W as getTableColumns$2, X as normalizeDateFieldsForWrite, Y as hydrateDateFieldsForRead, Z as normalizeTemporalComparableValue, _ as applyDefaults, _t as getIndexes, at as toConvexFilter, b as buildForeignKeyGraph, bt as CREATED_AT_MIGRATION_MESSAGE, c as getAggregateIndexDefinitions, ct as compileConvexFilter, d as COUNT_ERROR, dt as mapWithConcurrency, et as selectReturningRowWithHydration, f as createAggregateError, ft as findIndexForColumns, g as ensureCountAllowedForRls, gt as getAggregateIndexes, h as ensureAggregateAllowedForRls, ht as findVectorIndexByName, it as takeRowsWithinByteBudget, j as ensureDefaultColumns, k as enforcePolymorphicWrite, l as getRankIndexDefinitions, lt as convexAnd, mt as findSearchIndexByName, nt as softDeleteRow, o as aggregateExtension, ot as hasLifecycleHooks, p as createCountError, pt as findRelationIndex, q as getUniqueIndexes, rt as splitReturningSelection, st as markLifecycleHookedTables, tt as serializeFilterExpression, u as AGGREGATE_ERROR, ut as isConvexEnforceableFilter, v as applyIncomingForeignKeyActionsOnDelete, vt as getRankIndexes, w as decodeUndefinedDeep, x as canUsePrimaryIdLookupCursor, xt as INTERNAL_CREATION_TIME_FIELD, y as applyIncomingForeignKeyActionsOnUpdate, yt as resolveIndexOrderPushdown, z as getForeignKeys } from "../schema-C5WWEqsj.js";
+import { $ as resolveOrmRuntimeDefaults, A as enforceUniqueIndexes, B as getMutationAsyncDelayMs, C as collectPrimaryIdLookupRows, Ct as CREATED_AT_MIGRATION_MESSAGE, D as enforceCheckConstraints, E as encodeUndefinedDeep, Et as usesSystemCreatedAtAlias, F as evaluateFilter, G as getTableDeleteConfig, H as getMutationExecutionMode, I as extractPrimaryIdLookup, J as hardDeleteRow, K as getTableName, L as getChecks, M as ensureNonNullValues, N as ensureNullableColumns, O as enforceForeignKeys, P as evaluateCheckConstraintTriState, Q as patchReferencingRows, R as getColumnName$1, S as collectMutationRowsBounded, St as resolveIndexOrderPushdown, T as deserializeFilterExpression, Tt as PUBLIC_CREATED_AT_FIELD, U as getOrmContext, V as getMutationCollectionLimits, W as getTableColumns$2, X as normalizeDateFieldsForWrite, Y as hydrateDateFieldsForRead, Z as normalizeTemporalComparableValue, _ as applyDefaults, _t as findSearchIndexByName, at as stripUnsetFields, b as buildForeignKeyGraph, bt as getIndexes, c as getAggregateIndexDefinitions, ct as unsetFieldsOf, d as COUNT_ERROR, dt as compileConvexFilter, et as returningSelectionReadsCreationTime, f as createAggregateError, ft as convexAnd, g as ensureCountAllowedForRls, gt as findRelationIndex, h as ensureAggregateAllowedForRls, ht as findIndexForColumns, it as splitReturningSelection, j as ensureDefaultColumns, k as enforcePolymorphicWrite, l as getRankIndexDefinitions, lt as hasLifecycleHooks, mt as mapWithConcurrency, nt as serializeFilterExpression, o as aggregateExtension, ot as takeRowsWithinByteBudget, p as createCountError, pt as isConvexEnforceableFilter, q as getUniqueIndexes, rt as softDeleteRow, st as toConvexFilter, tt as selectReturningRowWithHydration, u as AGGREGATE_ERROR, ut as markLifecycleHookedTables, v as applyIncomingForeignKeyActionsOnDelete, vt as findVectorIndexByName, w as decodeUndefinedDeep, wt as INTERNAL_CREATION_TIME_FIELD, x as canUsePrimaryIdLookupCursor, xt as getRankIndexes, y as applyIncomingForeignKeyActionsOnUpdate, yt as getAggregateIndexes, z as getForeignKeys } from "../schema-D95Z3Kss.js";
 import { t as defineSchemaExtension } from "../extensions-Blzsyekm.js";
-import { compareValues, v } from "convex/values";
+import { compareValues, convexToJson, jsonToConvex, v } from "convex/values";
 import { defineSchema as defineSchema$1, internalActionGeneric, internalMutationGeneric } from "convex/server";
 
 //#region src/orm/builders/bigint.ts
@@ -1560,6 +1560,33 @@ var GelRelationalQuery = class GelRelationalQuery extends QueryPromise {
 		this._countIndexReadinessByKey = countIndexReadiness ?? /* @__PURE__ */ new Map();
 	}
 	/**
+	* Relation counts for a document the caller is already holding.
+	*
+	* `returning({ _count })` runs inside the mutation that just wrote the row,
+	* so resolving it through `execute()` spends one `db.get` re-reading a
+	* document that is already in the transaction's write set. The count engine
+	* only ever reads the counted edges' source fields off its parent, and the
+	* caller's document carries all of them, so the root read is pure waste.
+	* Everything else `execute()` would have done to that row — the select-plan
+	* assertion and the RLS select filter — still runs here.
+	*
+	* Reached through the static accessor below rather than exposed on the instance:
+	* `GelRelationalQuery` is the declared return type of the public query
+	* builders, so an instance method would land in every user's autocomplete.
+	*/
+	async _countRelationsForHeldRow(row, countSelection) {
+		this._assertRlsSelectPlan({ _count: countSelection }, this.tableConfig, this.edgeMetadata, 0, 3);
+		const carrier = { ...row };
+		const visible = await this._applyRlsSelectFilter([carrier], this.tableConfig);
+		if (visible.length === 0) return {};
+		await this._loadRelationCounts(visible, countSelection, this.edgeMetadata, this.tableConfig);
+		return carrier._count ?? {};
+	}
+	/** @internal Accessor for `returning({ _count })`; see `returning-count.ts`. */
+	static countRelationsForHeldRow(query, row, countSelection) {
+		return query._countRelationsForHeldRow(row, countSelection);
+	}
+	/**
 	* The aggregate-index runtime, registered at `createOrm()`.
 	*
 	* Only `count()`, `aggregate()` and relation counts reach this; plain reads
@@ -5118,13 +5145,26 @@ function createReturningCountLoader(db, table, ormContext) {
 	const tableEdges = edgeMetadata.filter((edge) => edge.sourceTable === tableName);
 	const countIndexReadiness = /* @__PURE__ */ new Map();
 	return { async load(row, countSelection) {
-		return (await new GelRelationalQuery(schema, tableConfig, tableEdges, db, {
-			where: { id: row._id },
-			columns: {},
-			with: { _count: countSelection }
-		}, "first", edgeMetadata, ormContext?.rls, ormContext?.relationLoading, void 0, void 0, countIndexReadiness).execute())?._count ?? {};
+		const query = new GelRelationalQuery(schema, tableConfig, tableEdges, db, {}, "first", edgeMetadata, ormContext?.rls, ormContext?.relationLoading, void 0, void 0, countIndexReadiness);
+		return await GelRelationalQuery.countRelationsForHeldRow(query, row, countSelection);
 	} };
 }
+/**
+* True when any edge leaving `tableName` keys on `_creationTime`.
+*
+* The count engine reads an edge's source fields straight off the row it is
+* handed, so a caller that derives that row instead of reading it back has to
+* know whether `_creationTime` is load-bearing — a derived insert post-image
+* cannot have it, and a missing source value counts zero without erroring.
+* Asked of every edge on the table rather than only the counted ones: the
+* count selection varies per statement, the schema does not.
+*/
+function countedEdgesReadCreationTime(edgeMetadata, tableName) {
+	return (edgeMetadata ?? []).some((edge) => {
+		if (edge.sourceTable !== tableName) return false;
+		return (edge.sourceFields.length > 0 ? edge.sourceFields : [edge.fieldName]).some((field) => field === INTERNAL_CREATION_TIME_FIELD || field === PUBLIC_CREATED_AT_FIELD);
+	});
+}
 
 //#endregion
 //#region src/orm/delete.ts
@@ -5459,6 +5499,7 @@ var ConvexDeleteBuilder = class extends QueryPromise {
 
 //#endregion
 //#region src/orm/insert.ts
+const canonicalizeStoredRow = (row) => jsonToConvex(convexToJson(row));
 var ConvexInsertBuilder = class extends QueryPromise {
 	valuesList = [];
 	returningFields;
@@ -5509,13 +5550,15 @@ var ConvexInsertBuilder = class extends QueryPromise {
 	async execute() {
 		if (this.valuesList.length === 0) throw new Error("values() must be called before execute()");
 		const ormContext = getOrmContext(this.db);
+		const tableName = getTableName(this.table);
 		const returningSelection = this.returningFields && this.returningFields !== true ? splitReturningSelection(this.returningFields) : void 0;
+		const derivedRowSatisfiesCount = returningSelection?.countSelection === void 0 || !countedEdgesReadCreationTime(ormContext?.edgeMetadata, tableName) && !isRlsEnabled(this.table);
+		const canDerivePostImage = returningSelection !== void 0 && !hasLifecycleHooks(this.db, tableName) && !returningSelectionReadsCreationTime(returningSelection.columnSelection) && derivedRowSatisfiesCount;
 		const results = [];
 		for (const value of this.valuesList) {
 			const preparedValue = normalizeDateFieldsForWrite(this.table, applyDefaults(this.table, value));
 			enforcePolymorphicWrite(this.table, preparedValue);
 			const rls = ormContext?.rls;
-			const tableName = getTableName(this.table);
 			const rlsResolution = createRlsPolicyResolutionCache();
 			if (!await canInsertRow({
 				cache: rlsResolution,
@@ -5534,7 +5577,10 @@ var ConvexInsertBuilder = class extends QueryPromise {
 			await enforceUniqueIndexes(this.db, this.table, preparedValue, { changedFields: new Set(Object.keys(preparedValue)) });
 			const id = await this.db.insert(tableName, preparedValue);
 			if (!this.returningFields) continue;
-			const inserted = await this.db.get(id);
+			const inserted = canDerivePostImage ? canonicalizeStoredRow({
+				...preparedValue,
+				_id: id
+			}) : await this.db.get(id);
 			if (inserted) results.push(await this.resolveReturningRow(inserted, returningSelection, ormContext));
 		}
 		if (!this.returningFields) return;
@@ -5625,7 +5671,10 @@ var ConvexInsertBuilder = class extends QueryPromise {
 		await this.db.patch(tableName, existing._id, writeSet);
 		return {
 			status: "updated",
-			row: this.returningFields ? await this.db.get(existing._id) : null
+			row: this.returningFields ? hasLifecycleHooks(this.db, tableName) ? await this.db.get(existing._id) : canonicalizeStoredRow(stripUnsetFields({
+				...existing,
+				...writeSet
+			}, unsetFieldsOf(writeSet))) : null
 		};
 	}
 	async findConflictRow(value, targetColumns) {
@@ -6637,13 +6686,7 @@ var ConvexUpdateBuilder = class extends QueryPromise {
 		const hooksCanWriteMidLoop = hasLifecycleHooks(this.db, tableName) || incomingForeignKeys.some((foreignKey) => hasLifecycleHooks(this.db, foreignKey.sourceTableName));
 		const cascadeTargetsThisTable = incomingForeignKeys.some((foreignKey) => foreignKey.sourceTableName === tableName);
 		const canDerivePostImage = !(hooksCanWriteMidLoop || cascadeTargetsThisTable);
-		const unsetFields = Object.keys(writeSet).filter((field) => writeSet[field] === void 0);
-		const derivePostImage = (candidate) => {
-			if (unsetFields.length === 0) return candidate;
-			const postImage = { ...candidate };
-			for (const field of unsetFields) delete postImage[field];
-			return postImage;
-		};
+		const unsetFields = unsetFieldsOf(writeSet);
 		/**
 		* A single-column `references()` FK to `_id` whose column is supplied by
 		* `set()` probes a byte-identical id on every row, and nothing in this loop
@@ -6690,7 +6733,7 @@ var ConvexUpdateBuilder = class extends QueryPromise {
 			await this.db.patch(tableName, row._id, writeSet);
 			numAffected++;
 			if (!this.returningFields) continue;
-			const updated = canDerivePostImage ? derivePostImage(updatedRow) : await this.db.get(row._id);
+			const updated = canDerivePostImage ? stripUnsetFields(updatedRow, unsetFields) : await this.db.get(row._id);
 			if (!updated) continue;
 			if (this.returningFields === true) results.push(hydrateDateFieldsForRead(this.table, updated));
 			else {

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-CLCYgRdY.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-DAPEBp1y.js";
+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-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/{schema-C5WWEqsj.js → schema-D95Z3Kss.js}

@@ -1142,6 +1142,39 @@ function splitReturningSelection(fields) {
 		countSelection
 	};
 }
+/**
+* The keys a `patch` payload removes rather than writes.
+*
+* `patch` drops a key whose value is `undefined`; a local `{ ...row, ...set }`
+* merge keeps it, and `hydrateDateFieldsForRead` would then emit it. Hoisted
+* out of per-row loops by callers: one statement writes one `set()`.
+*/
+function unsetFieldsOf(writeSet) {
+	return Object.keys(writeSet).filter((field) => writeSet[field] === void 0);
+}
+/**
+* Removes the keys `patch` would have dropped from a locally derived
+* post-image. Returns `candidate` untouched when there is nothing to remove.
+*/
+function stripUnsetFields(candidate, unsetFields) {
+	if (unsetFields.length === 0) return candidate;
+	const postImage = { ...candidate };
+	for (const field of unsetFields) delete postImage[field];
+	return postImage;
+}
+/**
+* True when the projection reads `_creationTime`, under either the public
+* `createdAt` alias or a user column that shadows it.
+*
+* `insert()` derives its post-image from the payload it just wrote, and
+* `_creationTime` is the one field that payload can never carry: Convex's
+* insert syscall returns the id and nothing else.
+*/
+function returningSelectionReadsCreationTime(columnSelection) {
+	if (!columnSelection) return false;
+	for (const column of Object.values(columnSelection)) if (getSelectionColumnName(column) === INTERNAL_CREATION_TIME_FIELD) return true;
+	return false;
+}
 const matchLike = matchLikePattern;
 function evaluateFilter(row, filter) {
 	if (filter.type === "binary") {
@@ -1489,4 +1522,4 @@ function aggregateExtension() {
 }
 
 //#endregion
-export { resolveOrmRuntimeDefaults as $, enforceUniqueIndexes as A, getMutationAsyncDelayMs as B, collectPrimaryIdLookupRows as C, usesSystemCreatedAtAlias as Ct, enforceCheckConstraints as D, encodeUndefinedDeep as E, evaluateFilter as F, getTableDeleteConfig as G, getMutationExecutionMode as H, extractPrimaryIdLookup as I, hardDeleteRow as J, getTableName as K, getChecks as L, ensureNonNullValues as M, ensureNullableColumns as N, enforceForeignKeys as O, evaluateCheckConstraintTriState as P, patchReferencingRows as Q, getColumnName as R, collectMutationRowsBounded as S, PUBLIC_CREATED_AT_FIELD as St, deserializeFilterExpression as T, getOrmContext as U, getMutationCollectionLimits as V, getTableColumns as W, normalizeDateFieldsForWrite as X, hydrateDateFieldsForRead as Y, normalizeTemporalComparableValue as Z, applyDefaults as _, getIndexes as _t, AGGREGATE_STATE_TABLE as a, toConvexFilter as at, buildForeignKeyGraph as b, CREATED_AT_MIGRATION_MESSAGE as bt, getAggregateIndexDefinitions as c, compileConvexFilter as ct, COUNT_ERROR as d, mapWithConcurrency as dt, selectReturningRowWithHydration as et, createAggregateError as f, findIndexForColumns as ft, ensureCountAllowedForRls as g, getAggregateIndexes as gt, ensureAggregateAllowedForRls as h, findVectorIndexByName as ht, AGGREGATE_RANK_TREE_TABLE as i, takeRowsWithinByteBudget as it, ensureDefaultColumns as j, enforcePolymorphicWrite as k, getRankIndexDefinitions as l, convexAnd as lt, createError as m, findSearchIndexByName as mt, AGGREGATE_EXTREMA_TABLE as n, softDeleteRow as nt, aggregateExtension as o, hasLifecycleHooks as ot, createCountError as p, findRelationIndex as pt, getUniqueIndexes as q, AGGREGATE_MEMBER_TABLE as r, splitReturningSelection as rt, rankAggregateName as s, markLifecycleHookedTables as st, AGGREGATE_BUCKET_TABLE as t, serializeFilterExpression as tt, AGGREGATE_ERROR as u, isConvexEnforceableFilter as ut, applyIncomingForeignKeyActionsOnDelete as v, getRankIndexes as vt, decodeUndefinedDeep as w, canUsePrimaryIdLookupCursor as x, INTERNAL_CREATION_TIME_FIELD as xt, applyIncomingForeignKeyActionsOnUpdate as y, resolveIndexOrderPushdown as yt, getForeignKeys as z };
+export { resolveOrmRuntimeDefaults as $, enforceUniqueIndexes as A, getMutationAsyncDelayMs as B, collectPrimaryIdLookupRows as C, CREATED_AT_MIGRATION_MESSAGE as Ct, enforceCheckConstraints as D, encodeUndefinedDeep as E, usesSystemCreatedAtAlias as Et, evaluateFilter as F, getTableDeleteConfig as G, getMutationExecutionMode as H, extractPrimaryIdLookup as I, hardDeleteRow as J, getTableName as K, getChecks as L, ensureNonNullValues as M, ensureNullableColumns as N, enforceForeignKeys as O, evaluateCheckConstraintTriState as P, patchReferencingRows as Q, getColumnName as R, collectMutationRowsBounded as S, resolveIndexOrderPushdown as St, deserializeFilterExpression as T, PUBLIC_CREATED_AT_FIELD as Tt, getOrmContext as U, getMutationCollectionLimits as V, getTableColumns as W, normalizeDateFieldsForWrite as X, hydrateDateFieldsForRead as Y, normalizeTemporalComparableValue as Z, applyDefaults as _, findSearchIndexByName as _t, AGGREGATE_STATE_TABLE as a, stripUnsetFields as at, buildForeignKeyGraph as b, getIndexes as bt, getAggregateIndexDefinitions as c, unsetFieldsOf as ct, COUNT_ERROR as d, compileConvexFilter as dt, returningSelectionReadsCreationTime as et, createAggregateError as f, convexAnd as ft, ensureCountAllowedForRls as g, findRelationIndex as gt, ensureAggregateAllowedForRls as h, findIndexForColumns as ht, AGGREGATE_RANK_TREE_TABLE as i, splitReturningSelection as it, ensureDefaultColumns as j, enforcePolymorphicWrite as k, getRankIndexDefinitions as l, hasLifecycleHooks as lt, createError as m, mapWithConcurrency as mt, AGGREGATE_EXTREMA_TABLE as n, serializeFilterExpression as nt, aggregateExtension as o, takeRowsWithinByteBudget as ot, createCountError as p, isConvexEnforceableFilter as pt, getUniqueIndexes as q, AGGREGATE_MEMBER_TABLE as r, softDeleteRow as rt, rankAggregateName as s, toConvexFilter as st, AGGREGATE_BUCKET_TABLE as t, selectReturningRowWithHydration as tt, AGGREGATE_ERROR as u, markLifecycleHookedTables as ut, applyIncomingForeignKeyActionsOnDelete as v, findVectorIndexByName as vt, decodeUndefinedDeep as w, INTERNAL_CREATION_TIME_FIELD as wt, canUsePrimaryIdLookupCursor as x, getRankIndexes as xt, applyIncomingForeignKeyActionsOnUpdate as y, getAggregateIndexes as yt, getForeignKeys as z };

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";