@beechcms/api 0.4.0-preview.9 → 0.4.1

package/src/features/draft/draft.handler.ts

@@ -1,198 +1,283 @@
-/// <reference types="@cloudflare/workers-types" />
-import { Hono } from 'hono'
-import { validateAndSanitizeSeedPayload, resolvePolicies, serializeForDb, deserializeFromDb } from '@beechcms/core'
-import type { Seed } from '@beechcms/core'
-import { publicProblem } from '../../public/problem-details'
-import { logActivity } from '../../shared/activity-logger'
-import { cleanStr } from '../../shared/query-utils'
-import { applyVisibility } from '../../shared/apply-policies'
-
-type Bindings = { DB: D1Database }
-type Variables = {
-  jwtPayload: { sub: string; email?: string }
-  getSeed: (slug: string) => Seed | null
-  seedRegistry: Record<string, Seed>
-}
-
-const draftApp = new Hono<{ Bindings: Bindings; Variables: Variables }>()
-
-function normalizeBody(raw: unknown): Record<string, unknown> {
-  return typeof raw === 'object' && raw !== null ? (raw as Record<string, unknown>) : {}
-}
-
-function draftNotAllowed(c: Parameters<typeof publicProblem>[0]) {
-  return publicProblem(c, {
-    type: 'draft-not-allowed', title: 'Method Not Allowed', status: 405,
-    detail: 'This content type does not support pending drafts. Set allowDrafts: true on the Seed to enable.',
-  })
-}
-
-// PUT /:slug/:id/draft — crea o sovrascrive la bozza in content_{slug}_drafts
-draftApp.put('/:slug/:id/draft', async (c) => {
-  const slug = c.req.param('slug')
-  const id = c.req.param('id')
-
-  const seed = c.get('getSeed')(slug)
-  if (!seed) return publicProblem(c, { type: 'content-seed-not-found', title: 'Not Found', status: 404, detail: 'Seed not found' })
-  if (!seed.allowDrafts) return draftNotAllowed(c)
-
-  let body: Record<string, unknown>
-  try {
-    body = normalizeBody(await c.req.json<unknown>())
-  } catch {
-    return publicProblem(c, { type: 'content-invalid-json', title: 'Bad Request', status: 400, detail: 'Invalid JSON body' })
-  }
-
-  const { DB } = c.env
-  const existing = await DB.prepare(`SELECT id FROM content_${slug} WHERE id = ?`).bind(id).first<{ id: string }>()
-  if (!existing) return publicProblem(c, { type: 'content-not-found', title: 'Not Found', status: 404, detail: 'Not found' })
-
-  const sensitiveAliases = Object.keys(body).filter((alias) => {
-    const branch = seed.branches.find((b) => b.alias === alias)
-    return branch != null && resolvePolicies(branch).privacy !== 'plain'
-  })
-  if (sensitiveAliases.length > 0) {
-    return publicProblem(c, { type: 'content-sensitive-field-edit', title: 'Unprocessable Entity', status: 422, detail: `Cannot draft sensitive fields: ${sensitiveAliases.join(', ')}` })
-  }
-
-  const validation = validateAndSanitizeSeedPayload(seed, body, {
-    operation: 'update', allowNull: true, requireAtLeastOneValidField: true, enforceRequiredFields: false,
-  })
-  if (validation.dangerousFields.length > 0) {
-    return publicProblem(c, { type: 'content-dangerous-content', title: 'Unprocessable Entity', status: 422, detail: `Dangerous markup in field '${validation.dangerousFields[0]}'` })
-  }
-  if (validation.details.length > 0) {
-    return publicProblem(c, { type: 'content-validation-failed', title: 'Bad Request', status: 400, detail: 'Validation failed', errors: validation.details })
-  }
-
-  // UPSERT in content_{slug}_drafts — solo colonne branch, nullable
-  const draftTable = `content_${slug}_drafts`
-  const cols: string[] = []
-  const placeholders: string[] = []
-  const bindings: (string | number | null)[] = []
-  for (const branch of seed.branches) {
-    if (Object.hasOwn(validation.data, branch.alias)) {
-      cols.push(branch.alias)
-      placeholders.push('?')
-      bindings.push(serializeForDb(branch, validation.data[branch.alias]))
-    }
-  }
-
-  const now = Math.floor(Date.now() / 1000)
-  const updateSet = cols.map((c) => `${c} = excluded.${c}`).join(', ')
-  await DB.prepare(
-    `INSERT INTO ${draftTable} (entry_id, ${cols.join(', ')}, updated_at)
-     VALUES (?, ${placeholders.join(', ')}, ?)
-     ON CONFLICT(entry_id) DO UPDATE SET ${updateSet}, updated_at = excluded.updated_at`
-  ).bind(id, ...bindings, now).run()
-
-  logActivity(c, {
-    action: 'update', entityType: 'content', entityId: id, entitySlug: slug,
-    details: { title: cleanStr(validation.data[seed.displayNameAlias]) ?? id, note: 'draft saved' },
-  })
-
-  return c.json({ success: true })
-})
-
-// GET /:slug/:id/draft — legge la bozza pendente
-draftApp.get('/:slug/:id/draft', async (c) => {
-  const slug = c.req.param('slug')
-  const id = c.req.param('id')
-
-  const seed = c.get('getSeed')(slug)
-  if (!seed) return publicProblem(c, { type: 'content-seed-not-found', title: 'Not Found', status: 404, detail: 'Seed not found' })
-  if (!seed.allowDrafts) return draftNotAllowed(c)
-
-  const { DB } = c.env
-  const row = await DB.prepare(`SELECT * FROM content_${slug}_drafts WHERE entry_id = ?`)
-    .bind(id)
-    .first<Record<string, unknown>>()
-
-  if (!row) {
-    // Verifica se entry esiste
-    const entry = await DB.prepare(`SELECT id FROM content_${slug} WHERE id = ?`).bind(id).first()
-    if (!entry) return publicProblem(c, { type: 'content-not-found', title: 'Not Found', status: 404, detail: 'Not found' })
-    return publicProblem(c, { type: 'draft-not-found', title: 'Not Found', status: 404, detail: 'No pending draft for this entry' })
-  }
-
-  // Deserializza colonne branch reali
-  const data: Record<string, unknown> = {}
-  for (const branch of seed.branches) {
-    if (Object.hasOwn(row, branch.alias)) {
-      data[branch.alias] = deserializeFromDb(branch, row[branch.alias] ?? null)
-    }
-  }
-
-  return c.json({ data: applyVisibility(data, seed) })
-})
-
-// POST /:slug/:id/draft/publish — promuove bozza → live atomicamente
-draftApp.post('/:slug/:id/draft/publish', async (c) => {
-  const slug = c.req.param('slug')
-  const id = c.req.param('id')
-
-  const seed = c.get('getSeed')(slug)
-  if (!seed) return publicProblem(c, { type: 'content-seed-not-found', title: 'Not Found', status: 404, detail: 'Seed not found' })
-  if (!seed.allowDrafts) return draftNotAllowed(c)
-
-  const { DB } = c.env
-  const draftRow = await DB.prepare(`SELECT * FROM content_${slug}_drafts WHERE entry_id = ?`)
-    .bind(id)
-    .first<Record<string, unknown>>()
-
-  if (!draftRow) {
-    const entry = await DB.prepare(`SELECT id FROM content_${slug} WHERE id = ?`).bind(id).first()
-    if (!entry) return publicProblem(c, { type: 'content-not-found', title: 'Not Found', status: 404, detail: 'Not found' })
-    return publicProblem(c, { type: 'draft-not-found', title: 'Not Found', status: 404, detail: 'No pending draft to publish' })
-  }
-
-  // Costruisce SET clause dal draft per UPDATE atomico
-  const now = Math.floor(Date.now() / 1000)
-  const setParts: string[] = ['status = ?', 'updated_at = ?']
-  const setBindings: (string | number | null)[] = ['published', now]
-
-  for (const branch of seed.branches) {
-    if (Object.hasOwn(draftRow, branch.alias) && draftRow[branch.alias] !== null) {
-      setParts.push(`${branch.alias} = ?`)
-      setBindings.push(draftRow[branch.alias] as string | number | null)
-    }
-  }
-
-  await DB.batch([
-    DB.prepare(`UPDATE content_${slug} SET ${setParts.join(', ')} WHERE id = ?`)
-      .bind(...setBindings, id),
-    DB.prepare(`DELETE FROM content_${slug}_drafts WHERE entry_id = ?`)
-      .bind(id),
-  ])
-
-  // Deserializza per activity log
-  const displayValue = draftRow[seed.displayNameAlias]
-  const displayStr = typeof displayValue === 'string' ? displayValue : id
-
-  logActivity(c, {
-    action: 'update', entityType: 'content', entityId: id, entitySlug: slug,
-    details: { title: displayStr, note: 'draft published' },
-  })
-
-  return c.json({ success: true })
-})
-
-// DELETE /:slug/:id/draft — scarta la bozza pendente
-draftApp.delete('/:slug/:id/draft', async (c) => {
-  const slug = c.req.param('slug')
-  const id = c.req.param('id')
-
-  const seed = c.get('getSeed')(slug)
-  if (!seed) return publicProblem(c, { type: 'content-seed-not-found', title: 'Not Found', status: 404, detail: 'Seed not found' })
-  if (!seed.allowDrafts) return draftNotAllowed(c)
-
-  const { DB } = c.env
-  const existing = await DB.prepare(`SELECT id FROM content_${slug} WHERE id = ?`).bind(id).first<{ id: string }>()
-  if (!existing) return publicProblem(c, { type: 'content-not-found', title: 'Not Found', status: 404, detail: 'Not found' })
-
-  await DB.prepare(`DELETE FROM content_${slug}_drafts WHERE entry_id = ?`).bind(id).run()
-
-  return c.json({ success: true })
-})
-
-export { draftApp }
+/// <reference types="@cloudflare/workers-types" />
+import { Hono } from 'hono'
+import { 
+  validateAndSanitizeSeedPayload, 
+  resolvePolicies, 
+  EntryNotFoundError 
+} from '@beechcms/core'
+import { publicProblem } from '../../public/problem-details'
+import { cleanStr } from '../../shared/query-utils'
+import { applyVisibility } from '../../shared/apply-policies'
+import { AppEnv } from '../../types'
+import { CONTENT_ERRORS } from '../content/constants'
+
+const draftApp = new Hono<AppEnv>()
+
+function normalizeBody(raw: unknown): Record<string, unknown> {
+  return typeof raw === 'object' && raw !== null ? (raw as Record<string, unknown>) : {}
+}
+
+function draftNotAllowed(context: any) {
+  return publicProblem(context, {
+    type: 'draft-not-allowed', 
+    title: 'Method Not Allowed', 
+    status: 405,
+    detail: 'This content type does not support pending drafts. Set allowDrafts: true on the Seed to enable.',
+  })
+}
+
+// PUT /:slug/:id/draft — crea o sovrascrive la bozza in content_{slug}_drafts
+draftApp.put('/:slug/:id/draft', async (context) => {
+  const slug = context.req.param('slug')
+  const id = context.req.param('id')
+
+  const seed = context.get('getSeed')(slug)
+  if (!seed) {
+    return publicProblem(context, { 
+      type: 'content-seed-not-found', 
+      title: 'Not Found', 
+      status: 404, 
+      detail: CONTENT_ERRORS.SEED_NOT_FOUND 
+    })
+  }
+  
+  if (!seed.allowDrafts) return draftNotAllowed(context)
+
+  let body: Record<string, unknown>
+  try {
+    body = normalizeBody(await context.req.json<unknown>())
+  } catch {
+    return publicProblem(context, { 
+      type: 'content-invalid-json', 
+      title: 'Bad Request', 
+      status: 400, 
+      detail: CONTENT_ERRORS.INVALID_JSON_BODY 
+    })
+  }
+
+  const repository = context.get('repository')
+  try {
+    // Verify entry existence
+    await repository.findById(seed, id)
+  } catch (error) {
+    if (error instanceof EntryNotFoundError) {
+      return publicProblem(context, { 
+        type: 'content-not-found', 
+        title: 'Not Found', 
+        status: 404, 
+        detail: CONTENT_ERRORS.NOT_FOUND 
+      })
+    }
+    throw error
+  }
+
+  const sensitiveAliases = Object.keys(body).filter((alias) => {
+    const branch = seed.branches.find((b) => b.alias === alias)
+    return branch != null && resolvePolicies(branch).privacy !== 'plain'
+  })
+  
+  if (sensitiveAliases.length > 0) {
+    return publicProblem(context, { 
+      type: 'content-sensitive-field-edit', 
+      title: 'Unprocessable Entity', 
+      status: 422, 
+      detail: `${CONTENT_ERRORS.SENSITIVE_FIELD_EDIT}: ${sensitiveAliases.join(', ')}` 
+    })
+  }
+
+  const validation = validateAndSanitizeSeedPayload(seed, body, {
+    operation: 'update', 
+    allowNull: true, 
+    requireAtLeastOneValidField: true, 
+    enforceRequiredFields: false,
+  })
+  
+  if (validation.dangerousFields.length > 0) {
+    return publicProblem(context, { 
+      type: 'content-dangerous-content', 
+      title: 'Unprocessable Entity', 
+      status: 422, 
+      detail: `Dangerous markup in field '${validation.dangerousFields[0]}'` 
+    })
+  }
+  
+  if (validation.details.length > 0) {
+    return publicProblem(context, { 
+      type: 'content-validation-failed', 
+      title: 'Bad Request', 
+      status: 400, 
+      detail: 'Validation failed', 
+      errors: validation.details 
+    })
+  }
+
+  await repository.saveDraft(seed, id, validation.data)
+
+  const draftSaveActor = context.get('jwtPayload')
+  context.get('activityLogger').log({
+    action: 'update',
+    entityType: 'content',
+    entityId: id,
+    entitySlug: slug,
+    details: {
+      title: cleanStr(validation.data[seed.displayNameAlias]) ?? id,
+      note: 'draft saved',
+    },
+    actor: {
+      id: draftSaveActor.sub,
+      email: draftSaveActor.email ?? 'unknown',
+      name: draftSaveActor.name ?? null,
+    },
+  })
+
+  return context.json({ success: true })
+})
+
+// GET /:slug/:id/draft — legge la bozza pendente
+draftApp.get('/:slug/:id/draft', async (context) => {
+  const slug = context.req.param('slug')
+  const id = context.req.param('id')
+
+  const seed = context.get('getSeed')(slug)
+  if (!seed) {
+    return publicProblem(context, { 
+      type: 'content-seed-not-found', 
+      title: 'Not Found', 
+      status: 404, 
+      detail: CONTENT_ERRORS.SEED_NOT_FOUND 
+    })
+  }
+  
+  if (!seed.allowDrafts) return draftNotAllowed(context)
+
+  const repository = context.get('repository')
+  const draft = await repository.getDraft(seed, id)
+
+  if (!draft) {
+    try {
+      await repository.findById(seed, id)
+      return publicProblem(context, { 
+        type: 'draft-not-found', 
+        title: 'Not Found', 
+        status: 404, 
+        detail: 'No pending draft for this entry' 
+      })
+    } catch (error) {
+      if (error instanceof EntryNotFoundError) {
+        return publicProblem(context, { 
+          type: 'content-not-found', 
+          title: 'Not Found', 
+          status: 404, 
+          detail: CONTENT_ERRORS.NOT_FOUND 
+        })
+      }
+      throw error
+    }
+  }
+
+  return context.json({ data: applyVisibility(draft, seed) })
+})
+
+// POST /:slug/:id/draft/publish — promuove bozza → live atomicamente
+draftApp.post('/:slug/:id/draft/publish', async (context) => {
+  const slug = context.req.param('slug')
+  const id = context.req.param('id')
+
+  const seed = context.get('getSeed')(slug)
+  if (!seed) {
+    return publicProblem(context, { 
+      type: 'content-seed-not-found', 
+      title: 'Not Found', 
+      status: 404, 
+      detail: CONTENT_ERRORS.SEED_NOT_FOUND 
+    })
+  }
+  
+  if (!seed.allowDrafts) return draftNotAllowed(context)
+
+  const repository = context.get('repository')
+  const draft = await repository.getDraft(seed, id)
+
+  if (!draft) {
+    try {
+      await repository.findById(seed, id)
+      return publicProblem(context, { 
+        type: 'draft-not-found', 
+        title: 'Not Found', 
+        status: 404, 
+        detail: 'No pending draft to publish' 
+      })
+    } catch (error) {
+      if (error instanceof EntryNotFoundError) {
+        return publicProblem(context, { 
+          type: 'content-not-found', 
+          title: 'Not Found', 
+          status: 404, 
+          detail: CONTENT_ERRORS.NOT_FOUND 
+        })
+      }
+      throw error
+    }
+  }
+
+  await repository.publishDraft(seed, id)
+
+  const displayValue = draft[seed.displayNameAlias]
+  const displayStr = typeof displayValue === 'string' ? displayValue : id
+
+  const draftPublishActor = context.get('jwtPayload')
+  context.get('activityLogger').log({
+    action: 'update',
+    entityType: 'content',
+    entityId: id,
+    entitySlug: slug,
+    details: { title: displayStr, note: 'draft published' },
+    actor: {
+      id: draftPublishActor.sub,
+      email: draftPublishActor.email ?? 'unknown',
+      name: draftPublishActor.name ?? null,
+    },
+  })
+
+  return context.json({ success: true })
+})
+
+// DELETE /:slug/:id/draft — scarta la bozza pendente
+draftApp.delete('/:slug/:id/draft', async (context) => {
+  const slug = context.req.param('slug')
+  const id = context.req.param('id')
+
+  const seed = context.get('getSeed')(slug)
+  if (!seed) {
+    return publicProblem(context, { 
+      type: 'content-seed-not-found', 
+      title: 'Not Found', 
+      status: 404, 
+      detail: CONTENT_ERRORS.SEED_NOT_FOUND 
+    })
+  }
+  
+  if (!seed.allowDrafts) return draftNotAllowed(context)
+
+  const repository = context.get('repository')
+  try {
+    await repository.findById(seed, id)
+  } catch (error) {
+    if (error instanceof EntryNotFoundError) {
+      return publicProblem(context, { 
+        type: 'content-not-found', 
+        title: 'Not Found', 
+        status: 404, 
+        detail: CONTENT_ERRORS.NOT_FOUND 
+      })
+    }
+    throw error
+  }
+
+  await repository.deleteDraft(seed, id)
+
+  return context.json({ success: true })
+})
+
+export { draftApp }
+

