emdash 1.0.1 → 1.2.0

package/src/content/converters/prosemirror-to-portable-text.ts

@@ -4,6 +4,7 @@
  * Converts TipTap's ProseMirror JSON format to Portable Text for storage.
  */
 
+import { htmlBlockFields } from "@emdash-cms/admin/html-block";
 import {
 	UnsafePortableTextTableError,
 	proseMirrorTableToPortableText,
@@ -35,7 +36,10 @@ import type {
 	PortableTextGalleryBlock,
 	PortableTextCodeBlock,
 	PortableTextHtmlBlock,
+	PortableTextIframeBlock,
+	PortableTextVideoBlock,
 } from "./types.js";
+import { videoBlockFields } from "./video.js";
 
 /**
  * Generate a unique key for Portable Text blocks
@@ -113,9 +117,15 @@ function convertNode(
 		case "htmlBlock":
 			return convertHtmlBlock(node);
 
+		case "iframeBlock":
+			return convertIframeBlock(node);
+
 		case "image":
 			return convertImage(node);
 
+		case "videoBlock":
+			return convertVideo(node);
+
 		case "gallery":
 			return convertGallery(node);
 
@@ -351,14 +361,46 @@ function convertCodeBlock(node: ProseMirrorNode): PortableTextCodeBlock {
  * Convert HTML block to Portable Text
  */
 function convertHtmlBlock(node: ProseMirrorNode): PortableTextHtmlBlock {
-	const rawHtml = node.attrs?.html;
 	return {
 		_type: "htmlBlock",
 		_key: portableTextKeyFromAttrs(node.attrs) ?? generateKey(),
-		html: typeof rawHtml === "string" ? rawHtml : "",
+		...htmlBlockFields(node.attrs ?? {}),
 	};
 }
 
+/**
+ * Convert iframe block to Portable Text, writing optional fields only when set
+ */
+function convertIframeBlock(node: ProseMirrorNode): PortableTextIframeBlock {
+	const { src, title, width, height, allow, allowFullscreen } = node.attrs ?? {};
+	const block: PortableTextIframeBlock = {
+		_type: "iframe",
+		_key: portableTextKeyFromAttrs(node.attrs) ?? generateKey(),
+		src: typeof src === "string" ? src : "",
+	};
+	if (typeof title === "string" && title) block.title = title;
+	if (isFrameDimension(width)) block.width = width;
+	if (isFrameDimension(height)) block.height = height;
+	if (typeof allow === "string" && allow) block.allow = allow;
+	if (allowFullscreen === true) block.allowFullscreen = true;
+	return block;
+}
+
+/**
+ * Convert video block to Portable Text
+ */
+function convertVideo(node: ProseMirrorNode): PortableTextVideoBlock {
+	return {
+		_type: "video",
+		_key: portableTextKeyFromAttrs(node.attrs) ?? generateKey(),
+		...videoBlockFields(node.attrs ?? {}),
+	};
+}
+
+function isFrameDimension(value: unknown): value is number {
+	return typeof value === "number" && Number.isInteger(value) && value >= 1 && value <= 10_000;
+}
+
 function imageDimension(value: unknown): number | undefined {
 	return typeof value === "number" && Number.isFinite(value) && value > 0 ? value : undefined;
 }

package/src/content/converters/types.ts

@@ -155,6 +155,50 @@ export interface PortableTextHtmlBlock {
 	_type: "htmlBlock";
 	_key: string;
 	html: string;
+	/** Styles for the isolated frame. Not used when the block renders inline. */
+	css?: string;
+	/** Script for the isolated frame. Not used when the block renders inline. */
+	js?: string;
+	/** Render in a sandboxed frame instead of as inline, sanitized HTML. */
+	isolated?: boolean;
+}
+
+/**
+ * Iframe block (a page from another site)
+ */
+export interface PortableTextIframeBlock {
+	_type: "iframe";
+	_key: string;
+	/** An absolute https URL. */
+	src: string;
+	title?: string;
+	/** Whole numbers from 1 to 10000. With both set, they give the aspect ratio. */
+	width?: number;
+	height?: number;
+	/** Permissions policy features for the embedded page. */
+	allow?: string;
+	allowFullscreen?: boolean;
+}
+
+/**
+ * Video block (a Media Library video, or a media provider's)
+ */
+export interface PortableTextVideoBlock {
+	_type: "video";
+	_key: string;
+	/** Absent while the block is empty, before an editor adds a video to it. */
+	asset?: {
+		/** Media Library id, or the provider's asset id */
+		_ref: string;
+		/** File URL of a Media Library video, which needs it to play */
+		url?: string;
+		/** Provider ID for external media (e.g., "cloudflare-stream"); omitted for the Media Library */
+		provider?: string;
+	};
+	caption?: string;
+	/** Size in pixels, in whole numbers. Gives the player its aspect ratio before the video loads. */
+	width?: number;
+	height?: number;
 }
 
 /**
@@ -175,6 +219,8 @@ export type PortableTextBlock =
 	| PortableTextGalleryBlock
 	| PortableTextCodeBlock
 	| PortableTextHtmlBlock
+	| PortableTextIframeBlock
+	| PortableTextVideoBlock
 	| PortableTextTableBlock
 	| PortableTextUnknownBlock;
 

package/src/content/converters/video.ts

@@ -0,0 +1,77 @@
+/**
+ * The editor's video block: its shape, and its ProseMirror attributes.
+ * Keep in sync with the admin editor's `VideoNode`.
+ */
+
+import type { PortableTextVideoBlock } from "./types.js";
+
+type FieldCheck = (value: unknown) => boolean;
+
+const isRecord = (value: unknown): value is Record<string, unknown> =>
+	typeof value === "object" && value !== null && !Array.isArray(value);
+const isString = (value: unknown) => typeof value === "string";
+const isDimension = (value: unknown): value is number =>
+	typeof value === "number" && Number.isInteger(value) && value >= 1;
+
+const hasOnly = (record: Record<string, unknown>, fields: Map<string, FieldCheck>) =>
+	Object.entries(record).every(
+		([key, value]) => value === undefined || (fields.get(key)?.(value) ?? false),
+	);
+
+const ASSET_FIELDS = new Map<string, FieldCheck>([
+	["_ref", isString],
+	["url", isString],
+	["provider", isString],
+]);
+
+const isAsset = (value: unknown) =>
+	isRecord(value) && typeof value._ref === "string" && hasOnly(value, ASSET_FIELDS);
+
+const VIDEO_FIELDS = new Map<string, FieldCheck>([
+	["_type", () => true],
+	["_key", () => true],
+	["asset", isAsset],
+	["caption", isString],
+	["width", isDimension],
+	["height", isDimension],
+]);
+
+/**
+ * Whether a block is the editor's own video block. A `video` block with other
+ * fields, or values of other types, belongs to a plugin.
+ */
+export function isPortableTextVideoBlock(block: unknown): block is PortableTextVideoBlock {
+	return isRecord(block) && block._type === "video" && hasOnly(block, VIDEO_FIELDS);
+}
+
+/** ProseMirror attributes of a `videoBlock` node. */
+export function videoNodeAttrs(block: PortableTextVideoBlock): Record<string, unknown> {
+	return {
+		src: block.asset?.url ?? "",
+		mediaId: block.asset?._ref ?? null,
+		provider: block.asset?.provider,
+		caption: block.caption ?? "",
+		width: block.width,
+		height: block.height,
+	};
+}
+
+/** A `videoBlock` node's Portable Text fields, writing optional fields only when set. */
+export function videoBlockFields(
+	attrs: Record<string, unknown>,
+): Omit<PortableTextVideoBlock, "_type" | "_key"> {
+	const { src, mediaId, provider, caption, width, height } = attrs;
+	const asset: NonNullable<PortableTextVideoBlock["asset"]> = {
+		_ref: typeof mediaId === "string" ? mediaId : "",
+	};
+	if (typeof src === "string" && src) asset.url = src;
+	if (typeof provider === "string" && provider && provider !== "local") asset.provider = provider;
+	// An empty block has no media id, file or provider.
+	const empty = typeof mediaId !== "string" && !asset.url && !asset.provider;
+	return {
+		...(empty ? {} : { asset }),
+		...(typeof caption === "string" && caption ? { caption } : {}),
+		...(isDimension(width) ? { width } : {}),
+		...(isDimension(height) ? { height } : {}),
+	};
+}

package/src/database/content-datetime.ts

@@ -7,7 +7,7 @@ import {
 	type DatetimeFieldDescriptor,
 } from "../datetime-normalization.js";
 import { requestCached } from "../request-cache.js";
-import type { FieldType, RepeaterSubField } from "../schema/types.js";
+import { isStoragelessFieldRow, type FieldType, type RepeaterSubField } from "../schema/types.js";
 import { isSafeUrlFieldWriteValue } from "../utils/url.js";
 import { EmDashValidationError } from "./repositories/types.js";
 import type { Database } from "./types.js";
@@ -21,6 +21,7 @@ interface DatetimeContext {
 	timezone: string;
 	fields: DatetimeFieldDescriptor[];
 	urlFields: UrlFieldDescriptor[];
+	writableFieldSlugs: ReadonlySet<string>;
 }
 
 function repeaterSubFieldsOfType(validation: string | null, type: FieldType): string[] {
@@ -83,7 +84,6 @@ export class ContentDatetimeNormalizer {
 				.innerJoin("_emdash_collections as collection", "collection.id", "field.collection_id")
 				.select(["field.slug", "field.type", "field.validation"])
 				.where("collection.slug", "=", collection)
-				.where("field.type", "in", ["datetime", "repeater", "url"])
 				.execute(),
 			this.db
 				.selectFrom("options")
@@ -107,7 +107,7 @@ export class ContentDatetimeNormalizer {
 				fields.push({ slug: row.slug, type: "datetime" });
 			} else if (row.type === "url") {
 				urlFields.push({ slug: row.slug });
-			} else {
+			} else if (row.type === "repeater") {
 				fields.push({
 					slug: row.slug,
 					type: "repeater",
@@ -117,7 +117,14 @@ export class ContentDatetimeNormalizer {
 				if (urlSubFields.length > 0) urlFields.push({ slug: row.slug, urlSubFields });
 			}
 		}
-		return { timezone, fields, urlFields };
+		const writableFieldSlugs = new Set(
+			rows.filter((field) => !isStoragelessFieldRow(field)).map((field) => field.slug),
+		);
+		return { timezone, fields, urlFields, writableFieldSlugs };
+	}
+
+	async writableFieldSlugs(collection: string): Promise<ReadonlySet<string>> {
+		return (await this.context(collection)).writableFieldSlugs;
 	}
 
 	/**

package/src/database/datetime-storage.ts

@@ -430,13 +430,13 @@ export async function normalizeDatetimeStorage(
 	db: Kysely<Database>,
 ): Promise<DatetimeStorageReport> {
 	const preflight = await scan(db, false);
-	console.error(`[datetime migration] ${formatDatetimeStorageReport(preflight)}`);
 	if (preflight.manualReviewCount > 0 || preflight.inspectionErrorCount > 0) {
 		throw new Error(
 			`Datetime migration requires manual review:\n${formatDatetimeStorageReport(preflight)}`,
 		);
 	}
 	if (preflight.noncanonicalCount === 0) return preflight;
+	console.info(`[datetime migration] ${formatDatetimeStorageReport(preflight)}`);
 	await scan(db, true);
 	const verified = await scan(db, false);
 	if (

package/src/database/migrations/090_redirect_enable_loop_guard.ts

@@ -0,0 +1,70 @@
+import { type Kysely, sql } from "kysely";
+
+import { isPostgres } from "../dialect-helpers.js";
+
+/**
+ * Rejects enabling a disabled redirect when its edge would close a loop.
+ * The loop guards from 081 only fire when source or destination changes.
+ */
+export async function up(db: Kysely<unknown>): Promise<void> {
+	if (isPostgres(db)) {
+		await sql`
+			CREATE OR REPLACE FUNCTION emdash_redirect_validate_enable()
+			RETURNS trigger
+			LANGUAGE plpgsql
+			AS $$
+			BEGIN
+				PERFORM pg_advisory_xact_lock(1168624763);
+				IF EXISTS (
+					WITH RECURSIVE chain(source, destination) AS (
+						SELECT source, destination FROM _emdash_redirects
+						WHERE source = NEW.destination AND enabled = 1 AND id <> NEW.id
+						UNION
+						SELECT redirect.source, redirect.destination
+						FROM _emdash_redirects AS redirect
+						JOIN chain ON redirect.source = chain.destination
+						WHERE redirect.enabled = 1 AND redirect.id <> NEW.id
+					)
+					SELECT 1 FROM chain WHERE destination = NEW.source
+				) THEN
+					RAISE EXCEPTION 'redirect loop';
+				END IF;
+				RETURN NEW;
+			END;
+			$$
+		`.execute(db);
+		await sql`DROP TRIGGER IF EXISTS emdash_redirect_loop_enable ON _emdash_redirects`.execute(db);
+		await sql`
+			CREATE TRIGGER emdash_redirect_loop_enable
+			BEFORE UPDATE OF enabled ON _emdash_redirects
+			FOR EACH ROW
+			WHEN (NEW.enabled = 1 AND OLD.enabled IS DISTINCT FROM 1 AND NEW.destination <> '')
+			EXECUTE FUNCTION emdash_redirect_validate_enable()
+		`.execute(db);
+		return;
+	}
+
+	// No `CASE ... END;` inside trigger bodies: the D1 HTTP API used by
+	// `emdash migrate` ends the statement at an inner `END;`.
+	await sql`
+		CREATE TRIGGER IF NOT EXISTS emdash_redirect_loop_enable
+		BEFORE UPDATE OF enabled ON _emdash_redirects
+		WHEN NEW.enabled = 1 AND OLD.enabled IS NOT 1 AND NEW.destination <> ''
+		BEGIN
+			SELECT RAISE(ABORT, 'redirect loop') WHERE EXISTS (
+				WITH RECURSIVE chain(source, destination) AS (
+					SELECT source, destination FROM _emdash_redirects
+					WHERE source = NEW.destination AND enabled = 1 AND id <> NEW.id
+					UNION
+					SELECT redirect.source, redirect.destination
+					FROM _emdash_redirects AS redirect
+					JOIN chain ON redirect.source = chain.destination
+					WHERE redirect.enabled = 1 AND redirect.id <> NEW.id
+				)
+				SELECT 1 FROM chain WHERE destination = NEW.source
+			);
+		END
+	`.execute(db);
+}
+
+export async function down(_db: Kysely<unknown>): Promise<void> {}

package/src/database/migrations/091_redirect_artifacts.ts

@@ -0,0 +1,141 @@
+import { type Kysely, sql } from "kysely";
+
+import { isPostgres } from "../dialect-helpers.js";
+
+/**
+ * Published redirect artifacts: compact, content-addressed snapshots of the
+ * enabled redirect rules that the middleware loads in one query.
+ *
+ * `revision` counts changes to the columns enabled rules are published from
+ * and is bumped by triggers, so writes that bypass the handlers still mark the
+ * published generation stale. Hit tracking does not bump it.
+ */
+export async function up(db: Kysely<unknown>): Promise<void> {
+	const postgres = isPostgres(db);
+
+	await db.schema
+		.createTable("_emdash_redirect_state")
+		.ifNotExists()
+		.addColumn("id", "integer", (column) => column.primaryKey())
+		.addColumn("revision", "integer", (column) => column.notNull().defaultTo(0))
+		.addColumn("generation", "text")
+		.addColumn("generation_revision", "integer", (column) => column.notNull().defaultTo(-1))
+		.addColumn("repair_expires_at", postgres ? "bigint" : "integer", (column) =>
+			column.notNull().defaultTo(0),
+		)
+		.execute();
+	await sql`
+		INSERT INTO _emdash_redirect_state (id, revision, generation, generation_revision, repair_expires_at)
+		VALUES (1, 0, NULL, -1, 0)
+		ON CONFLICT (id) DO NOTHING
+	`.execute(db);
+
+	await db.schema
+		.createTable("_emdash_redirect_artifacts")
+		.ifNotExists()
+		.addColumn("digest", "text", (column) => column.primaryKey())
+		.addColumn("kind", "text", (column) => column.notNull())
+		.addColumn("payload", "text", (column) => column.notNull())
+		.execute();
+
+	await db.schema
+		.createTable("_emdash_redirect_generation_artifacts")
+		.ifNotExists()
+		.addColumn("generation", "text", (column) => column.notNull())
+		.addColumn("position", "integer", (column) => column.notNull())
+		.addColumn("digest", "text", (column) => column.notNull())
+		.addPrimaryKeyConstraint("pk_emdash_redirect_generation_artifacts", ["generation", "position"])
+		.execute();
+	await db.schema
+		.createIndex("idx_emdash_redirect_generation_artifacts_digest")
+		.ifNotExists()
+		.on("_emdash_redirect_generation_artifacts")
+		.column("digest")
+		.execute();
+
+	if (postgres) {
+		await sql`
+			CREATE OR REPLACE FUNCTION emdash_redirect_bump_revision()
+			RETURNS trigger
+			LANGUAGE plpgsql
+			AS $$
+			BEGIN
+				UPDATE _emdash_redirect_state SET revision = revision + 1 WHERE id = 1;
+				RETURN NULL;
+			END;
+			$$
+		`.execute(db);
+		await sql`DROP TRIGGER IF EXISTS emdash_redirect_state_revision_insert ON _emdash_redirects`.execute(
+			db,
+		);
+		await sql`
+			CREATE TRIGGER emdash_redirect_state_revision_insert
+			AFTER INSERT ON _emdash_redirects
+			FOR EACH ROW
+			WHEN (NEW.enabled = 1)
+			EXECUTE FUNCTION emdash_redirect_bump_revision()
+		`.execute(db);
+		await sql`DROP TRIGGER IF EXISTS emdash_redirect_state_revision_delete ON _emdash_redirects`.execute(
+			db,
+		);
+		await sql`
+			CREATE TRIGGER emdash_redirect_state_revision_delete
+			AFTER DELETE ON _emdash_redirects
+			FOR EACH ROW
+			WHEN (OLD.enabled = 1)
+			EXECUTE FUNCTION emdash_redirect_bump_revision()
+		`.execute(db);
+		await sql`DROP TRIGGER IF EXISTS emdash_redirect_state_revision_update ON _emdash_redirects`.execute(
+			db,
+		);
+		await sql`
+			CREATE TRIGGER emdash_redirect_state_revision_update
+			AFTER UPDATE OF source, destination, enabled, is_pattern, type, created_at ON _emdash_redirects
+			FOR EACH ROW
+			WHEN ((NEW.enabled = 1 OR OLD.enabled = 1) AND (
+				NEW.source IS DISTINCT FROM OLD.source OR
+				NEW.destination IS DISTINCT FROM OLD.destination OR
+				NEW.enabled IS DISTINCT FROM OLD.enabled OR
+				NEW.is_pattern IS DISTINCT FROM OLD.is_pattern OR
+				NEW.type IS DISTINCT FROM OLD.type OR
+				NEW.created_at IS DISTINCT FROM OLD.created_at
+			))
+			EXECUTE FUNCTION emdash_redirect_bump_revision()
+		`.execute(db);
+		return;
+	}
+
+	await sql`
+		CREATE TRIGGER IF NOT EXISTS emdash_redirect_state_revision_insert
+		AFTER INSERT ON _emdash_redirects
+		WHEN NEW.enabled = 1
+		BEGIN
+			UPDATE _emdash_redirect_state SET revision = revision + 1 WHERE id = 1;
+		END
+	`.execute(db);
+	await sql`
+		CREATE TRIGGER IF NOT EXISTS emdash_redirect_state_revision_delete
+		AFTER DELETE ON _emdash_redirects
+		WHEN OLD.enabled = 1
+		BEGIN
+			UPDATE _emdash_redirect_state SET revision = revision + 1 WHERE id = 1;
+		END
+	`.execute(db);
+	await sql`
+		CREATE TRIGGER IF NOT EXISTS emdash_redirect_state_revision_update
+		AFTER UPDATE OF source, destination, enabled, is_pattern, type, created_at ON _emdash_redirects
+		WHEN (NEW.enabled = 1 OR OLD.enabled = 1) AND (
+			NEW.source IS NOT OLD.source OR
+			NEW.destination IS NOT OLD.destination OR
+			NEW.enabled IS NOT OLD.enabled OR
+			NEW.is_pattern IS NOT OLD.is_pattern OR
+			NEW.type IS NOT OLD.type OR
+			NEW.created_at IS NOT OLD.created_at
+		)
+		BEGIN
+			UPDATE _emdash_redirect_state SET revision = revision + 1 WHERE id = 1;
+		END
+	`.execute(db);
+}
+
+export async function down(_db: Kysely<unknown>): Promise<void> {}

package/src/database/migrations/runner.ts

@@ -97,6 +97,8 @@ import * as m086 from "./086_relations_structural.js";
 import * as m087 from "./087_reference_field_relations.js";
 import * as m088 from "./088_cron_oneshot_utc.js";
 import * as m089 from "./089_auto_seed_completion.js";
+import * as m090 from "./090_redirect_enable_loop_guard.js";
+import * as m091 from "./091_redirect_artifacts.js";
 
 const MIGRATIONS: Readonly<Record<string, Migration>> = Object.freeze({
 	"001_initial": m001,
@@ -187,6 +189,8 @@ const MIGRATIONS: Readonly<Record<string, Migration>> = Object.freeze({
 	"087_reference_field_relations": m087,
 	"088_cron_oneshot_utc": m088,
 	"089_auto_seed_completion": m089,
+	"090_redirect_enable_loop_guard": m090,
+	"091_redirect_artifacts": m091,
 });
 
 /** Ordered names from the statically registered migration set. */
@@ -249,6 +253,18 @@ export class MigrationLockHeldError extends Error {
 	}
 }
 
+/**
+ * Thrown when the migrator reports an error while applying pending migrations.
+ * Callers with failure backoff apply it. Errors from the applied-migration
+ * count check before the migrator runs are not wrapped and stay retryable.
+ */
+export class MigrationFailedError extends Error {
+	constructor(message: string) {
+		super(message);
+		this.name = "MigrationFailedError";
+	}
+}
+
 /** Custom migration table name */
 const MIGRATION_TABLE = "_emdash_migrations";
 
@@ -547,7 +563,7 @@ export async function runMigrations(
 		}
 
 		const failedSuffix = failedMigration ? ` (migration: ${failedMigration.migrationName})` : "";
-		throw new Error(`Migration failed: ${msg || "unknown error"}${failedSuffix}`);
+		throw new MigrationFailedError(`Migration failed: ${msg || "unknown error"}${failedSuffix}`);
 	}
 
 	return { applied };

package/src/database/repositories/comment.ts

@@ -8,6 +8,20 @@ import { encodeCursor, decodeCursor, type FindManyResult } from "./types.js";
 /** Matches LIKE wildcard characters and the escape character itself */
 const LIKE_ESCAPE_RE = /[%_\\]/g;
 
+const DEFAULT_COMMENT_LIMIT = 50;
+const MAX_COMMENT_LIMIT = 100;
+
+/**
+ * Normalize a caller-supplied page size to a whole number in [1, MAX].
+ * A fractional value reaching SQLite's `LIMIT` errors, and a negative one
+ * disables the cap; non-finite input falls back to the default.
+ */
+function clampLimit(limit: number | undefined): number {
+	const n = Math.floor(Number(limit));
+	if (!Number.isFinite(n)) return DEFAULT_COMMENT_LIMIT;
+	return Math.min(Math.max(n, 1), MAX_COMMENT_LIMIT);
+}
+
 // ---------------------------------------------------------------------------
 // Types
 // ---------------------------------------------------------------------------
@@ -147,7 +161,7 @@ export class CommentRepository {
 		contentId: string,
 		options: { status?: CommentStatus; limit?: number; cursor?: string } = {},
 	): Promise<FindManyResult<Comment>> {
-		const limit = Math.max(1, Math.min(options.limit || 50, 100));
+		const limit = clampLimit(options.limit);
 
 		let query = this.db
 			.selectFrom("_emdash_comments")
@@ -195,7 +209,7 @@ export class CommentRepository {
 		status: CommentStatus,
 		options: { collection?: string; search?: string; limit?: number; cursor?: string } = {},
 	): Promise<FindManyResult<Comment>> {
-		const limit = Math.max(1, Math.min(options.limit || 50, 100));
+		const limit = clampLimit(options.limit);
 
 		let query = this.db.selectFrom("_emdash_comments").selectAll().where("status", "=", status);
 
@@ -246,7 +260,7 @@ export class CommentRepository {
 
 	/** List non-trashed comments for capability-gated plugin administration. */
 	async findForPlugin(options: PluginCommentFindOptions = {}): Promise<FindManyResult<Comment>> {
-		const limit = Math.max(1, Math.min(options.limit ?? 50, 100));
+		const limit = clampLimit(options.limit);
 		let query = this.db.selectFrom("_emdash_comments").selectAll().where("status", "!=", "trash");
 
 		if (options.status) query = query.where("status", "=", options.status);