@beechcms/api 0.4.0-preview.9 → 0.4.0

package/src/search.ts

@@ -1,72 +1,72 @@
-// apps/api/src/search.ts
-
-import { Hono }              from "hono"
-import type { Env, Variables } from "./types"
-import { authMiddleware }    from "./middleware"
-import {
-  buildFtsQuery,
-  encodeCursor,
-  mapFtsRow,
-  type FtsRow,
-  type SearchResponse,
-} from "./search-utils"
-
-export const searchRouter = new Hono<{ Bindings: Env; Variables: Variables }>()
-
-searchRouter.use("*", async (c, next) => {
-  return authMiddleware(c.env.JWT_SECRET, {
-    issuer: c.env.JWT_ISSUER,
-    audience: c.env.JWT_AUDIENCE,
-  })(c, next)
-})
-
-// GET /api/search?q=...&schema_slug=...&status=...&limit=20&cursor=...
-searchRouter.get("/", async (c) => {
-  const q          = c.req.query("q")?.trim() ?? ""
-  const schemaSlug = c.req.query("schema_slug") ?? null
-  const status     = c.req.query("status") ?? null
-  const rawLimit   = parseInt(c.req.query("limit") ?? "20", 10)
-  const limit      = Math.min(Math.max(rawLimit, 1), 50)
-  const cursor     = c.req.query("cursor") ?? null
-
-  if (q.length < 2) {
-    return c.json({ error: "Il parametro 'q' deve avere almeno 2 caratteri." }, 400)
-  }
-
-  const seeds = Object.values(c.get('seedRegistry'))
-
-  let queryParts: ReturnType<typeof buildFtsQuery>
-  try {
-    queryParts = buildFtsQuery({ q, schemaSlug, status, limit, cursor }, seeds)
-  } catch (e) {
-    if ((e as Error).message === "EMPTY_QUERY") {
-      return c.json({ items: [], nextCursor: null, total: 0 } satisfies SearchResponse)
-    }
-    throw e
-  }
-
-  const { sql, binds, countSql, countBinds } = queryParts
-
-  const [ftsResult, countResult] = await Promise.all([
-    c.env.DB.prepare(sql).bind(...binds).all<FtsRow>(),
-    c.env.DB.prepare(countSql).bind(...countBinds).first<{ total: number }>(),
-  ])
-
-  const rows  = ftsResult.results ?? []
-  const total = countResult?.total ?? 0
-
-  const hasMore  = rows.length > limit
-  const pageRows = hasMore ? rows.slice(0, limit) : rows
-
-  const nextCursor = hasMore
-    ? encodeCursor(pageRows.at(-1)!.rank, pageRows.at(-1)!.entry_id)
-    : null
-
-  if (pageRows.length === 0) {
-    return c.json({ items: [], nextCursor: null, total } satisfies SearchResponse)
-  }
-
-  const items = pageRows.map(row => mapFtsRow(row))
-
-  return c.json({ items, nextCursor, total } satisfies SearchResponse)
-})
+// apps/api/src/search.ts
+
+import { Hono }              from "hono"
+import type { Env, Variables } from "./types"
+import { authMiddleware }    from "./middleware"
+import {
+  buildFtsQuery,
+  encodeCursor,
+  mapFtsRow,
+  type FtsRow,
+  type SearchResponse,
+} from "./search-utils"
+
+export const searchRouter = new Hono<{ Bindings: Env; Variables: Variables }>()
+
+searchRouter.use("*", async (c, next) => {
+  return authMiddleware(c.env.JWT_SECRET, {
+    issuer: c.env.JWT_ISSUER,
+    audience: c.env.JWT_AUDIENCE,
+  })(c, next)
+})
+
+// GET /api/search?q=...&schema_slug=...&status=...&limit=20&cursor=...
+searchRouter.get("/", async (c) => {
+  const q          = c.req.query("q")?.trim() ?? ""
+  const schemaSlug = c.req.query("schema_slug") ?? null
+  const status     = c.req.query("status") ?? null
+  const rawLimit   = parseInt(c.req.query("limit") ?? "20", 10)
+  const limit      = Math.min(Math.max(rawLimit, 1), 50)
+  const cursor     = c.req.query("cursor") ?? null
+
+  if (q.length < 2) {
+    return c.json({ error: "Il parametro 'q' deve avere almeno 2 caratteri." }, 400)
+  }
+
+  const seeds = Object.values(c.get('seedRegistry'))
+
+  let queryParts: ReturnType<typeof buildFtsQuery>
+  try {
+    queryParts = buildFtsQuery({ q, schemaSlug, status, limit, cursor }, seeds)
+  } catch (e) {
+    if ((e as Error).message === "EMPTY_QUERY") {
+      return c.json({ items: [], nextCursor: null, total: 0 } satisfies SearchResponse)
+    }
+    throw e
+  }
+
+  const { sql, binds, countSql, countBinds } = queryParts
+
+  const [ftsResult, countResult] = await Promise.all([
+    c.env.DB.prepare(sql).bind(...binds).all<FtsRow>(),
+    c.env.DB.prepare(countSql).bind(...countBinds).first<{ total: number }>(),
+  ])
+
+  const rows  = ftsResult.results ?? []
+  const total = countResult?.total ?? 0
+
+  const hasMore  = rows.length > limit
+  const pageRows = hasMore ? rows.slice(0, limit) : rows
+
+  const nextCursor = hasMore
+    ? encodeCursor(pageRows.at(-1)!.rank, pageRows.at(-1)!.entry_id)
+    : null
+
+  if (pageRows.length === 0) {
+    return c.json({ items: [], nextCursor: null, total } satisfies SearchResponse)
+  }
+
+  const items = pageRows.map(row => mapFtsRow(row))
+
+  return c.json({ items, nextCursor, total } satisfies SearchResponse)
+})

