@beechcms/api 0.4.0-preview.12 → 0.4.0-preview.13

package/src/features/content/constants.ts

@@ -1,10 +1,10 @@
-export const CONTENT_ERRORS = {
-  INVALID_SLUG: 'Invalid slug',
-  INVALID_SLUG_OR_ID: 'Invalid slug or id',
-  INVALID_JSON_BODY: 'Invalid JSON body',
-  NOT_FOUND: 'Not found',
-  SEED_NOT_FOUND: 'Seed not found',
-  DATABASE_ERROR: 'Database error',
-  SLUG_CONFLICT: 'Slug already exists for this schema',
-  SENSITIVE_FIELD_EDIT: 'Cannot edit sensitive fields',
-} as const
+export const CONTENT_ERRORS = {
+  INVALID_SLUG: 'Invalid slug',
+  INVALID_SLUG_OR_ID: 'Invalid slug or id',
+  INVALID_JSON_BODY: 'Invalid JSON body',
+  NOT_FOUND: 'Not found',
+  SEED_NOT_FOUND: 'Seed not found',
+  DATABASE_ERROR: 'Database error',
+  SLUG_CONFLICT: 'Slug already exists for this schema',
+  SENSITIVE_FIELD_EDIT: 'Cannot edit sensitive fields',
+} as const

package/src/features/content/handlers/create.ts

