kitcn 0.31.0 → 0.31.1

package/CHANGELOG.md

@@ -1,5 +1,32 @@
 # kitcn
 
+## 0.31.1
+
+### Patch Changes
+
+- [#424](https://github.com/udecode/kitcn/pull/424) [`0e3a221`](https://github.com/udecode/kitcn/commit/0e3a2214e8e1037b323e603f19c2df89b0d95602) Thanks [@MikeyZhang75](https://github.com/MikeyZhang75)! - ## Patches
+
+  - Stop `aggregateBackfill` rewriting the stored state it is about to delete.
+    Clearing a `rankIndex` walked the btree once per member — a root-to-leaf
+    descent plus a patch on every node along the way — and then dropped the whole
+    tree regardless, so all of that work was thrown away. Clearing an
+    `aggregateIndex` did the same thing with buckets, decrementing each one down to
+    zero before deleting it. Both now delete their member rows outright and let the
+    existing tree and bucket sweeps reclaim the rest. Clearing 120 rank members
+    across three partitions went from 201 btree node writes to 15, one per node.
+  - Fix a `rankIndex` clear crashing with `Unexpected field 'deletionStack'` once a
+    partition holds more than a few hundred rows. The rank storage tables now
+    reuse the same definitions the btree writes to, so a large tree can persist its
+    traversal state and resume across mutations. Run
+    `npx convex dev` (or your usual codegen) to pick the schema up.
+  - Report real work from a clear chunk instead of a fixed guess, so
+    `aggregateBackfill --batch-size` now bounds a clear by the documents it
+    actually touches. Multi-partition rank indexes no longer schedule far more
+    chunks than the remaining work needs.
+  - Allow an app to declare `aggregateStorageTables` from `kitcn/aggregate`
+    alongside a table that also declares a `rankIndex`. `defineSchema` used to
+    reject that combination as a duplicate table name.
+
 ## 0.31.0
 
 ### Minor Changes

package/dist/aggregate/index.d.ts

@@ -1,5 +1,5 @@
-import { Vn as ConvexTextBuilderInitial, Zt as ConvexTableWithColumns } from "../capabilities-DPB-JKlm.js";
-import { C as ConvexNumberBuilderInitial, E as ConvexIdBuilderInitial, N as ConvexCustomBuilderInitial } from "../where-clause-compiler-Dddhscyy.js";
+import { Vn as ConvexTextBuilderInitial, Zt as ConvexTableWithColumns } from "../capabilities-CG-oIMyR.js";
+import { C as ConvexNumberBuilderInitial, E as ConvexIdBuilderInitial, N as ConvexCustomBuilderInitial } from "../where-clause-compiler-Bgkzm3Y-.js";
 import * as convex_values0 from "convex/values";
 import { GenericId, Infer, Value } from "convex/values";
 import { DocumentByName, GenericDataModel, GenericDatabaseReader, GenericDatabaseWriter, TableNamesInDataModel } from "convex/server";
@@ -136,6 +136,10 @@ declare const aggregateStorageTables: {
 //#endregion
 //#region src/aggregate-core/btree.d.ts
 type Key$2 = Value;
+type DeleteTreesResult = {
+  /** True once this aggregate owns no tree row at all. */done: boolean; /** Documents this call wrote, so callers can charge a real work budget. */
+  documents: number;
+};
 //#endregion
 //#region src/aggregate-core/positions.d.ts
 type Bound$1<K extends Key$2, ID extends string> = {
@@ -240,11 +244,12 @@ declare class Aggregate<K extends Key, ID extends string, TNamespace extends Val
     rootLazy?: boolean;
   }, TNamespace>): Promise<void>;
   /**
-   * 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`.
    */
-  deleteTrees(ctx: RunMutationCtx, limit: number): Promise<boolean>;
+  deleteTrees(ctx: RunMutationCtx, limit: number): Promise<DeleteTreesResult>;
   makeRootLazy(ctx: RunMutationCtx, namespace: TNamespace): Promise<void>;
   paginateNamespaces(ctx: RunQueryCtx, cursor?: string, pageSize?: number): Promise<{
     cursor: string;

package/dist/aggregate/index.js

@@ -1,4 +1,5 @@
-import { n as TableAggregate$1, r as aggregateStorageTables, t as DirectAggregate$1 } from "../runtime-BcvcfaP8.js";
+import { n as TableAggregate$1, t as DirectAggregate$1 } from "../runtime-B-8HKSIE.js";
+import { i as aggregateStorageTables } from "../schema-BFP_awgP.js";
 
 //#region src/aggregate/index.ts
 const wrapTriggerFactory = (methodName, factory) => ((...args) => {

package/dist/auth/generated/index.d.ts

@@ -1,2 +1,2 @@
-import { C as GenericAuthTriggerHandlers, S as GenericAuthTriggerChange, T as defineAuth, b as GenericAuthBeforeResult, i as getGeneratedAuthDisabledReason, n as GeneratedAuthDisabledReasonKind, r as createDisabledAuthRuntime, t as AuthRuntime, w as GenericAuthTriggers, x as GenericAuthDefinition, y as BetterAuthOptionsWithoutDatabase } from "../../generated-contract-disabled-CTUQ9nxL.js";
+import { C as GenericAuthTriggerHandlers, S as GenericAuthTriggerChange, T as defineAuth, b as GenericAuthBeforeResult, i as getGeneratedAuthDisabledReason, n as GeneratedAuthDisabledReasonKind, r as createDisabledAuthRuntime, t as AuthRuntime, w as GenericAuthTriggers, x as GenericAuthDefinition, y as BetterAuthOptionsWithoutDatabase } from "../../generated-contract-disabled-BKvk4lFx.js";
 export { type AuthRuntime, BetterAuthOptionsWithoutDatabase, type GeneratedAuthDisabledReasonKind, GenericAuthBeforeResult, GenericAuthDefinition, GenericAuthTriggerChange, GenericAuthTriggerHandlers, GenericAuthTriggers, createDisabledAuthRuntime, defineAuth, getGeneratedAuthDisabledReason };

package/dist/auth/index.d.ts

@@ -1,7 +1,7 @@
 import { a as QueryCtxWithPreferredOrmQueryTable, n as LookupByIdResultByCtx, t as DocByCtx } from "../query-context-BkNjkDCk.js";
 import { t as GetAuth } from "../types-ex0-J-SC.js";
 import { t as GenericCtx } from "../context-utils-Cbv4r0AA.js";
-import { C as GenericAuthTriggerHandlers, S as GenericAuthTriggerChange, T as defineAuth, _ as updateManyHandler, a as AuthFunctions, b as GenericAuthBeforeResult, c as consumeOneHandler, d as createHandler, f as deleteManyHandler, g as incrementOneHandler, h as findOneHandler, i as getGeneratedAuthDisabledReason, l as countHandler, m as findManyHandler, n as GeneratedAuthDisabledReasonKind, o as Triggers, p as deleteOneHandler, r as createDisabledAuthRuntime, s as createClient, t as AuthRuntime, u as createApi, v as updateOneHandler, w as GenericAuthTriggers, x as GenericAuthDefinition, y as BetterAuthOptionsWithoutDatabase } from "../generated-contract-disabled-CTUQ9nxL.js";
+import { C as GenericAuthTriggerHandlers, S as GenericAuthTriggerChange, T as defineAuth, _ as updateManyHandler, a as AuthFunctions, b as GenericAuthBeforeResult, c as consumeOneHandler, d as createHandler, f as deleteManyHandler, g as incrementOneHandler, h as findOneHandler, i as getGeneratedAuthDisabledReason, l as countHandler, m as findManyHandler, n as GeneratedAuthDisabledReasonKind, o as Triggers, p as deleteOneHandler, r as createDisabledAuthRuntime, s as createClient, t as AuthRuntime, u as createApi, v as updateOneHandler, w as GenericAuthTriggers, x as GenericAuthDefinition, y as BetterAuthOptionsWithoutDatabase } from "../generated-contract-disabled-BKvk4lFx.js";
 import * as convex_values0 from "convex/values";
 import { Infer } from "convex/values";
 import { AuthConfig, DocumentByName, GenericDataModel, GenericMutationCtx, GenericQueryCtx, GenericSchema, PaginationOptions, PaginationResult, SchemaDefinition, TableNamesInDataModel } from "convex/server";
@@ -109,31 +109,31 @@ type AdapterPaginationOptions = PaginationOptions & {
 };
 declare const adapterWhereValidator: convex_values0.VObject<{
   mode?: "sensitive" | "insensitive" | undefined;
-  operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
 }, {
   connector: convex_values0.VUnion<"AND" | "OR" | undefined, [convex_values0.VLiteral<"AND", "required">, convex_values0.VLiteral<"OR", "required">], "optional", never>;
   field: convex_values0.VString<string, "required">;
   mode: convex_values0.VUnion<"sensitive" | "insensitive" | undefined, [convex_values0.VLiteral<"sensitive", "required">, convex_values0.VLiteral<"insensitive", "required">], "optional", never>;
-  operator: convex_values0.VUnion<"eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
+  operator: convex_values0.VUnion<"lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
   value: convex_values0.VUnion<string | number | boolean | string[] | number[] | null, [convex_values0.VString<string, "required">, convex_values0.VFloat64<number, "required">, convex_values0.VBoolean<boolean, "required">, convex_values0.VArray<string[], convex_values0.VString<string, "required">, "required">, convex_values0.VArray<number[], convex_values0.VFloat64<number, "required">, "required">, convex_values0.VNull<null, "required">], "required", never>;
-}, "required", "mode" | "operator" | "value" | "field" | "connector">;
+}, "required", "mode" | "value" | "connector" | "field" | "operator">;
 declare const adapterArgsValidator: convex_values0.VObject<{
-  limit?: number | undefined;
   where?: {
     mode?: "sensitive" | "insensitive" | undefined;
-    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
   }[] | undefined;
-  select?: string[] | undefined;
+  limit?: number | undefined;
   offset?: number | undefined;
+  select?: string[] | undefined;
   sortBy?: {
-    field: string;
     direction: "asc" | "desc";
+    field: string;
   } | undefined;
   model: string;
 }, {
@@ -142,32 +142,32 @@ declare const adapterArgsValidator: convex_values0.VObject<{
   offset: convex_values0.VFloat64<number | undefined, "optional">;
   select: convex_values0.VArray<string[] | undefined, convex_values0.VString<string, "required">, "optional">;
   sortBy: convex_values0.VObject<{
-    field: string;
     direction: "asc" | "desc";
+    field: string;
   } | undefined, {
     direction: convex_values0.VUnion<"asc" | "desc", [convex_values0.VLiteral<"asc", "required">, convex_values0.VLiteral<"desc", "required">], "required", never>;
     field: convex_values0.VString<string, "required">;
-  }, "optional", "field" | "direction">;
+  }, "optional", "direction" | "field">;
   where: convex_values0.VArray<{
     mode?: "sensitive" | "insensitive" | undefined;
-    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
   }[] | undefined, convex_values0.VObject<{
     mode?: "sensitive" | "insensitive" | undefined;
-    operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
   }, {
     connector: convex_values0.VUnion<"AND" | "OR" | undefined, [convex_values0.VLiteral<"AND", "required">, convex_values0.VLiteral<"OR", "required">], "optional", never>;
     field: convex_values0.VString<string, "required">;
     mode: convex_values0.VUnion<"sensitive" | "insensitive" | undefined, [convex_values0.VLiteral<"sensitive", "required">, convex_values0.VLiteral<"insensitive", "required">], "optional", never>;
-    operator: convex_values0.VUnion<"eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
+    operator: convex_values0.VUnion<"lt" | "lte" | "gt" | "gte" | "eq" | "in" | "not_in" | "ne" | "contains" | "starts_with" | "ends_with" | undefined, [convex_values0.VLiteral<"lt", "required">, convex_values0.VLiteral<"lte", "required">, convex_values0.VLiteral<"gt", "required">, convex_values0.VLiteral<"gte", "required">, convex_values0.VLiteral<"eq", "required">, convex_values0.VLiteral<"in", "required">, convex_values0.VLiteral<"not_in", "required">, convex_values0.VLiteral<"ne", "required">, convex_values0.VLiteral<"contains", "required">, convex_values0.VLiteral<"starts_with", "required">, convex_values0.VLiteral<"ends_with", "required">], "optional", never>;
     value: convex_values0.VUnion<string | number | boolean | string[] | number[] | null, [convex_values0.VString<string, "required">, convex_values0.VFloat64<number, "required">, convex_values0.VBoolean<boolean, "required">, convex_values0.VArray<string[], convex_values0.VString<string, "required">, "required">, convex_values0.VArray<number[], convex_values0.VFloat64<number, "required">, "required">, convex_values0.VNull<null, "required">], "required", never>;
-  }, "required", "mode" | "operator" | "value" | "field" | "connector">, "optional">;
-}, "required", "limit" | "where" | "model" | "select" | "offset" | "sortBy" | "sortBy.field" | "sortBy.direction">;
+  }, "required", "mode" | "value" | "connector" | "field" | "operator">, "optional">;
+}, "required", "model" | "where" | "limit" | "offset" | "select" | "sortBy" | "sortBy.direction" | "sortBy.field">;
 declare const hasUniqueFields: (betterAuthSchema: BetterAuthDBSchema, model: string, input: Record<string, any>) => boolean;
 declare const checkUniqueFields: <Schema extends SchemaDefinition<any, any>>(ctx: GenericQueryCtx<GenericDataModel>, schema: Schema, betterAuthSchema: BetterAuthDBSchema, table: string, input: Record<string, any>, doc?: Record<string, any>) => Promise<void>;
 declare const selectFields: <T extends TableNamesInDataModel<GenericDataModel>, D extends DocumentByName<GenericDataModel, T>>(doc: D | null, select?: string[]) => D | null;

package/dist/{capabilities-DPB-JKlm.d.ts → capabilities-CG-oIMyR.d.ts}

@@ -2341,12 +2341,16 @@ type ClearIndexChunkResult = {
  * 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.
  */
 declare const clearCountIndexChunk: (db: GenericDatabaseWriter<any>, tableName: string, indexName: string, batchSize: number) => Promise<ClearIndexChunkResult>;
 declare const listCountStates: (db: GenericDatabaseReader<any> | GenericDatabaseWriter<any>) => Promise<CountState[]>;
@@ -2392,10 +2396,20 @@ declare const ensureRankAllowedForRls: (tableConfig: TableRelationalConfig, rlsM
 declare const compileRankPlan: (tableConfig: TableRelationalConfig, indexName: string, where: unknown) => RankQueryPlan;
 declare const ensureRankIndexReady: (db: GenericDatabaseReader<any> | GenericDatabaseWriter<any>, tableName: string, indexName: string) => Promise<void>;
 /**
- * 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.
  */
 declare const clearRankIndexChunk: (db: GenericDatabaseWriter<any>, tableName: string, indexName: string, batchSize: number) => Promise<{
   done: boolean;

package/dist/cli.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { C as Columns, D as TableName, E as RlsPolicies, O as createSystemFields, S as getRankIndexes, T as OrmSchemaExtensions, _ as loadEsbuild, a as generateMeta, b as getAggregateIndexes, c as resolveSchemaDefaultExport, f as createProjectJiti, g as loadDotenv, h as loadClackPrompts, i as resolveConfiguredBackend, l as schemaDeclaresAggregateIndexes, m as loadBabelParser, n as withLocalCodegenEnv, o as getConvexConfig, p as CRPC_BUILDER_STUB_SOURCE, r as loadCliConfig, s as collectSchemaTables, t as getLocalBackendEnvVars, u as logger, v as highlighter, w as EnableRLS, x as getIndexes, y as isColorEnabled } from "./local-env-DGSkmXQk.mjs";
+import { C as Columns, D as TableName, E as RlsPolicies, O as createSystemFields, S as getRankIndexes, T as OrmSchemaExtensions, _ as loadEsbuild, a as generateMeta, b as getAggregateIndexes, c as resolveSchemaDefaultExport, f as createProjectJiti, g as loadDotenv, h as loadClackPrompts, i as resolveConfiguredBackend, l as schemaDeclaresAggregateIndexes, m as loadBabelParser, n as withLocalCodegenEnv, o as getConvexConfig, p as CRPC_BUILDER_STUB_SOURCE, r as loadCliConfig, s as collectSchemaTables, t as getLocalBackendEnvVars, u as logger, v as highlighter, w as EnableRLS, x as getIndexes, y as isColorEnabled } from "./local-env-CYYSNf_o.mjs";
 import { createRequire } from "node:module";
 import fs, { existsSync, readFileSync } from "node:fs";
 import path, { basename, delimiter, dirname, extname, isAbsolute, join, posix, relative, resolve } from "node:path";

package/dist/{generated-contract-disabled-CTUQ9nxL.d.ts → generated-contract-disabled-BKvk4lFx.d.ts}

@@ -199,8 +199,8 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
   count: convex_server0.RegisteredQuery<"internal", {
     where?: {
       mode?: "sensitive" | "insensitive" | undefined;
-      operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
     }[] | undefined;
@@ -209,8 +209,8 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
   consumeOne: convex_server0.RegisteredMutation<"internal", {
     input: {
       where?: {
-        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
       }[] | undefined;
@@ -235,18 +235,10 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     };
   }, Promise<any>>;
   deleteMany: convex_server0.RegisteredMutation<"internal", {
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
     input: {
       where?: {
-        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
       }[] | undefined;
@@ -255,6 +247,14 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
       where?: any[] | undefined;
       model: string;
     };
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
+    };
   }, Promise<{
     count: number;
     ids: any[];
@@ -266,8 +266,8 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
   deleteOne: convex_server0.RegisteredMutation<"internal", {
     input: {
       where?: {
-        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
       }[] | undefined;
@@ -278,20 +278,21 @@ 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;
-      operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
     }[] | undefined;
+    limit?: number | undefined;
     offset?: number | undefined;
     sortBy?: {
-      field: string;
       direction: "asc" | "desc";
+      field: string;
     } | undefined;
+    model: string;
     paginationOpts: {
       id?: number;
       endCursor?: string | null;
@@ -300,14 +301,13 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
       numItems: number;
       cursor: string | null;
     };
-    model: string;
   }, Promise<PaginationResult<convex_server0.GenericDocument>>>;
   findOne: convex_server0.RegisteredQuery<"internal", {
     join?: any;
     where?: {
       mode?: "sensitive" | "insensitive" | undefined;
-      operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
     }[] | undefined;
@@ -319,8 +319,8 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
     input: {
       where?: {
         mode?: "sensitive" | "insensitive" | undefined;
-        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
       }[] | undefined;
@@ -331,31 +331,31 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
   }, Promise<any>>;
   rotateKeys: convex_server0.RegisteredAction<"internal", {}, Promise<unknown>>;
   updateMany: convex_server0.RegisteredMutation<"internal", {
-    paginationOpts: {
-      id?: number;
-      endCursor?: string | null;
-      maximumRowsRead?: number;
-      maximumBytesRead?: number;
-      numItems: number;
-      cursor: string | null;
-    };
     input: {
       where?: {
-        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
       }[] | undefined;
+      model: string;
       update: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
-      model: string;
     } | {
       where?: any[] | undefined;
-      update: any;
       model: string;
+      update: any;
+    };
+    paginationOpts: {
+      id?: number;
+      endCursor?: string | null;
+      maximumRowsRead?: number;
+      maximumBytesRead?: number;
+      numItems: number;
+      cursor: string | null;
     };
   }, Promise<{
     count: number;
@@ -368,21 +368,21 @@ declare const createApi: <Schema extends SchemaDefinition<any, any>, DataModel e
   updateOne: convex_server0.RegisteredMutation<"internal", {
     input: {
       where?: {
-        operator?: "eq" | "ne" | "lt" | "lte" | "gt" | "gte" | "in" | "not_in" | "contains" | "starts_with" | "ends_with" | 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;
       }[] | undefined;
+      model: string;
       update: {
         [x: string]: unknown;
         [x: number]: unknown;
         [x: symbol]: unknown;
       };
-      model: string;
     } | {
       where?: any[] | undefined;
-      update: any;
       model: string;
+      update: any;
     };
   }, Promise<any>>;
 };

package/dist/{local-env-DGSkmXQk.mjs → local-env-CYYSNf_o.mjs}

@@ -937,58 +937,6 @@ function text(name) {
 	return new ConvexTextBuilder(name ?? "");
 }
 
-//#endregion
-//#region src/orm/extensions.ts
-function defineChainMethod(target, key, value) {
-	Object.defineProperty(target, key, {
-		value,
-		enumerable: false,
-		configurable: true
-	});
-}
-function createSchemaExtensionChain(state, capabilities) {
-	const extension = {
-		key: state.key,
-		tables: state.tables
-	};
-	Object.defineProperty(extension, OrmSchemaExtensionRelations, {
-		value: state.relations,
-		enumerable: false,
-		configurable: true
-	});
-	Object.defineProperty(extension, OrmSchemaExtensionTriggers, {
-		value: state.triggers,
-		enumerable: false,
-		configurable: true
-	});
-	if (capabilities.canRelations) defineChainMethod(extension, "relations", (relations) => createSchemaExtensionChain({
-		...state,
-		relations
-	}, {
-		canRelations: false,
-		canTriggers: true
-	}));
-	if (capabilities.canTriggers) defineChainMethod(extension, "triggers", (triggers) => createSchemaExtensionChain({
-		...state,
-		triggers
-	}, {
-		canRelations: false,
-		canTriggers: false
-	}));
-	return extension;
-}
-function defineSchemaExtension(key, tables) {
-	return createSchemaExtensionChain({
-		key,
-		tables,
-		relations: void 0,
-		triggers: void 0
-	}, {
-		canRelations: true,
-		canTriggers: true
-	});
-}
-
 //#endregion
 //#region src/orm/indexes.ts
 var ConvexIndexBuilderOn = class {
@@ -1961,14 +1909,98 @@ const convexTableWithRLS = (name, columns, extraConfig) => {
 };
 const convexTable = Object.assign(convexTableInternal, { withRLS: convexTableWithRLS });
 
+//#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$1 = {
+	[AGGREGATE_NODE_TABLE]: aggregateNodeTable,
+	[AGGREGATE_TREE_TABLE]: aggregateTreeTable
+};
+
+//#endregion
+//#region src/orm/extensions.ts
+function defineChainMethod(target, key, value) {
+	Object.defineProperty(target, key, {
+		value,
+		enumerable: false,
+		configurable: true
+	});
+}
+function createSchemaExtensionChain(state, capabilities) {
+	const extension = {
+		key: state.key,
+		tables: state.tables
+	};
+	Object.defineProperty(extension, OrmSchemaExtensionRelations, {
+		value: state.relations,
+		enumerable: false,
+		configurable: true
+	});
+	Object.defineProperty(extension, OrmSchemaExtensionTriggers, {
+		value: state.triggers,
+		enumerable: false,
+		configurable: true
+	});
+	if (capabilities.canRelations) defineChainMethod(extension, "relations", (relations) => createSchemaExtensionChain({
+		...state,
+		relations
+	}, {
+		canRelations: false,
+		canTriggers: true
+	}));
+	if (capabilities.canTriggers) defineChainMethod(extension, "triggers", (triggers) => createSchemaExtensionChain({
+		...state,
+		triggers
+	}, {
+		canRelations: false,
+		canTriggers: false
+	}));
+	return extension;
+}
+function defineSchemaExtension(key, tables) {
+	return createSchemaExtensionChain({
+		key,
+		tables,
+		relations: void 0,
+		triggers: void 0
+	}, {
+		canRelations: true,
+		canTriggers: true
+	});
+}
+
 //#endregion
 //#region src/orm/aggregate-index/schema.ts
 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;
 const countBucketTable = convexTable(AGGREGATE_BUCKET_TABLE, {
 	tableKey: text().notNull(),
 	indexName: text().notNull(),
@@ -2027,24 +2059,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/orm/aggregate-index/index.d.ts

@@ -1,4 +1,4 @@
-import { $ as RankIndexDefinition, G as CountBackfillChunkArgs, J as CountBackfillStatusArgs, K as CountBackfillKickoffArgs, Q as CountIndexDefinition, X as CountQueryPlan, Y as AggregateQueryPlan, Z as AggregateIndexDefinition, et as RankOrderField, q as CountBackfillMode, r as OrmCapability } from "../../capabilities-DPB-JKlm.js";
+import { $ as RankIndexDefinition, G as CountBackfillChunkArgs, J as CountBackfillStatusArgs, K as CountBackfillKickoffArgs, Q as CountIndexDefinition, X as CountQueryPlan, Y as AggregateQueryPlan, Z as AggregateIndexDefinition, et as RankOrderField, q as CountBackfillMode, r as OrmCapability } from "../../capabilities-CG-oIMyR.js";
 
 //#region src/orm/aggregate-index/capability.d.ts
 /**