@beechcms/api 0.5.0 → 0.6.0-preview.2

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

@@ -1,114 +1,118 @@
-/// <reference types="@cloudflare/workers-types" />
-import type {
-  INotificationRepository,
-  NotificationRecord,
-  NotificationStats,
-  NotificationType,
-  IClock,
-  IIdGenerator,
-} from '@beechcms/core'
-
-interface NotificationRow {
-  id: string
-  title: string
-  message: string
-  type: string
-  is_read: number
-  created_at: number
-}
-
-interface NotificationStatsRow {
-  total_count: number | null
-  latest_created_at: number | null
-  read_count: number | null
-}
-
-/**
- * D1-backed implementation of {@link INotificationRepository}.
- */
-export class D1NotificationRepository implements INotificationRepository {
-  constructor(
-    private readonly database: D1Database,
-    private readonly clock: IClock,
-    private readonly idGenerator: IIdGenerator,
-  ) {}
-
-  async list(limit: number): Promise<NotificationRecord[]> {
-    const queryResult = await this.database
-      .prepare(
-        `SELECT id, title, message, type, is_read, created_at
-           FROM notifications
-           ORDER BY created_at DESC
-           LIMIT ?`
-      )
-      .bind(limit)
-      .all<NotificationRow>()
-
-    return (queryResult.results ?? []).map(mapRowToRecord)
-  }
-
-  async stats(): Promise<NotificationStats> {
-    const statsRow = await this.database
-      .prepare(
-        `SELECT COUNT(*) as total_count,
-                MAX(created_at) as latest_created_at,
-                SUM(is_read) as read_count
-           FROM notifications`
-      )
-      .first<NotificationStatsRow>()
-
-    return {
-      totalCount: statsRow?.total_count ?? 0,
-      latestCreatedAt: statsRow?.latest_created_at ?? 0,
-      readCount: statsRow?.read_count ?? 0,
-    }
-  }
-
-  async create(record: Omit<NotificationRecord, 'id' | 'createdAt' | 'isRead'>): Promise<string> {
-    const generatedId = this.idGenerator.uuid()
-    await this.database
-      .prepare(
-        `INSERT INTO notifications (id, title, message, type)
-         VALUES (?, ?, ?, ?)`
-      )
-      .bind(generatedId, record.title, record.message, record.type)
-      .run()
-    return generatedId
-  }
-
-  async markRead(notificationId: string): Promise<void> {
-    await this.database
-      .prepare('UPDATE notifications SET is_read = 1 WHERE id = ?')
-      .bind(notificationId)
-      .run()
-  }
-
-  async markUnread(notificationId: string): Promise<void> {
-    await this.database
-      .prepare('UPDATE notifications SET is_read = 0 WHERE id = ?')
-      .bind(notificationId)
-      .run()
-  }
-
-  async markAllRead(): Promise<void> {
-    await this.database.prepare('UPDATE notifications SET is_read = 1').run()
-  }
-
-  async delete(notificationId: string): Promise<void> {
-    await this.database
-      .prepare('DELETE FROM notifications WHERE id = ?')
-      .bind(notificationId)
-      .run()
-  }
-}
-
-function mapRowToRecord(row: NotificationRow): NotificationRecord {
-  return {
-    id: row.id,
-    title: row.title,
-    message: row.message,
-    type: row.type as NotificationType,
-    isRead: row.is_read === 1,
-    createdAt: row.created_at,
-  }
-}
+// 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 {
+  INotificationRepository,
+  NotificationRecord,
+  NotificationStats,
+  NotificationType,
+  IClock,
+  IIdGenerator,
+} from '@beechcms/core'
+
+interface NotificationRow {
+  id: string
+  title: string
+  message: string
+  type: string
+  is_read: number
+  created_at: number
+}
+
+interface NotificationStatsRow {
+  total_count: number | null
+  latest_created_at: number | null
+  read_count: number | null
+}
+
+/**
+ * D1-backed implementation of {@link INotificationRepository}.
+ */
+export class D1NotificationRepository implements INotificationRepository {
+  constructor(
+    private readonly database: D1Database,
+    private readonly clock: IClock,
+    private readonly idGenerator: IIdGenerator,
+  ) {}
+
+  async list(limit: number): Promise<NotificationRecord[]> {
+    const queryResult = await this.database
+      .prepare(
+        `SELECT id, title, message, type, is_read, created_at
+           FROM notifications
+           ORDER BY created_at DESC
+           LIMIT ?`
+      )
+      .bind(limit)
+      .all<NotificationRow>()
+
+    return (queryResult.results ?? []).map(mapRowToRecord)
+  }
+
+  async stats(): Promise<NotificationStats> {
+    const statsRow = await this.database
+      .prepare(
+        `SELECT COUNT(*) as total_count,
+                MAX(created_at) as latest_created_at,
+                SUM(is_read) as read_count
+           FROM notifications`
+      )
+      .first<NotificationStatsRow>()
+
+    return {
+      totalCount: statsRow?.total_count ?? 0,
+      latestCreatedAt: statsRow?.latest_created_at ?? 0,
+      readCount: statsRow?.read_count ?? 0,
+    }
+  }
+
+  async create(record: Omit<NotificationRecord, 'id' | 'createdAt' | 'isRead'>): Promise<string> {
+    const generatedId = this.idGenerator.uuid()
+    await this.database
+      .prepare(
+        `INSERT INTO notifications (id, title, message, type)
+         VALUES (?, ?, ?, ?)`
+      )
+      .bind(generatedId, record.title, record.message, record.type)
+      .run()
+    return generatedId
+  }
+
+  async markRead(notificationId: string): Promise<void> {
+    await this.database
+      .prepare('UPDATE notifications SET is_read = 1 WHERE id = ?')
+      .bind(notificationId)
+      .run()
+  }
+
+  async markUnread(notificationId: string): Promise<void> {
+    await this.database
+      .prepare('UPDATE notifications SET is_read = 0 WHERE id = ?')
+      .bind(notificationId)
+      .run()
+  }
+
+  async markAllRead(): Promise<void> {
+    await this.database.prepare('UPDATE notifications SET is_read = 1').run()
+  }
+
+  async delete(notificationId: string): Promise<void> {
+    await this.database
+      .prepare('DELETE FROM notifications WHERE id = ?')
+      .bind(notificationId)
+      .run()
+  }
+}
+
+function mapRowToRecord(row: NotificationRow): NotificationRecord {
+  return {
+    id: row.id,
+    title: row.title,
+    message: row.message,
+    type: row.type as NotificationType,
+    isRead: row.is_read === 1,
+    createdAt: row.created_at,
+  }
+}

