kitcn 0.31.0 → 0.31.1

package/dist/orm/aggregate-index/index.js

@@ -1,7 +1,7 @@
-import { t as DirectAggregate } from "../../runtime-BcvcfaP8.js";
+import { t as DirectAggregate } from "../../runtime-B-8HKSIE.js";
 import { n as Columns } from "../../symbols-DDNAddkd.js";
 import { d as INTERNAL_CREATION_TIME_FIELD, f as PUBLIC_CREATED_AT_FIELD, m as usesSystemCreatedAtAlias } from "../../index-utils-C1DyktHe.js";
-import { Q as normalizeTemporalComparableValue, a as AGGREGATE_STATE_TABLE, c as getAggregateIndexDefinitions, d as COUNT_ERROR, ht as mapWithConcurrency, i as AGGREGATE_RANK_TREE_TABLE, l as getRankIndexDefinitions, m as createError, n as AGGREGATE_EXTREMA_TABLE, r as AGGREGATE_MEMBER_TABLE, s as rankAggregateName, t as AGGREGATE_BUCKET_TABLE, u as AGGREGATE_ERROR } from "../../schema-hL2FWCE7.js";
+import { Q as normalizeTemporalComparableValue, a as AGGREGATE_STATE_TABLE, c as getAggregateIndexDefinitions, d as COUNT_ERROR, ht as mapWithConcurrency, i as AGGREGATE_RANK_TREE_TABLE, l as getRankIndexDefinitions, m as createError, n as AGGREGATE_EXTREMA_TABLE, r as AGGREGATE_MEMBER_TABLE, s as rankAggregateName, t as AGGREGATE_BUCKET_TABLE, u as AGGREGATE_ERROR } from "../../schema-DbPcDW-N.js";
 
 //#region src/orm/transaction-cache.ts
 /**
@@ -1411,23 +1411,21 @@ const setCountStateError = async (db, tableName, indexName, error, kind = AGGREG
 * reports whether anything is left. Callers drive it to completion across
 * transactions, so clearing a large index never has to fit in one mutation.
 *
-* Members are removed through the normal delta machinery rather than raw
-* deletes, so buckets and extrema stay consistent with the members that remain
-* at every intermediate step. That keeps concurrent writers correct while the
-* clear drains. Residual bucket/extrema rows (drift with no member behind them)
-* are swept only once no members are left, and the loop re-checks members
-* afterwards.
+* Member rows are deleted outright rather than run back through the delta
+* machinery. The bucket and extrema branches below drop every row this index
+* owns whatever it holds, so folding a removal delta into a bucket first would
+* only rewrite a document this same clear is about to delete.
+*
+* Branch order is load-bearing: buckets and extrema are swept only once no
+* members are left, and the loop re-checks members afterwards. The intermediate
+* "members gone, buckets still populated" state is safe because `setCountState`
+* refuses to leave CLEARING while a bucket or extrema row survives, and the
+* CLEARING write barrier keeps concurrent writers out of the index.
 */
 const clearCountIndexChunk = async (db, tableName, indexName, batchSize) => {
 	const members = await takeMembersForIndex(db, tableName, indexName, batchSize);
 	if (members.length > 0) {
-		await flushAggregateMembershipDeltas(db, tableName, indexName, members.map((member) => computeMembershipDelta(member, {
-			tableName,
-			indexName,
-			docId: member.docId,
-			keyParts: null,
-			metricValues: null
-		})));
+		for (const member of members) await db.delete(AGGREGATE_MEMBER_TABLE, member._id);
 		return {
 			done: false,
 			processed: members.length
@@ -1593,36 +1591,35 @@ const rankCtx = (db) => ({
 	db,
 	orm: void 0
 });
-/** Trees dropped per invocation once every rank member has been removed. */
-const RANK_TREE_DROP_BATCH = 16;
 /**
-* Removes at most `batchSize` rank members and reports whether anything is
-* left. Each member is removed from the btree before its row is dropped, so the
-* tree stays consistent with the members that remain and a partially drained
-* clear can safely resume in a later mutation.
+* Removes at most `batchSize` documents of a rank index's stored state and
+* reports whether anything is left. Callers drive it to completion across
+* transactions, so clearing a large index never has to fit in one mutation.
+*
+* Member rows are dropped without touching the btree. The tree branch below
+* deletes every node whatever it contains, so removing a member key first would
+* only buy a root-to-leaf descent plus an aggregate patch per level on nodes
+* this same clear is about to delete.
+*
+* Branch order is load-bearing: a member delete recreates the tree it lands on,
+* so the members must be gone before the first node is dropped. The
+* intermediate "members gone, tree still full" state is safe because
+* `setCountState` refuses to leave CLEARING while a tree row survives, and the
+* CLEARING write barrier keeps concurrent writers out of the index.
 */
 const clearRankIndexChunk = async (db, tableName, indexName, batchSize) => {
-	const aggregate = rankAggregate(tableName, indexName);
-	const ctx = rankCtx(db);
 	const members = await takeRankMembers(db, tableName, indexName, batchSize);
 	if (members.length > 0) {
-		for (const member of members) {
-			if (member.rankKey !== void 0) await aggregate.deleteIfExists(ctx, {
-				id: member.docId,
-				key: member.rankKey,
-				namespace: member.rankNamespace
-			});
-			await db.delete(AGGREGATE_MEMBER_TABLE, member._id);
-		}
+		for (const member of members) await db.delete(AGGREGATE_MEMBER_TABLE, member._id);
 		return {
 			done: false,
 			processed: members.length
 		};
 	}
-	const done = await aggregate.deleteTrees(ctx, RANK_TREE_DROP_BATCH);
+	const { documents, done } = await rankAggregate(tableName, indexName).deleteTrees(rankCtx(db), batchSize);
 	return {
 		done,
-		processed: done ? 0 : RANK_TREE_DROP_BATCH
+		processed: documents
 	};
 };
 const reconcileRankMembership = async (db, params) => {

package/dist/orm/index.d.ts

@@ -1,5 +1,5 @@
-import { $n as TableName, $t as OrmLifecycleChange, An as ConvexCheckBuilder, At as UpdateSet, Bn as ConvexTextBuilder, Br as IsPrimaryKey, Bt as RelationsBuilderColumnBase, C as MigrationStep, Cn as ConvexVectorIndexConfig, Cr as not, Ct as OrderByClause, D as defineMigration, Dn as searchIndex, Dr as startsWith, Dt as ReturningAll, E as buildMigrationPlan, En as rankIndex, Er as or, Et as PredicateWhereIndexConfig, Fn as ConvexUniqueConstraintBuilderOn, Fr as ColumnBuilderTypeConfig, Ft as ExtractTablesFromSchema, Gn as Columns, Gt as TablesRelationalConfig, H as RlsMode, Hn as text, Hr as NotNull, In as ConvexUniqueConstraintConfig, Ir as ColumnBuilderWithTableName, It as ExtractTablesWithRelations, Jn as OrmSchemaExtensionTables, Jt as ConvexDeletionBuilder, Kt as defineRelations, Ln as check, Lr as ColumnDataType, Lt as ManyConfig, M as DatabaseWithQuery, Mn as ConvexForeignKeyBuilder, Mr as ColumnBuilder, Mt as VectorSearchProvider, N as OrmReader$1, Nn as ConvexForeignKeyConfig, Nr as ColumnBuilderBaseConfig, Nt as unsetToken, O as defineMigrationSet, On as uniqueIndex, Ot as ReturningResult, P as OrmWriter$1, Pn as ConvexUniqueConstraintBuilder, Pr as ColumnBuilderRuntimeConfig, Qn as OrmSchemaTriggers, Qt as DiscriminatorBuilderConfig, Rn as foreignKey, Rr as DrizzleEntity, Rt as OneConfig, S as MigrationStateMap, Sn as ConvexVectorIndexBuilderOn, Sr as ne, St as MutationRunMode, T as MigrationWriteMode, Tn as index, Tr as notInArray, Tt as PaginatedResult, U as EdgeMetadata, V as RlsContext, Vn as ConvexTextBuilderInitial, Vr as IsUnique, Vt as RelationsBuilderColumnConfig, W as extractRelationsConfig, Wn as Brand, Wt as TableRelationalConfig, Xn as OrmSchemaExtensions, Xt as ConvexTable, Yt as ConvexDeletionConfig, Zn as OrmSchemaRelations, Zt as ConvexTableWithColumns, _ as MigrationManifestEntry, _n as ConvexRankIndexBuilderOn, _r as isNotNull, _t as MutationExecutionMode, an as RlsPolicy, ar as UnaryExpression, at as BuildRelationResult, b as MigrationRunStatus, bn as ConvexSearchIndexConfig, br as lt, bt as MutationResult, cn as rlsPolicy, cr as contains, ct as DBQueryConfig, d as MigrationAppliedState, dn as rlsRole, dr as fieldRef, dt as InferInsertModel, en as OrmLifecycleOperation, er as BinaryExpression, f as MigrationDefinition, fn as ConvexAggregateIndexBuilder, fr as gt, ft as InferModelFromColumns, g as MigrationDriftIssue, gn as ConvexRankIndexBuilder, gr as isFieldReference, gt as MutationExecuteResult, h as MigrationDocContext, hn as ConvexIndexBuilderOn, hr as inArray, ht as MutationExecuteConfig, i as OrmMigrationCapability, in as discriminator, ir as LogicalExpression, it as BuildQueryResult, j as DatabaseWithMutations, jn as ConvexCheckConfig, jr as AnyColumn, jt as VectorQueryConfig, k as detectMigrationDrift, kn as vectorIndex, kr as SystemFields, kt as ReturningSelection, ln as RlsRole, lr as endsWith, lt as FilterOperators, m as MigrationDoc, mn as ConvexIndexBuilder, mr as ilike, mt as InsertValue, n as OrmCapabilities, nn as convexTable, nr as FieldReference, nt as AggregateFieldValue, on as RlsPolicyConfig, or as and, ot as CountConfig, p as MigrationDirection, pn as ConvexAggregateIndexBuilderOn, pr as gte, pt as InferSelectModel, qt as defineRelationsPart, r as OrmCapability, rn as deletion, rr as FilterExpression, rt as AggregateResult, sn as RlsPolicyToOption, sr as between, st as CountResult, t as OrmAggregateCapability, tn as TableConfig, tr as ExpressionVisitor, tt as AggregateConfig, un as RlsRoleConfig, ur as eq, ut as GetColumnData, v as MigrationMigrateOne, vn as ConvexSearchIndexBuilder, vr as isNull, vt as MutationPaginateConfig, w as MigrationTableName, wn as aggregateIndex, wr as notBetween, wt as OrderDirection, x as MigrationSet, xn as ConvexVectorIndexBuilder, xr as lte, xt as MutationReturning, y as MigrationPlan, yn as ConvexSearchIndexBuilderOn, yr as like, yt as MutationPaginatedResult, zn as unique, zr as HasDefault, zt as RelationsBuilder } from "../capabilities-DPB-JKlm.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-Dddhscyy.js";
+import { $n as TableName, $t as OrmLifecycleChange, An as ConvexCheckBuilder, At as UpdateSet, Bn as ConvexTextBuilder, Br as IsPrimaryKey, Bt as RelationsBuilderColumnBase, C as MigrationStep, Cn as ConvexVectorIndexConfig, Cr as not, Ct as OrderByClause, D as defineMigration, Dn as searchIndex, Dr as startsWith, Dt as ReturningAll, E as buildMigrationPlan, En as rankIndex, Er as or, Et as PredicateWhereIndexConfig, Fn as ConvexUniqueConstraintBuilderOn, Fr as ColumnBuilderTypeConfig, Ft as ExtractTablesFromSchema, Gn as Columns, Gt as TablesRelationalConfig, H as RlsMode, Hn as text, Hr as NotNull, In as ConvexUniqueConstraintConfig, Ir as ColumnBuilderWithTableName, It as ExtractTablesWithRelations, Jn as OrmSchemaExtensionTables, Jt as ConvexDeletionBuilder, Kt as defineRelations, Ln as check, Lr as ColumnDataType, Lt as ManyConfig, M as DatabaseWithQuery, Mn as ConvexForeignKeyBuilder, Mr as ColumnBuilder, Mt as VectorSearchProvider, N as OrmReader$1, Nn as ConvexForeignKeyConfig, Nr as ColumnBuilderBaseConfig, Nt as unsetToken, O as defineMigrationSet, On as uniqueIndex, Ot as ReturningResult, P as OrmWriter$1, Pn as ConvexUniqueConstraintBuilder, Pr as ColumnBuilderRuntimeConfig, Qn as OrmSchemaTriggers, Qt as DiscriminatorBuilderConfig, Rn as foreignKey, Rr as DrizzleEntity, Rt as OneConfig, S as MigrationStateMap, Sn as ConvexVectorIndexBuilderOn, Sr as ne, St as MutationRunMode, T as MigrationWriteMode, Tn as index, Tr as notInArray, Tt as PaginatedResult, U as EdgeMetadata, V as RlsContext, Vn as ConvexTextBuilderInitial, Vr as IsUnique, Vt as RelationsBuilderColumnConfig, W as extractRelationsConfig, Wn as Brand, Wt as TableRelationalConfig, Xn as OrmSchemaExtensions, Xt as ConvexTable, Yt as ConvexDeletionConfig, Zn as OrmSchemaRelations, Zt as ConvexTableWithColumns, _ as MigrationManifestEntry, _n as ConvexRankIndexBuilderOn, _r as isNotNull, _t as MutationExecutionMode, an as RlsPolicy, ar as UnaryExpression, at as BuildRelationResult, b as MigrationRunStatus, bn as ConvexSearchIndexConfig, br as lt, bt as MutationResult, cn as rlsPolicy, cr as contains, ct as DBQueryConfig, d as MigrationAppliedState, dn as rlsRole, dr as fieldRef, dt as InferInsertModel, en as OrmLifecycleOperation, er as BinaryExpression, f as MigrationDefinition, fn as ConvexAggregateIndexBuilder, fr as gt, ft as InferModelFromColumns, g as MigrationDriftIssue, gn as ConvexRankIndexBuilder, gr as isFieldReference, gt as MutationExecuteResult, h as MigrationDocContext, hn as ConvexIndexBuilderOn, hr as inArray, ht as MutationExecuteConfig, i as OrmMigrationCapability, in as discriminator, ir as LogicalExpression, it as BuildQueryResult, j as DatabaseWithMutations, jn as ConvexCheckConfig, jr as AnyColumn, jt as VectorQueryConfig, k as detectMigrationDrift, kn as vectorIndex, kr as SystemFields, kt as ReturningSelection, ln as RlsRole, lr as endsWith, lt as FilterOperators, m as MigrationDoc, mn as ConvexIndexBuilder, mr as ilike, mt as InsertValue, n as OrmCapabilities, nn as convexTable, nr as FieldReference, nt as AggregateFieldValue, on as RlsPolicyConfig, or as and, ot as CountConfig, p as MigrationDirection, pn as ConvexAggregateIndexBuilderOn, pr as gte, pt as InferSelectModel, qt as defineRelationsPart, r as OrmCapability, rn as deletion, rr as FilterExpression, rt as AggregateResult, sn as RlsPolicyToOption, sr as between, st as CountResult, t as OrmAggregateCapability, tn as TableConfig, tr as ExpressionVisitor, tt as AggregateConfig, un as RlsRoleConfig, ur as eq, ut as GetColumnData, v as MigrationMigrateOne, vn as ConvexSearchIndexBuilder, vr as isNull, vt as MutationPaginateConfig, w as MigrationTableName, wn as aggregateIndex, wr as notBetween, wt as OrderDirection, x as MigrationSet, xn as ConvexVectorIndexBuilder, xr as lte, xt as MutationReturning, y as MigrationPlan, yn as ConvexSearchIndexBuilderOn, yr as like, yt as MutationPaginatedResult, zn as unique, zr as HasDefault, zt as RelationsBuilder } from "../capabilities-CG-oIMyR.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-Bgkzm3Y-.js";
 import { i as pretendRequired, n as deprecated, r as pretend } from "../validators-0I-Ik1EN.js";
 import { a as QueryCtxWithPreferredOrmQueryTable, i as QueryCtxWithOrmQueryTable, n as LookupByIdResultByCtx, o as getByIdWithOrmQueryFallback, r as QueryCtxWithOptionalOrmQueryTable, t as DocByCtx } from "../query-context-BkNjkDCk.js";
 import { DefineSchemaOptions, GenericDatabaseReader, GenericDatabaseWriter, GenericSchema, SchemaDefinition } from "convex/server";

package/dist/orm/index.js

@@ -1,11 +1,11 @@
 import { _ as json, a as rlsPolicy, b as ConvexColumnBuilder, c as rankIndex, d as vectorIndex, f as text, g as custom, h as arrayOf, i as RlsPolicy, l as searchIndex, m as integer, n as deletion, o as aggregateIndex, p as createSystemFields, r as discriminator, s as index, t as convexTable, u as uniqueIndex, v as objectOf, x as entityKind, y as unionOf } from "../table-d9o_n4R3.js";
 import { d as boolean, i as detectMigrationDrift, l as migrationExtension, n as defineMigration, r as defineMigrationSet, t as buildMigrationPlan } from "../definitions-3PX4ywR-.js";
 import { a as pretendRequired, i as pretend, n as deprecated } from "../validators-CIoUYCqO.js";
-import { t as id } from "../id-BVdWER1U.js";
+import { o as id } from "../schema-BFP_awgP.js";
 import { a as OrmSchemaDefinition, c as OrmSchemaExtensionTriggers, d as OrmSchemaRelations, f as OrmSchemaTriggers, g as TablePolymorphic, h as TableName, i as OrmContext, l as OrmSchemaExtensions, n as Columns, o as OrmSchemaExtensionRelations, p as RlsPolicies, r as EnableRLS, s as OrmSchemaExtensionTables, t as Brand, u as OrmSchemaOptions } from "../symbols-DDNAddkd.js";
 import { A as inArray, B as notBetween, C as eq, D as gt, E as filterValuesEqual, F as lt, G as startsWith, H as notInArray, I as lte, L as matchLikePattern, M as isNotNull, N as isNull, O as gte, P as like, R as ne, S as endsWith, T as filterValueInList, U as notLike, V as notIlike, W as or, _ as arrayContains, a as findVectorIndexByName, b as column, c as getRankIndexes, d as INTERNAL_CREATION_TIME_FIELD, f as PUBLIC_CREATED_AT_FIELD, g as arrayContained, h as and, i as findSearchIndexByName, j as isFieldReference, k as ilike, l as resolveIndexOrderPushdown, m as usesSystemCreatedAtAlias, n as findIndexForColumns, o as getAggregateIndexes, r as findRelationIndex, s as getIndexes, t as findExactIndexForColumns, u as CREATED_AT_MIGRATION_MESSAGE, v as arrayOverlaps, w as fieldRef, x as contains, y as between, z as not } from "../index-utils-C1DyktHe.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-DdSg3fuk.js";
-import { $ as patchReferencingRows, A as enforcePolymorphicWrite, B as getForeignKeys, C as collectPrimaryIdLookupRows, D as encodeUndefinedDeep, E as deserializeFilterExpression, F as evaluateCheckConstraintTriState, G as getTableColumns$2, H as getMutationCollectionLimits, I as evaluateFilter, J as getUniqueIndexes, K as getTableDeleteConfig, L as extractPrimaryIdLookup, M as ensureDefaultColumns, N as ensureNonNullValues, O as enforceCheckConstraints, P as ensureNullableColumns, Q as normalizeTemporalComparableValue, R as getChecks, S as collectMutationRowsBounded, T as decodeUndefinedDeep, U as getMutationExecutionMode, V as getMutationAsyncDelayMs, W as getOrmContext, X as hydrateDateFieldsForRead, Y as hardDeleteRow, Z as normalizeDateFieldsForWrite, _ as applyDefaults, at as splitReturningSelection, b as buildForeignKeyGraph, c as getAggregateIndexDefinitions, ct as toConvexFilter, d as COUNT_ERROR, dt as markLifecycleHookedTables, et as resolveOrmRuntimeDefaults, f as createAggregateError, ft as compileConvexFilter, g as ensureCountAllowedForRls, h as ensureAggregateAllowedForRls, ht as mapWithConcurrency, it as softDeleteRow, j as enforceUniqueIndexes, k as enforceForeignKeys, l as getRankIndexDefinitions, lt as unsetFieldsOf, mt as isConvexEnforceableFilter, nt as selectReturningRowWithHydration, o as aggregateExtension, ot as stripUnsetFields, p as createCountError, pt as convexAnd, q as getTableName, rt as serializeFilterExpression, st as takeRowsWithinByteBudget, tt as returningSelectionReadsCreationTime, u as AGGREGATE_ERROR, ut as hasLifecycleHooks, v as applyIncomingForeignKeyActionsOnDelete, w as createForeignKeyProbeMemo, x as canUsePrimaryIdLookupCursor, y as applyIncomingForeignKeyActionsOnUpdate, z as getColumnName$1 } from "../schema-hL2FWCE7.js";
+import { $ as patchReferencingRows, A as enforcePolymorphicWrite, B as getForeignKeys, C as collectPrimaryIdLookupRows, D as encodeUndefinedDeep, E as deserializeFilterExpression, F as evaluateCheckConstraintTriState, G as getTableColumns$2, H as getMutationCollectionLimits, I as evaluateFilter, J as getUniqueIndexes, K as getTableDeleteConfig, L as extractPrimaryIdLookup, M as ensureDefaultColumns, N as ensureNonNullValues, O as enforceCheckConstraints, P as ensureNullableColumns, Q as normalizeTemporalComparableValue, R as getChecks, S as collectMutationRowsBounded, T as decodeUndefinedDeep, U as getMutationExecutionMode, V as getMutationAsyncDelayMs, W as getOrmContext, X as hydrateDateFieldsForRead, Y as hardDeleteRow, Z as normalizeDateFieldsForWrite, _ as applyDefaults, at as splitReturningSelection, b as buildForeignKeyGraph, c as getAggregateIndexDefinitions, ct as toConvexFilter, d as COUNT_ERROR, dt as markLifecycleHookedTables, et as resolveOrmRuntimeDefaults, f as createAggregateError, ft as compileConvexFilter, g as ensureCountAllowedForRls, h as ensureAggregateAllowedForRls, ht as mapWithConcurrency, it as softDeleteRow, j as enforceUniqueIndexes, k as enforceForeignKeys, l as getRankIndexDefinitions, lt as unsetFieldsOf, mt as isConvexEnforceableFilter, nt as selectReturningRowWithHydration, o as aggregateExtension, ot as stripUnsetFields, p as createCountError, pt as convexAnd, q as getTableName, rt as serializeFilterExpression, st as takeRowsWithinByteBudget, tt as returningSelectionReadsCreationTime, u as AGGREGATE_ERROR, ut as hasLifecycleHooks, v as applyIncomingForeignKeyActionsOnDelete, w as createForeignKeyProbeMemo, x as canUsePrimaryIdLookupCursor, y as applyIncomingForeignKeyActionsOnUpdate, z as getColumnName$1 } from "../schema-DbPcDW-N.js";
 import { t as defineSchemaExtension } from "../extensions-Bp0XHanR.js";
 import { compareValues, convexToJson, jsonToConvex, v } from "convex/values";
 import { defineSchema as defineSchema$1, internalActionGeneric, internalMutationGeneric, internalQueryGeneric } from "convex/server";

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

@@ -1,3 +1,3 @@
-import { C as MigrationStep, D as defineMigration, E as buildMigrationPlan, O as defineMigrationSet, S as MigrationStateMap, T as MigrationWriteMode, _ as MigrationManifestEntry, a as MAX_STATUS_RUN_LIMIT, b as MigrationRunStatus, c as MigrationRunChunkArgs, d as MigrationAppliedState, f as MigrationDefinition, g as MigrationDriftIssue, h as MigrationDocContext, k as detectMigrationDrift, l as MigrationStatusArgs, m as MigrationDoc, o as MigrationCancelArgs, p as MigrationDirection, s as MigrationRunArgs, u as createMigrationHandlers, v as MigrationMigrateOne, w as MigrationTableName, x as MigrationSet, y as MigrationPlan } from "../../capabilities-DPB-JKlm.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-Dddhscyy.js";
+import { C as MigrationStep, D as defineMigration, E as buildMigrationPlan, O as defineMigrationSet, S as MigrationStateMap, T as MigrationWriteMode, _ as MigrationManifestEntry, a as MAX_STATUS_RUN_LIMIT, b as MigrationRunStatus, c as MigrationRunChunkArgs, d as MigrationAppliedState, f as MigrationDefinition, g as MigrationDriftIssue, h as MigrationDocContext, k as detectMigrationDrift, l as MigrationStatusArgs, m as MigrationDoc, o as MigrationCancelArgs, p as MigrationDirection, s as MigrationRunArgs, u as createMigrationHandlers, v as MigrationMigrateOne, w as MigrationTableName, x as MigrationSet, y as MigrationPlan } from "../../capabilities-CG-oIMyR.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-Bgkzm3Y-.js";
 export { MAX_STATUS_RUN_LIMIT, 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/{runtime-BcvcfaP8.js → runtime-B-8HKSIE.js}

@@ -1,6 +1,5 @@
-import { f as text, g as custom, m as integer, s as index, t as convexTable } from "./table-d9o_n4R3.js";
-import { t as id } from "./id-BVdWER1U.js";
-import { ConvexError, convexToJson, jsonToConvex, v } from "convex/values";
+import { n as AGGREGATE_TREE_TABLE, t as AGGREGATE_NODE_TABLE } from "./schema-BFP_awgP.js";
+import { ConvexError, convexToJson, jsonToConvex } from "convex/values";
 
 //#region src/aggregate-core/compare.ts
 function isCommitTsPlaceholder(value) {
@@ -44,36 +43,6 @@ function makeComparable(v) {
 	return [8, keys.map((k) => [k, record[k]]).map(makeComparable)];
 }
 
-//#endregion
-//#region src/aggregate-core/schema.ts
-const AGGREGATE_TREE_TABLE = "aggregate_rank_tree";
-const AGGREGATE_NODE_TABLE = "aggregate_rank_node";
-const aggregateCounterValidator = v.object({
-	count: v.number(),
-	sum: v.number()
-});
-const aggregateItemValidator = v.object({
-	k: v.any(),
-	v: v.any(),
-	s: v.number()
-});
-const aggregateTreeTable = convexTable(AGGREGATE_TREE_TABLE, {
-	aggregateName: text().notNull(),
-	deletionStack: custom(v.array(v.id(AGGREGATE_NODE_TABLE))),
-	maxNodeSize: integer().notNull(),
-	namespace: custom(v.any()),
-	root: id(AGGREGATE_NODE_TABLE).notNull()
-}, (tree) => [index("by_namespace").on(tree.namespace), index("by_aggregate_name").on(tree.aggregateName)]);
-const aggregateNodeTable = convexTable(AGGREGATE_NODE_TABLE, {
-	aggregate: custom(aggregateCounterValidator),
-	items: custom(v.array(aggregateItemValidator)).notNull(),
-	subtrees: custom(v.array(v.string())).notNull()
-});
-const aggregateStorageTables = {
-	[AGGREGATE_NODE_TABLE]: aggregateNodeTable,
-	[AGGREGATE_TREE_TABLE]: aggregateTreeTable
-};
-
 //#endregion
 //#region src/aggregate-core/btree.ts
 const DEFAULT_MAX_NODE_SIZE = 16;
@@ -525,14 +494,21 @@ async function deleteTreeNodes(db, node) {
 }
 /**
 * Deletes up to `limit` nodes from one namespace tree belonging to an
-* aggregate, returning true once none are left. The traversal stack lives on
+* aggregate, reporting `done` once none are left. The traversal stack lives on
 * the tree document so a large tree resumes across transactions.
+*
+* Nodes are dropped whatever they contain, so a caller clearing an aggregate
+* never has to empty the tree key by key first.
 */
 async function deleteTreesHandler(ctx, args) {
 	const tree = (await ctx.db.query(AGGREGATE_TREE_TABLE).withIndex("by_aggregate_name", (q) => q.eq("aggregateName", args.aggregateName)).take(1))[0];
-	if (!tree) return true;
+	if (!tree) return {
+		done: true,
+		documents: 0
+	};
 	const stack = [...tree.deletionStack ?? [tree.root]];
 	let remaining = Math.max(1, Math.floor(args.limit));
+	let documents = 0;
 	while (stack.length > 0 && remaining > 0) {
 		const nodeId = stack.pop();
 		const node = await ctx.db.get(nodeId);
@@ -540,10 +516,14 @@ async function deleteTreesHandler(ctx, args) {
 		if (!node) continue;
 		stack.push(...node.subtrees);
 		await ctx.db.delete(nodeId);
+		documents += 1;
 	}
 	if (stack.length > 0) await ctx.db.patch(tree._id, { deletionStack: stack });
 	else await ctx.db.delete(tree._id);
-	return false;
+	return {
+		done: false,
+		documents: documents + 1
+	};
 }
 async function clearTree(db, args) {
 	const tree = await getTree(db, args.namespace);
@@ -935,9 +915,10 @@ var Aggregate = class {
 		});
 	}
 	/**
-	* Deletes up to `limit` namespace trees without recreating them. Returns true
-	* once this aggregate owns no trees, so callers can drain every namespace
-	* across several mutations instead of walking them all in one.
+	* Deletes up to `limit` nodes from one namespace tree without recreating it,
+	* reporting `done` once this aggregate owns no trees and how many documents
+	* the call wrote. Callers drain every namespace across several mutations
+	* instead of walking them all in one, and charge their budget by `documents`.
 	*/
 	async deleteTrees(ctx, limit) {
 		return deleteTreesHandler({ db: ctx.db }, {
@@ -1077,4 +1058,4 @@ function namespaceFromOpts(opts) {
 }
 
 //#endregion
-export { TableAggregate as n, aggregateStorageTables as r, DirectAggregate as t };
+export { TableAggregate as n, DirectAggregate as t };

package/dist/schema-BFP_awgP.js

@@ -0,0 +1,67 @@
+import { b as ConvexColumnBuilder, f as text, g as custom, m as integer, s as index, t as convexTable, x as entityKind } from "./table-d9o_n4R3.js";
+import { v } from "convex/values";
+
+//#region src/orm/builders/id.ts
+/**
+* ID column builder class
+* Compiles to v.id(tableName) or v.optional(v.id(tableName))
+*/
+var ConvexIdBuilder = class extends ConvexColumnBuilder {
+	static [entityKind] = "ConvexIdBuilder";
+	constructor(name, tableName) {
+		super(name, "string", "ConvexId");
+		this.tableName = tableName;
+		this.config.referenceTable = tableName;
+	}
+	/**
+	* Expose Convex validator for schema integration
+	*/
+	get convexValidator() {
+		if (this.config.notNull) return v.id(this.tableName);
+		return v.optional(v.union(v.null(), v.id(this.tableName)));
+	}
+	/**
+	* Compile to Convex validator
+	* .notNull() → v.id(tableName)
+	* nullable → v.optional(v.id(tableName))
+	*/
+	build() {
+		return this.convexValidator;
+	}
+};
+function id(tableName) {
+	return new ConvexIdBuilder("", tableName);
+}
+
+//#endregion
+//#region src/aggregate-core/schema.ts
+const AGGREGATE_TREE_TABLE = "aggregate_rank_tree";
+const AGGREGATE_NODE_TABLE = "aggregate_rank_node";
+const aggregateCounterValidator = v.object({
+	count: v.number(),
+	sum: v.number()
+});
+const aggregateItemValidator = v.object({
+	k: v.any(),
+	v: v.any(),
+	s: v.number()
+});
+const aggregateTreeTable = convexTable(AGGREGATE_TREE_TABLE, {
+	aggregateName: text().notNull(),
+	deletionStack: custom(v.array(v.id(AGGREGATE_NODE_TABLE))),
+	maxNodeSize: integer().notNull(),
+	namespace: custom(v.any()),
+	root: id(AGGREGATE_NODE_TABLE).notNull()
+}, (tree) => [index("by_namespace").on(tree.namespace), index("by_aggregate_name").on(tree.aggregateName)]);
+const aggregateNodeTable = convexTable(AGGREGATE_NODE_TABLE, {
+	aggregate: custom(aggregateCounterValidator),
+	items: custom(v.array(aggregateItemValidator)).notNull(),
+	subtrees: custom(v.array(v.string())).notNull()
+});
+const aggregateStorageTables = {
+	[AGGREGATE_NODE_TABLE]: aggregateNodeTable,
+	[AGGREGATE_TREE_TABLE]: aggregateTreeTable
+};
+
+//#endregion
+export { aggregateTreeTable as a, aggregateStorageTables as i, AGGREGATE_TREE_TABLE as n, id as o, aggregateNodeTable as r, AGGREGATE_NODE_TABLE as t };

package/dist/{schema-hL2FWCE7.js → schema-DbPcDW-N.js}

@@ -1,5 +1,5 @@
 import { _ as json, f as text, h as arrayOf, m as integer, s as index, t as convexTable, v as objectOf } from "./table-d9o_n4R3.js";
-import { t as id } from "./id-BVdWER1U.js";
+import { a as aggregateTreeTable, n as AGGREGATE_TREE_TABLE, r as aggregateNodeTable, t as AGGREGATE_NODE_TABLE } from "./schema-BFP_awgP.js";
 import { g as TablePolymorphic, h as TableName, i as OrmContext, m as TableDeleteConfig, n as Columns } from "./symbols-DDNAddkd.js";
 import { E as filterValuesEqual, L as matchLikePattern, T as filterValueInList, d as INTERNAL_CREATION_TIME_FIELD, f as PUBLIC_CREATED_AT_FIELD, j as isFieldReference, m as usesSystemCreatedAtAlias, n as findIndexForColumns, p as hasUserCreatedAtColumn, s as getIndexes, t as findExactIndexForColumns, u as CREATED_AT_MIGRATION_MESSAGE, w as fieldRef } from "./index-utils-C1DyktHe.js";
 import { t as defineSchemaExtension } from "./extensions-Bp0XHanR.js";
@@ -1344,9 +1344,11 @@ const getRankIndexDefinitions = (tableConfig) => {
 const AGGREGATE_BUCKET_TABLE = "aggregate_bucket";
 const AGGREGATE_MEMBER_TABLE = "aggregate_member";
 const AGGREGATE_EXTREMA_TABLE = "aggregate_extrema";
-const AGGREGATE_RANK_TREE_TABLE = "aggregate_rank_tree";
-const AGGREGATE_RANK_NODE_TABLE = "aggregate_rank_node";
 const AGGREGATE_STATE_TABLE = "aggregate_state";
+const AGGREGATE_RANK_TREE_TABLE = AGGREGATE_TREE_TABLE;
+const AGGREGATE_RANK_NODE_TABLE = AGGREGATE_NODE_TABLE;
+const rankTreeTable = aggregateTreeTable;
+const rankNodeTable = aggregateNodeTable;
 /**
 * Partition key a rank index's btree rows are stored under. Lives next to the
 * table names because it is how `AGGREGATE_RANK_TREE_TABLE` is addressed, and
@@ -1411,24 +1413,6 @@ const countStateTable = convexTable(AGGREGATE_STATE_TABLE, {
 	index("by_kind_status").on(t.kind, t.status),
 	index("by_table_status").on(t.tableKey, t.status)
 ]);
-const rankTreeTable = convexTable(AGGREGATE_RANK_TREE_TABLE, {
-	aggregateName: text().notNull(),
-	maxNodeSize: integer().notNull(),
-	namespace: json(),
-	root: id(AGGREGATE_RANK_NODE_TABLE).notNull()
-}, (tree) => [index("by_namespace").on(tree.namespace), index("by_aggregate_name").on(tree.aggregateName)]);
-const rankNodeTable = convexTable(AGGREGATE_RANK_NODE_TABLE, {
-	aggregate: objectOf({
-		count: integer().notNull(),
-		sum: integer().notNull()
-	}),
-	items: arrayOf(objectOf({
-		k: json(),
-		v: json(),
-		s: integer().notNull()
-	})).notNull(),
-	subtrees: arrayOf(text().notNull()).notNull()
-});
 const aggregateStorageTables = {
 	[AGGREGATE_BUCKET_TABLE]: countBucketTable,
 	[AGGREGATE_MEMBER_TABLE]: countMemberTable,

package/dist/watcher.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { a as generateMeta, d as PARSE_SNAPSHOT_SUFFIX, i as resolveConfiguredBackend, n as withLocalCodegenEnv, o as getConvexConfig, r as loadCliConfig, u as logger } from "./local-env-DGSkmXQk.mjs";
+import { a as generateMeta, d as PARSE_SNAPSHOT_SUFFIX, i as resolveConfiguredBackend, n as withLocalCodegenEnv, o as getConvexConfig, r as loadCliConfig, u as logger } from "./local-env-CYYSNf_o.mjs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";