@beechcms/api 0.6.0-preview.1 → 0.6.0-preview.2

package/src/shared/media.repository.d1.test.ts

@@ -1,107 +1,107 @@
-// 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 { D1MediaRepository } from './media.repository.d1'
-
-function makeMockDb(opts: { firstResult?: unknown; allResults?: unknown[] } = {}) {
-  const { firstResult = null, allResults = [] } = opts
-  const runMock = vi.fn().mockResolvedValue({ success: true })
-  const firstMock = vi.fn().mockResolvedValue(firstResult)
-  const allMock = vi.fn().mockResolvedValue({ results: allResults })
-  // bind() returns the same interface so chains like prepare().bind().all() work.
-  // The statement also exposes first/all/run directly for queries that skip bind().
-  const bindMock = vi.fn(() => ({ run: runMock, first: firstMock, all: allMock }))
-  const stmt = { bind: bindMock, run: runMock, first: firstMock, all: allMock }
-  const prepareMock = vi.fn(() => stmt)
-  return { db: { prepare: prepareMock } as any, prepareMock, bindMock, runMock, firstMock, allMock }
-}
-
-describe('D1MediaRepository', () => {
-  describe('trackUpload', () => {
-    it('calls INSERT INTO media_objects with correct bound values', async () => {
-      const { db, prepareMock, bindMock } = makeMockDb()
-      const obj = { key: 'k1', filename: 'img.png', mime_type: 'image/png', size_bytes: 1024, uploaded_by: 'user-1' }
-      await new D1MediaRepository(db).trackUpload(obj)
-      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('INSERT INTO media_objects'))
-      expect(bindMock).toHaveBeenCalledWith('k1', 'img.png', 'image/png', 1024, 'user-1')
-    })
-  })
-
-  describe('getByKey', () => {
-    it('returns the media object when found', async () => {
-      const row = { key: 'k1', filename: 'img.png', mime_type: 'image/png', size_bytes: 512, uploaded_by: 'u1', created_at: 1000 }
-      const { db } = makeMockDb({ firstResult: row })
-      const result = await new D1MediaRepository(db).getByKey('k1')
-      expect(result).toEqual(row)
-    })
-
-    it('returns null when the key is not found', async () => {
-      const { db } = makeMockDb({ firstResult: null })
-      expect(await new D1MediaRepository(db).getByKey('ghost')).toBeNull()
-    })
-
-    it('passes the key as bound value', async () => {
-      const { db, bindMock } = makeMockDb()
-      await new D1MediaRepository(db).getByKey('my-key')
-      expect(bindMock).toHaveBeenCalledWith('my-key')
-    })
-  })
-
-  describe('untrack', () => {
-    it('calls DELETE FROM media_objects with the key', async () => {
-      const { db, prepareMock, bindMock } = makeMockDb()
-      await new D1MediaRepository(db).untrack('k1')
-      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('DELETE FROM media_objects'))
-      expect(bindMock).toHaveBeenCalledWith('k1')
-    })
-  })
-
-  describe('list', () => {
-    it('returns items and total from D1', async () => {
-      const rows = [
-        { key: 'k1', filename: 'a.png', mime_type: 'image/png', size_bytes: 100, uploaded_by: 'u1', created_at: 1000 },
-      ]
-      const { db, allMock, firstMock } = makeMockDb()
-      // list() calls all() for items then first() for count (without bind)
-      allMock.mockResolvedValueOnce({ results: rows })
-      firstMock.mockResolvedValueOnce({ total: 1 })
-
-      const result = await new D1MediaRepository(db).list({ limit: 10, offset: 0 })
-      expect(result.items).toHaveLength(1)
-      expect(result.total).toBe(1)
-    })
-
-    it('returns empty items and 0 total when D1 returns nothing', async () => {
-      const { db, allMock, firstMock } = makeMockDb()
-      allMock.mockResolvedValueOnce({ results: [] })
-      firstMock.mockResolvedValueOnce(null) // count row is null → 0
-
-      const result = await new D1MediaRepository(db).list({ limit: 10, offset: 0 })
-      expect(result.items).toEqual([])
-      expect(result.total).toBe(0)
-    })
-
-    it('passes limit and offset as bound values for the list query', async () => {
-      const { db, bindMock, allMock, firstMock } = makeMockDb()
-      allMock.mockResolvedValueOnce({ results: [] })
-      firstMock.mockResolvedValueOnce({ total: 0 })
-
-      await new D1MediaRepository(db).list({ limit: 5, offset: 10 })
-      expect(bindMock).toHaveBeenCalledWith(5, 10)
-    })
-  })
-
-  describe('count', () => {
-    it('returns the count from D1', async () => {
-      const { db } = makeMockDb({ firstResult: { total: 42 } })
-      expect(await new D1MediaRepository(db).count()).toBe(42)
-    })
-
-    it('returns 0 when D1 returns null', async () => {
-      const { db } = makeMockDb({ firstResult: null })
-      expect(await new D1MediaRepository(db).count()).toBe(0)
-    })
-  })
-})
+// 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 { D1MediaRepository } from './media.repository.d1'
+
+function makeMockDb(opts: { firstResult?: unknown; allResults?: unknown[] } = {}) {
+  const { firstResult = null, allResults = [] } = opts
+  const runMock = vi.fn().mockResolvedValue({ success: true })
+  const firstMock = vi.fn().mockResolvedValue(firstResult)
+  const allMock = vi.fn().mockResolvedValue({ results: allResults })
+  // bind() returns the same interface so chains like prepare().bind().all() work.
+  // The statement also exposes first/all/run directly for queries that skip bind().
+  const bindMock = vi.fn(() => ({ run: runMock, first: firstMock, all: allMock }))
+  const stmt = { bind: bindMock, run: runMock, first: firstMock, all: allMock }
+  const prepareMock = vi.fn(() => stmt)
+  return { db: { prepare: prepareMock } as any, prepareMock, bindMock, runMock, firstMock, allMock }
+}
+
+describe('D1MediaRepository', () => {
+  describe('trackUpload', () => {
+    it('calls INSERT INTO media_objects with correct bound values', async () => {
+      const { db, prepareMock, bindMock } = makeMockDb()
+      const obj = { key: 'k1', filename: 'img.png', mime_type: 'image/png', size_bytes: 1024, uploaded_by: 'user-1' }
+      await new D1MediaRepository(db).trackUpload(obj)
+      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('INSERT INTO media_objects'))
+      expect(bindMock).toHaveBeenCalledWith('k1', 'img.png', 'image/png', 1024, 'user-1')
+    })
+  })
+
+  describe('getByKey', () => {
+    it('returns the media object when found', async () => {
+      const row = { key: 'k1', filename: 'img.png', mime_type: 'image/png', size_bytes: 512, uploaded_by: 'u1', created_at: 1000 }
+      const { db } = makeMockDb({ firstResult: row })
+      const result = await new D1MediaRepository(db).getByKey('k1')
+      expect(result).toEqual(row)
+    })
+
+    it('returns null when the key is not found', async () => {
+      const { db } = makeMockDb({ firstResult: null })
+      expect(await new D1MediaRepository(db).getByKey('ghost')).toBeNull()
+    })
+
+    it('passes the key as bound value', async () => {
+      const { db, bindMock } = makeMockDb()
+      await new D1MediaRepository(db).getByKey('my-key')
+      expect(bindMock).toHaveBeenCalledWith('my-key')
+    })
+  })
+
+  describe('untrack', () => {
+    it('calls DELETE FROM media_objects with the key', async () => {
+      const { db, prepareMock, bindMock } = makeMockDb()
+      await new D1MediaRepository(db).untrack('k1')
+      expect(prepareMock).toHaveBeenCalledWith(expect.stringContaining('DELETE FROM media_objects'))
+      expect(bindMock).toHaveBeenCalledWith('k1')
+    })
+  })
+
+  describe('list', () => {
+    it('returns items and total from D1', async () => {
+      const rows = [
+        { key: 'k1', filename: 'a.png', mime_type: 'image/png', size_bytes: 100, uploaded_by: 'u1', created_at: 1000 },
+      ]
+      const { db, allMock, firstMock } = makeMockDb()
+      // list() calls all() for items then first() for count (without bind)
+      allMock.mockResolvedValueOnce({ results: rows })
+      firstMock.mockResolvedValueOnce({ total: 1 })
+
+      const result = await new D1MediaRepository(db).list({ limit: 10, offset: 0 })
+      expect(result.items).toHaveLength(1)
+      expect(result.total).toBe(1)
+    })
+
+    it('returns empty items and 0 total when D1 returns nothing', async () => {
+      const { db, allMock, firstMock } = makeMockDb()
+      allMock.mockResolvedValueOnce({ results: [] })
+      firstMock.mockResolvedValueOnce(null) // count row is null → 0
+
+      const result = await new D1MediaRepository(db).list({ limit: 10, offset: 0 })
+      expect(result.items).toEqual([])
+      expect(result.total).toBe(0)
+    })
+
+    it('passes limit and offset as bound values for the list query', async () => {
+      const { db, bindMock, allMock, firstMock } = makeMockDb()
+      allMock.mockResolvedValueOnce({ results: [] })
+      firstMock.mockResolvedValueOnce({ total: 0 })
+
+      await new D1MediaRepository(db).list({ limit: 5, offset: 10 })
+      expect(bindMock).toHaveBeenCalledWith(5, 10)
+    })
+  })
+
+  describe('count', () => {
+    it('returns the count from D1', async () => {
+      const { db } = makeMockDb({ firstResult: { total: 42 } })
+      expect(await new D1MediaRepository(db).count()).toBe(42)
+    })
+
+    it('returns 0 when D1 returns null', async () => {
+      const { db } = makeMockDb({ firstResult: null })
+      expect(await new D1MediaRepository(db).count()).toBe(0)
+    })
+  })
+})

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