package/src/features/draft/index.ts

@@ -1 +1 @@
-export { draftApp } from './draft.handler'
+export { draftApp } from './draft.handler'

package/src/features/email/email.provider.ts

@@ -1,38 +1,38 @@
-import type { OutboundEmail } from './email.types'
-
-/**
- * EmailProvider — contratto formale per i provider di invio email.
- *
- * Ogni implementazione (Resend, SendGrid, Mailgun, SMTP, …) DEVE rispettare
- * questa interfaccia. È l'unico punto di accoppiamento tra il modulo email e
- * qualsiasi servizio esterno di terze parti.
- *
- * ─── COME CAMBIARE PROVIDER ──────────────────────────────────────────────────
- *  1. Crea un nuovo file sotto `providers/`  (es. `providers/sendgrid.ts`).
- *  2. Esporta una classe che implementa questa interfaccia.
- *  3. In `email.service.ts` sostituisci l'import e l'istanziazione del provider
- *     attuale con la tua nuova classe nella funzione `createProvider()`.
- *  4. Aggiorna le variabili d'ambiente necessarie in `types.ts` e `wrangler.jsonc`.
- *  5. Nessun altro file del progetto va toccato.
- * ─────────────────────────────────────────────────────────────────────────────
- */
-export interface EmailProvider {
-  /**
-   * Invia una singola email transazionale.
-   *
-   * @param email - Il messaggio completamente risolto: mittente, destinatario,
-   *               oggetto e corpo HTML. Usa i builder in `templates/` per
-   *               costruire questo oggetto in modo corretto.
-   *
-   * @returns Promise che si risolve quando il provider ha **accettato** il
-   *          messaggio per la consegna. L'accettazione non garantisce la ricezione
-   *          in inbox — quella dipende dal server del destinatario e dalla
-   *          deliverability del provider.
-   *
-   * @throws {Error} Se il provider rifiuta la richiesta (autenticazione fallita,
-   *                 errore di rete, payload non valido). Il chiamante
-   *                 (`email.service.ts`) è responsabile di catturare e gestire
-   *                 questo errore in modo appropriato.
-   */
-  send(email: OutboundEmail): Promise<void>
-}
+import type { OutboundEmail } from './email.types'
+
+/**
+ * EmailProvider — formal contract for email sending providers.
+ *
+ * Every implementation (Resend, SendGrid, Mailgun, SMTP, ...) MUST comply
+ * with this interface. It is the only point of coupling between the email module and
+ * any third-party external service.
+ *
+ * ─── HOW TO CHANGE PROVIDER ──────────────────────────────────────────────────
+ *  1. Create a new file under `providers/` (e.g., `providers/sendgrid.ts`).
+ *  2. Export a class that implements this interface.
+ *  3. In `email.service.ts`, replace the import and instantiation of the current
+ *     provider with your new class in the `createProvider()` function.
+ *  4. Update the necessary environment variables in `types.ts` and `wrangler.jsonc`.
+ *  5. No other file in the project needs to be touched.
+ * ─────────────────────────────────────────────────────────────────────────────
+ */
+export interface EmailProvider {
+  /**
+   * Sends a single transactional email.
+   *
+   * @param email - The fully resolved message: sender, recipient,
+   *               subject, and HTML body. Use the builders in `templates/` to
+   *               construct this object correctly.
+   *
+   * @returns Promise that resolves when the provider has **accepted** the
+   *          message for delivery. Acceptance does not guarantee delivery
+   *          to the inbox — that depends on the recipient's server and the
+   *          provider's deliverability.
+   *
+   * @throws {Error} If the provider rejects the request (failed authentication,
+   *                 network error, invalid payload). The caller
+   *                 (`email.service.ts`) is responsible for catching and handling
+   *                 this error appropriately.
+   */
+  send(email: OutboundEmail): Promise<void>
+}