@mastra/spanner 1.10.1 → 1.11.0

package/dist/index.js

@@ -1907,10 +1907,13 @@ function rowToTask(row) {
 		suspendedAt: transformed.suspendedAt ? transformed.suspendedAt instanceof Date ? transformed.suspendedAt : new Date(transformed.suspendedAt) : void 0,
 		completedAt: transformed.completedAt ? transformed.completedAt instanceof Date ? transformed.completedAt : new Date(transformed.completedAt) : void 0,
 		ownerId: transformed.ownerId != null ? String(transformed.ownerId) : void 0,
-		leaseExpiresAt: transformed.leaseExpiresAt ? transformed.leaseExpiresAt instanceof Date ? transformed.leaseExpiresAt : new Date(transformed.leaseExpiresAt) : void 0
+		leaseExpiresAt: transformed.leaseExpiresAt ? transformed.leaseExpiresAt instanceof Date ? transformed.leaseExpiresAt : new Date(transformed.leaseExpiresAt) : void 0,
+		expiresAt: transformed.expiresAt ? transformed.expiresAt instanceof Date ? transformed.expiresAt : new Date(transformed.expiresAt) : void 0,
+		metadata: parseJson(transformed.metadata) ?? void 0
 	};
 }
 var BackgroundTasksSpanner = class BackgroundTasksSpanner extends BackgroundTasksStorage {
+	supportsTaskExpiry = true;
 	database;
 	db;
 	skipDefaultIndexes;
@@ -1940,7 +1943,9 @@ var BackgroundTasksSpanner = class BackgroundTasksSpanner extends BackgroundTask
 				"suspend_payload",
 				"suspendedAt",
 				"ownerId",
-				"leaseExpiresAt"
+				"leaseExpiresAt",
+				"expiresAt",
+				"metadata"
 			]
 		});
 		await this.createDefaultIndexes();
@@ -2023,7 +2028,9 @@ var BackgroundTasksSpanner = class BackgroundTasksSpanner extends BackgroundTask
 				suspendedAt: task.suspendedAt ?? null,
 				completedAt: task.completedAt ?? null,
 				ownerId: task.ownerId ?? null,
-				leaseExpiresAt: task.leaseExpiresAt ?? null
+				leaseExpiresAt: task.leaseExpiresAt ?? null,
+				expiresAt: task.expiresAt ?? null,
+				metadata: task.metadata ?? null
 			}
 		});
 	}
@@ -2039,12 +2046,18 @@ var BackgroundTasksSpanner = class BackgroundTasksSpanner extends BackgroundTask
 		if ("completedAt" in update) data.completedAt = update.completedAt ?? null;
 		if ("ownerId" in update) data.ownerId = update.ownerId ?? null;
 		if ("leaseExpiresAt" in update) data.leaseExpiresAt = update.leaseExpiresAt ?? null;
+		if ("expiresAt" in update) data.expiresAt = update.expiresAt ?? null;
+		if ("metadata" in update) data.metadata = update.metadata ?? null;
 		if (Object.keys(data).length === 0) return false;
 		const setClauses = Object.keys(data).map((field) => `${quoteIdent(field, "column name")} = @${field}`);
