kitcn 0.31.0 → 0.32.0

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-CD-Ij91k.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-FDJTqLDC.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/{query-context-DdSg3fuk.js → query-context-D4z1CnDH.js}

@@ -545,6 +545,13 @@ var OrderedStreamQuery = class extends StreamableQuery {
 			minUpperBound = indexBounds.upperBound;
 			minUpperBoundInclusive = indexBounds.upperBoundInclusive;
 		}
+		if (compareKeys({
+			value: maxLowerBound,
+			kind: maxLowerBoundInclusive ? "predecessor" : "successor"
+		}, {
+			value: minUpperBound,
+			kind: minUpperBoundInclusive ? "successor" : "predecessor"
+		}) >= 0) return new EmptyStream(order, this.getIndexFields(), this.getEqualityIndexFilter());
 		return streamIndexRange(db, schema, table, index, {
 			lowerBound: maxLowerBound,
 			lowerBoundInclusive: maxLowerBoundInclusive,
@@ -1050,7 +1057,7 @@ var SingletonStream = class SingletonStream extends QueryStream {
 	}
 	narrow(indexBounds) {
 		if (indexKeyWithinBounds(this.#indexKey, indexBounds)) return new SingletonStream(this.#value, this.#order, this.#indexFields, this.#indexKey, this.#equalityIndexFilter);
-		return new EmptyStream(this.#order, this.#indexFields);
+		return new EmptyStream(this.#order, this.#indexFields, this.#equalityIndexFilter);
 	}
 };
 /**
@@ -1086,12 +1093,14 @@ function indexKeyWithinBounds(indexKey, indexBounds) {
 * towards maxScan.
 */
 var EmptyStream = class extends QueryStream {
+	#equalityIndexFilter;
 	#order;
 	#indexFields;
-	constructor(order, indexFields) {
+	constructor(order, indexFields, equalityIndexFilter = []) {
 		super();
 		this.#order = order;
 		this.#indexFields = indexFields;
+		this.#equalityIndexFilter = equalityIndexFilter;
 	}
 	iterWithKeys() {
 		return { [Symbol.asyncIterator]() {
@@ -1110,7 +1119,7 @@ var EmptyStream = class extends QueryStream {
 		return this.#indexFields;
 	}
 	getEqualityIndexFilter() {
-		return [];
+		return this.#equalityIndexFilter;
 	}
 	narrow(_indexBounds) {
 		return this;

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-Bh7AmJwY.js}

@@ -1,7 +1,7 @@
 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 { 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-DvK7P6Q1.js";
 import { t as defineSchemaExtension } from "./extensions-Bp0XHanR.js";
 
 //#region src/internal/concurrency.ts
@@ -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";