@beechcms/api 0.5.0 → 0.6.0-preview.2

package/src/shared/d1-search.repository.test.ts

@@ -1,83 +1,87 @@
-import { describe, it, expect, vi } from 'vitest'
-import type { Seed } from '@beechcms/core'
-import { D1SearchRepository } from './d1-search.repository'
-
-function makeMockDb(allResults: unknown[] = [], firstResult: unknown = null) {
-  const allMock = vi.fn().mockResolvedValue({ results: allResults })
-  const firstMock = vi.fn().mockResolvedValue(firstResult)
-  const bindMock = vi.fn(() => ({ all: allMock, first: firstMock }))
-  const prepareMock = vi.fn(() => ({ bind: bindMock }))
-  return { db: { prepare: prepareMock } as any, prepareMock, bindMock, allMock, firstMock }
-}
-
-const seeds: Seed[] = [
-  {
-    slug: 'posts',
-    label: 'Post',
-    displayNameAlias: 'title',
-    branches: [
-      { id: 'br_01', alias: 'title', type: 'text', label: 'Title' },
-      { id: 'br_02', alias: 'body',  type: 'richtext', label: 'Body' },
-    ],
-  },
-]
-
-describe('D1SearchRepository', () => {
-  it('maps FtsRow to camelCase SearchResultRow', async () => {
-    const ftsRow = {
-      entry_id: 'e1',
-      schema_slug: 'posts',
-      slug: 'hello',
-      status: 'published',
-      title: 'Hello',
-      excerpt: '<mark>Hi</mark>',
-      rank: -3.2,
-    }
-    const { db } = makeMockDb([ftsRow])
-    const result = await new D1SearchRepository(db).search(
-      { queryText: 'hello world', schemaSlug: null, statusFilter: null, limit: 10, cursor: null },
-      seeds,
-    )
-    expect(result).toEqual([
-      {
-        entryId: 'e1',
-        schemaSlug: 'posts',
-        slug: 'hello',
-        status: 'published',
-        title: 'Hello',
-        excerpt: '<mark>Hi</mark>',
-        rank: -3.2,
-      },
-    ])
-  })
-
-  it('returns [] on EMPTY_QUERY (single-character terms)', async () => {
-    const { db, prepareMock } = makeMockDb()
-    const result = await new D1SearchRepository(db).search(
-      { queryText: 'a', schemaSlug: null, statusFilter: null, limit: 10, cursor: null },
-      seeds,
-    )
-    expect(result).toEqual([])
-    expect(prepareMock).not.toHaveBeenCalled()
-  })
-
-  it('count returns { total: 0 } on EMPTY_QUERY', async () => {
-    const { db } = makeMockDb()
-    const result = await new D1SearchRepository(db).count(
-      { queryText: 'a', schemaSlug: null, statusFilter: null },
-      seeds,
-    )
-    expect(result).toEqual({ total: 0 })
-  })
-
-  it('count returns total from countSql', async () => {
-    const { db, prepareMock } = makeMockDb([], { total: 17 })
-    const result = await new D1SearchRepository(db).count(
-      { queryText: 'hello', schemaSlug: null, statusFilter: null },
-      seeds,
-    )
-    expect(result).toEqual({ total: 17 })
-    const sql = prepareMock.mock.calls[0]![0] as string
-    expect(sql).toMatch(/SUM\(c\)/)
-  })
-})
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
+import { describe, it, expect, vi } from 'vitest'
+import type { Seed } from '@beechcms/core'
+import { D1SearchRepository } from './d1-search.repository'
+
+function makeMockDb(allResults: unknown[] = [], firstResult: unknown = null) {
+  const allMock = vi.fn().mockResolvedValue({ results: allResults })
+  const firstMock = vi.fn().mockResolvedValue(firstResult)
+  const bindMock = vi.fn(() => ({ all: allMock, first: firstMock }))
+  const prepareMock = vi.fn(() => ({ bind: bindMock }))
+  return { db: { prepare: prepareMock } as any, prepareMock, bindMock, allMock, firstMock }
+}
+
+const seeds: Seed[] = [
+  {
+    slug: 'posts',
+    label: 'Post',
+    displayNameAlias: 'title',
+    branches: [
+      { id: 'br_01', alias: 'title', type: 'text', label: 'Title' },
+      { id: 'br_02', alias: 'body',  type: 'richtext', label: 'Body' },
+    ],
+  },
+]
+
+describe('D1SearchRepository', () => {
+  it('maps FtsRow to camelCase SearchResultRow', async () => {
+    const ftsRow = {
+      entry_id: 'e1',
+      schema_slug: 'posts',
+      slug: 'hello',
+      status: 'published',
+      title: 'Hello',
+      excerpt: '<mark>Hi</mark>',
+      rank: -3.2,
+    }
+    const { db } = makeMockDb([ftsRow])
+    const result = await new D1SearchRepository(db).search(
+      { queryText: 'hello world', schemaSlug: null, statusFilter: null, limit: 10, cursor: null },
+      seeds,
+    )
+    expect(result).toEqual([
+      {
+        entryId: 'e1',
+        schemaSlug: 'posts',
+        slug: 'hello',
+        status: 'published',
+        title: 'Hello',
+        excerpt: '<mark>Hi</mark>',
+        rank: -3.2,
+      },
+    ])
+  })
+
+  it('returns [] on EMPTY_QUERY (single-character terms)', async () => {
+    const { db, prepareMock } = makeMockDb()
+    const result = await new D1SearchRepository(db).search(
+      { queryText: 'a', schemaSlug: null, statusFilter: null, limit: 10, cursor: null },
+      seeds,
+    )
+    expect(result).toEqual([])
+    expect(prepareMock).not.toHaveBeenCalled()
+  })
+
+  it('count returns { total: 0 } on EMPTY_QUERY', async () => {
+    const { db } = makeMockDb()
+    const result = await new D1SearchRepository(db).count(
+      { queryText: 'a', schemaSlug: null, statusFilter: null },
+      seeds,
+    )
+    expect(result).toEqual({ total: 0 })
+  })
+
+  it('count returns total from countSql', async () => {
+    const { db, prepareMock } = makeMockDb([], { total: 17 })
+    const result = await new D1SearchRepository(db).count(
+      { queryText: 'hello', schemaSlug: null, statusFilter: null },
+      seeds,
+    )
+    expect(result).toEqual({ total: 17 })
+    const sql = prepareMock.mock.calls[0]![0] as string
+    expect(sql).toMatch(/SUM\(c\)/)
+  })
+})