@@ -1,163 +1,153 @@
-import { Context } from 'hono'
-import { 
-  slugify, 
-  isValidContentStatus, 
-  validateAndSanitizeSeedPayload,
-  SlugConflictError
-} from '@beechcms/core'
-import { applyPrivacy, PrivacyPolicyError } from '../../../shared/apply-policies'
-import { publicProblem } from '../../../public/problem-details'
-import { CONTENT_ERRORS } from '../constants'
-import { logActivity } from '../../../shared/activity-logger'
-import { logContentEvent } from '../../../shared/content-utils'
-import { cleanStr } from '../../../shared/query-utils'
-import { AppEnv } from '../../../types'
-
-function normalizeBody(raw: unknown): Record<string, unknown> {
-  return typeof raw === 'object' && raw !== null ? (raw as Record<string, unknown>) : {}
-}
-
-function contentValidationProblem(
-  context: Context,
-  details: Array<{ field: string; expected: string; received: string; message: string }>
-) {
-  return publicProblem(context, { 
-    type: 'content-validation-failed', 
-    title: 'Bad Request', 
-    status: 400, 
-    detail: 'Validation failed', 
-    errors: details 
-  })
-}
-
-export async function createHandler(context: Context<AppEnv>) {
-  const slug = context.req.param('slug')
-  if (!slug) {
-    return publicProblem(context, { 
-      type: 'content-invalid-slug', 
-      title: 'Bad Request', 
-      status: 400, 
-      detail: CONTENT_ERRORS.INVALID_SLUG 
-    })
-  }
-
-  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 
-    })
-  }
-
-  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 entrySlug = body.slug ? slugify(String(body.slug)) : null
-  const status = cleanStr(body.status) ?? 'draft'
-  if (!isValidContentStatus(status)) {
-    return publicProblem(context, { 
-      type: 'content-invalid-status', 
-      title: 'Bad Request', 
-      status: 400, 
-      detail: 'Invalid status. Allowed values are: draft, review, published' 
-    })
-  }
-
-  const bodyForData = { ...body }
-  delete bodyForData.slug
-  delete bodyForData.status
-
-  const validation = validateAndSanitizeSeedPayload(seed, bodyForData, {
-    operation: 'create', 
-    allowNull: false, 
-    requireAtLeastOneValidField: true, 
-    enforceRequiredFields: true,
-  })
-
-  if (validation.dangerousFields.length > 0) {
-    return publicProblem(context, { 
-      type: 'content-dangerous-content', 
-      title: 'Unprocessable Entity', 
-      status: 422, 
-      detail: `Content rejected: dangerous markup detected in field '${validation.dangerousFields[0]}'` 
-    })
-  }
-  
-  if (validation.details.length > 0) return contentValidationProblem(context, validation.details)
-
-  let privacyData: Record<string, unknown>
-  try {
-    privacyData = await applyPrivacy(validation.data, seed)
-  } catch (error) {
-    if (error instanceof PrivacyPolicyError) {
-      return publicProblem(context, { 
-        type: 'content-policy-not-implemented', 
-        title: 'Not Implemented', 
-        status: 501, 
-        detail: error.message 
-      })
-    }
-    throw error
-  }
-
-  const id = crypto.randomUUID()
-  let finalSlug = entrySlug
-  if (!finalSlug) {
-    const fallbackSource = privacyData[seed.displayNameAlias ?? 'title'] || privacyData.title || privacyData.name || id
-    finalSlug = slugify(String(fallbackSource))
-  }
-
-  try {
-    const repository = context.get('repository')
-    await repository.create(seed, id, finalSlug, status, privacyData)
-
-    const userId = context.get('jwtPayload')?.sub
-    const title = privacyData.title || privacyData.name || finalSlug
-    
-    // We use the DB from env for legacy logging utils until they are migrated
-    logContentEvent(context.env.DB, { 
-      action: 'create', 
-      schemaSlug: slug, 
-      entryId: id, 
-      userId, 
-      details: { title } 
-    }).catch(() => {})
-
-    logActivity(context, { 
-      action: 'create', 
-      entityType: 'content', 
-      entityId: id, 
-      entitySlug: slug, 
-      details: { title } 
-    })
-
-    return context.json({ id }, 201)
-  } catch (error) {
-    if (error instanceof SlugConflictError) {
-      return publicProblem(context, { 
-        type: 'content-slug-conflict', 
-        title: 'Conflict', 
-        status: 409, 
-        detail: CONTENT_ERRORS.SLUG_CONFLICT 
-      })
-    }
-    console.error('Content create error:', error)
-    return publicProblem(context, { 
-      type: 'content-database-error', 
-      title: 'Internal Server Error', 
-      status: 500, 
-      detail: CONTENT_ERRORS.DATABASE_ERROR 
-    })
-  }
-}
+import { Context } from 'hono'
+import { 
+  slugify, 
+  isValidContentStatus, 
+  validateAndSanitizeSeedPayload,
+  SlugConflictError
+} from '@beechcms/core'
+import { applyPrivacy, PrivacyPolicyError } from '../../../shared/apply-policies'
+import { publicProblem } from '../../../public/problem-details'
+import { CONTENT_ERRORS } from '../constants'
+import { logActivity } from '../../../shared/activity-logger'
+import { cleanStr } from '../../../shared/query-utils'
+import { AppEnv } from '../../../types'
+
+function normalizeBody(raw: unknown): Record<string, unknown> {
+  return typeof raw === 'object' && raw !== null ? (raw as Record<string, unknown>) : {}
+}
+
+function contentValidationProblem(
+  context: Context,
+  details: Array<{ field: string; expected: string; received: string; message: string }>
+) {
+  return publicProblem(context, { 
+    type: 'content-validation-failed', 
+    title: 'Bad Request', 
+    status: 400, 
+    detail: 'Validation failed', 
+    errors: details 
+  })
+}
+
+export async function createHandler(context: Context<AppEnv>) {
+  const slug = context.req.param('slug')
+  if (!slug) {
+    return publicProblem(context, { 
+      type: 'content-invalid-slug', 
+      title: 'Bad Request', 
+      status: 400, 
+      detail: CONTENT_ERRORS.INVALID_SLUG 
+    })
+  }
+
+  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 
+    })
+  }
+
+  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 entrySlug = body.slug ? slugify(String(body.slug)) : null
+  const status = cleanStr(body.status) ?? 'draft'
+  if (!isValidContentStatus(status)) {
+    return publicProblem(context, { 
+      type: 'content-invalid-status', 
+      title: 'Bad Request', 
+      status: 400, 
+      detail: 'Invalid status. Allowed values are: draft, review, published' 
+    })
+  }
+
+  const bodyForData = { ...body }
+  delete bodyForData.slug
+  delete bodyForData.status
+
+  const validation = validateAndSanitizeSeedPayload(seed, bodyForData, {
+    operation: 'create', 
+    allowNull: false, 
+    requireAtLeastOneValidField: true, 
+    enforceRequiredFields: true,
+  })
+
+  if (validation.dangerousFields.length > 0) {
+    return publicProblem(context, { 
+      type: 'content-dangerous-content', 
+      title: 'Unprocessable Entity', 
+      status: 422, 
+      detail: `Content rejected: dangerous markup detected in field '${validation.dangerousFields[0]}'` 
+    })
+  }
+  
+  if (validation.details.length > 0) return contentValidationProblem(context, validation.details)
+
+  let privacyData: Record<string, unknown>
+  try {
+    privacyData = await applyPrivacy(validation.data, seed)
+  } catch (error) {
+    if (error instanceof PrivacyPolicyError) {
+      return publicProblem(context, { 
+        type: 'content-policy-not-implemented', 
+        title: 'Not Implemented', 
+        status: 501, 
+        detail: error.message 
+      })
+    }
+    throw error
+  }
+
+  const id = crypto.randomUUID()
+  let finalSlug = entrySlug
+  if (!finalSlug) {
+    const fallbackSource = privacyData[seed.displayNameAlias ?? 'title'] || privacyData.title || privacyData.name || id
+    finalSlug = slugify(String(fallbackSource))
+  }
+
+  try {
+    const repository = context.get('repository')
+    await repository.create(seed, id, finalSlug, status, privacyData)
+
+    const userId = context.get('jwtPayload')?.sub
+    const title = privacyData.title || privacyData.name || finalSlug
+    
+    logActivity(context, { 
+      action: 'create', 
+      entityType: 'content', 
+      entityId: id, 
+      entitySlug: slug, 
+      details: { title } 
+    })
+
+    return context.json({ id }, 201)
+  } catch (error) {
+    if (error instanceof SlugConflictError) {
+      return publicProblem(context, { 
+        type: 'content-slug-conflict', 
+        title: 'Conflict', 
+        status: 409, 
+        detail: CONTENT_ERRORS.SLUG_CONFLICT 
+      })
+    }
+    console.error('Content create error:', error)
+    return publicProblem(context, { 
+      type: 'content-database-error', 
+      title: 'Internal Server Error', 
+      status: 500, 
+      detail: CONTENT_ERRORS.DATABASE_ERROR 
+    })
+  }
+}

