@mastra/pg 1.36.0-alpha.3 → 1.36.0-alpha.5

package/dist/index.js

@@ -250,31 +250,29 @@ function buildElemMatchConditions(value, paramIndex) {
 	if (typeof value !== "object" || Array.isArray(value)) throw new Error("$elemMatch requires an object with conditions");
 	const conditions = [];
 	const values = [];
+	function buildFieldCondition(field, operator, operatorValue) {
+		if (operator === "$not") {
+			const nested = Object.entries(operatorValue);
+			if (nested.length === 0) throw new Error("$not requires at least one operator");
+			return `NOT (COALESCE(${nested.map(([nestedOp, nestedValue]) => buildFieldCondition(field, nestedOp, nestedValue)).join(" AND ")}, FALSE))`;
+		}
+		const operatorFn = FILTER_OPERATORS[operator];
+		if (!operatorFn) throw new Error(`Invalid operator: ${operator}`);
+		const scalarElement = field.startsWith("$");
+		const result = operatorFn(scalarElement ? "" : field, paramIndex + values.length, operatorValue);
+		const sql = result.sql.replaceAll("metadata->>", "elem->>").replaceAll("metadata->", "elem->").replaceAll("metadata#>>", "elem#>>").replaceAll("metadata#>", "elem#>").replaceAll("metadata ?", "elem ?");
+		const elementSql = scalarElement ? sql.replaceAll("elem->>''", "elem #>> '{}'").replaceAll("elem->''", "elem") : sql;
+		if (result.needsValue) {
+			const transformedValue = result.transformValue ? result.transformValue() : operatorValue;
+			if (operator === "$elemMatch") values.push(...transformedValue);
+			else values.push(transformedValue);
+		}
+		return elementSql;
+	}
 	Object.entries(value).forEach(([field, val]) => {
-		const nextParamIndex = paramIndex + values.length;
-		let paramOperator;
-		let paramKey;
-		let paramValue;
-		if (field.startsWith("$")) {
-			paramOperator = field;
-			paramKey = "";
-			paramValue = val;
-		} else if (typeof val === "object" && !Array.isArray(val)) {
-			const [op, opValue] = Object.entries(val || {})[0] || [];
-			paramOperator = op;
-			paramKey = field;
-			paramValue = opValue;
-		} else {
-			paramOperator = "$eq";
-			paramKey = field;
-			paramValue = val;
-		}
-		const operatorFn = FILTER_OPERATORS[paramOperator];
-		if (!operatorFn) throw new Error(`Invalid operator: ${paramOperator}`);
-		const result = operatorFn(paramKey, nextParamIndex, paramValue);
-		const sql = result.sql.replaceAll("metadata->>", "elem->>").replaceAll("metadata->", "elem->").replaceAll("metadata#>>", "elem#>>").replaceAll("metadata#>", "elem#>");
-		conditions.push(sql);
-		if (result.needsValue) values.push(paramValue);
+		const operators = field.startsWith("$") ? [[field, val]] : typeof val === "object" && val !== null && !Array.isArray(val) ? Object.entries(val) : [["$eq", val]];
+		if (operators.length === 0) throw new Error(`$elemMatch field ${field} requires at least one operator`);
+		for (const [operator, operatorValue] of operators) conditions.push(buildFieldCondition(field, operator, operatorValue));
 	});
 	return {
 		sql: conditions.join(" AND "),
@@ -2068,8 +2066,10 @@ function truncateQuery(query, maxLength = 100) {
 */
 var PoolAdapter = class {
 	$pool;
-	constructor($pool) {
+	onRollbackError;
+	constructor($pool, onRollbackError) {
 		this.$pool = $pool;
+		this.onRollbackError = onRollbackError;
 	}
 	connect() {
 		return this.$pool.connect();
@@ -2106,8 +2106,14 @@ var PoolAdapter = class {
 	}
 	async tx(callback) {
 		const client = await this.$pool.connect();
+		let destroyClient = false;
 		try {
-			await client.query("BEGIN");
+			try {
+				await client.query("BEGIN");
+			} catch (error) {
+				destroyClient = true;
+				throw error;
+			}
 			const txClient = new TransactionClient(client);
 			try {
 				const result = await callback(txClient);
@@ -2119,12 +2125,16 @@ var PoolAdapter = class {
 				try {
 					await client.query("ROLLBACK");
 				} catch (rollbackError) {
-					console.error("Transaction rollback failed:", rollbackError);
+					destroyClient = true;
+					try {
+						if (this.onRollbackError) await this.onRollbackError(rollbackError);
+						else console.error("Failed to rollback transaction:", rollbackError);
+					} catch {}
 				}
 				throw error;
 			}
 		} finally {
-			client.release();
+			client.release(destroyClient || void 0);
 		}
 	}
 };
@@ -2231,6 +2241,7 @@ var TransactionClient = class {
 var PinnedClientAdapter = class {
 	$pool;
 	pinnedClient;
+	onRollbackError;
 	/**
 	* Serialization tail. Domain init() methods fire via Promise.all in
 	* MastraCompositeStore.#runInit(), so without our own gate every domain's
@@ -2241,9 +2252,14 @@ var PinnedClientAdapter = class {
 	* the reliance on pg's internal queue.
 	*/
 	#tail = Promise.resolve();
-	constructor($pool, pinnedClient) {
+	#rollbackError;
+	constructor($pool, pinnedClient, onRollbackError) {
 		this.$pool = $pool;
 		this.pinnedClient = pinnedClient;
+		this.onRollbackError = onRollbackError;
+	}
+	get shouldDestroyClient() {
+		return this.#rollbackError !== void 0;
 	}
 	/**
 	* Run `fn` after any previously enqueued work on this pinned client has
@@ -2251,7 +2267,11 @@ var PinnedClientAdapter = class {
 	* resume on the next caller's turn.
 	*/
 	#enqueue(fn) {
-		const next = this.#tail.then(fn, fn);
+		const run = async () => {
+			if (this.shouldDestroyClient) throw this.#rollbackError;
+			return fn();
+		};
+		const next = this.#tail.then(run, run);
 		this.#tail = next.catch(() => void 0);
 		return next;
 	}
@@ -2303,7 +2323,12 @@ var PinnedClientAdapter = class {
 	}
 	tx(callback) {
 		return this.#enqueue(async () => {
-			await this.pinnedClient.query("BEGIN");
+			try {
+				await this.pinnedClient.query("BEGIN");
+			} catch (error) {
+				this.#rollbackError = error;
+				throw error;
+			}
 			const txClient = new TransactionClient(this.pinnedClient);
 			try {
 				const result = await callback(txClient);
@@ -2315,7 +2340,11 @@ var PinnedClientAdapter = class {
 				try {
 					await this.pinnedClient.query("ROLLBACK");
 				} catch (rollbackError) {
-					console.error("Transaction rollback failed:", rollbackError);
+					this.#rollbackError = rollbackError;
+					try {
+						if (this.onRollbackError) await this.onRollbackError(rollbackError);
+						else console.error("Failed to rollback transaction:", rollbackError);
+					} catch {}
 				}
 				throw error;
 			}
@@ -3405,12 +3434,16 @@ var PgDB = class extends MastraBase {
 				}
 				if (snapshot) {
 					snapshot.tables.add(tableName);
-					if (isNewTable) snapshot.createdTables.add(tableName);
-					const created = this.snapshotColumns(snapshot, tableName);
-					for (const [name, def] of Object.entries(schema)) {
-						const parsedName = parseSqlIdentifier(name, "column name");
-						created.add(parsedName);
-						if (def.type === "timestamp") created.add(`${parsedName}Z`);
+					if (isNewTable) {
+						snapshot.createdTables.add(tableName);
+						snapshot.columns.set(tableName, new Set(await this.getTableColumns(tableName)));
+					} else {
+						const created = this.snapshotColumns(snapshot, tableName);
+						for (const [name, def] of Object.entries(schema)) {
+							const parsedName = parseSqlIdentifier(name, "column name");
+							created.add(parsedName);
+							if (def.type === "timestamp") created.add(`${parsedName}Z`);
+						}
 					}
 				}
 			}
@@ -11799,15 +11832,25 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 	* @param schemaPrefix - Prefix for index names (e.g. "my_schema_" or "")
 	*/
 	static getDefaultIndexDefs(schemaPrefix) {
-		return [{
-			name: `${schemaPrefix}mastra_threads_resourceid_createdat_idx`,
-			table: TABLE_THREADS,
-			columns: ["resourceId", "createdAt DESC"]
-		}, {
-			name: `${schemaPrefix}mastra_messages_thread_id_createdat_idx`,
-			table: TABLE_MESSAGES,
-			columns: ["thread_id", "createdAt DESC"]
-		}];
+		return [
+			{
+				name: `${schemaPrefix}mastra_threads_resourceid_createdat_idx`,
+				table: TABLE_THREADS,
+				columns: ["resourceId", "createdAt DESC"]
+			},
+			{
+				name: `${schemaPrefix}mastra_threads_metadata_gin_idx`,
+				table: TABLE_THREADS,
+				columns: ["metadata"],
+				method: "gin",
+				opclass: "jsonb_path_ops"
+			},
+			{
+				name: `${schemaPrefix}mastra_messages_thread_id_createdat_idx`,
+				table: TABLE_MESSAGES,
+				columns: ["thread_id", "createdAt DESC"]
+			}
+		];
 	}
 	/**
 	* Returns all DDL statements for this domain: tables (threads, messages, resources, OM), indexes.
@@ -21926,6 +21969,7 @@ async function dangerouslyClearTracing(client, schema) {
 const spanQueryFeatures = typeof coreStorage.planSpanQuery === "function" ? [
 	"span-query",
 	"span-query-context-fields",
+	...coreStorage.SPAN_QUERY_ORDER_FIELDS?.includes("durationMs") ? ["span-query-duration-sort"] : [],
 	..."model" in (coreStorage.SPAN_QUERY_FIELD_REGISTRY ?? {}) ? ["span-query-model-fields"] : []
 ] : [];
 const spanAggregateFeatures = typeof coreStorage.planSpanAggregate === "function" ? ["span-aggregate", ..."model" in (coreStorage.SPAN_AGGREGATE_DIMENSION_REGISTRY ?? {}) ? ["span-aggregate-model-dimensions"] : []] : [];
@@ -22997,6 +23041,8 @@ function rowToSchedule(row) {
 	if (metadata !== void 0) schedule.metadata = metadata;
 	if (row.owner_type != null) schedule.ownerType = String(row.owner_type);
 	if (row.owner_id != null) schedule.ownerId = String(row.owner_id);
+	if (row.run_at != null) schedule.runAt = Number(row.run_at);
+	if (row.end_at != null) schedule.endAt = Number(row.end_at);
 	return schedule;
 }
 function rowToTrigger(row) {
@@ -23056,6 +23102,11 @@ var SchedulesPG = class SchedulesPG extends SchedulesStorage {
 			tableName: TABLE_SCHEDULES,
 			schema: TABLE_SCHEMAS[TABLE_SCHEDULES]
 		});
+		await this.#db.alterTable({
+			tableName: TABLE_SCHEDULES,
+			schema: TABLE_SCHEMAS[TABLE_SCHEDULES],
+			ifNotExists: ["run_at", "end_at"]
+		});
 		await this.#db.createTable({
 			tableName: TABLE_SCHEDULE_TRIGGERS,
 			schema: TABLE_SCHEMAS[TABLE_SCHEDULE_TRIGGERS]
@@ -23183,7 +23234,9 @@ var SchedulesPG = class SchedulesPG extends SchedulesStorage {
 				updated_at: schedule.updatedAt,
 				metadata: schedule.metadata ?? null,
 				owner_type: schedule.ownerType ?? null,
-				owner_id: schedule.ownerId ?? null
+				owner_id: schedule.ownerId ?? null,
+				run_at: schedule.runAt ?? null,
+				end_at: schedule.endAt ?? null
 			}
 		});
 		return schedule;
@@ -23253,6 +23306,8 @@ var SchedulesPG = class SchedulesPG extends SchedulesStorage {
 		if ("metadata" in patch) push("metadata = ?::jsonb", patch.metadata != null ? toPgJson(patch.metadata) : null);
 		if ("ownerType" in patch) push("owner_type = ?", patch.ownerType ?? null);
 		if ("ownerId" in patch) push("owner_id = ?", patch.ownerId ?? null);
+		if ("runAt" in patch) push("run_at = ?", patch.runAt ?? null);
+		if ("endAt" in patch) push("end_at = ?", patch.endAt ?? null);
 		push("updated_at = ?", Date.now());
 		if (setClauses.length === 1) {
 			const existing = await this.#getSchedule(this.#client, id);
@@ -28077,18 +28132,29 @@ var PgFactoryStorageOps = class {
 		};
 		if (this.#transactionClient) return run(this.#transactionClient);
 		const client = await this.#queryable.connect();
+		let releaseError;
 		try {
-			await client.query("BEGIN");
+			try {
+				await client.query("BEGIN");
+			} catch (error) {
+				releaseError = error instanceof Error ? error : new Error(String(error));
+				throw error;
+			}
 			try {
 				const result = await run(client);
 				await client.query("COMMIT");
 				return result;
 			} catch (error) {
-				await client.query("ROLLBACK");
+				try {
+					await client.query("ROLLBACK");
+				} catch (rollbackError) {
+					releaseError = rollbackError instanceof Error ? rollbackError : new Error(String(rollbackError));
+					throw new AggregateError([error, rollbackError], "Factory transaction and rollback both failed");
+				}
 				throw error;
 			}
 		} finally {
-			client.release();
+			client.release(releaseError);
 		}
 	}
 };
@@ -28145,7 +28211,12 @@ var PgFactoryStorage = class extends FactoryStorage {
 			let transactionOpen = false;
 			let releaseError;
 			try {
-				await client.query(options?.isolationLevel === "serializable" ? "BEGIN ISOLATION LEVEL SERIALIZABLE" : "BEGIN");
+				try {
+					await client.query(options?.isolationLevel === "serializable" ? "BEGIN ISOLATION LEVEL SERIALIZABLE" : "BEGIN");
+				} catch (error) {
+					releaseError = error instanceof Error ? error : new Error(String(error));
+					throw error;
+				}
 				transactionOpen = true;
 				const result = await fn(new PgFactoryStorageOps(client, this.#schemas, client));
 				await client.query("COMMIT");
@@ -28347,8 +28418,9 @@ var PostgresStore = class extends MastraCompositeStore {
 				this.#ownsWritePool = true;
 			}
 			this.#readPool = config.readPool ?? this.#writePool;
-			this.#db = new RoutingDbClient(new PoolAdapter(this.#writePool));
-			this.#readDb = this.#readPool === this.#writePool ? this.#db : new PoolAdapter(this.#readPool);
+			const onRollbackError = (error) => this.logger?.error?.("Transaction rollback failed", { error });
+			this.#db = new RoutingDbClient(new PoolAdapter(this.#writePool, onRollbackError));
+			this.#readDb = this.#readPool === this.#writePool ? this.#db : new PoolAdapter(this.#readPool, onRollbackError);
 			const domainConfig = {
 				client: this.#db,
 				readClient: this.#readDb,
@@ -28417,7 +28489,7 @@ var PostgresStore = class extends MastraCompositeStore {
 		let pinned;
 		try {
 			pinnedClient = await this.#writePool.connect();
-			pinned = new PinnedClientAdapter(this.#writePool, pinnedClient);
+			pinned = new PinnedClientAdapter(this.#writePool, pinnedClient, (error) => this.logger?.error?.("Transaction rollback failed", { error }));
 			this.#db.pin(pinned);
 			for (let attempt = 1; attempt <= 3; attempt++) {
 				this.#db.setSchemaSnapshot(await loadSchemaSnapshot(pinned, this.schema));
@@ -28442,7 +28514,7 @@ var PostgresStore = class extends MastraCompositeStore {
 			this.#db.setSchemaSnapshot(null);
 			if (pinnedClient) {
 				this.#db.unpin();
-				pinnedClient.release();
+				pinnedClient.release(pinned?.shouldDestroyClient || void 0);
 			}
 		}
 	}