package/src/shared/activity-logger.ts

@@ -1,79 +1,79 @@
-import { Context } from 'hono'
-
-export type ActivityAction = 'create' | 'update' | 'delete' | 'upload'
-export type EntityType = 'content' | 'media'
-
-export interface ActivityLogParams {
-  action: ActivityAction
-  entityType: EntityType
-  entityId: string
-  entitySlug?: string
-  details?: Record<string, any>
-}
-
-/**
- * Logga un'azione utente asincronamente nel database D1.
- * Estrae le info dell'utente dal JWT payload presente nel contesto Hono.
- */
-export function logActivity(
-  c: Context<any>,
-  params: ActivityLogParams
-): void {
-  const db = c.env.DB as D1Database
-  const user = c.get('jwtPayload') as { sub: string; email: string; name?: string } | undefined
-
-  if (!db || !user) return
-
-  const { action, entityType, entityId, entitySlug, details } = params
-  const id = crypto.randomUUID()
-
-  // Usa waitUntil per non bloccare la risposta al client
-  let executionCtx: { waitUntil: (p: Promise<any>) => void } | undefined
-  try {
-    executionCtx = c.executionCtx
-  } catch {
-    // In ambiente di test Hono lancia se non presente
-  }
-
-  if (executionCtx) {
-    executionCtx.waitUntil((async () => {
-      try {
-        await db.prepare(
-          `INSERT INTO activity_logs (id, user_id, user_email, user_name, action, entity_type, entity_id, entity_slug, details)
-           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
-        ).bind(
-          id,
-          user.sub,
-          user.email || 'unknown',
-          user.name || null,
-          action,
-          entityType,
-          entityId,
-          entitySlug || null,
-          details ? JSON.stringify(details) : null
-        ).run()
-      } catch (err) {
-        console.error('Failed to log activity:', err)
-      }
-    })())
-  } else {
-    try {
-      db.prepare(
-        `INSERT INTO activity_logs (id, user_id, user_email, user_name, action, entity_type, entity_id, entity_slug, details)
-         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
-      ).bind(
-        id,
-        user.sub,
-        user.email || 'unknown',
-        user.name || null,
-        action,
-        entityType,
-        entityId,
-        entitySlug || null,
-        details ? JSON.stringify(details) : null
-      ).run().catch(err => console.error('Failed to log activity (sync fallback):', err))
-    } catch (err) {
-      console.error('Failed to log activity (sync fallback):', err)
-    }
-  }
-}
+import { Context } from 'hono'
+
+export type ActivityAction = 'create' | 'update' | 'delete' | 'upload'
+export type EntityType = 'content' | 'media'
+
+export interface ActivityLogParams {
+  action: ActivityAction
+  entityType: EntityType
+  entityId: string
+  entitySlug?: string
+  details?: Record<string, any>
+}
+
+/**
+ * Logga un'azione utente asincronamente nel database D1.
+ * Estrae le info dell'utente dal JWT payload presente nel contesto Hono.
+ */
+export function logActivity(
+  c: Context<any>,
+  params: ActivityLogParams
+): void {
+  const db = c.env.DB as D1Database
+  const user = c.get('jwtPayload') as { sub: string; email: string; name?: string } | undefined
+
+  if (!db || !user) return
+
+  const { action, entityType, entityId, entitySlug, details } = params
+  const id = crypto.randomUUID()
+
+  // Usa waitUntil per non bloccare la risposta al client
+  let executionCtx: { waitUntil: (p: Promise<any>) => void } | undefined
+  try {
+    executionCtx = c.executionCtx
+  } catch {
+    // In ambiente di test Hono lancia se non presente
+  }
+
+  if (executionCtx) {
+    executionCtx.waitUntil((async () => {
+      try {
+        await db.prepare(
+          `INSERT INTO activity_logs (id, user_id, user_email, user_name, action, entity_type, entity_id, entity_slug, details)
+           VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
+        ).bind(
+          id,
+          user.sub,
+          user.email || 'unknown',
+          user.name || null,
+          action,
+          entityType,
+          entityId,
+          entitySlug || null,
+          details ? JSON.stringify(details) : null
+        ).run()
+      } catch (err) {
+        console.error('Failed to log activity:', err)
+      }
+    })())
+  } else {
+    try {
+      db.prepare(
+        `INSERT INTO activity_logs (id, user_id, user_email, user_name, action, entity_type, entity_id, entity_slug, details)
+         VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
+      ).bind(
+        id,
+        user.sub,
+        user.email || 'unknown',
+        user.name || null,
+        action,
+        entityType,
+        entityId,
+        entitySlug || null,
+        details ? JSON.stringify(details) : null
+      ).run().catch(err => console.error('Failed to log activity (sync fallback):', err))
+    } catch (err) {
+      console.error('Failed to log activity (sync fallback):', err)
+    }
+  }
+}

package/src/shared/apply-policies.ts

@@ -1,63 +1,63 @@
-/// <reference types="@cloudflare/workers-types" />
-import { resolvePolicies, sha256hex } from '@beechcms/core'
-import type { Seed } from '@beechcms/core'
-
-class PrivacyPolicyError extends Error {
-  readonly status = 501 as const
-  constructor(message: string) {
-    super(message)
-    this.name = 'PrivacyPolicyError'
-  }
-}
-
-export { PrivacyPolicyError }
-
-/** Applica la privacy policy ai campi del payload prima della scrittura su DB. */
-export async function applyPrivacy(
-  data: Record<string, unknown>,
-  seed: Seed,
-): Promise<Record<string, unknown>> {
-  const result: Record<string, unknown> = {}
-  for (const [alias, value] of Object.entries(data)) {
-    const branch = seed.branches.find((b) => b.alias === alias)
-    if (!branch) {
-      result[alias] = value
-      continue
-    }
-    const { privacy } = resolvePolicies(branch)
-    if (privacy === 'encrypt') {
-      throw new PrivacyPolicyError(
-        `Field '${alias}' uses 'encrypt' privacy which is not yet implemented.`,
-      )
-    }
-    if (privacy === 'hash' && value != null) {
-      result[alias] = await sha256hex(String(value))
-    } else {
-      result[alias] = value
-    }
-  }
-  return result
-}
-
-/** Applica la visibility policy ai campi del payload in uscita verso il client. */
-export function applyVisibility(
-  data: Record<string, unknown>,
-  seed: Seed,
-): Record<string, unknown> {
-  const result: Record<string, unknown> = {}
-  for (const [alias, value] of Object.entries(data)) {
-    const branch = seed.branches.find((b) => b.alias === alias)
-    if (!branch) {
-      result[alias] = value
-      continue
-    }
-    const { visibility } = resolvePolicies(branch)
-    if (visibility === 'hidden') continue
-    if (visibility === 'masked') {
-      result[alias] = typeof value === 'string' && value.length > 0 ? '••••••••' : null
-    } else {
-      result[alias] = value
-    }
-  }
-  return result
-}
+/// <reference types="@cloudflare/workers-types" />
+import { resolvePolicies, sha256hex } from '@beechcms/core'
+import type { Seed } from '@beechcms/core'
+
+class PrivacyPolicyError extends Error {
+  readonly status = 501 as const
+  constructor(message: string) {
+    super(message)
+    this.name = 'PrivacyPolicyError'
+  }
+}
+
+export { PrivacyPolicyError }
+
+/** Applica la privacy policy ai campi del payload prima della scrittura su DB. */
+export async function applyPrivacy(
+  data: Record<string, unknown>,
+  seed: Seed,
+): Promise<Record<string, unknown>> {
+  const result: Record<string, unknown> = {}
+  for (const [alias, value] of Object.entries(data)) {
+    const branch = seed.branches.find((b) => b.alias === alias)
+    if (!branch) {
+      result[alias] = value
+      continue
+    }
+    const { privacy } = resolvePolicies(branch)
+    if (privacy === 'encrypt') {
+      throw new PrivacyPolicyError(
+        `Field '${alias}' uses 'encrypt' privacy which is not yet implemented.`,
+      )
+    }
+    if (privacy === 'hash' && value != null) {
+      result[alias] = await sha256hex(String(value))
+    } else {
+      result[alias] = value
+    }
+  }
+  return result
+}
+
+/** Applica la visibility policy ai campi del payload in uscita verso il client. */
+export function applyVisibility(
+  data: Record<string, unknown>,
+  seed: Seed,
+): Record<string, unknown> {
+  const result: Record<string, unknown> = {}
+  for (const [alias, value] of Object.entries(data)) {
+    const branch = seed.branches.find((b) => b.alias === alias)
+    if (!branch) {
+      result[alias] = value
+      continue
+    }
+    const { visibility } = resolvePolicies(branch)
+    if (visibility === 'hidden') continue
+    if (visibility === 'masked') {
+      result[alias] = typeof value === 'string' && value.length > 0 ? '••••••••' : null
+    } else {
+      result[alias] = value
+    }
+  }
+  return result
+}

package/src/shared/base.repository.d1.ts

@@ -0,0 +1,28 @@
+/// <reference types="@cloudflare/workers-types" />
+import { RepositoryError } from '@beechcms/core'
+
+/**
+ * Base class for D1-backed repositories.
+ * Handles the D1 instance and provides common database utilities and error mapping.
+ */
+export abstract class BaseD1Repository {
+  constructor(protected readonly database: D1Database) {}
+
+  /**
+   * Utility method to extract a table name for a given seed.
+   */
+  protected getTableName(slug: string, isDraft = false): string {
+    return isDraft ? `content_${slug}_drafts` : `content_${slug}`
+  }
+
+  /**
+   * Helper to map generic D1 errors to Beech RepositoryErrors.
+   * This centralizes error handling for all D1 repositories.
+   */
+  protected mapError(error: any, context: string): RepositoryError {
+    const message = error?.message || 'Unknown database error'
+    // In the future, we can add more specific SQLite error code checks here
+    // (e.g., checking for UNIQUE constraint via string matching or codes if available)
+    return new RepositoryError(`${context}: ${message}`, error)
+  }
+}

package/src/shared/content-utils.ts

@@ -1,108 +1,82 @@
-/// <reference types="@cloudflare/workers-types" />
-import { deserializeFromDb, serializeForDb } from '@beechcms/core'
-import type { Seed } from '@beechcms/core'
-import type { ContentEntry } from './query-utils'
-
-/** Deserializza ogni branch colonna di un DB row in formato API alias. */
-export function rowToApiData(seed: Seed, row: Record<string, unknown>): Record<string, unknown> {
-  const data: Record<string, unknown> = {}
-  for (const branch of seed.branches) {
-    data[branch.alias] = deserializeFromDb(branch, row[branch.alias] ?? null)
-  }
-  return data
-}
-
-/** Converte un row della tabella content_{slug} in ContentEntry per le risposte API. */
-export function rowToEntry(
-  seed: Seed,
-  row: Record<string, unknown>,
-  hasPendingDraft = false
-): ContentEntry {
-  return {
-    id: row.id as string,
-    schema_slug: seed.slug,
-    slug: (row.slug as string | null) ?? null,
-    status: (row.status as string) ?? 'draft',
-    data: rowToApiData(seed, row),
-    hasPendingDraft,
-    created_at: (row.created_at as number | null) ?? null,
-    updated_at: (row.updated_at as number | null) ?? null,
-  }
-}
-
-export interface InsertBindings {
-  cols: string[]
-  placeholders: string[]
-  bindings: (string | number | null)[]
-}
-
-/** Costruisce colonne, placeholders e bindings per INSERT INTO content_{slug}. */
-export function buildInsertBindings(seed: Seed, payload: Record<string, unknown>): InsertBindings {
-  const cols: string[] = []
-  const placeholders: string[] = []
-  const bindings: (string | number | null)[] = []
-  for (const branch of seed.branches) {
-    if (Object.hasOwn(payload, branch.alias)) {
-      cols.push(branch.alias)
-      placeholders.push('?')
-      bindings.push(serializeForDb(branch, payload[branch.alias]))
-    }
-  }
-  return { cols, placeholders, bindings }
-}
-
-export interface UpdateBindings {
-  setClause: string
-  bindings: (string | number | null)[]
-}
-
-/** Costruisce SET clause e bindings per UPDATE content_{slug}. */
-export function buildUpdateBindings(seed: Seed, payload: Record<string, unknown>): UpdateBindings {
-  const setParts: string[] = []
-  const bindings: (string | number | null)[] = []
-  for (const branch of seed.branches) {
-    if (Object.hasOwn(payload, branch.alias)) {
-      setParts.push(`${branch.alias} = ?`)
-      bindings.push(serializeForDb(branch, payload[branch.alias]))
-    }
-  }
-  return { setClause: setParts.join(', '), bindings }
-}
-
-/** Controlla se esiste un draft pendente in content_{slug}_drafts. */
-export async function hasDraft(db: D1Database, seed: Seed, entryId: string): Promise<boolean> {
-  if (!seed.allowDrafts) return false
-  const row = await db
-    .prepare(`SELECT 1 FROM content_${seed.slug}_drafts WHERE entry_id = ? LIMIT 1`)
-    .bind(entryId)
-    .first()
-  return row !== null
-}
-
-/** Scrive un evento CRUD in content_event_log per l'activity feed. */
-export async function logContentEvent(
-  db: D1Database,
-  opts: {
-    action: 'create' | 'update' | 'delete'
-    schemaSlug: string
-    entryId: string
-    userId?: string | null
-    details?: Record<string, unknown>
-  }
-): Promise<void> {
-  await db
-    .prepare(
-      `INSERT INTO content_event_log (id, schema_slug, entry_id, action, user_id, details, created_at)
-       VALUES (?, ?, ?, ?, ?, ?, ?)`
-    )
-    .bind(
-      crypto.randomUUID(),
-      opts.schemaSlug,
-      opts.entryId,
-      opts.action,
-      opts.userId ?? null,
-      opts.details ? JSON.stringify(opts.details) : null,
-      Math.floor(Date.now() / 1000)
-    )
-    .run()
-}
+/// <reference types="@cloudflare/workers-types" />
+import { deserializeFromDb, serializeForDb } from '@beechcms/core'
+import type { Seed } from '@beechcms/core'
+import type { ContentEntry } from './query-utils'
+
+/** Deserializza ogni branch colonna di un DB row in formato API alias. */
+export function rowToApiData(seed: Seed, row: Record<string, unknown>): Record<string, unknown> {
+  const data: Record<string, unknown> = {}
+  for (const branch of seed.branches) {
+    data[branch.alias] = deserializeFromDb(branch, row[branch.alias] ?? null)
+  }
+  return data
+}
+
+/** Converte un row della tabella content_{slug} in ContentEntry per le risposte API. */
+export function rowToEntry(
+  seed: Seed,
+  row: Record<string, unknown>,
+  hasPendingDraft = false
+): ContentEntry {
+  return {
+    id: row.id as string,
+    schema_slug: seed.slug,
+    slug: (row.slug as string | null) ?? null,
+    status: (row.status as string) ?? 'draft',
+    data: rowToApiData(seed, row),
+    hasPendingDraft,
+    created_at: (row.created_at as number | null) ?? null,
+    updated_at: (row.updated_at as number | null) ?? null,
+  }
+}
+
+export interface InsertBindings {
+  cols: string[]
+  placeholders: string[]
+  bindings: (string | number | null)[]
+}
+
+/** Costruisce colonne, placeholders e bindings per INSERT INTO content_{slug}. */
+export function buildInsertBindings(seed: Seed, payload: Record<string, unknown>): InsertBindings {
+  const cols: string[] = []
+  const placeholders: string[] = []
+  const bindings: (string | number | null)[] = []
+  for (const branch of seed.branches) {
+    if (Object.hasOwn(payload, branch.alias)) {
+      cols.push(branch.alias)
+      placeholders.push('?')
+      bindings.push(serializeForDb(branch, payload[branch.alias]))
+    }
+  }
+  return { cols, placeholders, bindings }
+}
+
+export interface UpdateBindings {
+  setClause: string
+  bindings: (string | number | null)[]
+}
+
+/** Costruisce SET clause e bindings per UPDATE content_{slug}. */
+export function buildUpdateBindings(seed: Seed, payload: Record<string, unknown>): UpdateBindings {
+  const setParts: string[] = []
+  const bindings: (string | number | null)[] = []
+  for (const branch of seed.branches) {
+    if (Object.hasOwn(payload, branch.alias)) {
+      setParts.push(`${branch.alias} = ?`)
+      bindings.push(serializeForDb(branch, payload[branch.alias]))
+    }
+  }
+  return { setClause: setParts.join(', '), bindings }
+}
+
+/** Controlla se esiste un draft pendente in content_{slug}_drafts. */
+export async function hasDraft(db: D1Database, seed: Seed, entryId: string): Promise<boolean> {
+  if (!seed.allowDrafts) return false
+  const row = await db
+    .prepare(`SELECT 1 FROM content_${seed.slug}_drafts WHERE entry_id = ? LIMIT 1`)
+    .bind(entryId)
+    .first()
+  return row !== null
+}
+
+