package/src/shared/d1-search.repository.ts

@@ -1,84 +1,88 @@
-/// <reference types="@cloudflare/workers-types" />
-import type {
-  Seed,
-  ISearchRepository,
-  SearchQueryOptions,
-  SearchResultRow,
-  SearchCountResult,
-} from '@beechcms/core'
-import { buildFtsQuery, type FtsRow } from '../search-utils'
-
-const EMPTY_QUERY_ERROR = 'EMPTY_QUERY'
-
-/**
- * D1-backed implementation of {@link ISearchRepository}.
- *
- * Delegates SQL composition to the pure `buildFtsQuery` helper to keep this
- * class focused on D1 wiring. Returns raw rows; the route handler is
- * responsible for mapping them via `mapFtsRow`.
- */
-export class D1SearchRepository implements ISearchRepository {
-  constructor(private readonly database: D1Database) {}
-
-  async search(options: SearchQueryOptions, seeds: Seed[]): Promise<SearchResultRow[]> {
-    let queryParts
-    try {
-      queryParts = buildFtsQuery(
-        {
-          q: options.queryText,
-          schemaSlug: options.schemaSlug,
-          status: options.statusFilter,
-          limit: options.limit,
-          cursor: options.cursor,
-        },
-        seeds,
-      )
-    } catch (error) {
-      if (error instanceof Error && error.message === EMPTY_QUERY_ERROR) return []
-      throw error
-    }
-
-    const result = await this.database.prepare(queryParts.sql).bind(...queryParts.binds).all<FtsRow>()
-    return (result.results ?? []).map(mapFtsRowToResultRow)
-  }
-
-  async count(
-    options: Omit<SearchQueryOptions, 'limit' | 'cursor'>,
-    seeds: Seed[],
-  ): Promise<SearchCountResult> {
-    let queryParts
-    try {
-      queryParts = buildFtsQuery(
-        {
-          q: options.queryText,
-          schemaSlug: options.schemaSlug,
-          status: options.statusFilter,
-          limit: 0,
-          cursor: null,
-        },
-        seeds,
-      )
-    } catch (error) {
-      if (error instanceof Error && error.message === EMPTY_QUERY_ERROR) return { total: 0 }
-      throw error
-    }
-
-    const row = await this.database
-      .prepare(queryParts.countSql)
-      .bind(...queryParts.countBinds)
-      .first<{ total: number }>()
-    return { total: row?.total ?? 0 }
-  }
-}
-
-function mapFtsRowToResultRow(row: FtsRow): SearchResultRow {
-  return {
-    entryId: row.entry_id,
-    schemaSlug: row.schema_slug,
-    slug: row.slug,
-    status: row.status,
-    title: row.title,
-    excerpt: row.excerpt,
-    rank: row.rank,
-  }
-}
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
+/// <reference types="@cloudflare/workers-types" />
+import type {
+  Seed,
+  ISearchRepository,
+  SearchQueryOptions,
+  SearchResultRow,
+  SearchCountResult,
+} from '@beechcms/core'
+import { buildFtsQuery, type FtsRow } from '../search-utils'
+
+const EMPTY_QUERY_ERROR = 'EMPTY_QUERY'
+
+/**
+ * D1-backed implementation of {@link ISearchRepository}.
+ *
+ * Delegates SQL composition to the pure `buildFtsQuery` helper to keep this
+ * class focused on D1 wiring. Returns raw rows; the route handler is
+ * responsible for mapping them via `mapFtsRow`.
+ */
+export class D1SearchRepository implements ISearchRepository {
+  constructor(private readonly database: D1Database) {}
+
+  async search(options: SearchQueryOptions, seeds: Seed[]): Promise<SearchResultRow[]> {
+    let queryParts
+    try {
+      queryParts = buildFtsQuery(
+        {
+          q: options.queryText,
+          schemaSlug: options.schemaSlug,
+          status: options.statusFilter,
+          limit: options.limit,
+          cursor: options.cursor,
+        },
+        seeds,
+      )
+    } catch (error) {
+      if (error instanceof Error && error.message === EMPTY_QUERY_ERROR) return []
+      throw error
+    }
+
+    const result = await this.database.prepare(queryParts.sql).bind(...queryParts.binds).all<FtsRow>()
+    return (result.results ?? []).map(mapFtsRowToResultRow)
+  }
+
+  async count(
+    options: Omit<SearchQueryOptions, 'limit' | 'cursor'>,
+    seeds: Seed[],
+  ): Promise<SearchCountResult> {
+    let queryParts
+    try {
+      queryParts = buildFtsQuery(
+        {
+          q: options.queryText,
+          schemaSlug: options.schemaSlug,
+          status: options.statusFilter,
+          limit: 0,
+          cursor: null,
+        },
+        seeds,
+      )
+    } catch (error) {
+      if (error instanceof Error && error.message === EMPTY_QUERY_ERROR) return { total: 0 }
+      throw error
+    }
+
+    const row = await this.database
+      .prepare(queryParts.countSql)
+      .bind(...queryParts.countBinds)
+      .first<{ total: number }>()
+    return { total: row?.total ?? 0 }
+  }
+}
+
+function mapFtsRowToResultRow(row: FtsRow): SearchResultRow {
+  return {
+    entryId: row.entry_id,
+    schemaSlug: row.schema_slug,
+    slug: row.slug,
+    status: row.status,
+    title: row.title,
+    excerpt: row.excerpt,
+    rank: row.rank,
+  }
+}

