emdash 1.3.0 → 1.4.0

package/dist/wxr-taxonomies-DbJtWrWM.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"wxr-taxonomies-DbJtWrWM.mjs","names":[],"sources":["../src/import/wxr-taxonomies.ts"],"sourcesContent":["/**\n * WXR taxonomy import helpers.\n *\n * Bridges parsed WordPress taxonomy data (`WxrCategory`, `WxrTag`, `WxrTerm`,\n * and per-item `WxrPost.categories` / `WxrPost.tags` / `WxrPost.customTaxonomies`)\n * onto EmDash's term + content_taxonomies tables.\n *\n * Why this isn't inline in `execute.ts`: pre-creating all terms before any\n * post is created lets us (a) build a lookup once for every (taxonomy, slug)\n * the import needs, and (b) keep the per-post attachment loop cheap. It also\n * makes the logic testable without spinning up an Astro request.\n *\n * Behaviour:\n *   - `wp:category` -> EmDash `category` taxonomy (seeded by migration 006).\n *   - `wp:tag`      -> EmDash `tag` taxonomy.\n *   - `wp:term`     -> matching EmDash taxonomy by `name` (case-sensitive).\n *                      If the taxonomy isn't defined in any locale, the\n *                      term is skipped — we don't auto-create defs because\n *                      the user controls their schema through the admin.\n *   - Terms are created idempotently by `(taxonomy, slug, locale)`. Existing\n *     terms are reused.\n *   - Assignments respect the def's `collections` array. If the post's target\n *     collection isn't listed on the taxonomy def, the assignment is skipped\n *     (matches admin UI behaviour: you can't tag a \"products\" post with a\n *     \"category\" if `category.collections` only includes \"posts\").\n */\n\nimport type { Kysely } from \"kysely\";\n\nimport type { WxrCategory, WxrPost, WxrTag, WxrTerm } from \"../cli/wxr/parser.js\";\nimport {\n\tfindTaxonomyStructure,\n\tselectTaxonomyDefs,\n} from \"../database/repositories/taxonomy-def.js\";\nimport { TaxonomyRepository } from \"../database/repositories/taxonomy.js\";\nimport type { Database } from \"../database/types.js\";\nimport { localeMatches, localeOrder } from \"../i18n/query.js\";\nimport { invalidateTermCache } from \"../taxonomies/index.js\";\n\n/**\n * Thrown by `mirrorTermsToLocales` when a pre-existing locale row at the\n * same `(taxonomy, slug)` belongs to a different `translation_group` than\n * the canonical term. Callers in the route layer surface\n * `publicMessage` to the operator (no internal data) while logging\n * `cause` server-side.\n *\n * Marker class so the route layer can distinguish \"operator-actionable\n * taxonomy conflict\" from any other DB / repository error that might\n * escape the helper.\n */\nexport class WxrTaxonomyConflictError extends Error {\n\treadonly publicMessage: string;\n\tconstructor(publicMessage: string, options?: { cause?: unknown }) {\n\t\tsuper(publicMessage, options);\n\t\tthis.name = \"WxrTaxonomyConflictError\";\n\t\tthis.publicMessage = publicMessage;\n\t}\n}\n\nexport function isWxrTaxonomyConflictError(error: unknown): error is WxrTaxonomyConflictError {\n\treturn error instanceof WxrTaxonomyConflictError;\n}\n\n/**\n * Result of pre-importing taxonomy terms from a WXR file.\n */\nexport interface TaxonomyImportPlan {\n\t/** terms created during this run (per taxonomy name) */\n\ttermsCreated: Record<string, number>;\n\t/** terms that already existed and were reused (per taxonomy name) */\n\ttermsReused: Record<string, number>;\n\t/** custom taxonomies (`wp:term`) skipped because no matching EmDash def exists */\n\tmissingTaxonomies: string[];\n\t/**\n\t * Lookup table: `taxonomy name` -> `term slug` -> term id.\n\t * Used by `attachPostTaxonomies` to translate WXR assignments into pivot rows.\n\t */\n\ttermIdByNameAndSlug: Map<string, Map<string, string>>;\n\t/**\n\t * Lookup table: `taxonomy name` -> set of collection slugs the def allows.\n\t * Empty (or missing) means \"any collection\" — we only enforce the filter\n\t * when the def explicitly lists collections.\n\t */\n\tcollectionsByTaxonomy: Map<string, Set<string>>;\n\t/**\n\t * Lookup table: `term id` -> the term's `translation_group` (or `null`\n\t * if the term doesn't exist any more). Populated lazily by helpers that\n\t * need to check pivot existence without repeating per-term DB reads.\n\t */\n\ttranslationGroupByTermId: Map<string, string | null>;\n}\n\n/**\n * Track running counts plus the lookup maps.\n */\ninterface TaxonomyImportState {\n\tplan: TaxonomyImportPlan;\n}\n\nfunction makeState(): TaxonomyImportState {\n\treturn {\n\t\tplan: {\n\t\t\ttermsCreated: {},\n\t\t\ttermsReused: {},\n\t\t\tmissingTaxonomies: [],\n\t\t\ttermIdByNameAndSlug: new Map(),\n\t\t\tcollectionsByTaxonomy: new Map(),\n\t\t\ttranslationGroupByTermId: new Map(),\n\t\t},\n\t};\n}\n\n/**\n * Record-keeping helpers — keep mutations centralised so the result object\n * stays consistent.\n */\nfunction bump(record: Record<string, number>, key: string): void {\n\trecord[key] = (record[key] ?? 0) + 1;\n}\n\nfunction rememberTerm(\n\tstate: TaxonomyImportState,\n\ttaxonomyName: string,\n\tslug: string,\n\ttermId: string,\n): void {\n\tlet bySlug = state.plan.termIdByNameAndSlug.get(taxonomyName);\n\tif (!bySlug) {\n\t\tbySlug = new Map();\n\t\tstate.plan.termIdByNameAndSlug.set(taxonomyName, bySlug);\n\t}\n\tbySlug.set(slug, termId);\n}\n\nfunction parseDefCollections(raw: string | null): string[] {\n\tif (!raw) return [];\n\ttry {\n\t\tconst parsed: unknown = JSON.parse(raw);\n\t\tif (Array.isArray(parsed)) {\n\t\t\treturn parsed.filter((c): c is string => typeof c === \"string\");\n\t\t}\n\t} catch {\n\t\t// malformed JSON in the def -- treat as \"no collection filter\"\n\t}\n\treturn [];\n}\n\n/**\n * Rebuild the taxonomy lookup maps from the database without creating\n * anything. The chunked WP import runs term creation once (first content\n * chunk); every later chunk only needs the maps to attach per-post\n * assignments, and two SELECTs are far cheaper than re-walking every term\n * through the ensure path.\n *\n * ponytail: first row wins per (name, slug), ordered by locale asc — the\n * same row `findBySlug` without a locale resolves to. Per-locale term\n * variants beyond that are the mirror pass's job, not the importer's.\n */\nexport async function loadTaxonomyPlanFromDb(db: Kysely<Database>): Promise<TaxonomyImportPlan> {\n\tconst state = makeState();\n\n\tconst defs = await selectTaxonomyDefs(db).orderBy(\"d.locale\", \"asc\").execute();\n\tfor (const def of defs) {\n\t\tif (!state.plan.collectionsByTaxonomy.has(def.name)) {\n\t\t\tstate.plan.collectionsByTaxonomy.set(def.name, new Set(parseDefCollections(def.collections)));\n\t\t}\n\t}\n\n\tconst terms = await db\n\t\t.selectFrom(\"taxonomies\")\n\t\t.select([\"name\", \"slug\", \"id\"])\n\t\t.orderBy(\"locale\", \"asc\")\n\t\t.execute();\n\tfor (const term of terms) {\n\t\tif (!state.plan.termIdByNameAndSlug.get(term.name)?.has(term.slug)) {\n\t\t\trememberTerm(state, term.name, term.slug, term.id);\n\t\t}\n\t}\n\n\treturn state.plan;\n}\n\ninterface TermDescriptor {\n\ttaxonomyName: string;\n\tslug: string;\n\tlabel: string;\n\tdescription?: string;\n}\n\nfunction termKey(taxonomyName: string, slug: string): string {\n\treturn `${taxonomyName}\\u0000${slug}`;\n}\n\n/**\n * Find or create many terms in a small number of batched SELECTs instead of\n * one SELECT per term. This is the dominant fixed cost for WXR imports with\n * large category/tag vocabularies: a site with 100+ categories would otherwise\n * spend one D1 round-trip per category before writing any posts.\n *\n * Batching rules:\n *   - Descriptors already resolved in `state.plan.termIdByNameAndSlug` are\n *     skipped (same idempotency as the old per-term loop).\n *   - Remaining descriptors are deduplicated by `(taxonomy, slug)`; the first\n *     label/description seen wins, matching the old behaviour where the first\n *     `ensureTerm` call cached the id.\n *   - One batched SELECT resolves existing rows at the requested locale.\n *   - One batched SELECT resolves any-locale rows for use as `translationOf`.\n *   - Missing rows are still created one at a time because each insert needs\n *     its own ULID/translation_group/sort_order bookkeeping, but the reads are\n *     where the round-trip bottleneck lives.\n */\nasync function ensureTermsBatch(\n\tdb: Kysely<Database>,\n\tstate: TaxonomyImportState,\n\tdescriptors: TermDescriptor[],\n\tlocale: string | undefined,\n): Promise<void> {\n\tif (descriptors.length === 0) return;\n\n\tconst repo = new TaxonomyRepository(db);\n\n\tconst needed: TermDescriptor[] = [];\n\tconst seenKeys = new Set<string>();\n\tfor (const d of descriptors) {\n\t\tif (state.plan.termIdByNameAndSlug.get(d.taxonomyName)?.has(d.slug)) continue;\n\t\tconst key = termKey(d.taxonomyName, d.slug);\n\t\tif (seenKeys.has(key)) continue;\n\t\tseenKeys.add(key);\n\t\tneeded.push(d);\n\t}\n\tif (needed.length === 0) return;\n\n\t// Resolve existing rows at the requested locale in one round-trip.\n\tconst existingAtLocale = await findExistingTerms(db, needed, locale);\n\tfor (const row of existingAtLocale) {\n\t\tbump(state.plan.termsReused, row.name);\n\t\trememberTerm(state, row.name, row.slug, row.id);\n\t}\n\n\t// Build the list of descriptors that still need creation.\n\tconst stillNeeded: TermDescriptor[] = [];\n\tfor (const d of needed) {\n\t\tif (!state.plan.termIdByNameAndSlug.get(d.taxonomyName)?.has(d.slug)) {\n\t\t\tstillNeeded.push(d);\n\t\t}\n\t}\n\tif (stillNeeded.length === 0) return;\n\n\t// Resolve any-locale rows once for translationOf linking.\n\tconst anyLocaleRows = await findExistingTerms(db, stillNeeded, undefined);\n\tconst translationOfByKey = new Map<string, string>();\n\tfor (const row of anyLocaleRows) {\n\t\tconst key = termKey(row.name, row.slug);\n\t\tif (!translationOfByKey.has(key)) translationOfByKey.set(key, row.id);\n\t}\n\n\tfor (const d of stillNeeded) {\n\t\tconst created = await repo.create({\n\t\t\tname: d.taxonomyName,\n\t\t\tslug: d.slug,\n\t\t\tlabel: d.label,\n\t\t\tdata: d.description ? { description: d.description } : undefined,\n\t\t\tlocale,\n\t\t\ttranslationOf: translationOfByKey.get(termKey(d.taxonomyName, d.slug)),\n\t\t});\n\t\tbump(state.plan.termsCreated, d.taxonomyName);\n\t\trememberTerm(state, d.taxonomyName, d.slug, created.id);\n\t}\n}\n\n/**\n * Batched lookup of term rows for a list of `(taxonomy, slug)` pairs.\n * Chunks at `SQL_BATCH_SIZE / 2` because each pair consumes two bind\n * parameters (`name` and `slug`). When `locale` is omitted, returns rows\n * for all locales ordered by locale ascending so callers can pick the first\n * row per pair (mirroring `TaxonomyRepository.findBySlug` without a locale\n * argument).\n */\nasync function findExistingTerms(\n\tdb: Kysely<Database>,\n\tdescriptors: TermDescriptor[],\n\tlocale: string | undefined,\n): Promise<Array<{ id: string; name: string; slug: string }>> {\n\tconst { chunks, SQL_BATCH_SIZE } = await import(\"../utils/chunks.js\");\n\tconst rows: Array<{ id: string; name: string; slug: string }> = [];\n\tconst seenKeys = new Set<string>();\n\n\t// Each pair uses 2 bind params, so limit each batch to SQL_BATCH_SIZE / 2 pairs.\n\tfor (const batch of chunks(descriptors, Math.floor(SQL_BATCH_SIZE / 2))) {\n\t\tconst batchRows = await db\n\t\t\t.selectFrom(\"taxonomies\")\n\t\t\t.select([\"id\", \"name\", \"slug\"])\n\t\t\t.where((eb) =>\n\t\t\t\teb.or(batch.map((d) => eb.and([eb(\"name\", \"=\", d.taxonomyName), eb(\"slug\", \"=\", d.slug)]))),\n\t\t\t)\n\t\t\t.$if(locale !== undefined, (qb) => qb.where(localeMatches(\"locale\", locale!)))\n\t\t\t.orderBy(locale !== undefined ? localeOrder(\"locale\", locale) : \"locale\", \"asc\")\n\t\t\t.execute();\n\n\t\tfor (const row of batchRows) {\n\t\t\tconst key = termKey(row.name, row.slug);\n\t\t\tif (seenKeys.has(key)) continue;\n\t\t\tseenKeys.add(key);\n\t\t\trows.push(row);\n\t\t}\n\t}\n\n\treturn rows;\n}\n\n/**\n * Retrieve the human label captured by the parser for a per-item\n * `<category>` text body, falling back to the slug when the parser didn't\n * see a label (e.g. self-closing tags or whitespace-only bodies).\n */\nfunction labelFor(post: WxrPost, taxonomy: string, slug: string): string {\n\tconst key = `${taxonomy}\\u0000${slug}`;\n\treturn post.taxonomyLabels?.get(key) ?? slug;\n}\n\n/**\n * Pre-import every term referenced by the WXR file.\n *\n * Pass 1: `wp:category` blocks. Each becomes a term in EmDash's seeded\n *         `category` taxonomy.\n * Pass 2: `wp:tag` blocks. Each becomes a term in `tag`.\n * Pass 3: `wp:term` blocks (custom taxonomies). Skipped when no matching\n *         EmDash def exists.\n * Pass 4: per-item `<category domain=\"…\" nicename=\"…\">` assignments. WXR\n *         exports sometimes reference taxonomies/terms that weren't declared\n *         at the top level (older exports especially), so we backfill terms\n *         from per-item assignments. Categories and tags use the seeded defs\n *         and pick up the assignment text as the label; custom domains fall\n *         back to the same \"def must exist\" rule.\n */\nexport async function preImportWxrTaxonomies(\n\tdb: Kysely<Database>,\n\tposts: WxrPost[],\n\tcategories: WxrCategory[],\n\ttags: WxrTag[],\n\tterms: WxrTerm[],\n\tlocale: string | undefined,\n): Promise<TaxonomyImportPlan> {\n\tconst state = makeState();\n\n\t// Cache def lookups for the duration of the import. Keyed by name; value\n\t// is `null` when we've already determined the taxonomy is missing (so we\n\t// only report the \"missing\" warning once per taxonomy).\n\tconst defCache = new Map<string, { id: string; collections: string[] } | null>();\n\tconst lookupDef = async (name: string): Promise<{ id: string; collections: string[] } | null> => {\n\t\tif (defCache.has(name)) return defCache.get(name) ?? null;\n\t\t// A taxonomy's structure is the same in every locale, so a definition in\n\t\t// any locale counts, as it does for the runtime's `getTaxonomyDef`.\n\t\tconst def = await findTaxonomyStructure(db, name);\n\t\tdefCache.set(name, def);\n\t\tif (def) {\n\t\t\tstate.plan.collectionsByTaxonomy.set(name, new Set(def.collections));\n\t\t}\n\t\treturn def;\n\t};\n\n\t// Pass 1-3: collect every term declared at the top of the WXR, then\n\t// resolve them in a few batched queries instead of one round-trip per term.\n\tconst categoryDef = await lookupDef(\"category\");\n\tconst tagDef = await lookupDef(\"tag\");\n\tconst topLevel: TermDescriptor[] = [];\n\n\tif (categoryDef) {\n\t\tfor (const cat of categories) {\n\t\t\tif (!cat.nicename || !cat.name) continue;\n\t\t\ttopLevel.push({\n\t\t\t\ttaxonomyName: \"category\",\n\t\t\t\tslug: cat.nicename,\n\t\t\t\tlabel: cat.name,\n\t\t\t\tdescription: cat.description,\n\t\t\t});\n\t\t}\n\t} else if (categories.length > 0) {\n\t\tstate.plan.missingTaxonomies.push(\"category\");\n\t}\n\n\tif (tagDef) {\n\t\tfor (const tag of tags) {\n\t\t\tif (!tag.slug || !tag.name) continue;\n\t\t\ttopLevel.push({\n\t\t\t\ttaxonomyName: \"tag\",\n\t\t\t\tslug: tag.slug,\n\t\t\t\tlabel: tag.name,\n\t\t\t\tdescription: tag.description,\n\t\t\t});\n\t\t}\n\t} else if (tags.length > 0) {\n\t\tstate.plan.missingTaxonomies.push(\"tag\");\n\t}\n\n\tfor (const term of terms) {\n\t\tif (term.taxonomy === \"nav_menu\" || term.taxonomy === \"language\") continue;\n\t\t// Normalize WordPress' `post_tag` synonym -> EmDash `tag`. WordPress\n\t\t// emits `<wp:tag>` for some exports and `<wp:term wp:term_taxonomy=\"post_tag\">`\n\t\t// for others; both must land in the same EmDash taxonomy.\n\t\tconst taxonomyName = term.taxonomy === \"post_tag\" ? \"tag\" : term.taxonomy;\n\t\tconst def = await lookupDef(taxonomyName);\n\t\tif (!def) {\n\t\t\tif (!state.plan.missingTaxonomies.includes(taxonomyName)) {\n\t\t\t\tstate.plan.missingTaxonomies.push(taxonomyName);\n\t\t\t}\n\t\t\tcontinue;\n\t\t}\n\t\ttopLevel.push({\n\t\t\ttaxonomyName,\n\t\t\tslug: term.slug,\n\t\t\tlabel: term.name,\n\t\t\tdescription: term.description,\n\t\t});\n\t}\n\n\tawait ensureTermsBatch(db, state, topLevel, locale);\n\n\t// Pass 4: per-item assignments. Backfills terms missing from the top-\n\t// level blocks (rare, but observed in hand-edited or partial exports).\n\t// Collect every assignment first so we can batch-resolve them too.\n\tconst fromPosts: TermDescriptor[] = [];\n\tlet recordedMissingCategoryFromPosts = false;\n\tlet recordedMissingTagFromPosts = false;\n\n\tfor (const post of posts) {\n\t\tfor (const slug of post.categories) {\n\t\t\tif (!categoryDef) {\n\t\t\t\tif (\n\t\t\t\t\t!recordedMissingCategoryFromPosts &&\n\t\t\t\t\t!state.plan.missingTaxonomies.includes(\"category\")\n\t\t\t\t) {\n\t\t\t\t\tstate.plan.missingTaxonomies.push(\"category\");\n\t\t\t\t\trecordedMissingCategoryFromPosts = true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tif (state.plan.termIdByNameAndSlug.get(\"category\")?.has(slug)) continue;\n\t\t\tfromPosts.push({\n\t\t\t\ttaxonomyName: \"category\",\n\t\t\t\tslug,\n\t\t\t\tlabel: labelFor(post, \"category\", slug),\n\t\t\t});\n\t\t}\n\t\tfor (const slug of post.tags) {\n\t\t\tif (!tagDef) {\n\t\t\t\tif (!recordedMissingTagFromPosts && !state.plan.missingTaxonomies.includes(\"tag\")) {\n\t\t\t\t\tstate.plan.missingTaxonomies.push(\"tag\");\n\t\t\t\t\trecordedMissingTagFromPosts = true;\n\t\t\t\t}\n\t\t\t\tbreak;\n\t\t\t}\n\t\t\tif (state.plan.termIdByNameAndSlug.get(\"tag\")?.has(slug)) continue;\n\t\t\tfromPosts.push({\n\t\t\t\ttaxonomyName: \"tag\",\n\t\t\t\tslug,\n\t\t\t\tlabel: labelFor(post, \"tag\", slug),\n\t\t\t});\n\t\t}\n\t\tif (post.customTaxonomies) {\n\t\t\tfor (const [rawName, slugs] of post.customTaxonomies) {\n\t\t\t\tif (rawName === \"nav_menu\" || rawName === \"language\") continue;\n\t\t\t\tconst taxonomyName = rawName === \"post_tag\" ? \"tag\" : rawName;\n\t\t\t\tconst def = await lookupDef(taxonomyName);\n\t\t\t\tif (!def) {\n\t\t\t\t\tif (!state.plan.missingTaxonomies.includes(taxonomyName)) {\n\t\t\t\t\t\tstate.plan.missingTaxonomies.push(taxonomyName);\n\t\t\t\t\t}\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t\tfor (const slug of slugs) {\n\t\t\t\t\tif (state.plan.termIdByNameAndSlug.get(taxonomyName)?.has(slug)) continue;\n\t\t\t\t\tfromPosts.push({\n\t\t\t\t\t\ttaxonomyName,\n\t\t\t\t\t\tslug,\n\t\t\t\t\t\tlabel: labelFor(post, taxonomyName, slug),\n\t\t\t\t\t});\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n\n\tawait ensureTermsBatch(db, state, fromPosts, locale);\n\n\t// `content_taxonomies` writes happen later in `attachPostTaxonomies`, but\n\t// term inserts above already invalidate the in-memory \"has any terms\" probe.\n\t// We flush once at the end of the pre-import to keep the runtime cache hot.\n\tinvalidateTermCache();\n\n\treturn state.plan;\n}\n\n/**\n * Walk a parsed WXR post's per-item taxonomy assignments and return only\n * the ones that resolve to a real EmDash term AND aren't filtered out by\n * the taxonomy def's `collections` allowlist. Grouped by EmDash taxonomy\n * name (so `post_tag` is already folded into `tag`). Deduplicated.\n *\n * This is the single source of truth for \"what will the importer try to\n * write for this post\". Both the anchor (additive `attachToEntry`) and\n * translation (per-taxonomy `setTermsForEntry`) paths drive from this map\n * so they agree on which taxonomies need touching. In particular, the\n * translation path uses the keys here -- not `postAssignedTaxonomies` --\n * to decide which inherited pivot rows to clear, so a translation whose\n * only assignment is filtered out by `collections` doesn't lose its\n * inherited terms (see #1087 review feedback).\n *\n * Skipped taxonomies: `nav_menu` (handled by the menu importer) and\n * `language` (Polylang's locale signal, already promoted to `post.locale`\n * by the parser).\n */\nexport function resolvePostTermAssignments(\n\tcollection: string,\n\tpost: WxrPost,\n\tplan: TaxonomyImportPlan,\n): Map<string, string[]> {\n\tconst result = new Map<string, string[]>();\n\tconst seen = new Set<string>();\n\n\tconst tryResolve = (taxonomyName: string, slug: string): void => {\n\t\tconst termId = plan.termIdByNameAndSlug.get(taxonomyName)?.get(slug);\n\t\tif (!termId) return;\n\t\tconst collectionFilter = plan.collectionsByTaxonomy.get(taxonomyName);\n\t\t// Empty set means \"no filter\" (def has no collections array). A\n\t\t// non-empty set is enforced: skip assignments to collections the\n\t\t// def doesn't list. Matches admin UI: a `category` term linked\n\t\t// only to `posts` shouldn't end up on a `products` row just\n\t\t// because the WXR happened to mention it.\n\t\tif (collectionFilter && collectionFilter.size > 0 && !collectionFilter.has(collection)) {\n\t\t\treturn;\n\t\t}\n\t\tconst dedupeKey = `${taxonomyName}\\u0000${termId}`;\n\t\tif (seen.has(dedupeKey)) return;\n\t\tseen.add(dedupeKey);\n\t\tconst existing = result.get(taxonomyName);\n\t\tif (existing) existing.push(termId);\n\t\telse result.set(taxonomyName, [termId]);\n\t};\n\n\tfor (const slug of post.categories) tryResolve(\"category\", slug);\n\tfor (const slug of post.tags) tryResolve(\"tag\", slug);\n\tif (post.customTaxonomies) {\n\t\tfor (const [rawName, slugs] of post.customTaxonomies) {\n\t\t\tif (rawName === \"nav_menu\" || rawName === \"language\") continue;\n\t\t\tconst taxonomyName = rawName === \"post_tag\" ? \"tag\" : rawName;\n\t\t\tfor (const slug of slugs) tryResolve(taxonomyName, slug);\n\t\t}\n\t}\n\n\treturn result;\n}\n\n/**\n * Attach the taxonomy assignments parsed for a single WXR post to a freshly-\n * created EmDash content row. Additive (`attachToEntry` + `ON CONFLICT DO\n * NOTHING`). Used for anchors -- translations need replace-semantics per\n * taxonomy and should use `setPostTermAssignmentsReplacing` instead.\n *\n * Returns the number of pivot rows actually inserted (excludes rows that\n * already existed via the `ON CONFLICT DO NOTHING` path), so the caller can\n * roll them up into the import summary without over-counting on re-imports.\n */\nexport async function attachPostTaxonomies(\n\tdb: Kysely<Database>,\n\tcollection: string,\n\tentryId: string,\n\tpost: WxrPost,\n\tplan: TaxonomyImportPlan,\n): Promise<number> {\n\tconst repo = new TaxonomyRepository(db);\n\tconst resolved = resolvePostTermAssignments(collection, post, plan);\n\tconst groups = new Set<string>();\n\tfor (const [, termIds] of resolved) {\n\t\tfor (const termId of termIds) {\n\t\t\tconst group = await termTranslationGroup(repo, plan, termId);\n\t\t\tif (group) groups.add(group);\n\t\t}\n\t}\n\treturn repo.attachGroupsToEntry(collection, entryId, [...groups]);\n}\n\n/**\n * Replace assignments per-taxonomy from a parsed WXR post. Used for\n * translations. Assignments belong to the content translation_group, so a\n * translated item's explicit taxonomy replaces that taxonomy for every\n * locale. Taxonomies with no resolvable permitted terms are left unchanged.\n *\n * Returns the number of pivot rows after replacement (sum of `termIds`\n * lists across taxonomies actually touched). Note this counts logical\n * assignments, not the delta from the prior state; the import summary\n * treats this as an additive count for compatibility with `attachPost-\n * Taxonomies`.\n */\nexport async function setPostTermAssignmentsReplacing(\n\tdb: Kysely<Database>,\n\tcollection: string,\n\tentryId: string,\n\tpost: WxrPost,\n\tplan: TaxonomyImportPlan,\n): Promise<number> {\n\tconst repo = new TaxonomyRepository(db);\n\tconst resolved = resolvePostTermAssignments(collection, post, plan);\n\n\tlet attached = 0;\n\tfor (const [taxonomyName, termIds] of resolved) {\n\t\tawait repo.setTermsForEntry(collection, entryId, taxonomyName, termIds);\n\t\tattached += termIds.length;\n\t}\n\treturn attached;\n}\n\n/**\n * Resolve a term id to its `translation_group` (the value\n * `content_taxonomies` stores). Caches the result on the plan so\n * repeated attaches of the same term don't repeat the lookup.\n */\nasync function termTranslationGroup(\n\trepo: TaxonomyRepository,\n\tplan: TaxonomyImportPlan,\n\ttermId: string,\n): Promise<string | null> {\n\tconst cached = plan.translationGroupByTermId.get(termId);\n\tif (cached !== undefined) return cached;\n\tconst term = await repo.findById(termId);\n\tconst group = term?.translationGroup ?? null;\n\tplan.translationGroupByTermId.set(termId, group);\n\treturn group;\n}\n\n/**\n * Mirror every term in the plan into each additional locale used by the\n * incoming posts. New rows share the canonical term's `translation_group`\n * so per-locale lookups (`getTermsForEntry(..., locale)`) resolve correctly\n * for translations whose locale differs from the import-wide one.\n *\n * Without this pass, multilingual WXR imports (#1080) write all term rows\n * at the upload-wide locale; the `content_taxonomies` pivot is correct (it\n * stores `translation_group`, not `term id`), but\n * `getTermsForEntry(collection, arabicPostId, \"category\", \"ar\")` filters on\n * `taxonomies.locale = \"ar\"` and returns zero rows. Users see \"no tags\" on\n * every non-canonical translation.\n *\n * Idempotent: skips a locale when a row already exists at `(name, slug,\n * locale)`. Safe to call after `preImportWxrTaxonomies` on subsequent\n * imports.\n */\nexport async function mirrorTermsToLocales(\n\tdb: Kysely<Database>,\n\tplan: TaxonomyImportPlan,\n\tpostLocales: Iterable<string>,\n\tcanonicalLocale: string | undefined,\n): Promise<void> {\n\tconst localeSet = new Set<string>();\n\tfor (const locale of postLocales) {\n\t\tif (!locale || locale === canonicalLocale) continue;\n\t\tlocaleSet.add(locale);\n\t}\n\tif (localeSet.size === 0) return;\n\n\tconst repo = new TaxonomyRepository(db);\n\n\tfor (const [taxonomyName, bySlug] of plan.termIdByNameAndSlug) {\n\t\tfor (const [slug, canonicalTermId] of bySlug) {\n\t\t\t// Resolve the canonical's translation_group once; we'll compare\n\t\t\t// against any pre-existing rows we find at the target locales.\n\t\t\t// Cache on the plan so subsequent attaches (which also need\n\t\t\t// this resolution) don't repeat the lookup.\n\t\t\tconst cachedGroup = await termTranslationGroup(repo, plan, canonicalTermId);\n\t\t\tif (!cachedGroup) {\n\t\t\t\t// The canonical term id is in the plan but the row is no\n\t\t\t\t// longer in the DB. Shouldn't happen during a single\n\t\t\t\t// import run; skip rather than crash so the rest of the\n\t\t\t\t// import can complete.\n\t\t\t\tcontinue;\n\t\t\t}\n\t\t\tconst canonicalGroup = cachedGroup;\n\n\t\t\tfor (const locale of localeSet) {\n\t\t\t\tconst existing = await repo.findBySlug(taxonomyName, slug, locale);\n\t\t\t\tif (existing) {\n\t\t\t\t\t// `ensureTerm` resolves cross-locale grouping when it\n\t\t\t\t\t// creates the canonical row, so a pre-existing sibling\n\t\t\t\t\t// row at this locale should already share the\n\t\t\t\t\t// canonical's `translation_group`. If it doesn't, the\n\t\t\t\t\t// import would write pivots pointing at a group that\n\t\t\t\t\t// has no row in this locale -- a silent data-integrity\n\t\t\t\t\t// bug. Fail closed: throw so the operator reconciles\n\t\t\t\t\t// the existing rows in the admin before retrying. This\n\t\t\t\t\t// happens when the canonical row was created in an\n\t\t\t\t\t// earlier import and a sibling-locale row was added\n\t\t\t\t\t// manually afterwards (or vice versa) without linking\n\t\t\t\t\t// them via translationOf.\n\t\t\t\t\tif (existing.translationGroup !== canonicalGroup) {\n\t\t\t\t\t\tthrow new WxrTaxonomyConflictError(\n\t\t\t\t\t\t\t`Cannot import: term \"${taxonomyName}/${slug}\" already exists at locale \"${locale}\" in a different translation group than the canonical row at this import's locale. Reconcile the rows in the admin (re-link via translationOf, or delete one) and retry.`,\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t\tcontinue;\n\t\t\t\t}\n\t\t\t\ttry {\n\t\t\t\t\tawait repo.create({\n\t\t\t\t\t\tname: taxonomyName,\n\t\t\t\t\t\tslug,\n\t\t\t\t\t\tlabel: slug, // we don't have a per-locale label from the WXR\n\t\t\t\t\t\tlocale,\n\t\t\t\t\t\ttranslationOf: canonicalTermId,\n\t\t\t\t\t});\n\t\t\t\t} catch (error) {\n\t\t\t\t\t// `findBySlug` + `create` is not atomic. A concurrent\n\t\t\t\t\t// import racing us into the same `(name, slug, locale)`\n\t\t\t\t\t// will trip the UNIQUE constraint. Re-read the row that\n\t\t\t\t\t// won the race and verify its `translation_group`\n\t\t\t\t\t// matches the canonical's; if not, the pivot will\n\t\t\t\t\t// resolve to a group that has no row in this locale\n\t\t\t\t\t// (silent data-integrity bug) so we surface that loudly\n\t\t\t\t\t// rather than continue.\n\t\t\t\t\t//\n\t\t\t\t\t// Other errors (validation, connectivity) re-throw so\n\t\t\t\t\t// the import fails closed rather than silently shipping\n\t\t\t\t\t// translations that resolve to empty taxonomy queries.\n\t\t\t\t\tconst message = error instanceof Error ? error.message.toLowerCase() : \"\";\n\t\t\t\t\tconst isUniqueRace =\n\t\t\t\t\t\tmessage.includes(\"unique constraint failed\") || message.includes(\"duplicate key\");\n\t\t\t\t\tif (!isUniqueRace) throw error;\n\n\t\t\t\t\tconst winner = await repo.findBySlug(taxonomyName, slug, locale);\n\t\t\t\t\tif (!winner) {\n\t\t\t\t\t\t// UNIQUE conflict but no row visible? Shouldn't\n\t\t\t\t\t\t// happen unless the racing transaction rolled back;\n\t\t\t\t\t\t// fail loudly so the operator can investigate.\n\t\t\t\t\t\tthrow new WxrTaxonomyConflictError(\n\t\t\t\t\t\t\t`Cannot import: term \"${taxonomyName}/${slug}\" raced UNIQUE at locale \"${locale}\" but no row is visible afterwards. The concurrent transaction may have rolled back; retry the import.`,\n\t\t\t\t\t\t\t{ cause: error },\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t\tif (winner.translationGroup !== canonicalGroup) {\n\t\t\t\t\t\tthrow new WxrTaxonomyConflictError(\n\t\t\t\t\t\t\t`Cannot import: term \"${taxonomyName}/${slug}\" raced UNIQUE at locale \"${locale}\" with a different translation group. Reconcile the rows in the admin and retry.`,\n\t\t\t\t\t\t\t{ cause: error },\n\t\t\t\t\t\t);\n\t\t\t\t\t}\n\t\t\t\t\tconsole.warn(\n\t\t\t\t\t\t`[WXR import] concurrent writer beat us to term \"${taxonomyName}/${slug}\" at locale \"${locale}\"; using existing row (same group).`,\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t}\n}\n"],"mappings":"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"}

