dineway 0.1.48 → 0.2.0

package/dist/{loader-tg63WSY2.mjs → loader-CjWqjweO.mjs}

@@ -1,9 +1,9 @@
-import { a as __exportAll } from "./runner-B-tbV751.mjs";
+import { a as __exportAll } from "./runner-DB7CRfOF.mjs";
 import { t as validateIdentifier } from "./validate-VPnKoIzW.mjs";
 import { o as isPostgres, r as currentIsoTimestampValue } from "./dialect-helpers-fk43GbDb.mjs";
-import { i as encodeCursor, r as decodeCursor } from "./types-DfuD0Afl.mjs";
 import { getRequestContext } from "./request-context.mjs";
 import { kyselyLogOption } from "./database/instrumentation.mjs";
+import { i as encodeCursor, r as decodeCursor } from "./types-Dq1qT19x.mjs";
 import { Kysely, sql } from "kysely";
 
 //#region src/live-collection-meta.ts
@@ -82,14 +82,19 @@ function isMissingColumnError(error) {
 //#region src/loader.ts
 var loader_exports = /* @__PURE__ */ __exportAll({
 	CURSOR_RAW_VALUES: () => CURSOR_RAW_VALUES,
+	FOLDED_BYLINES: () => FOLDED_BYLINES,
+	FOLDED_TERMS: () => FOLDED_TERMS,
 	dinewayLoader: () => dinewayLoader,
-	getDb: () => getDb
+	getDb: () => getDb,
+	resetTaxonomyNamesCache: () => resetTaxonomyNamesCache
 });
 const FIELD_NAME_PATTERN = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
 const LIKE_WILDCARD_RE = /[\\%_]/g;
 /**
-* SEO columns joined from `_dineway_seo` on the single-entry path.
-* The leading underscore in aliases prevents collisions with user field slugs.
+* SEO values are folded into one `_dineway_seo` JSON result column, then
+* expanded onto these aliases for extractSeo(). Keeping SEO to one result
+* column prevents wide flat-schema collections from crossing result-set column
+* limits while preserving the public `entry.data.seo` shape.
 */
 const SEO_COLUMN_ALIASES = {
 	seo_title: "_dineway_seo_title",
@@ -99,6 +104,7 @@ const SEO_COLUMN_ALIASES = {
 	seo_no_index: "_dineway_seo_no_index"
 };
 const SEO_ALIAS_COLUMNS = Object.values(SEO_COLUMN_ALIASES);
+const SEO_FOLDED_COLUMN = "_dineway_seo";
 /**
 * System columns excluded from entry.data
 * Note: slug is intentionally NOT excluded - it's useful as data.slug in templates
@@ -118,8 +124,76 @@ const SYSTEM_COLUMNS = new Set([
 	"draft_revision_id",
 	"locale",
 	"translation_group",
-	...SEO_ALIAS_COLUMNS
+	...SEO_ALIAS_COLUMNS,
+	"_dineway_terms",
+	"_dineway_bylines",
+	SEO_FOLDED_COLUMN
 ]);
+/** Markers for byline/taxonomy hydration folded into the content query. */
+const FOLDED_TERMS = Symbol.for("dineway:foldedTerms");
+const FOLDED_BYLINES = Symbol.for("dineway:foldedBylines");
+/**
+* Correlated JSON-array subqueries that fold taxonomy-term and byline hydration
+* into the content query without join fan-out. `outer` is the content table
+* alias/name, and each subquery correlates on `<outer>.id`.
+*/
+function foldedHydrationSelects(db, type, outer) {
+	const o = sql.ref(outer);
+	const pg = isPostgres(db);
+	const obj = (pairs) => pg ? sql.raw(`json_build_object(${pairs})`) : sql.raw(`json_object(${pairs})`);
+	const agg = (inner) => pg ? sql`coalesce(json_agg(${inner}), '[]'::json)` : sql`json_group_array(${inner})`;
+	const foldJoin = pg ? sql`JOIN` : sql`CROSS JOIN`;
+	const terms = sql`(SELECT ${agg(obj("'id', t.id, 'name', t.name, 'slug', t.slug, 'label', t.label, 'parent_id', t.parent_id, 'locale', t.locale, 'translation_group', t.translation_group"))} FROM ${sql.ref("content_taxonomies")} AS ct ${foldJoin} ${sql.ref("taxonomies")} AS t ON t.translation_group = ct.taxonomy_id WHERE ct.collection = ${type} AND ct.entry_id = ${o}.id AND t.locale = ${o}.locale) AS ${sql.ref("_dineway_terms")}`;
+	const bylineInner = obj("'id', b.id, 'slug', b.slug, 'displayName', b.display_name, 'bio', b.bio, 'avatarMediaId', b.avatar_media_id, 'avatarStorageKey', m.storage_key, 'avatarAlt', m.alt, 'avatarBlurhash', m.blurhash, 'avatarDominantColor', m.dominant_color, 'websiteUrl', b.website_url, 'userId', b.user_id, 'isGuest', b.is_guest, 'createdAt', b.created_at, 'updatedAt', b.updated_at, 'locale', b.locale, 'translationGroup', b.translation_group");
+	return {
+		terms,
+		bylines: sql`(SELECT ${agg(sql`${pg ? sql.raw("json_build_object('roleLabel', cb.role_label, 'sortOrder', cb.sort_order, 'byline', ") : sql.raw("json_object('roleLabel', cb.role_label, 'sortOrder', cb.sort_order, 'byline', ")}${bylineInner})`)} FROM ${sql.ref("_dineway_content_bylines")} AS cb ${foldJoin} ${sql.ref("_dineway_bylines")} AS b ON b.translation_group = cb.byline_id LEFT JOIN ${sql.ref("media")} AS m ON m.id = b.avatar_media_id WHERE cb.collection_slug = ${type} AND cb.content_id = ${o}.id AND b.locale = ${o}.locale) AS ${sql.ref("_dineway_bylines")}`
+	};
+}
+function foldedSeoSelect(db, type, outer) {
+	const o = sql.ref(outer);
+	const pairs = "'seo_title', s.seo_title, 'seo_description', s.seo_description, 'seo_image', s.seo_image, 'seo_canonical', s.seo_canonical, 'seo_no_index', s.seo_no_index";
+	return sql`(SELECT ${isPostgres(db) ? sql.raw(`json_build_object(${pairs})`) : sql.raw(`json_object(${pairs})`)} FROM ${sql.ref("_dineway_seo")} AS s WHERE s.collection = ${type} AND s.content_id = ${o}.id LIMIT 1) AS ${sql.ref(SEO_FOLDED_COLUMN)}`;
+}
+function isPlainObject(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function expandFoldedSeo(row) {
+	const raw = row[SEO_FOLDED_COLUMN];
+	delete row[SEO_FOLDED_COLUMN];
+	let parsed = null;
+	if (typeof raw === "string") try {
+		const candidate = JSON.parse(raw);
+		if (isPlainObject(candidate)) parsed = candidate;
+	} catch {
+		return;
+	}
+	else if (isPlainObject(raw)) parsed = raw;
+	if (!parsed) return;
+	for (const [column, alias] of Object.entries(SEO_COLUMN_ALIASES)) row[alias] = parsed[column] ?? null;
+}
+/**
+* Stash folded hydration JSON for query.ts fast paths. SQLite returns a JSON
+* string; Postgres drivers return parsed JSON for json/jsonb.
+*/
+function stashFolded(data, row) {
+	for (const [column, symbol] of [["_dineway_terms", FOLDED_TERMS], ["_dineway_bylines", FOLDED_BYLINES]]) {
+		const raw = row[column];
+		let value;
+		if (typeof raw === "string") try {
+			value = JSON.parse(raw);
+		} catch {
+			continue;
+		}
+		else if (Array.isArray(raw)) value = raw;
+		else continue;
+		Object.defineProperty(data, symbol, {
+			value,
+			enumerable: false,
+			configurable: true
+		});
+	}
+}
 function extractSeo(row) {
 	const noIndex = row[SEO_COLUMN_ALIASES.seo_no_index];
 	if (noIndex === null || noIndex === void 0) return null;
@@ -165,6 +239,9 @@ async function getTaxonomyNames(db) {
 		return empty;
 	}
 }
+function resetTaxonomyNamesCache() {
+	taxonomyNames = null;
+}
 /**
 * System columns to include in data (mapped to camelCase where needed)
 */
@@ -451,9 +528,11 @@ function dinewayLoader() {
 				const orderBy = filter?.orderBy;
 				const locale = filter?.locale;
 				const fetchLimit = limit ? limit + 1 : void 0;
+				const rawOffset = cursor ? void 0 : filter?.offset;
+				const offset = typeof rawOffset === "number" && Number.isInteger(rawOffset) && rawOffset > 0 ? rawOffset : void 0;
 				const cursorCondition = cursor ? buildCursorCondition(cursor, orderBy) : null;
 				let result;
-				let taxonomyFilter = null;
+				const taxonomyFilters = [];
 				let bylineFilter = null;
 				const fieldFilters = {};
 				if (where && Object.keys(where).length > 0) {
@@ -473,20 +552,17 @@ function dinewayLoader() {
 								console.warn(`[dineway] where filter: range operators are not supported on taxonomy "${key}", ignored`);
 								continue;
 							}
-							if (taxonomyFilter) {
-								console.warn(`[dineway] where filter: only one taxonomy is supported per query, "${key}" ignored`);
-								continue;
-							}
-							taxonomyFilter = {
+							const slugs = Array.isArray(value) ? value : [value];
+							taxonomyFilters.push({
 								name: key,
-								slugs: Array.isArray(value) ? value : [value]
-							};
+								slugs
+							});
 							continue;
 						}
 						fieldFilters[key] = value;
 					}
 				}
-				if (taxonomyFilter && taxonomyFilter.slugs.length === 0 || bylineFilter && bylineFilter.ids.length === 0) {
+				if (taxonomyFilters.some((taxonomyFilter) => taxonomyFilter.slugs.length === 0) || bylineFilter && bylineFilter.ids.length === 0) {
 					setCollectionMeta(filter, { total: 0 });
 					return {
 						entries: [],
@@ -502,14 +578,20 @@ function dinewayLoader() {
 				const fieldConditionsSql = fieldConditions.length > 0 ? sql`${sql.join(fieldConditions, sql` AND `)}` : null;
 				const searchCondition = buildSearchCondition(q, searchColumns);
 				const searchConditionSql = searchCondition ? sql`AND ${searchCondition}` : sql``;
-				const taxonomyCondition = taxonomyFilter ? sql`AND EXISTS (
+				const { terms: termsSelect, bylines: bylinesSelect } = foldedHydrationSelects(db, type, tableName);
+				let limitOffsetClause = sql``;
+				if (fetchLimit != null && offset != null) limitOffsetClause = sql`LIMIT ${fetchLimit} OFFSET ${offset}`;
+				else if (fetchLimit != null) limitOffsetClause = sql`LIMIT ${fetchLimit}`;
+				else if (offset != null) limitOffsetClause = isPostgres(db) ? sql`OFFSET ${offset}` : sql`LIMIT -1 OFFSET ${offset}`;
+				const taxonomyCondition = taxonomyFilters.length > 0 ? sql`${sql.join(taxonomyFilters.map((taxonomyFilter) => sql`AND EXISTS (
 						SELECT 1 FROM content_taxonomies ct
-						INNER JOIN taxonomies t ON t.id = ct.taxonomy_id
+						INNER JOIN taxonomies t ON t.translation_group = ct.taxonomy_id
 						WHERE ct.collection = ${type}
 							AND ct.entry_id = ${sql.ref(tableName)}.id
 							AND t.name = ${taxonomyFilter.name}
 							AND t.slug IN (${sql.join(taxonomyFilter.slugs.map((slug) => sql`${slug}`))})
-					)` : sql``;
+							${locale ? sql`AND t.locale = ${locale}` : sql``}
+					)`), sql` `)}` : sql``;
 				const bylineCondition = bylineFilter ? sql`AND EXISTS (
 						SELECT 1 FROM _dineway_content_bylines cb
 						WHERE cb.collection_slug = ${type}
@@ -524,7 +606,7 @@ function dinewayLoader() {
 							)
 					)` : sql``;
 				const [entriesResult, totalResult] = await Promise.all([sql`
-						SELECT * FROM ${sql.ref(tableName)}
+						SELECT *, ${termsSelect}, ${bylinesSelect} FROM ${sql.ref(tableName)}
 						WHERE deleted_at IS NULL
 						AND ${statusCondition}
 						${localeFilter}
@@ -534,7 +616,7 @@ function dinewayLoader() {
 						${fieldConditionsSql ? sql`AND ${fieldConditionsSql}` : sql``}
 						${searchConditionSql}
 						${orderByClause}
-						${fetchLimit ? sql`LIMIT ${fetchLimit}` : sql``}
+						${limitOffsetClause}
 					`.execute(db), sql`
 						SELECT COUNT(*) AS total FROM ${sql.ref(tableName)}
 						WHERE deleted_at IS NULL
@@ -554,11 +636,14 @@ function dinewayLoader() {
 				const entries = rows.map((row) => {
 					const slug = rowStr(row, "slug") || rowStr(row, "id");
 					const rowLocale = rowStr(row, "locale");
+					const id = i18nEnabled && rowLocale !== "" && (rowLocale !== i18nConfig.defaultLocale || i18nConfig.prefixDefaultLocale) ? `${rowLocale}/${slug}` : slug;
+					const data = mapRowToData(row);
+					stashFolded(data, row);
 					return {
-						id: i18nEnabled && rowLocale !== "" && (rowLocale !== i18nConfig.defaultLocale || i18nConfig.prefixDefaultLocale) ? `${rowLocale}/${slug}` : slug,
+						id,
 						slug: rowStr(row, "slug"),
 						status: rowStr(row, "status", "draft"),
-						data: mapRowToData(row),
+						data,
 						cacheHint: {
 							tags: [rowStr(row, "id")],
 							lastModified: row.updated_at ? new Date(rowStr(row, "updated_at")) : void 0
@@ -579,12 +664,14 @@ function dinewayLoader() {
 				}
 				setCollectionMeta(filter, {
 					nextCursor,
-					total
+					total,
+					hasMore
 				});
 				return {
 					entries,
 					nextCursor,
 					total,
+					hasMore,
 					cacheHint: {
 						tags: [type],
 						lastModified: collectionLastModified
@@ -611,25 +698,23 @@ function dinewayLoader() {
 				if (!type || !id) return { error: /* @__PURE__ */ new Error("type and id filters are required. Use getDinewayEntry() instead of getLiveEntry() directly.") };
 				const tableName = getTableName(type);
 				const locale = filter?.locale;
-				const seoSelect = sql.join(Object.entries(SEO_COLUMN_ALIASES).map(([column, alias]) => sql`${sql.ref(`s.${column}`)} AS ${sql.ref(alias)}`));
+				const { terms: termsSelect, bylines: bylinesSelect } = foldedHydrationSelects(db, type, "c");
+				const seoSelect = foldedSeoSelect(db, type, "c");
 				const row = (locale ? await sql`
-							SELECT c.*, ${seoSelect}
+							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}
 							FROM ${sql.ref(tableName)} AS c
-							LEFT JOIN ${sql.ref("_dineway_seo")} AS s
-								ON s.collection = ${type} AND s.content_id = c.id
 							WHERE c.deleted_at IS NULL
 							AND ((c.slug = ${id} AND c.locale = ${locale}) OR c.id = ${id})
 							LIMIT 1
 						`.execute(db) : await sql`
-							SELECT c.*, ${seoSelect}
+							SELECT c.*, ${seoSelect}, ${termsSelect}, ${bylinesSelect}
 							FROM ${sql.ref(tableName)} AS c
-							LEFT JOIN ${sql.ref("_dineway_seo")} AS s
-								ON s.collection = ${type} AND s.content_id = c.id
 							WHERE c.deleted_at IS NULL
 							AND (c.slug = ${id} OR c.id = ${id})
 							LIMIT 1
 						`.execute(db)).rows[0];
 				if (!row) return;
+				expandFoldedSeo(row);
 				const i18nConfig = virtualConfig?.i18n;
 				const i18nEnabled = i18nConfig && i18nConfig.locales.length > 1;
 				const entrySlug = rowStr(row, "slug") || rowStr(row, "id");
@@ -673,6 +758,7 @@ function dinewayLoader() {
 				const entryData = mapRowToData(row);
 				const entrySeo = extractSeo(row);
 				if (entrySeo) entryData.seo = entrySeo;
+				stashFolded(entryData, row);
 				return {
 					id: entryId,
 					slug: rowStr(row, "slug"),
@@ -694,4 +780,4 @@ function dinewayLoader() {
 }
 
 //#endregion
-export { isMissingTableError as a, loader_exports as i, dinewayLoader as n, takeLiveCollectionMeta as o, getDb as r, CURSOR_RAW_VALUES as t };
+export { resetTaxonomyNamesCache as a, loader_exports as i, dinewayLoader as n, isMissingTableError as o, getDb as r, takeLiveCollectionMeta as s, CURSOR_RAW_VALUES as t };

package/dist/{manifest-schema-qh2P7RDX.mjs → manifest-schema-BxVPYMJR.mjs}

@@ -1,3 +1,4 @@
+import { n as declaredAccessToCapabilities, t as capabilitiesToDeclaredAccess } from "./types-4garmdWa.mjs";
 import { z } from "zod";
 
 //#region src/plugins/manifest-schema.ts
@@ -52,6 +53,9 @@ const HOOK_NAMES = [
 	"content:afterDelete",
 	"content:afterPublish",
 	"content:afterUnpublish",
+	"content:afterRestore",
+	"content:afterSchedule",
+	"content:afterUnschedule",
 	"media:beforeUpload",
 	"media:afterUpload",
 	"cron",
@@ -171,6 +175,25 @@ const pluginAdminConfigSchema = z.object({
 		}).passthrough()).optional()
 	})).optional()
 });
+const accessConstraints = z.record(z.string(), z.unknown());
+const declaredAccessSchema = z.object({
+	content: z.object({
+		read: accessConstraints.optional(),
+		write: accessConstraints.optional()
+	}).optional(),
+	media: z.object({
+		read: accessConstraints.optional(),
+		write: accessConstraints.optional()
+	}).optional(),
+	network: z.object({ request: z.object({ allowedHosts: z.array(z.string()).min(1).optional() }).optional() }).optional(),
+	email: z.object({
+		send: accessConstraints.optional(),
+		events: accessConstraints.optional(),
+		transport: accessConstraints.optional()
+	}).optional(),
+	page: z.object({ fragments: accessConstraints.optional() }).optional(),
+	users: z.object({ read: accessConstraints.optional() }).optional()
+});
 /**
 * Zod schema matching the PluginManifest interface from types.ts.
 *
@@ -179,6 +202,7 @@ const pluginAdminConfigSchema = z.object({
 const pluginManifestSchema = z.object({
 	id: z.string().min(1),
 	version: z.string().min(1),
+	declaredAccess: declaredAccessSchema.optional(),
 	capabilities: z.array(z.enum(PLUGIN_CAPABILITIES)),
 	allowedHosts: z.array(z.string()),
 	storage: z.record(z.string(), storageCollectionSchema),
@@ -186,6 +210,15 @@ const pluginManifestSchema = z.object({
 	routes: z.array(z.union([z.string().min(1).regex(routeNamePattern, "Route name must be a safe path segment"), manifestRouteEntrySchema])),
 	admin: pluginAdminConfigSchema
 });
+function reconcileManifestAccess(manifest) {
+	return manifest.declaredAccess ? {
+		...manifest,
+		...declaredAccessToCapabilities(manifest.declaredAccess)
+	} : {
+		...manifest,
+		declaredAccess: capabilitiesToDeclaredAccess(manifest.capabilities, manifest.allowedHosts)
+	};
+}
 /**
 * Normalize a manifest route entry — plain strings become `{ name }` objects.
 */
@@ -195,4 +228,4 @@ function normalizeManifestRoute(entry) {
 }
 
 //#endregion
-export { pluginManifestSchema as i, PLUGIN_CAPABILITIES as n, normalizeManifestRoute as r, HOOK_NAMES as t };
+export { reconcileManifestAccess as a, pluginManifestSchema as i, PLUGIN_CAPABILITIES as n, normalizeManifestRoute as r, HOOK_NAMES as t };