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

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

@@ -1,116 +1,116 @@
-import { Context } from 'hono'
-import { applyVisibility } from '../../../shared/apply-policies'
-import { publicProblem } from '../../../public/problem-details'
-import { CONTENT_ERRORS } from '../constants'
-import { AppEnv } from '../../../types'
-import { EntryNotFoundError } from '@beechcms/core'
-
-export async function getByIdHandler(context: Context<AppEnv>) {
-  const slug = context.req.param('slug')
-  const id = context.req.param('id')
-  if (!slug || !id) {
-    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')(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 item = await repository.findById(seed, id)
-    
-    let hasPendingDraft = false
-    if (seed.allowDrafts) {
-      hasPendingDraft = await repository.hasDraft(seed, id)
-    }
-
-    return context.json({
-      ...item,
-      has_pending_draft: hasPendingDraft,
-      data: applyVisibility(item, seed)
-    })
-  } 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 detail error:', error)
-    return publicProblem(context, { 
-      type: 'content-database-error', 
-      title: 'Internal Server Error', 
-      status: 500, 
-      detail: CONTENT_ERRORS.DATABASE_ERROR 
-    })
-  }
-}
-
-export async function getBySlugHandler(context: Context<AppEnv>) {
-  const schemaSlug = context.req.param('schema_slug')
-  const entrySlug = context.req.param('entry_slug')
-  if (!schemaSlug || !entrySlug) {
-    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')
-    const item = await repository.findBySlug(seed, entrySlug)
-    
-    let hasPendingDraft = false
-    if (seed.allowDrafts) {
-      hasPendingDraft = await repository.hasDraft(seed, item.id)
-    }
-
-    return context.json({
-      ...item,
-      has_pending_draft: hasPendingDraft,
-      data: applyVisibility(item, seed)
-    })
-  } 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 by-slug 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 { applyVisibility } from '../../../shared/apply-policies'
+import { publicProblem } from '../../../public/problem-details'
+import { CONTENT_ERRORS } from '../constants'
+import { AppEnv } from '../../../types'
+import { EntryNotFoundError } from '@beechcms/core'
+
+export async function getByIdHandler(context: Context<AppEnv>) {
+  const slug = context.req.param('slug')
+  const id = context.req.param('id')
+  if (!slug || !id) {
+    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')(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 item = await repository.findById(seed, id)
+    
+    let hasPendingDraft = false
+    if (seed.allowDrafts) {
+      hasPendingDraft = await repository.hasDraft(seed, id)
+    }
+
+    return context.json({
+      ...item,
+      has_pending_draft: hasPendingDraft,
+      data: applyVisibility(item, seed)
+    })
+  } 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 detail error:', error)
+    return publicProblem(context, { 
+      type: 'content-database-error', 
+      title: 'Internal Server Error', 
+      status: 500, 
+      detail: CONTENT_ERRORS.DATABASE_ERROR 
+    })
+  }
+}
+
+export async function getBySlugHandler(context: Context<AppEnv>) {
+  const schemaSlug = context.req.param('schema_slug')
+  const entrySlug = context.req.param('entry_slug')
+  if (!schemaSlug || !entrySlug) {
+    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')
+    const item = await repository.findBySlug(seed, entrySlug)
+    
+    let hasPendingDraft = false
+    if (seed.allowDrafts) {
+      hasPendingDraft = await repository.hasDraft(seed, item.id)
+    }
+
+    return context.json({
+      ...item,
+      has_pending_draft: hasPendingDraft,
+      data: applyVisibility(item, seed)
+    })
+  } 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 by-slug 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/list.ts

@@ -1,88 +1,88 @@
-import { Context } from 'hono'
-import { parsePositiveInt, parseQueryFilters, cleanStr, toEngineFilters } from '../../../shared/query-utils'
-import { applyVisibility } from '../../../shared/apply-policies'
-import { publicProblem } from '../../../public/problem-details'
-import { CONTENT_ERRORS } from '../constants'
-import { AppEnv } from '../../../types'
-
-export async function listHandler(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 query = context.req.query()
-    const search = cleanStr(query.search) ?? ''
-    const sortBy = cleanStr(query.sortBy) ?? ''
-    const sortDirRaw = cleanStr(query.sortDir)?.toLowerCase() ?? 'asc'
-    const rawFilters = parseQueryFilters(query.filters)
-    const engineFilters = toEngineFilters(rawFilters)
-    
-    // Note: repository doesn't yet support has_pending_draft filter/column natively 
-    // in findMany without SQL manipulation. We'll stick to basic findMany for now
-    // and might need to enhance the repository if this feature is critical for v1 of this refactor.
-    // The legacy code was doing a lot of SQL injection here.
-    
-    const page = parsePositiveInt(query.page, 1)
-    const limit = Math.min(parsePositiveInt(query.limit, 25), 100)
-    const offset = (page - 1) * limit
-
-    const orderBy = sortBy
-      ? { column: sortBy, dir: (sortDirRaw === 'desc' ? 'DESC' : 'ASC') as 'ASC' | 'DESC' }
-      : undefined
-
-    const repository = context.get('repository')
-    const { items, total } = await repository.findMany(seed, {
-      filters: engineFilters,
-      orderBy,
-      search: search || undefined,
-      pagination: { limit, offset },
-    })
-
-    const entries = await Promise.all(items.map(async (item) => {
-      // Check for pending draft if allowed
-      let hasPendingDraft = false
-      if (seed.allowDrafts) {
-        hasPendingDraft = await repository.hasDraft(seed, item.id)
-      }
-
-      return {
-        ...item,
-        has_pending_draft: hasPendingDraft,
-        data: applyVisibility(item, seed) // Repository returns "pure" data including system fields
-      }
-    }))
-
-    // If no query params (except slug), return array directly (legacy compatibility)
-    const hasQueryParams = Boolean(search) || Boolean(sortBy) || Boolean(query.filters) || query.page !== undefined || query.limit !== undefined
-    if (!hasQueryParams) {
-      return context.json(entries)
-    }
-
-    return context.json({ items: entries, total, page, limit })
-  } catch (error) {
-    console.error('Content list 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 { parsePositiveInt, parseQueryFilters, cleanStr, toEngineFilters } from '../../../shared/query-utils'
+import { applyVisibility } from '../../../shared/apply-policies'
+import { publicProblem } from '../../../public/problem-details'
+import { CONTENT_ERRORS } from '../constants'
+import { AppEnv } from '../../../types'
+
+export async function listHandler(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 query = context.req.query()
+    const search = cleanStr(query.search) ?? ''
+    const sortBy = cleanStr(query.sortBy) ?? ''
+    const sortDirRaw = cleanStr(query.sortDir)?.toLowerCase() ?? 'asc'
+    const rawFilters = parseQueryFilters(query.filters)
+    const engineFilters = toEngineFilters(rawFilters)
+    
+    // Note: repository doesn't yet support has_pending_draft filter/column natively 
+    // in findMany without SQL manipulation. We'll stick to basic findMany for now
+    // and might need to enhance the repository if this feature is critical for v1 of this refactor.
+    // The legacy code was doing a lot of SQL injection here.
+    
+    const page = parsePositiveInt(query.page, 1)
+    const limit = Math.min(parsePositiveInt(query.limit, 25), 100)
+    const offset = (page - 1) * limit
+
+    const orderBy = sortBy
+      ? { column: sortBy, dir: (sortDirRaw === 'desc' ? 'DESC' : 'ASC') as 'ASC' | 'DESC' }
+      : undefined
+
+    const repository = context.get('repository')
+    const { items, total } = await repository.findMany(seed, {
+      filters: engineFilters,
+      orderBy,
+      search: search || undefined,
+      pagination: { limit, offset },
+    })
+
+    const entries = await Promise.all(items.map(async (item) => {
+      // Check for pending draft if allowed
+      let hasPendingDraft = false
+      if (seed.allowDrafts) {
+        hasPendingDraft = await repository.hasDraft(seed, item.id)
+      }
+
+      return {
+        ...item,
+        has_pending_draft: hasPendingDraft,
+        data: applyVisibility(item, seed) // Repository returns "pure" data including system fields
+      }
+    }))
+
+    // If no query params (except slug), return array directly (legacy compatibility)
+    const hasQueryParams = Boolean(search) || Boolean(sortBy) || Boolean(query.filters) || query.page !== undefined || query.limit !== undefined
+    if (!hasQueryParams) {
+      return context.json(entries)
+    }
+
+    return context.json({ items: entries, total, page, limit })
+  } catch (error) {
+    console.error('Content list error:', error)
+    return publicProblem(context, { 
+      type: 'content-database-error', 
+      title: 'Internal Server Error', 
+      status: 500, 
+      detail: CONTENT_ERRORS.DATABASE_ERROR 
+    })
+  }
+}