package/src/shared/d1-session.repository.test.ts

@@ -1,121 +1,125 @@
-import { describe, it, expect, vi } from 'vitest'
-import { D1SessionRepository } from './d1-session.repository'
-import { FixedClock } from './fixed-clock'
-
-const FIXED_NOW_MS = 1700000000_000
-const NOW = Math.floor(FIXED_NOW_MS / 1000)
-const FUTURE = NOW + 7 * 24 * 3600
-const clock = new FixedClock(FIXED_NOW_MS)
-
-function makeMockDb(opts: {
-  firstResult?: unknown
-  runChanges?: number
-  allResults?: unknown[]
-} = {}) {
-  const { firstResult = null, runChanges = 1, allResults = [] } = opts
-  const runMock = vi.fn().mockResolvedValue({ success: true, meta: { changes: runChanges } })
-  const firstMock = vi.fn().mockResolvedValue(firstResult)
-  const allMock = vi.fn().mockResolvedValue({ results: allResults })
-  const bindMock = vi.fn(() => ({ first: firstMock, all: allMock, run: runMock }))
-  const prepareMock = vi.fn(() => ({ bind: bindMock }))
-  return { db: { prepare: prepareMock } as any, prepareMock, bindMock, runMock, firstMock, allMock }
-}
-
-describe('D1SessionRepository', () => {
-  describe('saveRefreshToken', () => {
-    it('calls INSERT INTO refresh_tokens with the correct bound values', async () => {
-      const { db, prepareMock, bindMock } = makeMockDb()
-      await new D1SessionRepository(db, clock).saveRefreshToken({
-        id: 'rt-1', userId: 'u1', tokenHash: 'h', expiresAt: FUTURE,
-      })
-      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('INSERT INTO refresh_tokens'))
-      expect(bindMock).toHaveBeenCalledWith('rt-1', 'u1', 'h', FUTURE, NOW)
-    })
-  })
-
-  describe('findActiveByHash', () => {
-    it('returns a RefreshTokenRecord with camelCase keys mapped from the snake_case row', async () => {
-      const row = {
-        id: 'rt-1', user_id: 'u1', token_hash: 'h',
-        expires_at: FUTURE, created_at: NOW, revoked_at: null,
-      }
-      const { db } = makeMockDb({ firstResult: row })
-      const result = await new D1SessionRepository(db, clock).findActiveByHash('h', NOW)
-      expect(result).toEqual({
-        id: 'rt-1', userId: 'u1', tokenHash: 'h',
-        expiresAt: FUTURE, createdAt: NOW, revokedAt: null,
-      })
-    })
-
-    it('returns null when no active token is found', async () => {
-      const { db } = makeMockDb({ firstResult: null })
-      expect(await new D1SessionRepository(db, clock).findActiveByHash('missing', NOW)).toBeNull()
-    })
-
-    it('passes tokenHash and nowTimestamp as bound values', async () => {
-      const { db, bindMock } = makeMockDb()
-      await new D1SessionRepository(db, clock).findActiveByHash('my-hash', NOW)
-      expect(bindMock).toHaveBeenCalledWith('my-hash', NOW)
-    })
-  })
-
-  describe('revokeByHash', () => {
-    it('returns true when one row is updated (changes = 1)', async () => {
-      const { db } = makeMockDb({ runChanges: 1 })
-      expect(await new D1SessionRepository(db, clock).revokeByHash('h', NOW)).toBe(true)
-    })
-
-    it('returns false when no row is updated (token already revoked or not found)', async () => {
-      const { db } = makeMockDb({ runChanges: 0 })
-      expect(await new D1SessionRepository(db, clock).revokeByHash('h', NOW)).toBe(false)
-    })
-  })
-
-  describe('revokeAllForUser', () => {
-    it('calls UPDATE refresh_tokens and includes the userId in the bound values', async () => {
-      const { db, prepareMock, bindMock } = makeMockDb()
-      await new D1SessionRepository(db, clock).revokeAllForUser('u1', NOW)
-      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('UPDATE refresh_tokens'))
-      expect((bindMock.mock.calls[0] as unknown[]).includes('u1')).toBe(true)
-    })
-  })
-
-  describe('listActiveForUser', () => {
-    it('returns mapped ActiveSessionSummary objects in the original order', async () => {
-      const rows = [
-        { id: 's1', created_at: NOW - 100, expires_at: FUTURE },
-        { id: 's2', created_at: NOW - 200, expires_at: FUTURE },
-      ]
-      const { db } = makeMockDb({ allResults: rows })
-      const sessions = await new D1SessionRepository(db, clock).listActiveForUser('u1', NOW, 20)
-      expect(sessions).toHaveLength(2)
-      expect(sessions[0]).toEqual({ id: 's1', createdAt: NOW - 100, expiresAt: FUTURE })
-      expect(sessions[1]).toEqual({ id: 's2', createdAt: NOW - 200, expiresAt: FUTURE })
-    })
-
-    it('returns an empty array when no active sessions exist', async () => {
-      const { db } = makeMockDb({ allResults: [] })
-      expect(await new D1SessionRepository(db, clock).listActiveForUser('u1', NOW, 20)).toEqual([])
-    })
-  })
-
-  describe('revokeById', () => {
-    it('returns true when the session is revoked (changes = 1)', async () => {
-      const { db } = makeMockDb({ runChanges: 1 })
-      expect(await new D1SessionRepository(db, clock).revokeById('s1', 'u1', NOW)).toBe(true)
-    })
-
-    it('returns false when the session is not found or belongs to another user (changes = 0)', async () => {
-      const { db } = makeMockDb({ runChanges: 0 })
-      expect(await new D1SessionRepository(db, clock).revokeById('s1', 'other-user', NOW)).toBe(false)
-    })
-
-    it('binds both sessionId and userId to prevent cross-user revocation', async () => {
-      const { db, bindMock } = makeMockDb({ runChanges: 1 })
-      await new D1SessionRepository(db, clock).revokeById('my-session', 'my-user', NOW)
-      const args = bindMock.mock.calls[0] as unknown[]
-      expect(args).toContain('my-session')
-      expect(args).toContain('my-user')
-    })
-  })
-})
+// SPDX-License-Identifier: BUSL-1.1
+// Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
+// See LICENSE in the repository root for license terms.
+
+import { describe, it, expect, vi } from 'vitest'
+import { D1SessionRepository } from './d1-session.repository'
+import { FixedClock } from './fixed-clock'
+
+const FIXED_NOW_MS = 1700000000_000
+const NOW = Math.floor(FIXED_NOW_MS / 1000)
+const FUTURE = NOW + 7 * 24 * 3600
+const clock = new FixedClock(FIXED_NOW_MS)
+
+function makeMockDb(opts: {
+  firstResult?: unknown
+  runChanges?: number
+  allResults?: unknown[]
+} = {}) {
+  const { firstResult = null, runChanges = 1, allResults = [] } = opts
+  const runMock = vi.fn().mockResolvedValue({ success: true, meta: { changes: runChanges } })
+  const firstMock = vi.fn().mockResolvedValue(firstResult)
+  const allMock = vi.fn().mockResolvedValue({ results: allResults })
+  const bindMock = vi.fn(() => ({ first: firstMock, all: allMock, run: runMock }))
+  const prepareMock = vi.fn(() => ({ bind: bindMock }))
+  return { db: { prepare: prepareMock } as any, prepareMock, bindMock, runMock, firstMock, allMock }
+}
+
+describe('D1SessionRepository', () => {
+  describe('saveRefreshToken', () => {
+    it('calls INSERT INTO refresh_tokens with the correct bound values', async () => {
+      const { db, prepareMock, bindMock } = makeMockDb()
+      await new D1SessionRepository(db, clock).saveRefreshToken({
+        id: 'rt-1', userId: 'u1', tokenHash: 'h', expiresAt: FUTURE,
+      })
+      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('INSERT INTO refresh_tokens'))
+      expect(bindMock).toHaveBeenCalledWith('rt-1', 'u1', 'h', FUTURE, NOW)
+    })
+  })
+
+  describe('findActiveByHash', () => {
+    it('returns a RefreshTokenRecord with camelCase keys mapped from the snake_case row', async () => {
+      const row = {
+        id: 'rt-1', user_id: 'u1', token_hash: 'h',
+        expires_at: FUTURE, created_at: NOW, revoked_at: null,
+      }
+      const { db } = makeMockDb({ firstResult: row })
+      const result = await new D1SessionRepository(db, clock).findActiveByHash('h', NOW)
+      expect(result).toEqual({
+        id: 'rt-1', userId: 'u1', tokenHash: 'h',
+        expiresAt: FUTURE, createdAt: NOW, revokedAt: null,
+      })
+    })
+
+    it('returns null when no active token is found', async () => {
+      const { db } = makeMockDb({ firstResult: null })
+      expect(await new D1SessionRepository(db, clock).findActiveByHash('missing', NOW)).toBeNull()
+    })
+
+    it('passes tokenHash and nowTimestamp as bound values', async () => {
+      const { db, bindMock } = makeMockDb()
+      await new D1SessionRepository(db, clock).findActiveByHash('my-hash', NOW)
+      expect(bindMock).toHaveBeenCalledWith('my-hash', NOW)
+    })
+  })
+
+  describe('revokeByHash', () => {
+    it('returns true when one row is updated (changes = 1)', async () => {
+      const { db } = makeMockDb({ runChanges: 1 })
+      expect(await new D1SessionRepository(db, clock).revokeByHash('h', NOW)).toBe(true)
+    })
+
+    it('returns false when no row is updated (token already revoked or not found)', async () => {
+      const { db } = makeMockDb({ runChanges: 0 })
+      expect(await new D1SessionRepository(db, clock).revokeByHash('h', NOW)).toBe(false)
+    })
+  })
+
+  describe('revokeAllForUser', () => {
+    it('calls UPDATE refresh_tokens and includes the userId in the bound values', async () => {
+      const { db, prepareMock, bindMock } = makeMockDb()
+      await new D1SessionRepository(db, clock).revokeAllForUser('u1', NOW)
+      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('UPDATE refresh_tokens'))
+      expect((bindMock.mock.calls[0] as unknown[]).includes('u1')).toBe(true)
+    })
+  })
+
+  describe('listActiveForUser', () => {
+    it('returns mapped ActiveSessionSummary objects in the original order', async () => {
+      const rows = [
+        { id: 's1', created_at: NOW - 100, expires_at: FUTURE },
+        { id: 's2', created_at: NOW - 200, expires_at: FUTURE },
+      ]
+      const { db } = makeMockDb({ allResults: rows })
+      const sessions = await new D1SessionRepository(db, clock).listActiveForUser('u1', NOW, 20)
+      expect(sessions).toHaveLength(2)
+      expect(sessions[0]).toEqual({ id: 's1', createdAt: NOW - 100, expiresAt: FUTURE })
+      expect(sessions[1]).toEqual({ id: 's2', createdAt: NOW - 200, expiresAt: FUTURE })
+    })
+
+    it('returns an empty array when no active sessions exist', async () => {
+      const { db } = makeMockDb({ allResults: [] })
+      expect(await new D1SessionRepository(db, clock).listActiveForUser('u1', NOW, 20)).toEqual([])
+    })
+  })
+
+  describe('revokeById', () => {
+    it('returns true when the session is revoked (changes = 1)', async () => {
+      const { db } = makeMockDb({ runChanges: 1 })
+      expect(await new D1SessionRepository(db, clock).revokeById('s1', 'u1', NOW)).toBe(true)
+    })
+
+    it('returns false when the session is not found or belongs to another user (changes = 0)', async () => {
+      const { db } = makeMockDb({ runChanges: 0 })
+      expect(await new D1SessionRepository(db, clock).revokeById('s1', 'other-user', NOW)).toBe(false)
+    })
+
+    it('binds both sessionId and userId to prevent cross-user revocation', async () => {
+      const { db, bindMock } = makeMockDb({ runChanges: 1 })
+      await new D1SessionRepository(db, clock).revokeById('my-session', 'my-user', NOW)
+      const args = bindMock.mock.calls[0] as unknown[]
+      expect(args).toContain('my-session')
+      expect(args).toContain('my-user')
+    })
+  })
+})