package/src/shared/d1-password-reset-token.repository.test.ts

@@ -1,77 +1,81 @@
-import { describe, it, expect, vi } from 'vitest'
-import { D1PasswordResetTokenRepository } from './d1-password-reset-token.repository'
-
-const NOW = Math.floor(Date.now() / 1000)
-const fixedIdGen = { uuid: () => 'prt-1' }
-
-function makeMockDb(opts: { firstResult?: unknown; runChanges?: number } = {}) {
-  const { firstResult = null, runChanges = 1 } = opts
-  const runMock = vi.fn().mockResolvedValue({ success: true, meta: { changes: runChanges } })
-  const firstMock = vi.fn().mockResolvedValue(firstResult)
-  const bindMock = vi.fn(() => ({ first: firstMock, run: runMock }))
-  const prepareMock = vi.fn(() => ({ bind: bindMock }))
-  return { db: { prepare: prepareMock } as any, prepareMock, bindMock, runMock }
-}
-
-describe('D1PasswordResetTokenRepository', () => {
-  describe('create', () => {
-    it('calls INSERT INTO password_reset_tokens', async () => {
-      const { db, prepareMock } = makeMockDb()
-      await new D1PasswordResetTokenRepository(db, fixedIdGen).create({
-        userId: 'u1', tokenHash: 'h', expiresAt: NOW + 1800,
-      })
-      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('INSERT INTO password_reset_tokens'))
-    })
-
-    it('binds id, userId, tokenHash, and expiresAt in the correct order', async () => {
-      const { db, bindMock } = makeMockDb()
-      await new D1PasswordResetTokenRepository(db, fixedIdGen).create({
-        userId: 'u1', tokenHash: 'h', expiresAt: NOW + 1800,
-      })
-      expect(bindMock).toHaveBeenCalledWith('prt-1', 'u1', 'h', NOW + 1800)
-    })
-  })
-
-  describe('findValidByHashWithEmail', () => {
-    it('returns a ValidatedResetToken with the userId and email from the JOIN', async () => {
-      const row = { id: 'prt-1', user_id: 'u1', email: 'user@test.com' }
-      const { db } = makeMockDb({ firstResult: row })
-      const result = await new D1PasswordResetTokenRepository(db, fixedIdGen).findValidByHashWithEmail('h', NOW)
-      expect(result).toEqual({ id: 'prt-1', userId: 'u1', email: 'user@test.com' })
-    })
-
-    it('returns null when the token is not found, expired, or already used', async () => {
-      const { db } = makeMockDb({ firstResult: null })
-      expect(await new D1PasswordResetTokenRepository(db, fixedIdGen).findValidByHashWithEmail('bad-hash', NOW)).toBeNull()
-    })
-
-    it('passes tokenHash and nowTimestamp as bound values', async () => {
-      const { db, bindMock } = makeMockDb()
-      await new D1PasswordResetTokenRepository(db, fixedIdGen).findValidByHashWithEmail('my-hash', NOW)
-      expect(bindMock).toHaveBeenCalledWith('my-hash', NOW)
-    })
-  })
-
-  describe('markUsed', () => {
-    it('calls UPDATE password_reset_tokens SET used_at', async () => {
-      const { db, prepareMock } = makeMockDb()
-      await new D1PasswordResetTokenRepository(db, fixedIdGen).markUsed('prt-1', NOW)
-      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('used_at'))
-    })
-
-    it('binds nowTimestamp and tokenId in the correct order', async () => {
-      const { db, bindMock } = makeMockDb()
-      await new D1PasswordResetTokenRepository(db, fixedIdGen).markUsed('prt-1', NOW)
-      expect(bindMock).toHaveBeenCalledWith(NOW, 'prt-1')
-    })
-  })
-
-  describe('invalidatePending', () => {
-    it('calls UPDATE password_reset_tokens and includes the userId in the bound values', async () => {
-      const { db, prepareMock, bindMock } = makeMockDb()
-      await new D1PasswordResetTokenRepository(db, fixedIdGen).invalidatePending('u1', NOW)
-      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('UPDATE password_reset_tokens'))
-      expect((bindMock.mock.calls[0] as unknown[]).includes('u1')).toBe(true)
-    })
-  })
-})
+// 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 { D1PasswordResetTokenRepository } from './d1-password-reset-token.repository'
+
+const NOW = Math.floor(Date.now() / 1000)
+const fixedIdGen = { uuid: () => 'prt-1' }
+
+function makeMockDb(opts: { firstResult?: unknown; runChanges?: number } = {}) {
+  const { firstResult = null, runChanges = 1 } = opts
+  const runMock = vi.fn().mockResolvedValue({ success: true, meta: { changes: runChanges } })
+  const firstMock = vi.fn().mockResolvedValue(firstResult)
+  const bindMock = vi.fn(() => ({ first: firstMock, run: runMock }))
+  const prepareMock = vi.fn(() => ({ bind: bindMock }))
+  return { db: { prepare: prepareMock } as any, prepareMock, bindMock, runMock }
+}
+
+describe('D1PasswordResetTokenRepository', () => {
+  describe('create', () => {
+    it('calls INSERT INTO password_reset_tokens', async () => {
+      const { db, prepareMock } = makeMockDb()
+      await new D1PasswordResetTokenRepository(db, fixedIdGen).create({
+        userId: 'u1', tokenHash: 'h', expiresAt: NOW + 1800,
+      })
+      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('INSERT INTO password_reset_tokens'))
+    })
+
+    it('binds id, userId, tokenHash, and expiresAt in the correct order', async () => {
+      const { db, bindMock } = makeMockDb()
+      await new D1PasswordResetTokenRepository(db, fixedIdGen).create({
+        userId: 'u1', tokenHash: 'h', expiresAt: NOW + 1800,
+      })
+      expect(bindMock).toHaveBeenCalledWith('prt-1', 'u1', 'h', NOW + 1800)
+    })
+  })
+
+  describe('findValidByHashWithEmail', () => {
+    it('returns a ValidatedResetToken with the userId and email from the JOIN', async () => {
+      const row = { id: 'prt-1', user_id: 'u1', email: 'user@test.com' }
+      const { db } = makeMockDb({ firstResult: row })
+      const result = await new D1PasswordResetTokenRepository(db, fixedIdGen).findValidByHashWithEmail('h', NOW)
+      expect(result).toEqual({ id: 'prt-1', userId: 'u1', email: 'user@test.com' })
+    })
+
+    it('returns null when the token is not found, expired, or already used', async () => {
+      const { db } = makeMockDb({ firstResult: null })
+      expect(await new D1PasswordResetTokenRepository(db, fixedIdGen).findValidByHashWithEmail('bad-hash', NOW)).toBeNull()
+    })
+
+    it('passes tokenHash and nowTimestamp as bound values', async () => {
+      const { db, bindMock } = makeMockDb()
+      await new D1PasswordResetTokenRepository(db, fixedIdGen).findValidByHashWithEmail('my-hash', NOW)
+      expect(bindMock).toHaveBeenCalledWith('my-hash', NOW)
+    })
+  })
+
+  describe('markUsed', () => {
+    it('calls UPDATE password_reset_tokens SET used_at', async () => {
+      const { db, prepareMock } = makeMockDb()
+      await new D1PasswordResetTokenRepository(db, fixedIdGen).markUsed('prt-1', NOW)
+      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('used_at'))
+    })
+
+    it('binds nowTimestamp and tokenId in the correct order', async () => {
+      const { db, bindMock } = makeMockDb()
+      await new D1PasswordResetTokenRepository(db, fixedIdGen).markUsed('prt-1', NOW)
+      expect(bindMock).toHaveBeenCalledWith(NOW, 'prt-1')
+    })
+  })
+
+  describe('invalidatePending', () => {
+    it('calls UPDATE password_reset_tokens and includes the userId in the bound values', async () => {
+      const { db, prepareMock, bindMock } = makeMockDb()
+      await new D1PasswordResetTokenRepository(db, fixedIdGen).invalidatePending('u1', NOW)
+      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('UPDATE password_reset_tokens'))
+      expect((bindMock.mock.calls[0] as unknown[]).includes('u1')).toBe(true)
+    })
+  })
+})