@@ -1,68 +1,68 @@
-// 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 { MediaRepository, MediaObject } from '@beechcms/core'
-
-/**
- * Implementation of MediaRepository using Cloudflare D1.
- * Provides methods to track media uploads, retrieve media metadata, and manage the media library state in the database.
- */
-export class D1MediaRepository implements MediaRepository {
-  constructor(private database: D1Database) {}
-
-  /**
-   * Registers a new media upload in the database.
-   */
-  async trackUpload(mediaObject: Omit<MediaObject, 'created_at'>): Promise<void> {
-    await this.database.prepare(
-      'INSERT INTO media_objects (key, filename, mime_type, size_bytes, uploaded_by) VALUES (?, ?, ?, ?, ?)'
-    ).bind(
-      mediaObject.key, 
-      mediaObject.filename, 
-      mediaObject.mime_type, 
-      mediaObject.size_bytes, 
-      mediaObject.uploaded_by
-    ).run()
-  }
-
-  /**
-   * Retrieves a media object's metadata by its unique key.
-   */
-  async getByKey(mediaKey: string): Promise<MediaObject | null> {
-    return await this.database.prepare(
-      'SELECT key, filename, mime_type, size_bytes, uploaded_by, created_at FROM media_objects WHERE key = ?'
-    ).bind(mediaKey).first<MediaObject>()
-  }
-
-  /**
-   * Removes the metadata tracking for a specific media key.
-   */
-  async untrack(mediaKey: string): Promise<void> {
-    await this.database.prepare('DELETE FROM media_objects WHERE key = ?').bind(mediaKey).run()
-  }
-
-  /**
-   * Lists media objects with pagination support.
-   */
-  async list(paginationOptions: { limit: number; offset: number }): Promise<{ items: MediaObject[]; total: number }> {
-    const { results: mediaItems } = await this.database.prepare(
-      'SELECT key, filename, mime_type, size_bytes, uploaded_by, created_at FROM media_objects ORDER BY created_at DESC LIMIT ? OFFSET ?'
-    ).bind(paginationOptions.limit, paginationOptions.offset).all<MediaObject>()
-
-    const totalCountRecord = await this.database.prepare('SELECT COUNT(*) as total FROM media_objects').first<{ total: number }>()
-
-    return {
-      items: mediaItems ?? [],
-      total: totalCountRecord?.total ?? 0
-    }
-  }
-
-  /**
-   * Returns the total number of media objects in the database.
-   */
-  async count(): Promise<number> {
-    const totalCountRecord = await this.database.prepare('SELECT COUNT(*) as total FROM media_objects').first<{ total: number }>()
-    return totalCountRecord?.total ?? 0
-  }
-}
+// 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 { MediaRepository, MediaObject } from '@beechcms/core'
+
+/**
+ * Implementation of MediaRepository using Cloudflare D1.
+ * Provides methods to track media uploads, retrieve media metadata, and manage the media library state in the database.
+ */
+export class D1MediaRepository implements MediaRepository {
+  constructor(private database: D1Database) {}
+
+  /**
+   * Registers a new media upload in the database.
+   */
+  async trackUpload(mediaObject: Omit<MediaObject, 'created_at'>): Promise<void> {
+    await this.database.prepare(
+      'INSERT INTO media_objects (key, filename, mime_type, size_bytes, uploaded_by) VALUES (?, ?, ?, ?, ?)'
+    ).bind(
+      mediaObject.key, 
+      mediaObject.filename, 
+      mediaObject.mime_type, 
+      mediaObject.size_bytes, 
+      mediaObject.uploaded_by
+    ).run()
+  }
+
+  /**
+   * Retrieves a media object's metadata by its unique key.
+   */
+  async getByKey(mediaKey: string): Promise<MediaObject | null> {
+    return await this.database.prepare(
+      'SELECT key, filename, mime_type, size_bytes, uploaded_by, created_at FROM media_objects WHERE key = ?'
+    ).bind(mediaKey).first<MediaObject>()
+  }
+
+  /**
+   * Removes the metadata tracking for a specific media key.
+   */
+  async untrack(mediaKey: string): Promise<void> {
+    await this.database.prepare('DELETE FROM media_objects WHERE key = ?').bind(mediaKey).run()
+  }
+
+  /**
+   * Lists media objects with pagination support.
+   */
+  async list(paginationOptions: { limit: number; offset: number }): Promise<{ items: MediaObject[]; total: number }> {
+    const { results: mediaItems } = await this.database.prepare(
+      'SELECT key, filename, mime_type, size_bytes, uploaded_by, created_at FROM media_objects ORDER BY created_at DESC LIMIT ? OFFSET ?'
+    ).bind(paginationOptions.limit, paginationOptions.offset).all<MediaObject>()
+
+    const totalCountRecord = await this.database.prepare('SELECT COUNT(*) as total FROM media_objects').first<{ total: number }>()
+
+    return {
+      items: mediaItems ?? [],
+      total: totalCountRecord?.total ?? 0
+    }
+  }
+
+  /**
+   * Returns the total number of media objects in the database.
+   */
+  async count(): Promise<number> {
+    const totalCountRecord = await this.database.prepare('SELECT COUNT(*) as total FROM media_objects').first<{ total: number }>()
+    return totalCountRecord?.total ?? 0
+  }
+}

