@growth-labs/cms 0.5.10 → 0.5.12

package/dist/ui/editor/trim-boundary-marks.js

@@ -0,0 +1,157 @@
+import { Extension } from '@tiptap/core';
+import { Plugin } from '@tiptap/pm/state';
+const BOUNDARY_MARKS = ['link', 'underline'];
+function markKey(mark) {
+    return `${mark.type}:${JSON.stringify(mark.attrs ?? {})}`;
+}
+function sameMarks(a, b) {
+    return JSON.stringify(a ?? []) === JSON.stringify(b ?? []);
+}
+function mergeAdjacentText(nodes) {
+    const merged = [];
+    for (const node of nodes) {
+        const previous = merged.at(-1);
+        if (previous?.type === 'text' &&
+            node.type === 'text' &&
+            sameMarks(previous.marks, node.marks)) {
+            previous.text = (previous.text ?? '') + (node.text ?? '');
+        }
+        else {
+            merged.push(node);
+        }
+    }
+    return merged;
+}
+function trimJsonMark(nodes, markType) {
+    const output = [];
+    let index = 0;
+    while (index < nodes.length) {
+        const node = nodes[index];
+        const mark = node.type === 'text'
+            ? node.marks?.find((candidate) => candidate.type === markType)
+            : undefined;
+        if (!mark) {
+            output.push(node);
+            index += 1;
+            continue;
+        }
+        const key = markKey(mark);
+        const run = [];
+        while (index < nodes.length) {
+            const candidate = nodes[index];
+            const candidateMark = candidate.type === 'text'
+                ? candidate.marks?.find((item) => item.type === markType && markKey(item) === key)
+                : undefined;
+            if (!candidateMark)
+                break;
+            run.push(candidate);
+            index += 1;
+        }
+        const text = run.map((item) => item.text ?? '').join('');
+        const leading = text.match(/^\s+/u)?.[0].length ?? 0;
+        const trailing = text.match(/\s+$/u)?.[0].length ?? 0;
+        const markedEnd = Math.max(leading, text.length - trailing);
+        let offset = 0;
+        for (const item of run) {
+            const itemText = item.text ?? '';
+            const itemStart = offset;
+            const itemEnd = offset + itemText.length;
+            const cuts = [itemStart, Math.max(itemStart, leading), Math.min(itemEnd, markedEnd), itemEnd]
+                .filter((value, cutIndex, all) => value >= itemStart && value <= itemEnd && all.indexOf(value) === cutIndex)
+                .sort((a, b) => a - b);
+            for (let cutIndex = 0; cutIndex < cuts.length - 1; cutIndex += 1) {
+                const from = cuts[cutIndex];
+                const to = cuts[cutIndex + 1];
+                if (from === to)
+                    continue;
+                const keepMark = from >= leading && to <= markedEnd;
+                const marks = keepMark
+                    ? item.marks
+                    : item.marks?.filter((candidate) => candidate.type !== markType);
+                output.push({
+                    ...item,
+                    text: itemText.slice(from - itemStart, to - itemStart),
+                    ...(marks?.length ? { marks } : { marks: undefined }),
+                });
+            }
+            offset = itemEnd;
+        }
+    }
+    return mergeAdjacentText(output);
+}
+/**
+ * Remove link and underline marks from leading/trailing whitespace in every
+ * inline mark run. Underline follows the same rule as links: whitespace is
+ * layout, not editorial emphasis, and pasted underline is the visible half of
+ * the malformed-link report.
+ */
+export function normalizeBoundaryMarks(node) {
+    if (!node.content)
+        return node;
+    let content = node.content.map(normalizeBoundaryMarks);
+    for (const markType of BOUNDARY_MARKS)
+        content = trimJsonMark(content, markType);
+    return { ...node, content };
+}
+function matchingMark(node, markType, previous) {
+    const mark = markType.isInSet(node.marks);
+    if (!mark)
+        return undefined;
+    return previous && !mark.eq(previous) ? undefined : mark;
+}
+/** Keep the live Tiptap document visually consistent after toolbar and paste transactions. */
+export const TrimBoundaryMarks = Extension.create({
+    name: 'trimBoundaryMarks',
+    addProseMirrorPlugins() {
+        return [
+            new Plugin({
+                appendTransaction: (transactions, _oldState, newState) => {
+                    if (!transactions.some((transaction) => transaction.docChanged))
+                        return null;
+                    const transaction = newState.tr;
+                    newState.doc.descendants((parent, parentPosition) => {
+                        if (!parent.isTextblock)
+                            return true;
+                        for (const markName of BOUNDARY_MARKS) {
+                            const markType = newState.schema.marks[markName];
+                            if (!markType)
+                                continue;
+                            const children = [];
+                            parent.forEach((child, offset) => {
+                                if (child.isText)
+                                    children.push({ node: child, from: parentPosition + 1 + offset });
+                            });
+                            let index = 0;
+                            while (index < children.length) {
+                                const first = children[index];
+                                const mark = matchingMark(first.node, markType);
+                                if (!mark) {
+                                    index += 1;
+                                    continue;
+                                }
+                                const run = [];
+                                while (index < children.length &&
+                                    matchingMark(children[index].node, markType, mark)) {
+                                    run.push(children[index]);
+                                    index += 1;
+                                }
+                                const text = run.map((item) => item.node.text ?? '').join('');
+                                const leading = text.match(/^\s+/u)?.[0].length ?? 0;
+                                const trailing = text.match(/\s+$/u)?.[0].length ?? 0;
+                                const runFrom = run[0].from;
+                                const runTo = run.at(-1).from + (run.at(-1).node.text?.length ?? 0);
+                                if (leading)
+                                    transaction.removeMark(runFrom, runFrom + leading, markType);
+                                if (trailing)
+                                    transaction.removeMark(runTo - trailing, runTo, markType);
+                            }
+                        }
+                        return false;
+                    });
+                    return transaction.steps.length ? transaction : null;
+                },
+            }),
+        ];
+    },
+});
+//# sourceMappingURL=trim-boundary-marks.js.map

