dineway 0.2.31 → 0.2.33

package/dist/{review-requests-D-lhld0A.mjs → review-requests-DICrYH2-.mjs}

@@ -1,8 +1,14 @@
-import { i as encodeCursor, r as decodeCursor } from "./types-DXwmu5rT.mjs";
+import { i as encodeCursor, r as decodeCursor } from "./types-BpSTdH1H.mjs";
+import { t as buildStableHash } from "./stable-hash-DF7R5eN8.mjs";
 import { ulid } from "ulidx";
 
 //#region src/database/repositories/review-requests.ts
-var ReviewRequestRepository = class {
+var RejectedReviewContentError = class extends Error {
+	constructor() {
+		super("This content was rejected. Change the content before approving a new review.");
+	}
+};
+var ReviewRequestRepository = class ReviewRequestRepository {
 	constructor(db) {
 		this.db = db;
 	}
@@ -16,12 +22,34 @@ var ReviewRequestRepository = class {
 	}
 	async findById(id) {
 		const row = await this.db.selectFrom("_dineway_review_requests").selectAll().where("id", "=", id).executeTakeFirst();
-		return row ? rowToReviewRequest(row) : null;
+		return row ? this.withAutomation(row) : null;
 	}
 	async list(query = {}) {
 		const limit = clampLimit(query.limit);
 		const rows = await this.queryRows(query).execute();
 		const items = rows.slice(0, limit).map(rowToReviewRequest);
+		if (items.length) {
+			const jobs = await this.db.selectFrom("_dineway_review_jobs").select([
+				"review_id",
+				"state",
+				"release_state",
+				"reason",
+				"release_reason",
+				"scheduled_at"
+			]).where("review_id", "in", items.map((item) => item.id)).execute();
+			const byId = new Map(jobs.map((job) => [job.review_id, job]));
+			for (const item of items) {
+				const job = byId.get(item.id);
+				if (job) item.automation = {
+					state: job.state,
+					releaseState: job.release_state,
+					scheduledAt: job.scheduled_at,
+					reason: job.reason,
+					releaseReason: job.release_reason,
+					evidence: null
+				};
+			}
+		}
 		const result = { items };
 		if (rows.length > limit && items.length > 0) {
 			const last = items.at(-1);
@@ -36,6 +64,20 @@ var ReviewRequestRepository = class {
 		return Number(result?.count ?? 0);
 	}
 	async resolve(id, input) {
+		if (!this.db.isTransaction) return this.db.transaction().execute((trx) => new ReviewRequestRepository(trx).resolve(id, input));
+		if (input.decision === "approved") {
+			const target = await this.findById(id);
+			if (!target || target.status !== "pending") return null;
+			const diff = target.reviewPayload.diff;
+			if (isRecord(diff) && isRecord(diff.draft)) {
+				const hash = await buildStableHash(diff.draft);
+				const rejected = await this.db.selectFrom("_dineway_review_requests").select("review_payload").where("collection", "=", target.collection).where("entry_id", "=", target.entryId).where("status", "=", "rejected").execute();
+				for (const row of rejected) {
+					const priorDiff = parseRecord(row.review_payload)?.diff;
+					if (isRecord(priorDiff) && isRecord(priorDiff.draft) && await buildStableHash(priorDiff.draft) === hash) throw new RejectedReviewContentError();
+				}
+			}
+		}
 		const resolvedAt = input.resolvedAt ?? (/* @__PURE__ */ new Date()).toISOString();
 		const result = await this.db.updateTable("_dineway_review_requests").set({
 			status: input.decision,
@@ -47,19 +89,39 @@ var ReviewRequestRepository = class {
 			updated_at: resolvedAt
 		}).where("id", "=", id).where("status", "=", "pending").executeTakeFirst();
 		if (Number(result.numUpdatedRows ?? 0) === 0) return null;
+		await this.db.updateTable("_dineway_review_jobs").set({
+			state: "complete",
+			release_state: input.decision === "approved" ? "queued" : "none",
+			reason: input.reviewNote ?? "Resolved by reviewer",
+			updated_at: resolvedAt
+		}).where("review_id", "=", id).execute();
 		return this.findById(id);
 	}
 	async findApprovedForTarget(target) {
-		let query = this.db.selectFrom("_dineway_review_requests").selectAll().where("status", "=", "approved").where("collection", "=", target.collection).where("entry_id", "=", target.entryId).where("reviewed_rev", "=", target.reviewedRev).where("action_type", "=", target.actionType).where("action_hash", "=", target.actionHash).orderBy("resolved_at", "desc").orderBy("created_at", "desc").orderBy("id", "desc");
+		let query = this.db.selectFrom("_dineway_review_requests").selectAll().where("status", "=", "approved").where("revoked_at", "is", null).where("collection", "=", target.collection).where("entry_id", "=", target.entryId).where("reviewed_rev", "=", target.reviewedRev).where("action_type", "=", target.actionType).where("action_hash", "=", target.actionHash).orderBy("resolved_at", "desc").orderBy("created_at", "desc").orderBy("id", "desc");
 		query = target.liveRevisionId === null ? query.where("live_revision_id", "is", null) : query.where("live_revision_id", "=", target.liveRevisionId);
 		query = target.draftRevisionId === null ? query.where("draft_revision_id", "is", null) : query.where("draft_revision_id", "=", target.draftRevisionId);
 		const row = await query.executeTakeFirst();
-		return row ? rowToReviewRequest(row) : null;
+		return row ? this.withAutomation(row) : null;
+	}
+	async withAutomation(row) {
+		const item = rowToReviewRequest(row);
+		const job = await this.db.selectFrom("_dineway_review_jobs").selectAll().where("review_id", "=", row.id).executeTakeFirst();
+		if (job) item.automation = {
+			state: job.state,
+			releaseState: job.release_state,
+			scheduledAt: job.scheduled_at,
+			reason: job.reason,
+			releaseReason: job.release_reason,
+			evidence: parseRecord(job.evidence_json)
+		};
+		return item;
 	}
 	queryRows(query) {
 		const limit = clampLimit(query.limit);
 		let q = this.db.selectFrom("_dineway_review_requests").selectAll().orderBy("created_at", "desc").orderBy("id", "desc").limit(limit + 1);
-		if (query.status) q = q.where("status", "=", query.status);
+		if (query.status === "resolved") q = q.where("status", "in", ["approved", "rejected"]);
+		else if (query.status) q = q.where("status", "=", query.status);
 		if (query.collection) q = q.where("collection", "=", query.collection);
 		if (query.entryId) q = q.where("entry_id", "=", query.entryId);
 		if (query.scope) q = q.where("scope", "=", query.scope);
@@ -102,6 +164,7 @@ function toInsertableReviewRequest(id, input, now) {
 function rowToReviewRequest(row) {
 	return {
 		id: row.id,
+		revokedAt: row.revoked_at,
 		status: row.status,
 		collection: row.collection,
 		entryId: row.entry_id,
@@ -145,4 +208,4 @@ function clampLimit(value) {
 }
 
 //#endregion
-export { ReviewRequestRepository as t };
+export { ReviewRequestRepository as n, RejectedReviewContentError as t };

package/dist/{review-route-helpers-3MNvw1AH.mjs → review-route-helpers-DaZBBps8.mjs}

@@ -1,5 +1,5 @@
-import { n as resolveActorIdentity } from "./actor-BraTCiOp.mjs";
-import { p as logSiteActivitySafely } from "./activity-events-C1U22VYR.mjs";
+import { n as resolveActorIdentity } from "./actor-DrJJsvy6.mjs";
+import { p as logSiteActivitySafely } from "./activity-events-BVo9rMUz.mjs";
 
 //#region src/api/review-route-helpers.ts
 function resolveReviewRouteActor(locals) {

package/dist/revocation-CkTOhdlw.mjs

@@ -0,0 +1,42 @@
+import { t as SiteActivityRepository } from "./site-activity-7oezuHXK.mjs";
+import { n as ReviewRequestRepository } from "./review-requests-DICrYH2-.mjs";
+import { sql } from "kysely";
+
+//#region src/review-automation/revocation.ts
+async function revokeReview(db, id, actor, reason, sourceType = "api_route") {
+	return db.transaction().execute(async (trx) => {
+		const now = (/* @__PURE__ */ new Date()).toISOString();
+		if (!await trx.updateTable("_dineway_review_requests").set({
+			revoked_at: now,
+			updated_at: now
+		}).where("id", "=", id).where("status", "=", "approved").where("revoked_at", "is", null).returning("id").executeTakeFirst()) return null;
+		await trx.updateTable("_dineway_review_jobs").set({
+			target_key: `revoked:${id}`,
+			release_state: sql`CASE WHEN release_state = 'published' THEN 'published' ELSE 'blocked' END`,
+			release_reason: `Approval revoked: ${reason}`,
+			updated_at: now
+		}).where("review_id", "=", id).execute();
+		await trx.updateTable("_dineway_content_release_grants").set({
+			status: "revoked",
+			revoked_at: now,
+			revocation_reason: reason,
+			updated_at: now
+		}).where("editorial_review_request_id", "=", id).where("status", "=", "active").execute();
+		const item = await new ReviewRequestRepository(trx).findById(id);
+		await new SiteActivityRepository(trx).create({
+			...actor,
+			actionType: "review.revoked",
+			subjectType: "review_request",
+			subjectId: id,
+			scope: item.scope,
+			summary: "Revoked editorial approval",
+			detail: { reason },
+			sourceType,
+			sourceName: "review-revoke"
+		});
+		return item;
+	});
+}
+
+//#endregion
+export { revokeReview as t };