package/src/shared/qstash-notification-service.test.ts

@@ -1,67 +1,67 @@
-// 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, beforeEach } from 'vitest'
-import { QStashNotificationService } from './qstash-notification-service'
-import { Client } from '@upstash/qstash'
-
-// Mock the @upstash/qstash Client
-vi.mock('@upstash/qstash', () => {
-  const publishJSON = vi.fn().mockResolvedValue({ messageId: 'msg_123' })
-  return {
-    Client: vi.fn().mockImplementation(function () {
-      return { publishJSON }
-    }),
-  }
-})
-
-describe('QStashNotificationService', () => {
-  beforeEach(() => {
-    vi.clearAllMocks()
-  })
-
-  it('delegates publishing to the QStash client with correct URL', async () => {
-    const service = new QStashNotificationService('fake_token', 'https://beechcms.test/')
-    await service.notify({
-      title: 'Hello',
-      message: 'World',
-      type: 'success',
-    })
-
-    const clientInstance = vi.mocked(Client).mock.results[0].value
-    expect(clientInstance.publishJSON).toHaveBeenCalledWith({
-      url: 'https://beechcms.test/api/webhooks/qstash',
-      body: {
-        title: 'Hello',
-        message: 'World',
-        type: 'success',
-      },
-    })
-  })
-
-  it('delegates to the background scheduler when provided', () => {
-    const schedule = vi.fn()
-    const service = new QStashNotificationService('fake_token', 'https://beechcms.test', schedule)
-    
-    service.notify({ title: 'T', message: 'M' })
-    
-    expect(schedule).toHaveBeenCalledTimes(1)
-    expect(schedule.mock.calls[0][0]).toBeInstanceOf(Promise)
-  })
-
-  it('never throws to the caller when the publish write fails', async () => {
-    // Override the mock for this specific test
-    const mockPublish = vi.fn().mockRejectedValue(new Error('network error'))
-    vi.mocked(Client).mockImplementationOnce(function () {
-      return { publishJSON: mockPublish }
-    } as any)
-
-    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
-    const service = new QStashNotificationService('fake_token', 'https://beechcms.test')
-    
-    await expect(service.notify({ title: 'T', message: 'M' })).resolves.toBeUndefined()
-    expect(consoleSpy).toHaveBeenCalled()
-    consoleSpy.mockRestore()
-  })
-})
+// 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, beforeEach } from 'vitest'
+import { QStashNotificationService } from './qstash-notification-service'
+import { Client } from '@upstash/qstash'
+
+// Mock the @upstash/qstash Client
+vi.mock('@upstash/qstash', () => {
+  const publishJSON = vi.fn().mockResolvedValue({ messageId: 'msg_123' })
+  return {
+    Client: vi.fn().mockImplementation(function () {
+      return { publishJSON }
+    }),
+  }
+})
+
+describe('QStashNotificationService', () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  it('delegates publishing to the QStash client with correct URL', async () => {
+    const service = new QStashNotificationService('fake_token', 'https://beechcms.test/')
+    await service.notify({
+      title: 'Hello',
+      message: 'World',
+      type: 'success',
+    })
+
+    const clientInstance = vi.mocked(Client).mock.results[0].value
+    expect(clientInstance.publishJSON).toHaveBeenCalledWith({
+      url: 'https://beechcms.test/api/webhooks/qstash',
+      body: {
+        title: 'Hello',
+        message: 'World',
+        type: 'success',
+      },
+    })
+  })
+
+  it('delegates to the background scheduler when provided', () => {
+    const schedule = vi.fn()
+    const service = new QStashNotificationService('fake_token', 'https://beechcms.test', schedule)
+    
+    service.notify({ title: 'T', message: 'M' })
+    
+    expect(schedule).toHaveBeenCalledTimes(1)
+    expect(schedule.mock.calls[0][0]).toBeInstanceOf(Promise)
+  })
+
+  it('never throws to the caller when the publish write fails', async () => {
+    // Override the mock for this specific test
+    const mockPublish = vi.fn().mockRejectedValue(new Error('network error'))
+    vi.mocked(Client).mockImplementationOnce(function () {
+      return { publishJSON: mockPublish }
+    } as any)
+
+    const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
+    const service = new QStashNotificationService('fake_token', 'https://beechcms.test')
+    
+    await expect(service.notify({ title: 'T', message: 'M' })).resolves.toBeUndefined()
+    expect(consoleSpy).toHaveBeenCalled()
+    consoleSpy.mockRestore()
+  })
+})