-		const params = {
-			...data,
-			id: taskId
-		};
+		const params = { id: taskId };
+		const types = {};
+		for (const [field, value] of Object.entries(data)) {
+			const prepared = this.db.prepareValue(value, field, TABLE_BACKGROUND_TASKS);
+			params[field] = prepared;
+			const colType = getColumnDef(TABLE_BACKGROUND_TASKS, field)?.type;
+			if (prepared === null || colType === "jsonb" || colType === "timestamp") types[field] = getSpannerParamType(colType);
+		}
 		const predicates = [];
 		if (options?.expectedStatus) {
 			predicates.push("status = @expectedStatus");
@@ -2061,15 +2074,24 @@ var BackgroundTasksSpanner = class BackgroundTasksSpanner extends BackgroundTask
 			if (options.expectedLeaseExpiresAt === null) predicates.push("leaseExpiresAt IS NULL");
 			else {
 				predicates.push("leaseExpiresAt = @expectedLeaseExpiresAt");
-				params.expectedLeaseExpiresAt = options.expectedLeaseExpiresAt;
+				params.expectedLeaseExpiresAt = this.db.prepareValue(options.expectedLeaseExpiresAt, "leaseExpiresAt", TABLE_BACKGROUND_TASKS);
+				types.expectedLeaseExpiresAt = getSpannerParamType("timestamp");
+			}
+		}
+		if (options?.expectedSuspendedAt !== void 0) {
+			if (options.expectedSuspendedAt === null) predicates.push("suspendedAt IS NULL");
+			else {
+				predicates.push("suspendedAt = @expectedSuspendedAt");
+				params.expectedSuspendedAt = this.db.prepareValue(options.expectedSuspendedAt, "suspendedAt", TABLE_BACKGROUND_TASKS);
+				types.expectedSuspendedAt = getSpannerParamType("timestamp");
 			}
 		}
 		const predicateSql = predicates.length > 0 ? ` AND ${predicates.join(" AND ")}` : "";
-		const [rowCount] = await this.database.runUpdate({
+		return await this.db.runDml({
 			sql: `UPDATE ${this.tableName()} SET ${setClauses.join(", ")} WHERE id = @id${predicateSql}`,
-			params
-		});
-		return rowCount > 0;
+			params,
+			types
+		}) > 0;
 	}
 	async getTask(taskId) {
 		const [rows] = await this.database.run({
@@ -2139,7 +2161,8 @@ var BackgroundTasksSpanner = class BackgroundTasksSpanner extends BackgroundTask
 			params[name] = filter.toolCallId;
 			conditions.push(`${quoteIdent("tool_call_id", "column name")} = @${name}`);
 		}
-		const dateCol = filter.dateFilterBy === "startedAt" ? quoteIdent("startedAt", "column name") : filter.dateFilterBy === "suspendedAt" ? quoteIdent("suspendedAt", "column name") : filter.dateFilterBy === "completedAt" ? quoteIdent("completedAt", "column name") : quoteIdent("createdAt", "column name");
+		const dateCol = filter.dateFilterBy === "startedAt" ? quoteIdent("startedAt", "column name") : filter.dateFilterBy === "suspendedAt" ? quoteIdent("suspendedAt", "column name") : filter.dateFilterBy === "completedAt" ? quoteIdent("completedAt", "column name") : filter.dateFilterBy === "expiresAt" ? quoteIdent("expiresAt", "column name") : quoteIdent("createdAt", "column name");
+		if (filter.hasExpiresAt !== void 0) conditions.push(`${quoteIdent("expiresAt", "column name")} IS ${filter.hasExpiresAt ? "NOT NULL" : "NULL"}`);
 		if (filter.fromDate) {
 			const name = `p${idx++}`;
 			params[name] = filter.fromDate.toISOString();
@@ -2204,7 +2227,8 @@ var BackgroundTasksSpanner = class BackgroundTasksSpanner extends BackgroundTask
 			conditions.push(statusCondition.sql);
 			idx = statusCondition.nextIdx;
 		}
-		const dateCol = filter.dateFilterBy === "startedAt" ? quoteIdent("startedAt", "column name") : filter.dateFilterBy === "completedAt" ? quoteIdent("completedAt", "column name") : quoteIdent("createdAt", "column name");
+		const dateCol = filter.dateFilterBy === "startedAt" ? quoteIdent("startedAt", "column name") : filter.dateFilterBy === "suspendedAt" ? quoteIdent("suspendedAt", "column name") : filter.dateFilterBy === "completedAt" ? quoteIdent("completedAt", "column name") : filter.dateFilterBy === "expiresAt" ? quoteIdent("expiresAt", "column name") : quoteIdent("createdAt", "column name");
+		if (filter.hasExpiresAt !== void 0) conditions.push(`${quoteIdent("expiresAt", "column name")} IS ${filter.hasExpiresAt ? "NOT NULL" : "NULL"}`);
 		if (filter.fromDate) {
 			const name = `p${idx++}`;
 			params[name] = filter.fromDate.toISOString();