package/dist/ui/editor/trim-boundary-marks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trim-boundary-marks.js","sourceRoot":"","sources":["../../../src/ui/editor/trim-boundary-marks.ts"],"names":[],"mappings":"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"}

package/migrations/0023_content_tag_link_labels.sql

@@ -0,0 +1,11 @@
+-- Preserve each content item's declared display label for a canonical tag slug.
+ALTER TABLE content_tag_links
+  ADD COLUMN label TEXT;
+
+UPDATE content_tag_links
+SET label = (
+  SELECT label
+  FROM content_tags
+  WHERE content_tags.id = content_tag_links.tag_id
+)
+WHERE label IS NULL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growth-labs/cms",
-  "version": "0.5.10",
+  "version": "0.5.12",
   "type": "module",
   "bin": {
     "growth-labs-cms-migrations": "./dist/cli/migrations.js"

package/src/engine/index.ts

@@ -208,6 +208,10 @@ export {
 	getContentItem,
 	getContentRelations,
 	getContentSnapshot,
+	getContentTagPairs,
+	MAX_ITEM_TAG_COUNT,
+	MAX_ITEM_TAGS_TOTAL_BYTES,
+	MAX_TAG_LABEL_BYTES,
 	type NewsletterInput,
 	type PodcastInput,
 	PublishContentValidationError,
@@ -215,6 +219,7 @@ export {
 	scheduleContent,
 	setContentRelations,
 	setContentTags,
+	TagInputError,
 	type UpdateContentInput,
 	unpublishContent,
 	updateContentItem,
@@ -308,12 +313,21 @@ export {
 } from './soft-delete.js'
 // Tag CRUD engine — listTags / searchTags / renameTag / deleteTag.
 export {
+	createTag,
 	deleteTag,
 	listTags,
 	renameTag,
 	searchTags,
 	type TagSummary,
 } from './tags.js'
+export {
+	type TaxonomyTag,
+	utf8ByteLength,
+	validateDeclaredTagList,
+	validateRevisionTaxonomy,
+	validateSingleDeclaredTag,
+	validateStoredTaxonomyRows,
+} from './taxonomy.js'
 // SSRF guard for outbound webhook URLs — single source of truth for create + fire time.
 export { type UrlGuardResult, validateWebhookUrl } from './url-guard.js'
 // Article-body validator (single source of truth for ingest formatting QA).

package/src/engine/publication.ts

@@ -22,6 +22,7 @@ import {
 } from './publisher.js'
 import { getRevision } from './revisions.js'
 import { slugify } from './slug.js'
+import { TagInputError, validateDeclaredTagList } from './taxonomy.js'
 
 export type PublicationOperation = 'publish' | 'rollback'
 export type PublicationSurfacePhase = 'prepare' | 'commit' | 'abort'
@@ -2249,18 +2250,32 @@ function validateArchiveItem(item: ContentArchiveItem, maxBodyBytes: number): vo
 			-1,
 		)
 	}
-	if (
-		item.tags !== undefined &&
-		(!Array.isArray(item.tags) ||
-			item.tags.length > 10 ||
-			!item.tags.every((tag) => typeof tag === 'string'))
-	) {
-		throw new ContentArchiveImportLimitError(
-			'archive_tags_invalid',
-			'tags must contain at most 10 strings',
-			10,
-			Array.isArray(item.tags) ? item.tags.length : -1,
-		)
+	if (item.tags !== undefined) {
+		const ARCHIVE_TAG_CODE: Record<string, string> = {
+			tags_not_array: 'archive_tags_invalid',
+			tag_not_string: 'archive_tag_not_string',
+			tag_blank: 'archive_tag_blank',
+			tag_untrimmed: 'archive_tag_untrimmed',
+			tag_not_nfc: 'archive_tag_not_nfc',
+			tag_label_too_long: 'archive_tag_too_long',
+			tag_non_slugifiable: 'archive_tag_non_slugifiable',
+			tag_duplicate: 'archive_tag_duplicate',
+			tag_count_exceeded: 'archive_tag_count_exceeded',
+			tags_total_bytes_exceeded: 'archive_tags_total_bytes_exceeded',
+		}
+		try {
+			validateDeclaredTagList(item.tags)
+		} catch (error) {
+			if (error instanceof TagInputError) {
+				throw new ContentArchiveImportLimitError(
+					ARCHIVE_TAG_CODE[error.code] ?? 'archive_tags_invalid',
+					error.message,
+					error.limit,
+					error.actual,
+				)
+			}
+			throw error
+		}
 	}
 	if (item.bodyMarkdown !== undefined && typeof item.bodyMarkdown !== 'string') {
 		throw new ContentArchiveImportLimitError(

package/src/engine/published-content.ts

@@ -6,6 +6,7 @@ import {
 } from './content-metadata.js'
 import type { D1Database } from './d1.js'
 import type { ContentRevisionPayload } from './revisions.js'
+import { TagInputError, validateRevisionTaxonomy } from './taxonomy.js'
 
 const CONTENT_TYPES = new Set<ContentType>(['article', 'video', 'podcast', 'newsletter', 'page'])
 const CONTENT_STATUSES = new Set(['draft', 'scheduled', 'review', 'published', 'archived'])
@@ -168,14 +169,19 @@ function validatePayload(raw: string, row: PublishedContentRow): ContentRevision
 	if (decoded.content !== null && !isPlainRecord(decoded.content)) {
 		return invalidPayload('published revision content must be an object or null')
 	}
-	if (!Array.isArray(decoded.tags) || !decoded.tags.every((tag) => typeof tag === 'string')) {
-		return invalidPayload('published revision tags must be strings')
-	}
-	if (
-		decoded.tags.length > 10 ||
-		decoded.tags.some((tag) => tag.length === 0 || tag.length > 256)
-	) {
-		return invalidPayload('published revision tags exceed their canonical bounds')
+	try {
+		const taxonomy = validateRevisionTaxonomy({
+			tags: decoded.tags,
+			tagLabels: decoded.tagLabels,
+			allowLegacyLabels: true,
+		})
+		decoded.tags = taxonomy.map((tag) => tag.slug)
+		decoded.tagLabels = taxonomy.map((tag) => tag.label)
+	} catch (error) {
+		if (error instanceof TagInputError) {
+			return invalidPayload(`published revision taxonomy is invalid: ${error.code}`)
+		}
+		throw error
 	}
 	if (
 		!Array.isArray(decoded.related) ||

package/src/engine/publisher.ts

@@ -24,6 +24,22 @@ import { type ContentMetadata, serializeContentMetadata } from './content-metada
 import type { D1Database } from './d1.js'
 import { evaluateArticleBody, type PublishGuardOutcome } from './publish-guard.js'
 import { slugify } from './slug.js'
+import {
+	MAX_ITEM_TAG_COUNT,
+	type TaxonomyTag,
+	validateDeclaredTagList,
+	validateStoredTaxonomyRows,
+} from './taxonomy.js'
+
+export {
+	MAX_ITEM_TAG_COUNT,
+	MAX_ITEM_TAGS_TOTAL_BYTES,
+	MAX_TAG_LABEL_BYTES,
+	TagInputError,
+	validateDeclaredTagList,
+	validateRevisionTaxonomy,
+	validateSingleDeclaredTag,
+} from './taxonomy.js'
 
 type ContentVisibility = 'free' | 'premium'
 type BodyBackedContentType = 'article' | 'newsletter' | 'page'
@@ -449,14 +465,6 @@ export async function ensureUniqueSlug(
 	}
 }
 
-function normalizeTags(tags?: string[]): string[] {
-	if (!tags) return []
-	return tags
-		.map((tag) => slugify(tag))
-		.filter(Boolean)
-		.slice(0, 10)
-}
-
 function serializeTakeaways(value: string[] | null | undefined): string | null {
 	if (!value) return null
 	const normalized = value
@@ -466,11 +474,18 @@ function serializeTakeaways(value: string[] | null | undefined): string | null {
 	return normalized.length > 0 ? JSON.stringify(normalized) : null
 }
 
-async function ensureTags(db: D1Database, tags: string[]): Promise<{ id: string; slug: string }[]> {
-	const normalized = normalizeTags(tags)
-	const results: { id: string; slug: string }[] = []
-
-	for (const tag of normalized) {
+async function ensureTags(
+	db: D1Database,
+	pairs: TaxonomyTag[],
+): Promise<
+	Array<{
+		id: string
+		slug: string
+		label: string
+	}>
+> {
+	const results: Array<{ id: string; slug: string; label: string }> = []
+	for (const { slug, label } of pairs) {
 		// Concurrency-safe upsert. A plain SELECT-then-INSERT races under parallel
 		// import shards: two shards can both miss the same shared tag slug and both
 		// INSERT it, and the second hits `UNIQUE constraint failed: content_tags.slug`
@@ -482,20 +497,19 @@ async function ensureTags(db: D1Database, tags: string[]): Promise<{ id: string;
 			.prepare(
 				'INSERT INTO content_tags (id, slug, label) VALUES (?, ?, ?) ON CONFLICT(slug) DO NOTHING',
 			)
-			.bind(crypto.randomUUID(), tag, tag)
+			.bind(crypto.randomUUID(), slug, label)
 			.run()
 
 		const row = await db
 			.prepare('SELECT id, slug FROM content_tags WHERE slug = ? LIMIT 1')
-			.bind(tag)
+			.bind(slug)
 			.first<{ id: string; slug: string }>()
 
 		if (!row) {
-			throw new Error(`content tag "${tag}" could not be resolved after upsert`)
+			throw new Error(`content tag "${slug}" could not be resolved after upsert`)
 		}
-		results.push(row)
+		results.push({ ...row, label })
 	}
-
 	return results
 }
 
@@ -504,19 +518,44 @@ export async function setContentTags(
 	contentId: string,
 	tags: string[],
 ): Promise<void> {
-	const normalized = normalizeTags(tags)
-	await db.prepare('DELETE FROM content_tag_links WHERE content_id = ?').bind(contentId).run()
-	if (normalized.length === 0) return
-
-	const tagRows = await ensureTags(db, normalized)
-
-	const insert = db.prepare('INSERT INTO content_tag_links (content_id, tag_id) VALUES (?, ?)')
+	const pairs = validateDeclaredTagList(tags)
+	await setContentTagPairs(db, contentId, pairs)
+}
 
+async function setContentTagPairs(
+	db: D1Database,
+	contentId: string,
+	pairs: TaxonomyTag[],
+): Promise<void> {
+	await db.prepare('DELETE FROM content_tag_links WHERE content_id = ?').bind(contentId).run()
+	if (pairs.length === 0) return
+	const tagRows = await ensureTags(db, pairs)
+	const insert = db.prepare(
+		'INSERT INTO content_tag_links (content_id, tag_id, label) VALUES (?, ?, ?)',
+	)
 	for (const tag of tagRows) {
-		await insert.bind(contentId, tag.id).run()
+		await insert.bind(contentId, tag.id, tag.label).run()
 	}
 }
 
+export async function getContentTagPairs(
+	db: D1Database,
+	contentId: string,
+): Promise<TaxonomyTag[]> {
+	const tags = await db
+		.prepare(
+			`SELECT t.slug, COALESCE(l.label, t.label) AS label
+			 FROM content_tag_links l
+			 JOIN content_tags t ON t.id = l.tag_id
+			 WHERE l.content_id = ?
+			 ORDER BY t.slug ASC
+			 LIMIT ?`,
+		)
+		.bind(contentId, MAX_ITEM_TAG_COUNT + 1)
+		.all<{ slug: string; label: string }>()
+	return validateStoredTaxonomyRows(tags.results || [])
+}
+
 export async function setContentRelations(
 	db: D1Database,
 	contentId: string,
@@ -567,6 +606,7 @@ export async function createContent(
 						input.content.durationSeconds,
 					)
 				: null
+	const tagPairs = input.tags === undefined ? null : validateDeclaredTagList(input.tags)
 	const id = crypto.randomUUID()
 	const slug = await ensureUniqueSlug(db, input.slug)
 	const visibility = input.visibility || 'free'
@@ -672,8 +712,8 @@ export async function createContent(
 			.run()
 	}
 
-	if (input.tags) {
-		await setContentTags(db, id, input.tags)
+	if (tagPairs) {
+		await setContentTagPairs(db, id, tagPairs)
 	}
 
 	return { id, slug }
@@ -694,6 +734,7 @@ export async function updateContentItem(
 	id: string,
 	input: UpdateContentInput,
 ): Promise<{ slug: string } | null> {
+	const tagPairs = input.tags === undefined ? null : validateDeclaredTagList(input.tags)
 	const existing = await getContentItem(db, id)
 	if (!existing) return null
 
@@ -912,7 +953,7 @@ export async function updateContentItem(
 		.run()
 
 	if (input.tags !== undefined) {
-		await setContentTags(db, id, input.tags)
+		await setContentTagPairs(db, id, tagPairs ?? [])
 	}
 
 	if (input.relations !== undefined) {
@@ -1278,11 +1319,11 @@ export async function duplicateContentItem(
 			.run()
 	}
 
-	// INSERT…SELECT copy #4 — content_tag_links (carry the same tags).
+	// INSERT…SELECT copy #4 — content_tag_links (carry the same canonical tags and labels).
 	await db
 		.prepare(
-			`INSERT INTO content_tag_links (content_id, tag_id)
-			 SELECT ?, tag_id FROM content_tag_links WHERE content_id = ?`,
+			`INSERT INTO content_tag_links (content_id, tag_id, label)
+			 SELECT ?, tag_id, label FROM content_tag_links WHERE content_id = ?`,
 		)
 		.bind(newId, sourceId)
 		.run()
@@ -1347,12 +1388,7 @@ export async function getContentSnapshot(
 			.first<Record<string, unknown>>()
 	}
 
-	const tags = await db
-		.prepare(
-			'SELECT t.slug FROM content_tag_links l JOIN content_tags t ON t.id = l.tag_id WHERE l.content_id = ? ORDER BY t.slug ASC',
-		)
-		.bind(contentId)
-		.all<{ slug: string }>()
+	const tags = await getContentTagPairs(db, contentId)
 
 	const related = await db
 		.prepare(
@@ -1364,7 +1400,8 @@ export async function getContentSnapshot(
 	return {
 		item: base,
 		content,
-		tags: (tags.results || []).map((row) => row.slug),
+		tags: tags.map((row) => row.slug),
+		tagLabels: tags.map((row) => row.label),
 		related: related.results || [],
 	}
 }

package/src/engine/revisions.ts

@@ -8,12 +8,16 @@
 import { parseContentMetadata } from './content-metadata.js'
 import type { D1Database } from './d1.js'
 import { countWords, getContentItem, getContentSnapshot, updateContentItem } from './publisher.js'
+import { validateRevisionTaxonomy } from './taxonomy.js'
 
 /** The one canonical revision snapshot shape (spec §4 "ContentRevisionPayload"). */
 export interface ContentRevisionPayload {
 	item: Record<string, unknown>
 	content: Record<string, unknown> | null
+	/** Canonical tag slugs, ordered ascending. */
 	tags: string[]
+	/** NFC-normalized display labels parallel to tags[]; preserves original casing through revisions. */
+	tagLabels?: string[]
 	related: Array<{ related_id: string; rank: number; reason: string | null }>
 }
 
@@ -212,6 +216,11 @@ export async function restoreRevision(
 		}
 	}
 	const restoredTakeaways = parseTakeaways(body?.editor_takeaways)
+	const restoredTags = validateRevisionTaxonomy({
+		tags: target.payload.tags,
+		tagLabels: target.payload.tagLabels,
+		allowLegacyLabels: true,
+	}).map((tag) => tag.label)
 	// Restore intentionally rolls back CONTENT fields (title/body/tags/relations/
 	// featured/seo/hero/etc.) to the snapshot, but NOT publication state
 	// (status / publish_at / published_at / published_revision_id) — that is by
@@ -237,7 +246,7 @@ export async function restoreRevision(
 		metadata: parseContentMetadata(
 			typeof item.metadata_json === 'string' ? item.metadata_json : '{}',
 		),
-		tags: target.payload.tags,
+		tags: restoredTags,
 		relations: target.payload.related.map((r) => ({
 			relatedId: r.related_id,
 			rank: r.rank,