package/src/features/content/handlers/delete.ts

@@ -1,85 +1,76 @@
-import { Context } from 'hono'
-import { EntryNotFoundError } from '@beechcms/core'
-import { deleteR2Objects } from '../../../upload'
-import { extractMediaKeysFromData } from '../../../media-utils'
-import { publicProblem } from '../../../public/problem-details'
-import { CONTENT_ERRORS } from '../constants'
-import { logActivity } from '../../../shared/activity-logger'
-import { logContentEvent } from '../../../shared/content-utils'
-import { AppEnv } from '../../../types'
-
-export async function deleteHandler(context: Context<AppEnv>) {
-  const schemaSlug = context.req.param('slug')
-  const entryId = context.req.param('id')
-  if (!schemaSlug || !entryId) {
-    return publicProblem(context, { 
-      type: 'content-invalid-slug-or-id', 
-      title: 'Bad Request', 
-      status: 400, 
-      detail: CONTENT_ERRORS.INVALID_SLUG_OR_ID 
-    })
-  }
-
-  const seed = context.get('getSeed')(schemaSlug)
-  if (!seed) {
-    return publicProblem(context, { 
-      type: 'content-seed-not-found', 
-      title: 'Not Found', 
-      status: 404, 
-      detail: CONTENT_ERRORS.SEED_NOT_FOUND 
-    })
-  }
-
-  try {
-    const repository = context.get('repository')
-    // Repository.delete returns the row data for cleanup
-    const { row } = await repository.delete(seed, entryId)
-
-    const userId = context.get('jwtPayload')?.sub
-    const title = row.title || row.name || entryId
-    
-    logContentEvent(context.env.DB, { 
-      action: 'delete', 
-      schemaSlug, 
-      entryId, 
-      userId, 
-      details: { title } 
-    }).catch(() => {})
-
-    logActivity(context, { 
-      action: 'delete', 
-      entityType: 'content', 
-      entityId: entryId, 
-      entitySlug: schemaSlug, 
-      details: { title } 
-    })
-
-    // Task 4.3: Cleanup R2 logic
-    const r2ObjectKeys = extractMediaKeysFromData(seed, row)
-    if (r2ObjectKeys.length > 0) {
-      await deleteR2Objects(context.env, r2ObjectKeys).catch((error) => {
-        if (context.env.ENV !== 'production') {
-          console.warn('R2 cleanup on delete failed (orphaned files):', error)
-        }
-      })
-    }
-
-    return context.json({ success: true })
-  } catch (error) {
-    if (error instanceof EntryNotFoundError) {
-      return publicProblem(context, { 
-        type: 'content-not-found', 
-        title: 'Not Found', 
-        status: 404, 
-        detail: CONTENT_ERRORS.NOT_FOUND 
-      })
-    }
-    console.error('Content delete error:', error)
-    return publicProblem(context, { 
-      type: 'content-database-error', 
-      title: 'Internal Server Error', 
-      status: 500, 
-      detail: CONTENT_ERRORS.DATABASE_ERROR 
-    })
-  }
-}
+import { Context } from 'hono'
+import { EntryNotFoundError } from '@beechcms/core'
+import { deleteR2Objects } from '../../../upload'
+import { extractMediaKeysFromData } from '../../../media-utils'
+import { publicProblem } from '../../../public/problem-details'
+import { CONTENT_ERRORS } from '../constants'
+import { logActivity } from '../../../shared/activity-logger'
+import { AppEnv } from '../../../types'
+
+export async function deleteHandler(context: Context<AppEnv>) {
+  const schemaSlug = context.req.param('slug')
+  const entryId = context.req.param('id')
+  if (!schemaSlug || !entryId) {
+    return publicProblem(context, { 
+      type: 'content-invalid-slug-or-id', 
+      title: 'Bad Request', 
+      status: 400, 
+      detail: CONTENT_ERRORS.INVALID_SLUG_OR_ID 
+    })
+  }
+
+  const seed = context.get('getSeed')(schemaSlug)
+  if (!seed) {
+    return publicProblem(context, { 
+      type: 'content-seed-not-found', 
+      title: 'Not Found', 
+      status: 404, 
+      detail: CONTENT_ERRORS.SEED_NOT_FOUND 
+    })
+  }
+
+  try {
+    const repository = context.get('repository')
+    // Repository.delete returns the row data for cleanup
+    const { row } = await repository.delete(seed, entryId)
+
+    const userId = context.get('jwtPayload')?.sub
+    const title = row.title || row.name || entryId
+    
+    logActivity(context, { 
+      action: 'delete', 
+      entityType: 'content', 
+      entityId: entryId, 
+      entitySlug: schemaSlug, 
+      details: { title } 
+    })
+
+    
+    const r2ObjectKeys = extractMediaKeysFromData(seed, row)
+    if (r2ObjectKeys.length > 0) {
+      await deleteR2Objects(context, r2ObjectKeys).catch((error) => {
+        if (context.env.ENV !== 'production') {
+          console.warn('R2 cleanup on delete failed (orphaned files):', error)
+        }
+      })
+    }
+
+    return context.json({ success: true })
+  } catch (error) {
+    if (error instanceof EntryNotFoundError) {
+      return publicProblem(context, { 
+        type: 'content-not-found', 
+        title: 'Not Found', 
+        status: 404, 
+        detail: CONTENT_ERRORS.NOT_FOUND 
+      })
+    }
+    console.error('Content delete error:', error)
+    return publicProblem(context, { 
+      type: 'content-database-error', 
+      title: 'Internal Server Error', 
+      status: 500, 
+      detail: CONTENT_ERRORS.DATABASE_ERROR 
+    })
+  }
+}