package/src/shared/qstash-notification-service.ts

@@ -1,55 +1,55 @@
-// 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 type { INotificationService, CreateNotificationInput } from '@beechcms/core'
-import { Client } from '@upstash/qstash'
-
-type ScheduleBackgroundTask = (task: Promise<unknown>) => void
-
-/**
- * QStash implementation of {@link INotificationService}.
- *
- * This service acts as a publisher, sending the notification payload to Upstash QStash,
- * which guarantees delivery and retries. QStash will then forward the payload to the
- * local webhook endpoint where it is actually inserted into D1.
- */
-export class QStashNotificationService implements INotificationService {
-  private readonly client: Client
-  private readonly webhookUrl: string
-
-  constructor(
-    token: string,
-    appUrl: string,
-    private readonly scheduleBackgroundTask?: ScheduleBackgroundTask,
-    qstashUrl?: string
-  ) {
-    this.client = new Client({ 
-      token,
-      ...(qstashUrl ? { baseUrl: qstashUrl } : {})
-    })
-    this.webhookUrl = `${appUrl.replace(/\/$/, '')}/api/webhooks/qstash`
-  }
-
-  notify(input: CreateNotificationInput): Promise<void> | void {
-    const publishPromise = this.runPublish(input)
-
-    if (this.scheduleBackgroundTask) {
-      this.scheduleBackgroundTask(publishPromise)
-      return
-    }
-
-    return publishPromise
-  }
-
-  private async runPublish(input: CreateNotificationInput): Promise<void> {
-    try {
-      await this.client.publishJSON({
-        url: this.webhookUrl,
-        body: input,
-      })
-    } catch (error) {
-      console.error('QStashNotificationService: failed to publish notification', error)
-    }
-  }
-}
+// 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 type { INotificationService, CreateNotificationInput } from '@beechcms/core'
+import { Client } from '@upstash/qstash'
+
+type ScheduleBackgroundTask = (task: Promise<unknown>) => void
+
+/**
+ * QStash implementation of {@link INotificationService}.
+ *
+ * This service acts as a publisher, sending the notification payload to Upstash QStash,
+ * which guarantees delivery and retries. QStash will then forward the payload to the
+ * local webhook endpoint where it is actually inserted into D1.
+ */
+export class QStashNotificationService implements INotificationService {
+  private readonly client: Client
+  private readonly webhookUrl: string
+
+  constructor(
+    token: string,
+    appUrl: string,
+    private readonly scheduleBackgroundTask?: ScheduleBackgroundTask,
+    qstashUrl?: string
+  ) {
+    this.client = new Client({ 
+      token,
+      ...(qstashUrl ? { baseUrl: qstashUrl } : {})
+    })
+    this.webhookUrl = `${appUrl.replace(/\/$/, '')}/api/webhooks/qstash`
+  }
+
+  notify(input: CreateNotificationInput): Promise<void> | void {
+    const publishPromise = this.runPublish(input)
+
+    if (this.scheduleBackgroundTask) {
+      this.scheduleBackgroundTask(publishPromise)
+      return
+    }
+
+    return publishPromise
+  }
+
+  private async runPublish(input: CreateNotificationInput): Promise<void> {
+    try {
+      await this.client.publishJSON({
+        url: this.webhookUrl,
+        body: input,
+      })
+    } catch (error) {
+      console.error('QStashNotificationService: failed to publish notification', error)
+    }
+  }
+}