package/src/shared/d1-password-reset-token.repository.ts

@@ -1,52 +1,56 @@
-/// <reference types="@cloudflare/workers-types" />
-import type { IPasswordResetTokenRepository, NewPasswordResetToken, ValidatedResetToken, IIdGenerator } from '@beechcms/core'
-
-type ValidatedResetTokenRow = {
-  id: string
-  user_id: string
-  email: string
-}
-
-export class D1PasswordResetTokenRepository implements IPasswordResetTokenRepository {
-  constructor(
-    private readonly db: D1Database,
-    private readonly idGenerator: IIdGenerator,
-  ) {}
-
-  async invalidatePending(userId: string, nowTimestamp: number): Promise<void> {
-    await this.db
-      .prepare('UPDATE password_reset_tokens SET used_at = ? WHERE user_id = ? AND used_at IS NULL')
-      .bind(nowTimestamp, userId)
-      .run()
-  }
-
-  async create(record: NewPasswordResetToken): Promise<void> {
-    const generatedId = this.idGenerator.uuid()
-    await this.db
-      .prepare('INSERT INTO password_reset_tokens (id, user_id, token_hash, expires_at) VALUES (?, ?, ?, ?)')
-      .bind(generatedId, record.userId, record.tokenHash, record.expiresAt)
-      .run()
-  }
-
-  async findValidByHashWithEmail(tokenHash: string, nowTimestamp: number): Promise<ValidatedResetToken | null> {
-    const row = await this.db
-      .prepare(
-        `SELECT prt.id, prt.user_id, u.email
-         FROM password_reset_tokens prt
-         JOIN users u ON u.id = prt.user_id
-         WHERE prt.token_hash = ? AND prt.expires_at > ? AND prt.used_at IS NULL`
-      )
-      .bind(tokenHash, nowTimestamp)
-      .first<ValidatedResetTokenRow>()
-
-    if (!row) return null
-    return { id: row.id, userId: row.user_id, email: row.email }
-  }
-
-  async markUsed(tokenId: string, nowTimestamp: number): Promise<void> {
-    await this.db
-      .prepare('UPDATE password_reset_tokens SET used_at = ? WHERE id = ?')
-      .bind(nowTimestamp, tokenId)
-      .run()
-  }
-}
+// 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 { IPasswordResetTokenRepository, NewPasswordResetToken, ValidatedResetToken, IIdGenerator } from '@beechcms/core'
+
+type ValidatedResetTokenRow = {
+  id: string
+  user_id: string
+  email: string
+}
+
+export class D1PasswordResetTokenRepository implements IPasswordResetTokenRepository {
+  constructor(
+    private readonly db: D1Database,
+    private readonly idGenerator: IIdGenerator,
+  ) {}
+
+  async invalidatePending(userId: string, nowTimestamp: number): Promise<void> {
+    await this.db
+      .prepare('UPDATE password_reset_tokens SET used_at = ? WHERE user_id = ? AND used_at IS NULL')
+      .bind(nowTimestamp, userId)
+      .run()
+  }
+
+  async create(record: NewPasswordResetToken): Promise<void> {
+    const generatedId = this.idGenerator.uuid()
+    await this.db
+      .prepare('INSERT INTO password_reset_tokens (id, user_id, token_hash, expires_at) VALUES (?, ?, ?, ?)')
+      .bind(generatedId, record.userId, record.tokenHash, record.expiresAt)
+      .run()
+  }
+
+  async findValidByHashWithEmail(tokenHash: string, nowTimestamp: number): Promise<ValidatedResetToken | null> {
+    const row = await this.db
+      .prepare(
+        `SELECT prt.id, prt.user_id, u.email
+         FROM password_reset_tokens prt
+         JOIN users u ON u.id = prt.user_id
+         WHERE prt.token_hash = ? AND prt.expires_at > ? AND prt.used_at IS NULL`
+      )
+      .bind(tokenHash, nowTimestamp)
+      .first<ValidatedResetTokenRow>()
+
+    if (!row) return null
+    return { id: row.id, userId: row.user_id, email: row.email }
+  }
+
+  async markUsed(tokenId: string, nowTimestamp: number): Promise<void> {
+    await this.db
+      .prepare('UPDATE password_reset_tokens SET used_at = ? WHERE id = ?')
+      .bind(nowTimestamp, tokenId)
+      .run()
+  }
+}