package/src/features/content/handlers/facets.ts

@@ -1,45 +1,45 @@
-import { Context } from 'hono'
-import { publicProblem } from '../../../public/problem-details'
-import { CONTENT_ERRORS } from '../constants'
-import { AppEnv } from '../../../types'
-
-export async function facetsHandler(context: Context<AppEnv>) {
-  const slug = context.req.param('slug')
-  if (!slug) {
-    return publicProblem(context, { 
-      type: 'content-invalid-slug', 
-      title: 'Bad Request', 
-      status: 400, 
-      detail: CONTENT_ERRORS.INVALID_SLUG 
-    })
-  }
-
-  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 
-    })
-  }
-
-  try {
-    const repository = context.get('repository')
-    const { statuses, tagsByColumn } = await repository.getFacets(seed)
-
-    // Legacy format expected by the dashboard
-    return context.json({
-      statuses: Object.keys(statuses).sort((a, b) => a.localeCompare(b, 'it')),
-      tagsByColumnId: tagsByColumn,
-    })
-  } catch (error) {
-    console.error('Content facets error:', error)
-    return publicProblem(context, { 
-      type: 'content-database-error', 
-      title: 'Internal Server Error', 
-      status: 500, 
-      detail: CONTENT_ERRORS.DATABASE_ERROR 
-    })
-  }
-}
+import { Context } from 'hono'
+import { publicProblem } from '../../../public/problem-details'
+import { CONTENT_ERRORS } from '../constants'
+import { AppEnv } from '../../../types'
+
+export async function facetsHandler(context: Context<AppEnv>) {
+  const slug = context.req.param('slug')
+  if (!slug) {
+    return publicProblem(context, { 
+      type: 'content-invalid-slug', 
+      title: 'Bad Request', 
+      status: 400, 
+      detail: CONTENT_ERRORS.INVALID_SLUG 
+    })
+  }
+
+  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 
+    })
+  }
+
+  try {
+    const repository = context.get('repository')
+    const { statuses, tagsByColumn } = await repository.getFacets(seed)
+
+    // Legacy format expected by the dashboard
+    return context.json({
+      statuses: Object.keys(statuses).sort((a, b) => a.localeCompare(b, 'it')),
+      tagsByColumnId: tagsByColumn,
+    })
+  } catch (error) {
+    console.error('Content facets error:', error)
+    return publicProblem(context, { 
+      type: 'content-database-error', 
+      title: 'Internal Server Error', 
+      status: 500, 
+      detail: CONTENT_ERRORS.DATABASE_ERROR 
+    })
+  }
+}