package/dist/{wxr-taxonomies-CrMonejI.d.mts → wxr-taxonomies-Dy2i2ON3.d.mts}

@@ -31,4 +31,4 @@ interface TaxonomyImportPlan {
 }
 //#endregion
 export { TaxonomyImportPlan as t };
-//# sourceMappingURL=wxr-taxonomies-CrMonejI.d.mts.map
+//# sourceMappingURL=wxr-taxonomies-Dy2i2ON3.d.mts.map

package/dist/wxr-taxonomies-Dy2i2ON3.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wxr-taxonomies-Dy2i2ON3.d.mts","names":[],"sources":["../src/import/wxr-taxonomies.ts"],"mappings":";;;;;;UAkEiB,kBAAA;;EAEhB,YAAA,EAAc,MAAA;;EAEd,WAAA,EAAa,MAAA;;EAEb,iBAAA;;;;;EAKA,mBAAA,EAAqB,GAAA,SAAY,GAAA;;;;;;EAMjC,qBAAA,EAAuB,GAAA,SAAY,GAAA;;;;;;EAMnC,wBAAA,EAA0B,GAAA;AAAA"}

package/dist/{zod-generator-D0JKy94C.mjs → zod-generator--nlM0930.mjs}

@@ -1,5 +1,5 @@
-import { p as isStoragelessField } from "./types-BGmQ0uXs.mjs";
-import { n as isSafeUrlFieldValue } from "./url-Dn3IStq8.mjs";
+import { p as isStoragelessField } from "./types-C_asjp1J.mjs";
+import { n as isSafeUrlFieldValue } from "./url-DTfGDJhI.mjs";
 import { r as hashString } from "./hash-BJaeek87.mjs";
 import { z } from "zod";
 
