@mastra/pg 1.24.0-alpha.3 → 1.24.1-alpha.0

package/dist/index.js

@@ -6274,23 +6274,6 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 	}
 	async _doUpdateItem(args) {
 		try {
-			const existing = await this.#getItemById(this.#db.client, { id: args.id });
-			if (!existing) throw new MastraError({
-				id: createStorageErrorId("PG", "UPDATE_ITEM", "NOT_FOUND"),
-				domain: ErrorDomain.STORAGE,
-				category: ErrorCategory.USER,
-				details: { itemId: args.id }
-			});
-			if (existing.datasetId !== args.datasetId) throw new MastraError({
-				id: createStorageErrorId("PG", "UPDATE_ITEM", "DATASET_MISMATCH"),
-				domain: ErrorDomain.STORAGE,
-				category: ErrorCategory.USER,
-				details: {
-					itemId: args.id,
-					expectedDatasetId: args.datasetId,
-					actualDatasetId: existing.datasetId
-				}
-			});
 			const datasetsTable = getTableName$5({
 				indexName: TABLE_DATASETS,
 				schemaName: getSchemaName$5(this.#schema)
@@ -6306,23 +6289,49 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 			const versionId = crypto.randomUUID();
 			const now = /* @__PURE__ */ new Date();
 			const nowIso = now.toISOString();
-			const mergedInput = args.input !== void 0 ? args.input : existing.input;
-			const mergedGroundTruth = args.groundTruth !== void 0 ? args.groundTruth : existing.groundTruth;
-			const mergedExpectedTrajectory = args.expectedTrajectory !== void 0 ? args.expectedTrajectory : existing.expectedTrajectory;
-			const mergedToolMocks = args.toolMocks !== void 0 ? args.toolMocks : existing.toolMocks;
-			const mergedUnmockedToolPolicy = args.unmockedToolPolicy !== void 0 ? args.unmockedToolPolicy : existing.unmockedToolPolicy;
-			const mergedScorerIds = args.scorerIds !== void 0 ? args.scorerIds ?? void 0 : existing.scorerIds;
-			const mergedRequestContext = args.requestContext !== void 0 ? args.requestContext : existing.requestContext;
-			const mergedMetadata = args.metadata !== void 0 ? args.metadata : existing.metadata;
-			const mergedSource = args.source !== void 0 ? args.source : existing.source;
-			let newVersion;
-			let parentOrganizationId = null;
-			let parentProjectId = null;
+			let updated;
 			await this.#db.client.tx(async (t) => {
+				await t.oneOrNone(`SELECT "id" FROM ${datasetsTable} WHERE "id" = $1 FOR UPDATE`, [args.datasetId]);
+				const existing = await this.#getItemById(t, { id: args.id });
+				if (!existing) throw new MastraError({
+					id: createStorageErrorId("PG", "UPDATE_ITEM", "NOT_FOUND"),
+					domain: ErrorDomain.STORAGE,
+					category: ErrorCategory.USER,
+					details: { itemId: args.id }
+				});
+				if (existing.datasetId !== args.datasetId) throw new MastraError({
+					id: createStorageErrorId("PG", "UPDATE_ITEM", "DATASET_MISMATCH"),
+					domain: ErrorDomain.STORAGE,
+					category: ErrorCategory.USER,
+					details: {
+						itemId: args.id,
+						expectedDatasetId: args.datasetId,
+						actualDatasetId: existing.datasetId
+					}
+				});
+				if (existing.metadata?.__purged === true) throw new MastraError({
+					id: "DATASET_ITEM_PURGED",
+					domain: ErrorDomain.STORAGE,
+					category: ErrorCategory.USER,
+					details: {
+						datasetId: args.datasetId,
+						itemId: args.id
+					},
+					text: `Purged dataset item cannot be updated: ${args.id}`
+				});
+				const mergedInput = args.input !== void 0 ? args.input : existing.input;
+				const mergedGroundTruth = args.groundTruth !== void 0 ? args.groundTruth : existing.groundTruth;
+				const mergedExpectedTrajectory = args.expectedTrajectory !== void 0 ? args.expectedTrajectory : existing.expectedTrajectory;
+				const mergedToolMocks = args.toolMocks !== void 0 ? args.toolMocks : existing.toolMocks;
+				const mergedUnmockedToolPolicy = args.unmockedToolPolicy !== void 0 ? args.unmockedToolPolicy : existing.unmockedToolPolicy;
+				const mergedScorerIds = args.scorerIds !== void 0 ? args.scorerIds ?? void 0 : existing.scorerIds;
+				const mergedRequestContext = args.requestContext !== void 0 ? args.requestContext : existing.requestContext;
+				const mergedMetadata = args.metadata !== void 0 ? args.metadata : existing.metadata;
+				const mergedSource = args.source !== void 0 ? args.source : existing.source;
 				const row = await t.one(`UPDATE ${datasetsTable} SET "version" = "version" + 1 WHERE "id" = $1 RETURNING "version", "organizationId", "projectId"`, [args.datasetId]);
-				newVersion = row.version;
-				parentOrganizationId = row.organizationId ?? null;
-				parentProjectId = row.projectId ?? null;
+				const newVersion = row.version;
+				const parentOrganizationId = row.organizationId ?? null;
+				const parentProjectId = row.projectId ?? null;
 				await t.none(`UPDATE ${itemsTable} SET "validTo" = $1 WHERE "id" = $2 AND "validTo" IS NULL AND "isDeleted" = false`, [newVersion, args.id]);
 				await t.none(`INSERT INTO ${itemsTable} ("id","datasetId","datasetVersion","externalId","organizationId","projectId","validTo","isDeleted","input","groundTruth","expectedTrajectory","toolMocks","unmockedToolPolicy","scorerIds","requestContext","metadata","source","createdAt","createdAtZ","updatedAt","updatedAtZ") VALUES ($1,$2,$3,$4,$5,$6,NULL,false,$7,$8,$9,$10,$11,$12,$13,$14,$15,$16,$17,$18,$19)`, [
 					args.id,
@@ -6352,23 +6361,24 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 					nowIso,
 					nowIso
 				]);
+				updated = {
+					...existing,
+					datasetVersion: newVersion,
+					organizationId: parentOrganizationId,
+					projectId: parentProjectId,
+					input: mergedInput,
+					groundTruth: mergedGroundTruth,
+					expectedTrajectory: mergedExpectedTrajectory,
+					toolMocks: mergedToolMocks,
+					unmockedToolPolicy: mergedUnmockedToolPolicy,
+					scorerIds: mergedScorerIds,
+					requestContext: mergedRequestContext,
+					metadata: mergedMetadata,
+					source: mergedSource,
+					updatedAt: now
+				};
 			});
-			return {
-				...existing,
-				datasetVersion: newVersion,
-				organizationId: parentOrganizationId,
-				projectId: parentProjectId,
-				input: mergedInput,
-				groundTruth: mergedGroundTruth,
-				expectedTrajectory: mergedExpectedTrajectory,
-				toolMocks: mergedToolMocks,
-				unmockedToolPolicy: mergedUnmockedToolPolicy,
-				scorerIds: mergedScorerIds,
-				requestContext: mergedRequestContext,
-				metadata: mergedMetadata,
-				source: mergedSource,
-				updatedAt: now
-			};
+			return updated;
 		} catch (error) {
 			if (error instanceof MastraError) throw error;
 			throw new MastraError({
@@ -6380,18 +6390,6 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 	}
 	async _doDeleteItem({ id, datasetId }) {
 		try {
-			const existing = await this.#getItemById(this.#db.client, { id });
-			if (!existing) return;
-			if (existing.datasetId !== datasetId) throw new MastraError({
-				id: createStorageErrorId("PG", "DELETE_ITEM", "DATASET_MISMATCH"),
-				domain: ErrorDomain.STORAGE,
-				category: ErrorCategory.USER,
-				details: {
-					itemId: id,
-					expectedDatasetId: datasetId,
-					actualDatasetId: existing.datasetId
-				}
-			});
 			const datasetsTable = getTableName$5({
 				indexName: TABLE_DATASETS,
 				schemaName: getSchemaName$5(this.#schema)
@@ -6407,6 +6405,19 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 			const versionId = crypto.randomUUID();
 			const nowIso = (/* @__PURE__ */ new Date()).toISOString();
 			await this.#db.client.tx(async (t) => {
+				await t.oneOrNone(`SELECT "id" FROM ${datasetsTable} WHERE "id" = $1 FOR UPDATE`, [datasetId]);
+				const existing = await this.#getItemById(t, { id });
+				if (!existing) return;
+				if (existing.datasetId !== datasetId) throw new MastraError({
+					id: createStorageErrorId("PG", "DELETE_ITEM", "DATASET_MISMATCH"),
+					domain: ErrorDomain.STORAGE,
+					category: ErrorCategory.USER,
+					details: {
+						itemId: id,
+						expectedDatasetId: datasetId,
+						actualDatasetId: existing.datasetId
+					}
+				});
 				const row = await t.one(`UPDATE ${datasetsTable} SET "version" = "version" + 1 WHERE "id" = $1 RETURNING "version", "organizationId", "projectId"`, [datasetId]);
 				const newVersion = row.version;
 				const parentOrganizationId = row.organizationId ?? null;
@@ -6593,19 +6604,6 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 	}
 	async _doBatchDeleteItems(input) {
 		try {
-			const dataset = await this.#getDatasetById(this.#db.client, { id: input.datasetId });
-			if (!dataset) throw new MastraError({
-				id: createStorageErrorId("PG", "BULK_DELETE_ITEMS", "DATASET_NOT_FOUND"),
-				domain: ErrorDomain.STORAGE,
-				category: ErrorCategory.USER,
-				details: { datasetId: input.datasetId }
-			});
-			const currentItems = [];
-			for (const itemId of input.itemIds) {
-				const item = await this.#getItemById(this.#db.client, { id: itemId });
-				if (item && item.datasetId === input.datasetId) currentItems.push(item);
-			}
-			if (currentItems.length === 0) return;
 			const datasetsTable = getTableName$5({
 				indexName: TABLE_DATASETS,
 				schemaName: getSchemaName$5(this.#schema)
@@ -6620,9 +6618,19 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 			});
 			const nowIso = (/* @__PURE__ */ new Date()).toISOString();
 			const versionId = crypto.randomUUID();
-			const parentOrganizationId = dataset.organizationId ?? null;
-			const parentProjectId = dataset.projectId ?? null;
 			await this.#db.client.tx(async (t) => {
+				await t.oneOrNone(`SELECT "id" FROM ${datasetsTable} WHERE "id" = $1 FOR UPDATE`, [input.datasetId]);
+				const dataset = await this.#getDatasetById(t, { id: input.datasetId });
+				if (!dataset) throw new MastraError({
+					id: createStorageErrorId("PG", "BULK_DELETE_ITEMS", "DATASET_NOT_FOUND"),
+					domain: ErrorDomain.STORAGE,
+					category: ErrorCategory.USER,
+					details: { datasetId: input.datasetId }
+				});
+				const currentItems = (await t.manyOrNone(`SELECT * FROM ${itemsTable} WHERE "id" = ANY($1::text[]) AND "datasetId" = $2 AND "validTo" IS NULL AND "isDeleted" = false`, [input.itemIds, input.datasetId])).map((row) => this.transformItemRow(row));
+				if (currentItems.length === 0) return;
+				const parentOrganizationId = dataset.organizationId ?? null;
+				const parentProjectId = dataset.projectId ?? null;
 				const newVersion = (await t.one(`UPDATE ${datasetsTable} SET "version" = "version" + 1 WHERE "id" = $1 RETURNING "version"`, [input.datasetId])).version;
 				for (const item of currentItems) {
 					await t.none(`UPDATE ${itemsTable} SET "validTo" = $1 WHERE "id" = $2 AND "validTo" IS NULL AND "isDeleted" = false`, [newVersion, item.id]);
@@ -11690,9 +11698,10 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 			indexName: TABLE_MESSAGES,
 			schemaName: getSchemaName$3(this.#schema)
 		});
+		const hydrateMessages = options?.hydrateMessages ?? true;
 		try {
 			return await this.#db.client.tx(async (t) => {
-				let messageQuery = `SELECT id, content, role, type, "createdAt", "createdAtZ", thread_id AS "threadId", "resourceId"
+				let messageQuery = `SELECT ${hydrateMessages ? `id, content, role, type, "createdAt", "createdAtZ", thread_id AS "threadId", "resourceId"` : `id, "createdAt"`}
                             FROM ${messageTableName} WHERE thread_id = $1`;
 				const messageParams = [sourceThreadId];
 				let paramIndex = 2;
@@ -11759,6 +11768,18 @@ var MemoryPG = class MemoryPG extends MemoryStorage {
 				for (const sourceMsg of sourceMessages) {
 					const newMessageId = crypto.randomUUID();
 					messageIdMap[sourceMsg.id] = newMessageId;
+					if (!hydrateMessages) {
+						const insertResult = await t.query(`INSERT INTO ${messageTableName} (id, thread_id, content, "createdAt", "createdAtZ", role, type, "resourceId")
+               SELECT $1, $2, content, "createdAt", "createdAtZ", role, type, $3
+               FROM ${messageTableName} WHERE id = $4`, [
+							newMessageId,
+							newThreadId,
+							targetResourceId,
+							sourceMsg.id
+						]);
+						if (insertResult.rowCount !== 1) throw new Error(`Failed to clone message ${sourceMsg.id}: expected 1 row copied but got ${insertResult.rowCount}`);
+						continue;
+					}
 					const normalizedMsg = this.normalizeMessageRow(sourceMsg);
 					let parsedContent = normalizedMsg.content;
 					try {
@@ -15276,11 +15297,6 @@ function jsonField(value) {
 }
 function parsedJson(value) {
 	if (value == null) return void 0;
-	if (typeof value === "string") try {
-		return JSON.parse(value);
-	} catch {
-		return;
-	}
 	return value;
 }
 function rowToCommonContext(row) {