@@ -86,6 +86,7 @@ function getBaseSchema(type, field) {
 				id: z.string(),
 				src: z.string().optional(),
 				alt: z.string().optional(),
+				caption: z.string().optional(),
 				width: z.number().optional(),
 				height: z.number().optional(),
 				filename: z.string().optional(),
@@ -349,7 +350,7 @@ function fieldTypeToTypeScript(field) {
 		}
 		case "portableText": return "PortableTextBlock[]";
 		case "image": {
-			const media = "{ id: string; src?: string; alt?: string; width?: number; height?: number; filename?: string; mimeType?: string; blurhash?: string; dominantColor?: string; focalX?: number; focalY?: number; provider?: string; previewUrl?: string; meta?: Record<string, unknown> }";
+			const media = "{ id: string; src?: string; alt?: string; caption?: string; width?: number; height?: number; filename?: string; mimeType?: string; blurhash?: string; dominantColor?: string; focalX?: number; focalY?: number; provider?: string; previewUrl?: string; meta?: Record<string, unknown> }";
 			return `${media.slice(0, -2)}; darkVariant?: ${media} }`;
 		}
 		case "file": return "{ id: string; url?: string; src?: string; filename?: string; mimeType?: string; size?: number; provider?: string; meta?: Record<string, unknown> }";
@@ -421,4 +422,4 @@ function uniqueInterfaceNames(collections) {
 
 //#endregion
 export { generateTypesFile as a, uniqueInterfaceNames as c, generateTypeScript as i, generateFieldSchema as n, generateZodSchema as o, generateSchemaHash as r, invalidateSchemaCache as s, generateBlockFieldSchema as t };
-//# sourceMappingURL=zod-generator-D0JKy94C.mjs.map
+//# sourceMappingURL=zod-generator--nlM0930.mjs.map

package/dist/zod-generator--nlM0930.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"zod-generator--nlM0930.mjs","names":[],"sources":["../src/schema/zod-generator.ts"],"sourcesContent":["import { z, type ZodType } from \"zod\";\n\nimport { hashString } from \"../utils/hash.js\";\nimport { isSafeUrlFieldValue } from \"../utils/url.js\";\nimport type { BlockFieldDefinition } from \"./block-types.js\";\nimport {\n\tisStoragelessField,\n\ttype CollectionWithFields,\n\ttype Field,\n\ttype FieldType,\n\ttype RepeaterSubField,\n} from \"./types.js\";\n\n/** Pattern to split on underscores, hyphens, and spaces for PascalCase conversion */\nconst PASCAL_CASE_SPLIT_PATTERN = /[_\\-\\s]+/;\n\n/**\n * Generate a Zod schema from a collection's field definitions\n *\n * This allows runtime validation of content based on dynamically\n * defined schemas stored in D1.\n */\nexport function generateZodSchema(\n\tcollection: CollectionWithFields,\n): z.ZodObject<Record<string, ZodType>> {\n\tconst shape: Record<string, ZodType> = {};\n\n\tfor (const field of collection.fields) {\n\t\tif (isStoragelessField(field)) continue;\n\t\tshape[field.slug] = generateFieldSchema(field);\n\t}\n\n\treturn z.object(shape);\n}\n\n/**\n * Generate Zod schema for a single field\n */\ntype RuntimeFieldDefinition = Pick<Field, \"type\" | \"validation\" | \"required\" | \"defaultValue\">;\n\nexport function generateFieldSchema(field: RuntimeFieldDefinition): ZodType {\n\tlet schema = getBaseSchema(field.type, field);\n\n\t// Apply validation rules\n\tif (field.validation) {\n\t\tschema = applyValidation(schema, field);\n\t}\n\n\t// Apply required/optional. Non-required fields use `.nullish()` rather\n\t// than `.optional()` because the underlying SQLite columns are nullable\n\t// (see `SchemaRegistry.addFieldColumn` -- non-required fields are added\n\t// without `NOT NULL`). The admin re-sends what it loaded from the\n\t// server on autosave, so any field that's actually `null` in the DB\n\t// must round-trip cleanly through the validator. `.optional()` only\n\t// accepts `undefined`; `.nullish()` accepts both `undefined` and\n\t// `null`. (#867 — autosave failures on seeded entries.)\n\tif (!field.required) {\n\t\tschema = schema.nullish();\n\t}\n\n\t// Apply default value\n\tif (field.defaultValue !== undefined) {\n\t\tschema = schema.default(field.defaultValue);\n\t}\n\n\treturn schema;\n}\n\nexport function generateBlockFieldSchema(field: BlockFieldDefinition): ZodType {\n\treturn generateFieldSchema({\n\t\ttype: field.type,\n\t\tvalidation: field.validation,\n\t\trequired: field.required ?? false,\n\t\tdefaultValue: field.defaultValue,\n\t});\n}\n\n/**\n * Get base Zod schema for a field type\n */\nfunction getBaseSchema(type: FieldType, field: Pick<Field, \"validation\">): ZodType {\n\tswitch (type) {\n\t\tcase \"url\":\n\t\t\t// The admin localizes `invalid_format` issues with `format: \"url\"`.\n\t\t\treturn z.string().check((ctx) => {\n\t\t\t\tif (isSafeUrlFieldValue(ctx.value)) return;\n\t\t\t\tctx.issues.push({\n\t\t\t\t\tcode: \"invalid_format\",\n\t\t\t\t\tformat: \"url\",\n\t\t\t\t\tinput: ctx.value,\n\t\t\t\t\tmessage: \"URL must use http, https, mailto, or tel, or be a site-relative path\",\n\t\t\t\t});\n\t\t\t});\n\n\t\tcase \"string\":\n\t\tcase \"text\":\n\t\tcase \"slug\":\n\t\t\treturn z.string();\n\n\t\tcase \"number\":\n\t\t\treturn z.number();\n\n\t\tcase \"integer\":\n\t\t\treturn z.number().int();\n\n\t\tcase \"boolean\":\n\t\t\t// Boolean fields map to `INTEGER` columns (`FIELD_TYPE_TO_COLUMN`\n\t\t\t// in `schema/types.ts`) and `serializeValue` in\n\t\t\t// `database/repositories/content.ts` writes booleans as 0/1.\n\t\t\t// `deserializeValue` never converts them back, so reads return\n\t\t\t// numbers. Coerce the stored 0/1 shape here so a GET → POST\n\t\t\t// round-trip on a boolean field passes validation. Other inputs\n\t\t\t// (strings, other numbers) fall through to `z.boolean()` and\n\t\t\t// produce its standard rejection.\n\t\t\treturn z.preprocess((v) => (v === 0 || v === 1 ? Boolean(v) : v), z.boolean());\n\n\t\tcase \"datetime\":\n\t\t\treturn z.iso.datetime({ offset: true }).or(z.iso.datetime({ offset: true, precision: -1 }));\n\n\t\tcase \"select\": {\n\t\t\tconst options = field.validation?.options;\n\t\t\tif (options && options.length > 0) {\n\t\t\t\tconst [first, ...rest] = options;\n\t\t\t\treturn z.enum([first, ...rest]);\n\t\t\t}\n\t\t\treturn z.string();\n\t\t}\n\n\t\tcase \"multiSelect\": {\n\t\t\tconst multiOptions = field.validation?.options;\n\t\t\tif (multiOptions && multiOptions.length > 0) {\n\t\t\t\tconst [first, ...rest] = multiOptions;\n\t\t\t\treturn z.array(z.enum([first, ...rest]));\n\t\t\t}\n\t\t\treturn z.array(z.string());\n\t\t}\n\n\t\tcase \"repeater\":\n\t\t\treturn z.array(generateRepeaterRowSchema(field.validation?.subFields ?? []));\n\n\t\tcase \"blocks\":\n\t\t\treturn z.array(z.unknown());\n\n\t\tcase \"portableText\":\n\t\t\t// Portable Text is an array of blocks. We require `_type` because\n\t\t\t// renderers dispatch on it, but `_key` is intentionally optional:\n\t\t\t// it's a UI-layer concern that the editor regenerates on every\n\t\t\t// change (see `PortableTextEditor`), and the rest of this schema\n\t\t\t// uses `.loose()` for everything below the top level. Making\n\t\t\t// `_key` strictly required here was an accidentally tight invariant\n\t\t\t// that rejected any seed/import data not authored against the\n\t\t\t// editor (#867 — autosave failures on seeded template content).\n\t\t\treturn z.array(\n\t\t\t\tz\n\t\t\t\t\t.object({\n\t\t\t\t\t\t_type: z.string(),\n\t\t\t\t\t\t_key: z.string().optional(),\n\t\t\t\t\t})\n\t\t\t\t\t.loose(),\n\t\t\t);\n\n\t\tcase \"image\": {\n\t\t\tconst mediaSchema = z.object({\n\t\t\t\tid: z.string(),\n\t\t\t\tsrc: z.string().optional(),\n\t\t\t\talt: z.string().optional(),\n\t\t\t\tcaption: z.string().optional(),\n\t\t\t\twidth: z.number().optional(),\n\t\t\t\theight: z.number().optional(),\n\t\t\t\tfilename: z.string().optional(),\n\t\t\t\tmimeType: z.string().optional(),\n\t\t\t\tblurhash: z.string().optional(),\n\t\t\t\tdominantColor: z.string().optional(),\n\t\t\t\t/** Focal point as 0..1 fractions of width and height */\n\t\t\t\tfocalX: z.number().optional(),\n\t\t\t\tfocalY: z.number().optional(),\n\t\t\t\t/** Provider ID (e.g. \"local\", \"cloudflare-images\") */\n\t\t\t\tprovider: z.string().optional(),\n\t\t\t\t/** Admin-side preview URL for external providers (not persisted by plugins) */\n\t\t\t\tpreviewUrl: z.string().optional(),\n\t\t\t\t/** Provider-specific metadata; for local media this carries storageKey */\n\t\t\t\tmeta: z.record(z.string(), z.unknown()).optional(),\n\t\t\t});\n\t\t\treturn mediaSchema.extend({\n\t\t\t\t/** Counterpart shown when the page renders in a dark color scheme */\n\t\t\t\tdarkVariant: mediaSchema.optional(),\n\t\t\t});\n\t\t}\n\n\t\tcase \"file\":\n\t\t\treturn z.object({\n\t\t\t\tid: z.string(),\n\t\t\t\turl: z.string().optional(),\n\t\t\t\tsrc: z.string().optional(),\n\t\t\t\tfilename: z.string().optional(),\n\t\t\t\tmimeType: z.string().optional(),\n\t\t\t\tsize: z.number().optional(),\n\t\t\t\t/** Provider ID (e.g. \"local\", \"s3\") */\n\t\t\t\tprovider: z.string().optional(),\n\t\t\t\t/** Provider-specific metadata; for local media this carries storageKey */\n\t\t\t\tmeta: z.record(z.string(), z.unknown()).optional(),\n\t\t\t});\n\n\t\tcase \"reference\":\n\t\t\treturn z.string(); // Reference ID\n\n\t\tcase \"json\":\n\t\t\treturn z.unknown();\n\n\t\tdefault:\n\t\t\treturn z.unknown();\n\t}\n}\n\nfunction generateRepeaterRowSchema(\n\tsubFields: readonly RepeaterSubField[],\n): z.ZodObject<Record<string, ZodType>> {\n\tconst shape: Record<string, ZodType> = {};\n\n\tfor (const subField of subFields) {\n\t\tlet schema = getBaseSchema(subField.type, {\n\t\t\tvalidation: subField.options ? { options: subField.options } : undefined,\n\t\t});\n\n\t\tif (subField.required && schema instanceof z.ZodString) {\n\t\t\tschema = schema.min(1, \"required (empty value not allowed)\");\n\t\t}\n\t\tif (!subField.required) {\n\t\t\tschema = schema.nullish();\n\t\t}\n\n\t\tshape[subField.slug] = schema;\n\t}\n\n\treturn z.object(shape).loose();\n}\n\n/**\n * Apply validation rules to a schema\n */\nfunction applyValidation(\n\tschema: ZodType,\n\tfield: Pick<RuntimeFieldDefinition, \"type\" | \"validation\">,\n): ZodType {\n\tconst validation = field.validation;\n\tif (!validation) return schema;\n\n\t// String validations\n\tif (schema instanceof z.ZodString) {\n\t\tlet strSchema = schema;\n\t\tif (validation.minLength !== undefined) {\n\t\t\tstrSchema = strSchema.min(validation.minLength);\n\t\t}\n\t\tif (validation.maxLength !== undefined) {\n\t\t\tstrSchema = strSchema.max(validation.maxLength);\n\t\t}\n\t\tif (validation.pattern) {\n\t\t\tstrSchema = strSchema.regex(new RegExp(validation.pattern));\n\t\t}\n\t\treturn strSchema;\n\t}\n\n\t// Number validations\n\tif (schema instanceof z.ZodNumber) {\n\t\tlet numSchema = schema;\n\t\tif (validation.min !== undefined) {\n\t\t\tnumSchema = numSchema.min(validation.min);\n\t\t}\n\t\tif (validation.max !== undefined) {\n\t\t\tnumSchema = numSchema.max(validation.max);\n\t\t}\n\t\treturn numSchema;\n\t}\n\n\tif ((field.type === \"repeater\" || field.type === \"blocks\") && schema instanceof z.ZodArray) {\n\t\tlet arraySchema = schema;\n\t\tif (validation.minItems !== undefined) {\n\t\t\tarraySchema = arraySchema.min(validation.minItems);\n\t\t}\n\t\tif (validation.maxItems !== undefined) {\n\t\t\tarraySchema = arraySchema.max(validation.maxItems);\n\t\t}\n\t\treturn arraySchema;\n\t}\n\n\treturn schema;\n}\n\n/**\n * Schema cache to avoid regenerating schemas on every request\n */\nconst schemaCache = new Map<string, { schema: z.ZodObject<any>; version: string }>();\n\n/**\n * Get or generate a cached schema for a collection\n */\nexport function getCachedSchema(\n\tcollection: CollectionWithFields,\n\tversion?: string,\n): z.ZodObject<any> {\n\tconst cacheKey = collection.slug;\n\tconst cached = schemaCache.get(cacheKey);\n\n\t// If version matches, return cached schema\n\tif (cached && (!version || cached.version === version)) {\n\t\treturn cached.schema;\n\t}\n\n\t// Generate new schema\n\tconst schema = generateZodSchema(collection);\n\n\t// Cache it\n\tschemaCache.set(cacheKey, {\n\t\tschema,\n\t\tversion: version || collection.updatedAt,\n\t});\n\n\treturn schema;\n}\n\n/**\n * Invalidate cached schema for a collection\n */\nexport function invalidateSchemaCache(slug: string): void {\n\tschemaCache.delete(slug);\n}\n\n/**\n * Clear all cached schemas\n */\nexport function clearSchemaCache(): void {\n\tschemaCache.clear();\n}\n\n/**\n * Validate data against a collection's schema\n */\nexport function validateContent(\n\tcollection: CollectionWithFields,\n\tdata: unknown,\n): { success: true; data: unknown } | { success: false; errors: z.ZodError } {\n\tconst schema = getCachedSchema(collection);\n\n\tconst result = schema.safeParse(data);\n\n\tif (result.success) {\n\t\treturn { success: true, data: result.data };\n\t}\n\n\treturn { success: false, errors: result.error };\n}\n\n/**\n * Generate TypeScript interface from field definitions\n * Used by CLI `emdash types` to generate types\n */\nexport function generateTypeScript(\n\tcollection: CollectionWithFields,\n\tinterfaceName: string = getInterfaceName(collection),\n\tblockFieldTypes: ReadonlyMap<string, string> = new Map(),\n): string {\n\tconst lines: string[] = [];\n\n\tlines.push(`export interface ${interfaceName} {`);\n\tlines.push(`  id: string;`);\n\tlines.push(`  slug: string | null;`);\n\tlines.push(`  status: string;`);\n\n\tfor (const field of collection.fields) {\n\t\t// A storage-less field holds no value in `data`; a reference field bound to\n\t\t// a relation resolves through `references` instead. One that predates\n\t\t// relations still owns its column, so it stays an entry id string.\n\t\tif (isStoragelessField(field)) continue;\n\t\tconst tsType = blockFieldTypes.get(field.slug) ?? fieldTypeToTypeScript(field);\n\t\tconst optional = field.required ? \"\" : \"?\";\n\t\tlines.push(`  ${field.slug}${optional}: ${tsType};`);\n\t}\n\n\tlines.push(`  createdAt: Date;`);\n\tlines.push(`  updatedAt: Date;`);\n\tlines.push(`  publishedAt: Date | null;`);\n\t// Bylines are eagerly loaded by getEmDashCollection/getEmDashEntry\n\tlines.push(`  byline?: BylineSummary | null;`);\n\tlines.push(`  bylines?: ContentBylineCredit[];`);\n\t// Taxonomy terms are eagerly loaded by getEmDashCollection/getEmDashEntry,\n\t// keyed by taxonomy name (e.g. data.terms?.tag)\n\tlines.push(`  terms?: Record<string, TaxonomyTerm[]>;`);\n\tlines.push(`}`);\n\n\treturn lines.join(\"\\n\");\n}\n\nfunction generateBlockTypeDeclarations(\n\tcollection: CollectionWithFields,\n\tinterfaceName: string,\n): { lines: string[]; fieldTypes: Map<string, string> } {\n\tconst lines: string[] = [];\n\tconst fieldTypes = new Map<string, string>();\n\tfor (const field of collection.fields) {\n\t\tif (field.type !== \"blocks\") continue;\n\t\tconst fieldName = `${interfaceName}${pascalCase(field.slug)}`;\n\t\tconst typeNames: string[] = [];\n\t\tfor (const blockType of field.blockTypes ?? []) {\n\t\t\tconst typeName = `${fieldName}${pascalCase(blockType.slug)}`;\n\t\t\tconst versionNames: string[] = [];\n\t\t\tfor (const version of blockType.versions) {\n\t\t\t\tconst versionName = `${typeName}V${version.version}Block`;\n\t\t\t\tversionNames.push(versionName);\n\t\t\t\tlines.push(`export interface ${versionName} {`);\n\t\t\t\tlines.push(`  _type: ${JSON.stringify(blockType.slug)};`);\n\t\t\t\tlines.push(`  _version: ${version.version};`);\n\t\t\t\tlines.push(`  _key: string;`);\n\t\t\t\tfor (const nestedField of version.fields) {\n\t\t\t\t\tconst nestedType = fieldTypeToTypeScript({\n\t\t\t\t\t\ttype: nestedField.type,\n\t\t\t\t\t\tvalidation: nestedField.validation,\n\t\t\t\t\t});\n\t\t\t\t\tconst name = JSON.stringify(nestedField.slug);\n\t\t\t\t\tlines.push(\n\t\t\t\t\t\tnestedField.required\n\t\t\t\t\t\t\t? `  ${name}: ${nestedType};`\n\t\t\t\t\t\t\t: `  ${name}?: ${nestedType} | null;`,\n\t\t\t\t\t);\n\t\t\t\t}\n\t\t\t\tlines.push(`}`);\n\t\t\t\tlines.push(``);\n\t\t\t}\n\t\t\tconst unionName = `${typeName}Block`;\n\t\t\tlines.push(`export type ${unionName} = ${versionNames.join(\" | \") || \"never\"};`);\n\t\t\tlines.push(``);\n\t\t\ttypeNames.push(unionName);\n\t\t}\n\t\tconst fieldUnion = `${fieldName}Block`;\n\t\tlines.push(`export type ${fieldUnion} = ${typeNames.join(\" | \") || \"never\"};`);\n\t\tlines.push(``);\n\t\tfieldTypes.set(field.slug, `${fieldUnion}[]`);\n\t}\n\treturn { lines, fieldTypes };\n}\n\n/**\n * Generate a complete types file with module augmentation\n * This produces emdash-env.d.ts content that provides typed query functions\n */\nexport function generateTypesFile(collections: CollectionWithFields[]): string {\n\tconst lines: string[] = [];\n\n\t// Header\n\tlines.push(`// Generated by EmDash on dev server start`);\n\tlines.push(`// Do not edit manually`);\n\tlines.push(``);\n\tlines.push(`/// <reference types=\"emdash/locals\" />`);\n\tlines.push(``);\n\n\t// Check if we need PortableTextBlock import\n\tconst needsPortableText = collections.some((collection) =>\n\t\tcollection.fields.some(\n\t\t\t(field) =>\n\t\t\t\tfield.type === \"portableText\" ||\n\t\t\t\tfield.blockTypes?.some((blockType) =>\n\t\t\t\t\tblockType.versions.some((version) =>\n\t\t\t\t\t\tversion.fields.some((nestedField) => nestedField.type === \"portableText\"),\n\t\t\t\t\t),\n\t\t\t\t),\n\t\t),\n\t);\n\n\tconst withReferences = collections.filter((c) => c.fields.some(isStoragelessField));\n\n\t// Build imports - BylineSummary, ContentBylineCredit and TaxonomyTerm are always needed\n\t// for the hydrated bylines/terms fields\n\tconst imports = [\"BylineSummary\", \"ContentBylineCredit\", \"TaxonomyTerm\"];\n\tif (needsPortableText) {\n\t\timports.push(\"PortableTextBlock\");\n\t}\n\tif (withReferences.length > 0) {\n\t\timports.push(\"ReferencePage\");\n\t}\n\tlines.push(`import type { ${imports.join(\", \")} } from \"emdash\";`);\n\tlines.push(``);\n\n\t// Singularizing the slug can map two distinct slugs to the same name\n\t// (e.g. `book` and `books` both -> `Book`), so resolve collisions up front\n\t// to keep every interface identifier unique within the file.\n\tconst interfaceNames = uniqueInterfaceNames(collections);\n\t// `{Collection}References`, built on an already-unique name. No slug can\n\t// produce a data interface name ending in `References` -- `singularize`\n\t// always strips the trailing `s` of a final `references` segment -- so the\n\t// suffix cannot collide with one.\n\tconst referenceInterfaces: [CollectionWithFields, string][] = withReferences.map((c) => [\n\t\tc,\n\t\t`${interfaceNames.get(c.slug)}References`,\n\t]);\n\n\t// Generate individual interfaces\n\tfor (const collection of collections) {\n\t\tconst interfaceName = interfaceNames.get(collection.slug) ?? getInterfaceName(collection);\n\t\tconst blocks = generateBlockTypeDeclarations(collection, interfaceName);\n\t\tlines.push(...blocks.lines);\n\t\tlines.push(generateTypeScript(collection, interfaceName, blocks.fieldTypes));\n\t\tlines.push(``);\n\t}\n\n\tfor (const [collection, name] of referenceInterfaces) {\n\t\tlines.push(generateReferencesTypeScript(collection, name, interfaceNames));\n\t\tlines.push(``);\n\t}\n\n\t// Generate the Collections interface for module augmentation\n\tlines.push(`declare module \"emdash\" {`);\n\tlines.push(`  interface EmDashCollections {`);\n\tfor (const collection of collections) {\n\t\tlines.push(`    ${collection.slug}: ${interfaceNames.get(collection.slug)};`);\n\t}\n\tlines.push(`  }`);\n\tif (referenceInterfaces.length > 0) {\n\t\tlines.push(`  interface EmDashCollectionReferences {`);\n\t\tfor (const [collection, name] of referenceInterfaces) {\n\t\t\tlines.push(`    ${collection.slug}: ${name};`);\n\t\t}\n\t\tlines.push(`  }`);\n\t}\n\tlines.push(`}`);\n\n\treturn lines.join(\"\\n\");\n}\n\n/**\n * Generate the references interface for one collection: a page per reference\n * field bound to a relation, keyed by field slug, which is how\n * `getEmDashEntry({ references })` both asks for and returns them.\n *\n * A field is always present on the interface, not optional -- a selection that\n * names it always yields a page, empty when nothing is linked. The narrowing in\n * `getEmDashEntry` picks out the fields the caller asked for.\n */\nfunction generateReferencesTypeScript(\n\tcollection: CollectionWithFields,\n\tinterfaceName: string,\n\tinterfaceNames: Map<string, string>,\n): string {\n\tconst lines: string[] = [`export interface ${interfaceName} {`];\n\n\tfor (const field of collection.fields) {\n\t\tif (!isStoragelessField(field)) continue;\n\t\t// A target outside this file (dropped collection, or a relation whose\n\t\t// other end has not been created) leaves the page's data un-narrowed\n\t\t// rather than referring to an identifier that does not exist.\n\t\tconst target = field.validation?.targetCollection;\n\t\tconst targetName = target ? interfaceNames.get(target) : undefined;\n\t\tlines.push(`  ${field.slug}: ReferencePage${targetName ? `<${targetName}>` : \"\"};`);\n\t}\n\n\tlines.push(`}`);\n\treturn lines.join(\"\\n\");\n}\n\n/**\n * Generate schema hash for cache invalidation\n */\nexport async function generateSchemaHash(collections: CollectionWithFields[]): Promise<string> {\n\tconst str = JSON.stringify(\n\t\tcollections.map((c) => ({\n\t\t\tslug: c.slug,\n\t\t\tfields: c.fields.map((f) => ({\n\t\t\t\tslug: f.slug,\n\t\t\t\ttype: f.type,\n\t\t\t\trequired: f.required,\n\t\t\t\tvalidation: f.validation,\n\t\t\t\tblockTypeFingerprint: f.blockTypeFingerprint,\n\t\t\t})),\n\t\t})),\n\t);\n\treturn hashString(str);\n}\n\n/**\n * Map field type to TypeScript type\n */\nfunction fieldTypeToTypeScript(field: {\n\ttype: Field[\"type\"];\n\tvalidation?: Field[\"validation\"];\n}): string {\n\tswitch (field.type) {\n\t\tcase \"string\":\n\t\tcase \"text\":\n\t\tcase \"slug\":\n\t\tcase \"url\":\n\t\tcase \"datetime\":\n\t\t\treturn \"string\";\n\n\t\tcase \"number\":\n\t\tcase \"integer\":\n\t\t\treturn \"number\";\n\n\t\tcase \"boolean\":\n\t\t\treturn \"boolean\";\n\n\t\tcase \"select\":\n\t\t\tconst options = field.validation?.options;\n\t\t\tif (options && options.length > 0) {\n\t\t\t\treturn options.map((o) => `\"${o}\"`).join(\" | \");\n\t\t\t}\n\t\t\treturn \"string\";\n\n\t\tcase \"multiSelect\":\n\t\t\tconst multiOptions = field.validation?.options;\n\t\t\tif (multiOptions && multiOptions.length > 0) {\n\t\t\t\treturn `(${multiOptions.map((o) => `\"${o}\"`).join(\" | \")})[]`;\n\t\t\t}\n\t\t\treturn \"string[]\";\n\n\t\tcase \"repeater\": {\n\t\t\tconst subFields = field.validation?.subFields;\n\t\t\t// `validation` is unvalidated JSON on the seed and registry paths.\n\t\t\tif (!Array.isArray(subFields) || subFields.length === 0) return \"unknown\";\n\n\t\t\t// A duplicated slug keeps its first position and last declaration, as\n\t\t\t// `generateRepeaterRowSchema`'s `shape[subField.slug]` does.\n\t\t\tconst members = new Map<string, string>();\n\n\t\t\tfor (const subField of subFields) {\n\t\t\t\tconst type = fieldTypeToTypeScript({\n\t\t\t\t\ttype: subField.type,\n\t\t\t\t\tvalidation: subField.options ? { options: subField.options } : undefined,\n\t\t\t\t});\n\t\t\t\t// A sub-field slug is not guaranteed to be a valid identifier, so it is\n\t\t\t\t// quoted rather than emitted bare.\n\t\t\t\tconst name = JSON.stringify(subField.slug);\n\t\t\t\t// A sub-field that is not required may be null at runtime.\n\t\t\t\tmembers.set(\n\t\t\t\t\tsubField.slug,\n\t\t\t\t\tsubField.required ? `${name}: ${type}` : `${name}?: ${type} | null`,\n\t\t\t\t);\n\t\t\t}\n\n\t\t\treturn `{ ${[...members.values()].join(\"; \")} }[]`;\n\t\t}\n\n\t\tcase \"portableText\":\n\t\t\treturn \"PortableTextBlock[]\";\n\n\t\tcase \"image\": {\n\t\t\tconst media =\n\t\t\t\t\"{ id: string; src?: string; alt?: string; caption?: string; width?: number; height?: number; filename?: string; mimeType?: string; blurhash?: string; dominantColor?: string; focalX?: number; focalY?: number; provider?: string; previewUrl?: string; meta?: Record<string, unknown> }\";\n\t\t\treturn `${media.slice(0, -2)}; darkVariant?: ${media} }`;\n\t\t}\n\n\t\tcase \"file\":\n\t\t\treturn \"{ id: string; url?: string; src?: string; filename?: string; mimeType?: string; size?: number; provider?: string; meta?: Record<string, unknown> }\";\n\n\t\tcase \"reference\":\n\t\t\t// Could be enhanced to include the referenced collection type\n\t\t\treturn \"string\";\n\n\t\tcase \"json\":\n\t\t\treturn \"unknown\";\n\n\t\tcase \"blocks\":\n\t\t\treturn \"unknown[]\";\n\n\t\tdefault:\n\t\t\treturn \"unknown\";\n\t}\n}\n\n/**\n * Convert string to PascalCase (handles slugs, spaces, etc.)\n */\nfunction pascalCase(str: string): string {\n\treturn str\n\t\t.split(PASCAL_CASE_SPLIT_PATTERN)\n\t\t.filter(Boolean)\n\t\t.map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())\n\t\t.join(\"\");\n}\n\n/**\n * Naive singularization for slug-derived interface names. Handles the common\n * English plural endings; intentionally simple, not a full inflector.\n */\nfunction singularize(str: string): string {\n\tif (str.endsWith(\"ies\")) {\n\t\treturn str.slice(0, -3) + \"y\";\n\t}\n\tif (\n\t\tstr.endsWith(\"es\") &&\n\t\t(str.endsWith(\"sses\") || str.endsWith(\"xes\") || str.endsWith(\"ches\") || str.endsWith(\"shes\"))\n\t) {\n\t\treturn str.slice(0, -2);\n\t}\n\tif (str.endsWith(\"s\") && !str.endsWith(\"ss\")) {\n\t\treturn str.slice(0, -1);\n\t}\n\treturn str;\n}\n\n/**\n * Get the interface name for a collection.\n *\n * Derived from the slug, not the human label. Slugs are constrained to\n * `/^[a-z][a-z0-9_]*$/`, so PascalCasing one always yields a valid TS\n * identifier; labels are arbitrary and user-controlled (punctuation, spaces,\n * duplicates across collections), which produced syntactically invalid or\n * duplicate interface names. The slug is singularized first because the\n * interface describes a single entry, not the collection (`posts` -> `Post`).\n *\n * Singularization can map two distinct slugs onto the same name, so callers\n * generating more than one interface must dedupe -- see `uniqueInterfaceNames`.\n */\nfunction getInterfaceName(collection: CollectionWithFields): string {\n\treturn pascalCase(singularize(collection.slug));\n}\n\n/**\n * Resolve interface names for a set of collections, guaranteeing each is\n * unique within the file. Collisions (from singularization or PascalCasing\n * collapsing distinct slugs) get a numeric suffix in collection order, so the\n * generated `.d.ts` never declares two interfaces with the same identifier.\n *\n * The suffix is chosen against the set of names already emitted, not a\n * per-base counter, so a generated name can't collide with another slug's\n * base name (e.g. slugs `book`, `books`, `book2`: `books` -> `Book2` would\n * clash with `book2`, so it advances to `Book3`).\n */\nexport function uniqueInterfaceNames(collections: CollectionWithFields[]): Map<string, string> {\n\tconst used = new Set<string>();\n\tconst names = new Map<string, string>();\n\tfor (const collection of collections) {\n\t\tconst base = getInterfaceName(collection);\n\t\tlet name = base;\n\t\tlet suffix = 2;\n\t\twhile (used.has(name)) {\n\t\t\tname = `${base}${suffix}`;\n\t\t\tsuffix++;\n\t\t}\n\t\tused.add(name);\n\t\tnames.set(collection.slug, name);\n\t}\n\treturn names;\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "emdash",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Astro-native CMS with WordPress migration support",
   "type": "module",
   "main": "dist/index.mjs",
@@ -298,10 +298,10 @@
     "upng-js": "^2.1.0",
     "zod": "4.5.4",
     "@atcute/client": "^5.0.0",
-    "@emdash-cms/admin": "1.3.0",
-    "@emdash-cms/auth": "1.3.0",
-    "@emdash-cms/gutenberg-to-portable-text": "1.3.0",
-    "@emdash-cms/blocks": "1.3.0",
+    "@emdash-cms/admin": "1.4.0",
+    "@emdash-cms/auth": "1.4.0",
+    "@emdash-cms/blocks": "1.4.0",
+    "@emdash-cms/gutenberg-to-portable-text": "1.4.0",
     "@emdash-cms/plugin-types": "0.6.0",
     "@emdash-cms/registry-client": "0.7.1",
     "@emdash-cms/registry-lexicons": "0.7.0",

package/src/api/handlers/bulk-tag.ts

@@ -6,7 +6,7 @@ import { ContentRepository } from "../../database/repositories/content.js";
 import { TaxonomyRepository } from "../../database/repositories/taxonomy.js";
 import type { ContentItem } from "../../database/repositories/types.js";
 import type { Database } from "../../database/types.js";
-import { getI18nConfig } from "../../i18n/config.js";
+import { getI18nConfig, resolveConfiguredLocale } from "../../i18n/config.js";
 import { localizePath, resolveLocalizedContentRoutePath } from "../../i18n/resolve.js";
 import { SchemaRegistry } from "../../schema/registry.js";
 import { compileUrlPattern } from "../../schema/url-pattern.js";
@@ -155,7 +155,9 @@ export async function handleBulkTag(
 		for (const [key, group] of slugNeeds) {
 			bySlug.set(
 				key,
-				await content.findManyBySlugsInLocale(group.collection, [...group.slugs], group.locale),
+				await content.findManyBySlugsInLocale(group.collection, [...group.slugs], group.locale, {
+					publishedOnly: true,
+				}),
 			);
 		}
 		const prepared: Array<{
@@ -175,7 +177,13 @@ export async function handleBulkTag(
 							: bySlug
 									.get(`${candidate.collection.slug}:${candidate.locale}`)
 									?.get(candidate.identifier);
-					if (!item || item.locale !== candidate.locale || item.status !== "published") continue;
+					if (
+						!item ||
+						item.locale === null ||
+						resolveConfiguredLocale(item.locale) !== resolveConfiguredLocale(candidate.locale) ||
+						item.status !== "published"
+					)
+						continue;
 					const canonical = await resolveLocalizedContentRoutePath({
 						pattern: candidate.collection.urlPattern ?? `/${candidate.collection.slug}/{slug}`,
 						collection: candidate.collection.slug,

package/src/api/handlers/bylines.ts

@@ -31,7 +31,7 @@ function bylineFixedFieldsMatch(
 		norm(existing.websiteUrl) === norm(input.websiteUrl) &&
 		norm(existing.userId) === norm(input.userId) &&
 		existing.isGuest === (input.isGuest ?? false) &&
-		existing.locale === effectiveLocale
+		resolveConfiguredLocale(existing.locale) === resolveConfiguredLocale(effectiveLocale)
 	);
 }
 
@@ -176,7 +176,11 @@ export async function handleBylineCreate(
 		// net; this is the friendly error.
 		if (sourceGroup) {
 			const siblings = await repo.findByTranslationGroup(sourceGroup);
-			if (siblings.some((b) => b.locale === effectiveLocale)) {
+			if (
+				siblings.some(
+					(b) => resolveConfiguredLocale(b.locale) === resolveConfiguredLocale(effectiveLocale),
+				)
+			) {
 				return {
 					success: false,
 					error: {

package/src/api/handlers/content.ts

@@ -26,6 +26,7 @@ import { TaxonomyRepository } from "../../database/repositories/taxonomy.js";
 import {
 	ContentCollectionNotFoundError,
 	ContentMutationConflictError,
+	ContentSlugConflictError,
 	EmDashValidationError,
 	ScheduledNotDueError,
 	InvalidCursorError,
@@ -43,6 +44,7 @@ import { withTransaction } from "../../database/transaction.js";
 import type { Database } from "../../database/types.js";
 import { validateIdentifier } from "../../database/validate.js";
 import { getI18nConfig, isI18nEnabled, resolveConfiguredLocale } from "../../i18n/config.js";
+import { interpolateUrlPattern } from "../../i18n/resolve.js";
 import {
 	scheduledPolicyRejectionKey,
 	type ScheduledPolicyRejection,
@@ -213,10 +215,13 @@ function decodeRevisionPrecondition(
 }
 
 /**
- * Extract a slug source (title or name) from content data.
+ * Extract a slug source from content data: the collection's `titleField` when
+ * it sets one and the entry has a value for it, otherwise `title`, then `name`.
  * Returns null if no suitable string field is found.
  */
-function getSlugSource(data: Record<string, unknown>): string | null {
+function getSlugSource(data: Record<string, unknown>, titleField?: string | null): string | null {
+	const configured = titleField ? data[titleField] : undefined;
+	if (typeof configured === "string" && configured.length > 0) return configured;
 	if (typeof data.title === "string" && data.title.length > 0) return data.title;
 	if (typeof data.name === "string" && data.name.length > 0) return data.name;
 	return null;
@@ -269,6 +274,20 @@ async function getCollectionPublishConfig(
 	});
 }
 
+async function getCollectionTitleField(
+	db: Kysely<Database>,
+	collection: string,
+): Promise<string | null> {
+	return requestCached(`collectionTitleField:${collection}`, async () => {
+		const row = await db
+			.selectFrom("_emdash_collections")
+			.select("title_field")
+			.where("slug", "=", collection)
+			.executeTakeFirst();
+		return row?.title_field ?? null;
+	});
+}
+
 function requireRoutablePublishSlug(routable: boolean, slug: string | null | undefined): void {
 	if (routable && !slug?.trim()) {
 		throw new EmDashValidationError("Cannot publish routable content without a slug");
@@ -634,7 +653,8 @@ export interface TrashedContentItem {
  * the `title`/`name` display fields when the collection actually defines them,
  * mirroring the admin's item-title resolution (titleField -> title -> name ->
  * slug), and includes every field explicitly marked searchable. Returning only
- * schema-backed columns avoids "no such column" errors.
+ * fields that have a column (a reference field bound to a relation has none)
+ * avoids "no such column" errors.
  */
 async function resolveSearchColumns(db: Kysely<Database>, collection: string): Promise<string[]> {
 	const row = await db
@@ -644,12 +664,13 @@ async function resolveSearchColumns(db: Kysely<Database>, collection: string): P
 		.executeTakeFirst();
 	if (!row) return ["slug"];
 
-	const fields = await db
+	const fieldRows = await db
 		.selectFrom("_emdash_fields")
-		.select(["slug", "searchable"])
+		.select(["slug", "searchable", "type", "validation"])
 		.where("collection_id", "=", row.id)
 		.orderBy("sort_order", "asc")
 		.execute();
+	const fields = fieldRows.filter((f) => !isStoragelessFieldRow(f));
 	const columns = new Set(["slug"]);
 	const fieldSlugs = new Set(fields.map((f) => f.slug));
 
@@ -811,6 +832,45 @@ async function createSlugChangeRedirect(
 	return redirect !== null;
 }
 
+/**
+ * Remove any auto-redirect whose source is the URL a newly published entry
+ * now occupies. This prevents an earlier slug-change redirect from shadowing
+ * the new live page, because the redirect middleware runs before routing.
+ */
+async function removeShadowingAutoRedirect(
+	db: Kysely<Database>,
+	collection: string,
+	slug: string | null | undefined,
+	contentId: string,
+	publishedAt: string | null | undefined,
+): Promise<boolean> {
+	if (!slug) return false;
+	validateIdentifier(collection, "collection slug");
+
+	const collectionRow = await db
+		.selectFrom("_emdash_collections")
+		.select("url_pattern")
+		.where("slug", "=", collection)
+		.executeTakeFirst();
+
+	const url = interpolateUrlPattern({
+		pattern: collectionRow?.url_pattern ?? null,
+		collection,
+		slug,
+		id: contentId,
+		date: publishedAt,
+	});
+
+	const result = await db
+		.deleteFrom("_emdash_redirects")
+		.where("source", "=", url)
+		.where("auto", "=", 1)
+		.executeTakeFirst();
+	const removed = BigInt(result.numDeletedRows ?? 0n) > 0n;
+	if (removed) invalidateRedirectCache();
+	return removed;
+}
+
 /** Whether a row other than `contentId` still holds `slug` in this collection. */
 async function slugStillTaken(
 	db: Kysely<Database>,
@@ -1250,6 +1310,7 @@ export async function handleContentCreate(
 		if (!requiredReferences.success) return requiredReferences;
 
 		// Wrap content + SEO writes in a transaction for atomicity
+		let redirectChanged = false;
 		const item = await withTransaction(db, async (trx) => {
 			const repo = new ContentRepository(trx);
 			const bylineRepo = new BylineRepository(trx);
@@ -1306,7 +1367,7 @@ export async function handleContentCreate(
 
 			let slug: string | null | undefined = body.slug;
 			if (!slug) {
-				const slugSource = getSlugSource(body.data);
+				const slugSource = getSlugSource(body.data, await getCollectionTitleField(trx, collection));
 				if (slugSource) {
 					slug = await repo.generateUniqueSlug(collection, slugSource, effectiveLocale);
 				}
@@ -1390,8 +1451,19 @@ export async function handleContentCreate(
 				}
 			}
 
+			if (created.status === "published") {
+				redirectChanged = await removeShadowingAutoRedirect(
+					trx,
+					collection,
+					created.slug,
+					created.id,
+					created.publishedAt,
+				);
+			}
+
 			return created;
 		});
+		if (redirectChanged) after(() => publishRedirectChanges(db));
 
 		return {
 			success: true,
@@ -1415,6 +1487,18 @@ export async function handleContentCreate(
 				},
 			};
 		}
+		if (error instanceof ContentMutationConflictError) {
+			return { success: false, error: { code: "CONFLICT", message: error.message } };
+		}
+		if (error instanceof ContentSlugConflictError) {
+			return {
+				success: false,
+				error: {
+					code: "SLUG_CONFLICT",
+					message: `Slug '${body.slug ?? "(auto-generated)"}' already exists in collection '${collection}'`,
+				},
+			};
+		}
 		if (error instanceof EmDashValidationError) {
 			if (error.message === "Translation source content not found") {
 				return {
@@ -1539,10 +1623,11 @@ export async function handleContentUpdate(
 			}
 		}
 
-		// Wrap content + SEO writes in a transaction for atomicity.
-		// The _rev check is inside the transaction so the read-then-write
-		// is atomic -- no concurrent write can slip between the check and update.
-		let redirectCreated = false;
+		// Wrap content + SEO writes in a transaction for atomicity. The transaction
+		// does not keep a concurrent save out between the _rev check and the update
+		// (D1 has none, and Postgres reads without a lock), so the update repeats
+		// the check in its WHERE clause.
+		let redirectChanged = false;
 		const item = await withTransaction(db, async (trx) => {
 			const trxRepo = new ContentRepository(trx);
 			const bylineRepo = new BylineRepository(trx);
@@ -1610,13 +1695,23 @@ export async function handleContentUpdate(
 				}
 			}
 
-			const updated = await trxRepo.update(collection, resolvedId, {
-				data: body.data,
-				slug: body.slug,
-				status: body.status,
-				authorId: body.authorId,
-				publishedAt: body.publishedAt,
-			});
+			// Collections without revisions save to the columns, and reads show any
+			// draft revision over them, so no draft pointer may outlive a save.
+			const { supportsRevisions } = await getCollectionPublishConfig(trx, collection);
+			const updated = await trxRepo.update(
+				collection,
+				resolvedId,
+				{
+					data: body.data,
+					slug: body.slug,
+					locale: existing?.locale ?? body.locale,
+					status: body.status,
+					authorId: body.authorId,
+					publishedAt: body.publishedAt,
+					...(supportsRevisions ? {} : { draftRevisionId: null }),
+				},
+				body._rev ? decodeRevisionPrecondition(body._rev) : undefined,
+			);
 
 			if (body.bylines !== undefined) {
 				const credits = await bylineRepo.setContentBylines(collection, resolvedId, body.bylines);
@@ -1632,7 +1727,7 @@ export async function handleContentUpdate(
 			// pre-update date (the URL that was actually live) and the new URL
 			// the post-update one.
 			if (oldSlug && body.slug) {
-				redirectCreated = await createSlugChangeRedirect(
+				redirectChanged = await createSlugChangeRedirect(
 					trx,
 					collection,
 					oldSlug,
@@ -1685,9 +1780,20 @@ export async function handleContentUpdate(
 				await writeReferenceSelection(trx, write);
 			}
 
+			if (updated.status === "published") {
+				redirectChanged =
+					(await removeShadowingAutoRedirect(
+						trx,
+						collection,
+						updated.slug,
+						updated.id,
+						updated.publishedAt,
+					)) || redirectChanged;
+			}
+
 			return updated;
 		});
-		if (redirectCreated) after(() => publishRedirectChanges(db));
+		if (redirectChanged) after(() => publishRedirectChanges(db));
 
 		return {
 			success: true,
@@ -1702,6 +1808,12 @@ export async function handleContentUpdate(
 				error: { code: error.apiError.code, message: error.message },
 			};
 		}
+		if (error instanceof ContentMutationConflictError) {
+			return {
+				success: false,
+				error: { code: "CONFLICT", message: error.message },
+			};
+		}
 		if (isMissingTableError(error)) {
 			return {
 				success: false,
@@ -1717,6 +1829,15 @@ export async function handleContentUpdate(
 				error: { code: "VALIDATION_ERROR", message: error.message },
 			};
 		}
+		if (error instanceof ContentSlugConflictError) {
+			return {
+				success: false,
+				error: {
+					code: "SLUG_CONFLICT",
+					message: `Slug '${body.slug ?? id}' already exists in collection '${collection}'`,
+				},
+			};
+		}
 		const message = error instanceof Error ? error.message.toLowerCase() : "";
 		if (message.includes("unique constraint failed") || message.includes("duplicate key")) {
 			if (message.includes("slug")) {
@@ -2352,7 +2473,7 @@ export async function handleContentPublish(
 ): Promise<ApiResult<ContentResponse>> {
 	try {
 		const expectedRevision = decodeRevisionPrecondition(options._rev);
-		let redirectCreated = false;
+		let redirectChanged = false;
 		const item = await withTransaction(db, async (trx) => {
 			const repo = new ContentRepository(trx);
 			const resolvedId = (await resolveId(repo, collection, id)) ?? id;
@@ -2472,7 +2593,7 @@ export async function handleContentPublish(
 				published.slug &&
 				existing.slug !== published.slug
 			) {
-				redirectCreated = await createSlugChangeRedirect(
+				redirectChanged = await createSlugChangeRedirect(
 					trx,
 					collection,
 					existing.slug,
@@ -2483,9 +2604,18 @@ export async function handleContentPublish(
 				);
 			}
 
+			redirectChanged =
+				(await removeShadowingAutoRedirect(
+					trx,
+					collection,
+					published.slug,
+					published.id,
+					published.publishedAt,
+				)) || redirectChanged;
+
 			return published;
 		});
-		if (redirectCreated) after(() => publishRedirectChanges(db));
+		if (redirectChanged) after(() => publishRedirectChanges(db));
 
 		const hasSeo = await collectionHasSeo(db, collection);
 		await hydrateSeo(db, collection, item, hasSeo);
@@ -2583,7 +2713,8 @@ export async function handleContentUnpublish(
 		const item = await withTransaction(db, async (trx) => {
 			const repo = new ContentRepository(trx);
 			const resolvedId = (await resolveId(repo, collection, id)) ?? id;
-			return repo.unpublish(collection, resolvedId, expectedRevision);
+			const { supportsRevisions } = await getCollectionPublishConfig(trx, collection);
+			return repo.unpublish(collection, resolvedId, expectedRevision, supportsRevisions);
 		});
 
 		const hasSeo = await collectionHasSeo(db, collection);