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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (222) hide show
  1. package/assets/dashboard/BeechLogo.svg +18 -18
  2. package/assets/dashboard/BeechLogoLIght.svg +48 -48
  3. package/assets/dashboard/assets/chart-BrJFdsGZ.js +39 -0
  4. package/assets/dashboard/assets/index-CIaoMxuB.css +1 -0
  5. package/assets/dashboard/assets/index-wTKgygsg.js +636 -0
  6. package/assets/dashboard/assets/pie-chart-recharts-BEaE1FOE.js +1 -0
  7. package/assets/dashboard/assets/timeseries-chart-recharts-DmWM6imF.js +1 -0
  8. package/assets/dashboard/beechLogoDark.svg +48 -48
  9. package/assets/dashboard/index.html +18 -18
  10. package/assets/dashboard/noResult.svg +42 -42
  11. package/assets/dashboard/sol.svg +3 -3
  12. package/assets/dashboard/undraw_enter_nwx3.svg +36 -36
  13. package/migrations/0000_v040_base.sql +265 -265
  14. package/migrations/0029_automations.sql +14 -14
  15. package/migrations/0030_test_seeds.sql +125 -125
  16. package/package.json +2 -2
  17. package/src/auth/__fixtures__/in-memory-hash-provider.ts +17 -17
  18. package/src/auth/__fixtures__/static-token-service.ts +22 -22
  19. package/src/auth/bcrypt-hash-provider.ts +24 -24
  20. package/src/auth/constants.ts +14 -14
  21. package/src/auth/generate-refresh-token.test.ts +23 -23
  22. package/src/auth/hash-provider.test.ts +55 -55
  23. package/src/auth/jose-token-service.ts +62 -62
  24. package/src/auth/jwt-claims-passthrough.test.ts +87 -87
  25. package/src/auth/login.test.ts +100 -100
  26. package/src/auth/login.ts +78 -78
  27. package/src/auth/refresh.ts +11 -11
  28. package/src/auth/token-service.test.ts +90 -90
  29. package/src/factory.ts +370 -368
  30. package/src/features/automations/__tests__/action-executors.test.ts +255 -255
  31. package/src/features/automations/__tests__/automation-runner.test.ts +196 -196
  32. package/src/features/automations/__tests__/automation-runner.utils.test.ts +60 -60
  33. package/src/features/automations/__tests__/automations.handler.test.ts +264 -264
  34. package/src/features/automations/__tests__/automations.repository.test.ts +163 -163
  35. package/src/features/automations/__tests__/automations.schema.test.ts +224 -224
  36. package/src/features/automations/__tests__/context-resolver.test.ts +126 -126
  37. package/src/features/automations/__tests__/cron-runner.test.ts +267 -267
  38. package/src/features/automations/__tests__/cron-runner.utils.test.ts +144 -144
  39. package/src/features/automations/__tests__/set-variable.executor.test.ts +383 -383
  40. package/src/features/automations/__tests__/template-grammar.test.ts +308 -308
  41. package/src/features/automations/__tests__/webhook.executor.test.ts +142 -142
  42. package/src/features/automations/__tests__/when-evaluator.test.ts +274 -274
  43. package/src/features/automations/__tests__/when-pushdown.test.ts +281 -281
  44. package/src/features/automations/action-executors/create-entry.executor.ts +27 -27
  45. package/src/features/automations/action-executors/edit-field.executor.ts +26 -26
  46. package/src/features/automations/action-executors/index.ts +37 -37
  47. package/src/features/automations/action-executors/send-mail.executor.ts +53 -53
  48. package/src/features/automations/action-executors/set-variable.executor.ts +159 -159
  49. package/src/features/automations/action-executors/webhook.executor.ts +67 -67
  50. package/src/features/automations/automation-runner.ts +85 -85
  51. package/src/features/automations/automation-runner.utils.ts +47 -47
  52. package/src/features/automations/automations.handler.ts +197 -197
  53. package/src/features/automations/automations.schema.ts +177 -177
  54. package/src/features/automations/context-resolver.ts +152 -152
  55. package/src/features/automations/cron-runner.ts +140 -140
  56. package/src/features/automations/cron-runner.utils.ts +44 -44
  57. package/src/features/automations/filter-translation.ts +46 -46
  58. package/src/features/automations/index.ts +16 -16
  59. package/src/features/automations/template-grammar.ts +245 -245
  60. package/src/features/automations/var-access-resolver.ts +140 -140
  61. package/src/features/automations/when-evaluator.ts +87 -87
  62. package/src/features/automations/when-pushdown.ts +57 -57
  63. package/src/features/backrefs/__tests__/backrefs.handler.test.ts +359 -359
  64. package/src/features/backrefs/backrefs.handler.ts +168 -168
  65. package/src/features/backrefs/d1-backref.repository.ts +84 -84
  66. package/src/features/backrefs/index.ts +5 -5
  67. package/src/features/content/constants.ts +16 -16
  68. package/src/features/content/handlers/bulk.handler.ts +185 -185
  69. package/src/features/content/handlers/create.ts +129 -129
  70. package/src/features/content/handlers/delete.ts +62 -62
  71. package/src/features/content/handlers/facets.ts +49 -49
  72. package/src/features/content/handlers/get.ts +120 -120
  73. package/src/features/content/handlers/helpers.test.ts +180 -180
  74. package/src/features/content/handlers/helpers.ts +93 -93
  75. package/src/features/content/handlers/list.ts +174 -174
  76. package/src/features/content/handlers/update.ts +174 -174
  77. package/src/features/content/index.ts +26 -26
  78. package/src/features/dashboard-layout/__tests__/dashboard-layout.handler.test.ts +388 -0
  79. package/src/features/dashboard-layout/dashboard-layout.handler.ts +206 -0
  80. package/src/features/dashboard-layout/index.ts +5 -0
  81. package/src/features/draft/draft.handler.ts +195 -195
  82. package/src/features/draft/draft.middleware.ts +66 -66
  83. package/src/features/draft/index.ts +5 -5
  84. package/src/features/email/email.provider.ts +42 -42
  85. package/src/features/email/email.service.ts +98 -98
  86. package/src/features/email/email.types.ts +119 -119
  87. package/src/features/email/index.ts +33 -33
  88. package/src/features/email/providers/resend.ts +67 -67
  89. package/src/features/email/providers/smtp.ts +55 -55
  90. package/src/features/email/templates/automation-mail.ts +19 -19
  91. package/src/features/email/templates/password-changed.ts +63 -63
  92. package/src/features/email/templates/password-reset.ts +68 -68
  93. package/src/features/email/templates/shell.ts +96 -96
  94. package/src/features/notifications/index.ts +5 -5
  95. package/src/features/notifications/notifications.handler.ts +105 -105
  96. package/src/features/password-reset/index.ts +19 -19
  97. package/src/features/password-reset/request.ts +92 -92
  98. package/src/features/password-reset/reset.ts +102 -102
  99. package/src/features/rotate-field/index.ts +5 -5
  100. package/src/features/rotate-field/rotate-field.handler.ts +132 -132
  101. package/src/features/rotate-field/rotate-field.schema.ts +17 -17
  102. package/src/features/schema/schema.handler.ts +131 -131
  103. package/src/features/seeds/index.ts +5 -5
  104. package/src/features/seeds/seeds.handler.test.ts +1199 -632
  105. package/src/features/seeds/seeds.handler.ts +558 -693
  106. package/src/features/settings/__tests__/settings.handler.test.ts +555 -555
  107. package/src/features/settings/settings.handler.ts +392 -392
  108. package/src/features/setup/index.ts +288 -204
  109. package/src/features/stats/index.ts +5 -5
  110. package/src/features/stats/stats.handler.ts +420 -420
  111. package/src/features/webhooks/index.ts +63 -63
  112. package/src/index.ts +65 -65
  113. package/src/media-utils.ts +82 -82
  114. package/src/middleware/auth-providers.middleware.test.ts +85 -0
  115. package/src/middleware/auth-providers.middleware.ts +45 -45
  116. package/src/middleware/observability.middleware.test.ts +93 -0
  117. package/src/middleware/observability.middleware.ts +70 -70
  118. package/src/middleware/rate-limit.middleware.ts +45 -45
  119. package/src/middleware/repository.middleware.ts +117 -114
  120. package/src/middleware/seed-registry.middleware.test.ts +97 -97
  121. package/src/middleware/seed-registry.middleware.ts +21 -21
  122. package/src/middleware/storage.middleware.ts +25 -25
  123. package/src/middleware.ts +45 -45
  124. package/src/public/access-policy.ts +27 -27
  125. package/src/public/api-key-middleware.ts +57 -57
  126. package/src/public/cache-utils.ts +38 -38
  127. package/src/public/entry-projection.ts +46 -46
  128. package/src/public/idempotency.ts +23 -23
  129. package/src/public/index.ts +16 -16
  130. package/src/public/problem-details.ts +124 -124
  131. package/src/public/public-add.ts +114 -114
  132. package/src/public/public-edit.ts +163 -163
  133. package/src/public/public-errors.ts +19 -19
  134. package/src/public/public-read.ts +63 -63
  135. package/src/public/public-routes.ts +88 -88
  136. package/src/public/query-builder.test.ts +224 -224
  137. package/src/public/query-builder.ts +156 -156
  138. package/src/public/rate-limit-middleware.ts +34 -34
  139. package/src/public/read-list.ts +54 -54
  140. package/src/public/read-single.ts +48 -48
  141. package/src/public/response-builder.ts +30 -30
  142. package/src/public/sanitize.ts +69 -69
  143. package/src/public/slug-utils.ts +18 -18
  144. package/src/rate-limit/cloudflare-rate-limiter.test.ts +30 -30
  145. package/src/rate-limit/cloudflare-rate-limiter.ts +15 -15
  146. package/src/rate-limit/in-memory-rate-limiter.test.ts +37 -37
  147. package/src/rate-limit/in-memory-rate-limiter.ts +17 -17
  148. package/src/rate-limit/no-op-rate-limiter.test.ts +22 -22
  149. package/src/rate-limit/no-op-rate-limiter.ts +11 -11
  150. package/src/search-utils.test.ts +211 -211
  151. package/src/search-utils.ts +213 -213
  152. package/src/search.ts +65 -65
  153. package/src/shared/apply-policies.test.ts +81 -81
  154. package/src/shared/apply-policies.ts +67 -67
  155. package/src/shared/automations.repository.d1.ts +150 -150
  156. package/src/shared/background-notification-service.test.ts +62 -62
  157. package/src/shared/background-notification-service.ts +52 -52
  158. package/src/shared/base.repository.d1.ts +32 -32
  159. package/src/shared/content-utils.test.ts +165 -165
  160. package/src/shared/content-utils.ts +86 -86
  161. package/src/shared/content.repository.d1.test.ts +507 -458
  162. package/src/shared/content.repository.d1.ts +851 -851
  163. package/src/shared/d1-activity-log.repository.test.ts +140 -140
  164. package/src/shared/d1-activity-log.repository.ts +105 -105
  165. package/src/shared/d1-activity-logger.test.ts +86 -86
  166. package/src/shared/d1-activity-logger.ts +67 -67
  167. package/src/shared/d1-analytics.repository.test.ts +78 -78
  168. package/src/shared/d1-analytics.repository.ts +85 -85
  169. package/src/shared/d1-content-scan.repository.test.ts +80 -80
  170. package/src/shared/d1-content-scan.repository.ts +37 -37
  171. package/src/shared/d1-notification.repository.test.ts +128 -128
  172. package/src/shared/d1-notification.repository.ts +118 -118
  173. package/src/shared/d1-password-reset-token.repository.test.ts +81 -81
  174. package/src/shared/d1-password-reset-token.repository.ts +56 -56
  175. package/src/shared/d1-search.repository.test.ts +87 -87
  176. package/src/shared/d1-search.repository.ts +88 -88
  177. package/src/shared/d1-session.repository.test.ts +125 -125
  178. package/src/shared/d1-session.repository.ts +102 -102
  179. package/src/shared/d1-setup-checklist.repository.ts +36 -36
  180. package/src/shared/d1-user.repository.test.ts +151 -151
  181. package/src/shared/d1-user.repository.ts +119 -119
  182. package/src/shared/d1-widget.repository.test.ts +267 -221
  183. package/src/shared/d1-widget.repository.ts +385 -341
  184. package/src/shared/dashboard-layout.repository.d1.test.ts +135 -0
  185. package/src/shared/dashboard-layout.repository.d1.ts +58 -0
  186. package/src/shared/demo-data-sql.ts +216 -54
  187. package/src/shared/demo-data.repository.d1.ts +20 -20
  188. package/src/shared/execution-context-scheduler.ts +13 -13
  189. package/src/shared/fixed-clock.ts +25 -25
  190. package/src/shared/fts-sync.ts +8 -8
  191. package/src/shared/idempotency.repository.d1.test.ts +83 -83
  192. package/src/shared/idempotency.repository.d1.ts +60 -60
  193. package/src/shared/in-memory-activity-logger.ts +19 -19
  194. package/src/shared/in-memory-notification-service.ts +19 -19
  195. package/src/shared/in-memory-seed.repository.ts +58 -51
  196. package/src/shared/media.repository.d1.test.ts +107 -107
  197. package/src/shared/media.repository.d1.ts +68 -68
  198. package/src/shared/qstash-notification-service.test.ts +67 -67
  199. package/src/shared/qstash-notification-service.ts +55 -55
  200. package/src/shared/query-utils.ts +141 -141
  201. package/src/shared/request-utils.ts +26 -26
  202. package/src/shared/schema-mutator.d1.test.ts +142 -0
  203. package/src/shared/schema-mutator.d1.ts +64 -64
  204. package/src/shared/seed-layout.repository.d1.test.ts +114 -114
  205. package/src/shared/seed-layout.repository.d1.ts +62 -62
  206. package/src/shared/seed-registry-cache.test.ts +68 -68
  207. package/src/shared/seed-registry-cache.ts +49 -49
  208. package/src/shared/seed.repository.d1.test.ts +143 -143
  209. package/src/shared/seed.repository.d1.ts +98 -98
  210. package/src/shared/sequential-id-generator.ts +33 -33
  211. package/src/shared/site-settings.repository.d1.ts +53 -53
  212. package/src/shared/storage/factory.ts +41 -41
  213. package/src/shared/storage/s3-bucket.ts +195 -195
  214. package/src/shared/storage-utils.ts +40 -40
  215. package/src/shared/system-stats.repository.d1.test.ts +58 -58
  216. package/src/shared/system-stats.repository.d1.ts +48 -48
  217. package/src/types.ts +90 -87
  218. package/src/upload.ts +198 -198
  219. package/src/widget.test.ts +85 -0
  220. package/src/widget.ts +251 -212
  221. package/assets/dashboard/assets/index-BSjk0Sx9.js +0 -634
  222. package/assets/dashboard/assets/index-kRCYVN2B.css +0 -1
@@ -1,67 +1,67 @@
1
- // SPDX-License-Identifier: BUSL-1.1
2
- // Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
3
- // See LICENSE in the repository root for license terms.
4
-
5
- /// <reference types="@cloudflare/workers-types" />
6
- import type { IActivityLogger, ActivityLogEntry, IClock, IIdGenerator } from '@beechcms/core'
7
-
8
- const ACTIVITY_LOG_INSERT_SQL =
9
- `INSERT INTO activity_logs
10
- (id, user_id, user_email, user_name, action, entity_type, entity_id, entity_slug, details)
11
- VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
12
-
13
- const FALLBACK_USER_EMAIL = 'unknown'
14
-
15
- type ScheduleBackgroundTask = (task: Promise<unknown>) => void
16
-
17
- /**
18
- * D1-backed implementation of {@link IActivityLogger}.
19
- *
20
- * When `scheduleBackgroundTask` is provided (production path, wired to
21
- * `c.executionCtx.waitUntil`), the INSERT runs after the response is sent so
22
- * audit logging never adds latency to the user-facing request. When absent
23
- * (tests, scripts), the INSERT runs inline and any errors are logged.
24
- */
25
- export class D1ActivityLogger implements IActivityLogger {
26
- constructor(
27
- private readonly database: D1Database,
28
- private readonly clock: IClock,
29
- private readonly idGenerator: IIdGenerator,
30
- private readonly scheduleBackgroundTask?: ScheduleBackgroundTask
31
- ) {}
32
-
33
- log(entry: ActivityLogEntry): Promise<void> | void {
34
- const insertPromise = this.runInsert(entry)
35
-
36
- if (this.scheduleBackgroundTask) {
37
- this.scheduleBackgroundTask(insertPromise)
38
- return
39
- }
40
-
41
- return insertPromise
42
- }
43
-
44
- private async runInsert(entry: ActivityLogEntry): Promise<void> {
45
- try {
46
- const recordId = this.idGenerator.uuid()
47
- const serializedDetails = entry.details ? JSON.stringify(entry.details) : null
48
-
49
- await this.database
50
- .prepare(ACTIVITY_LOG_INSERT_SQL)
51
- .bind(
52
- recordId,
53
- entry.actor.id,
54
- entry.actor.email || FALLBACK_USER_EMAIL,
55
- entry.actor.name ?? null,
56
- entry.action,
57
- entry.entityType,
58
- entry.entityId,
59
- entry.entitySlug ?? null,
60
- serializedDetails
61
- )
62
- .run()
63
- } catch (error) {
64
- console.error('D1ActivityLogger: failed to persist activity entry', error)
65
- }
66
- }
67
- }
1
+ // SPDX-License-Identifier: BUSL-1.1
2
+ // Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
3
+ // See LICENSE in the repository root for license terms.
4
+
5
+ /// <reference types="@cloudflare/workers-types" />
6
+ import type { IActivityLogger, ActivityLogEntry, IClock, IIdGenerator } from '@beechcms/core'
7
+
8
+ const ACTIVITY_LOG_INSERT_SQL =
9
+ `INSERT INTO activity_logs
10
+ (id, user_id, user_email, user_name, action, entity_type, entity_id, entity_slug, details)
11
+ VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)`
12
+
13
+ const FALLBACK_USER_EMAIL = 'unknown'
14
+
15
+ type ScheduleBackgroundTask = (task: Promise<unknown>) => void
16
+
17
+ /**
18
+ * D1-backed implementation of {@link IActivityLogger}.
19
+ *
20
+ * When `scheduleBackgroundTask` is provided (production path, wired to
21
+ * `c.executionCtx.waitUntil`), the INSERT runs after the response is sent so
22
+ * audit logging never adds latency to the user-facing request. When absent
23
+ * (tests, scripts), the INSERT runs inline and any errors are logged.
24
+ */
25
+ export class D1ActivityLogger implements IActivityLogger {
26
+ constructor(
27
+ private readonly database: D1Database,
28
+ private readonly clock: IClock,
29
+ private readonly idGenerator: IIdGenerator,
30
+ private readonly scheduleBackgroundTask?: ScheduleBackgroundTask
31
+ ) {}
32
+
33
+ log(entry: ActivityLogEntry): Promise<void> | void {
34
+ const insertPromise = this.runInsert(entry)
35
+
36
+ if (this.scheduleBackgroundTask) {
37
+ this.scheduleBackgroundTask(insertPromise)
38
+ return
39
+ }
40
+
41
+ return insertPromise
42
+ }
43
+
44
+ private async runInsert(entry: ActivityLogEntry): Promise<void> {
45
+ try {
46
+ const recordId = this.idGenerator.uuid()
47
+ const serializedDetails = entry.details ? JSON.stringify(entry.details) : null
48
+
49
+ await this.database
50
+ .prepare(ACTIVITY_LOG_INSERT_SQL)
51
+ .bind(
52
+ recordId,
53
+ entry.actor.id,
54
+ entry.actor.email || FALLBACK_USER_EMAIL,
55
+ entry.actor.name ?? null,
56
+ entry.action,
57
+ entry.entityType,
58
+ entry.entityId,
59
+ entry.entitySlug ?? null,
60
+ serializedDetails
61
+ )
62
+ .run()
63
+ } catch (error) {
64
+ console.error('D1ActivityLogger: failed to persist activity entry', error)
65
+ }
66
+ }
67
+ }
@@ -1,78 +1,78 @@
1
- // SPDX-License-Identifier: BUSL-1.1
2
- // Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
3
- // See LICENSE in the repository root for license terms.
4
-
5
- import { describe, it, expect, vi } from 'vitest'
6
- import { D1AnalyticsRepository } from './d1-analytics.repository'
7
- import { FixedClock } from './fixed-clock'
8
-
9
- const FIXED_NOW_MS = 1700000000_000
10
- const EXPECTED_DAY_BUCKET = Math.floor(FIXED_NOW_MS / 1000 / 86400) * 86400
11
-
12
- function makeMockDb(allResults: unknown[] = [], firstResult: unknown = null) {
13
- const allMock = vi.fn().mockResolvedValue({ results: allResults })
14
- const firstMock = vi.fn().mockResolvedValue(firstResult)
15
- const runMock = vi.fn().mockResolvedValue({ success: true })
16
- const bindMock = vi.fn(() => ({ all: allMock, first: firstMock, run: runMock }))
17
- const prepareMock = vi.fn(() => ({ bind: bindMock }))
18
- return { db: { prepare: prepareMock } as any, prepareMock, bindMock, allMock, firstMock, runMock }
19
- }
20
-
21
- describe('D1AnalyticsRepository', () => {
22
- describe('recordRequest', () => {
23
- it('issues an INSERT ... ON CONFLICT upsert with seed and computed day bucket', async () => {
24
- const { db, prepareMock, bindMock, runMock } = makeMockDb()
25
- await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).recordRequest('posts')
26
- const sql = prepareMock.mock.calls[0]![0] as string
27
- expect(sql).toMatch(/INSERT INTO analytics/)
28
- expect(sql).toMatch(/ON CONFLICT\(day_ts, metric, seed\) DO UPDATE SET value = value \+ 1/)
29
- expect(bindMock).toHaveBeenCalledWith(EXPECTED_DAY_BUCKET, 'posts')
30
- expect(runMock).toHaveBeenCalled()
31
- })
32
- })
33
-
34
- describe('sumByMetric', () => {
35
- it('binds requests metric, seed and since', async () => {
36
- const { db, prepareMock, bindMock } = makeMockDb([], { total: 99 })
37
- const total = await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).sumByMetric('requests', 'posts', 1)
38
- expect(total).toBe(99)
39
- const sql = prepareMock.mock.calls[0]![0] as string
40
- expect(sql).toMatch(/SELECT SUM\(value\) as total/)
41
- expect(sql).toMatch(/WHERE metric = \? AND seed = \? AND day_ts >= \?/)
42
- expect(bindMock).toHaveBeenCalledWith('requests', 'posts', 1)
43
- })
44
-
45
- it('returns 0 when SUM is null', async () => {
46
- const { db } = makeMockDb([], { total: null })
47
- const total = await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).sumByMetric('visitors', '', 0)
48
- expect(total).toBe(0)
49
- })
50
-
51
- it('returns 0 when no row matches', async () => {
52
- const { db } = makeMockDb([], null)
53
- const total = await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).sumByMetric('requests', '', 0)
54
- expect(total).toBe(0)
55
- })
56
- })
57
-
58
- describe('groupByMetric', () => {
59
- it('returns a date_label → count map filtered to metric=requests', async () => {
60
- const { db, prepareMock, bindMock } = makeMockDb([
61
- { date_label: '2026-01-01', daily_count: 10 },
62
- { date_label: '2026-01-02', daily_count: 20 },
63
- ])
64
- const result = await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).groupByMetric('posts', 1)
65
- expect(result).toEqual({ '2026-01-01': 10, '2026-01-02': 20 })
66
- const sql = prepareMock.mock.calls[0]![0] as string
67
- expect(sql).toMatch(/strftime\('%Y-%m-%d', day_ts, 'unixepoch'\)/)
68
- expect(sql).toMatch(/metric = 'requests'/)
69
- expect(bindMock).toHaveBeenCalledWith('posts', 1)
70
- })
71
-
72
- it('skips rows with null date_label', async () => {
73
- const { db } = makeMockDb([{ date_label: null, daily_count: 5 }])
74
- const result = await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).groupByMetric('', 0)
75
- expect(result).toEqual({})
76
- })
77
- })
78
- })
1
+ // SPDX-License-Identifier: BUSL-1.1
2
+ // Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
3
+ // See LICENSE in the repository root for license terms.
4
+
5
+ import { describe, it, expect, vi } from 'vitest'
6
+ import { D1AnalyticsRepository } from './d1-analytics.repository'
7
+ import { FixedClock } from './fixed-clock'
8
+
9
+ const FIXED_NOW_MS = 1700000000_000
10
+ const EXPECTED_DAY_BUCKET = Math.floor(FIXED_NOW_MS / 1000 / 86400) * 86400
11
+
12
+ function makeMockDb(allResults: unknown[] = [], firstResult: unknown = null) {
13
+ const allMock = vi.fn().mockResolvedValue({ results: allResults })
14
+ const firstMock = vi.fn().mockResolvedValue(firstResult)
15
+ const runMock = vi.fn().mockResolvedValue({ success: true })
16
+ const bindMock = vi.fn(() => ({ all: allMock, first: firstMock, run: runMock }))
17
+ const prepareMock = vi.fn(() => ({ bind: bindMock }))
18
+ return { db: { prepare: prepareMock } as any, prepareMock, bindMock, allMock, firstMock, runMock }
19
+ }
20
+
21
+ describe('D1AnalyticsRepository', () => {
22
+ describe('recordRequest', () => {
23
+ it('issues an INSERT ... ON CONFLICT upsert with seed and computed day bucket', async () => {
24
+ const { db, prepareMock, bindMock, runMock } = makeMockDb()
25
+ await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).recordRequest('posts')
26
+ const sql = prepareMock.mock.calls[0]![0] as string
27
+ expect(sql).toMatch(/INSERT INTO analytics/)
28
+ expect(sql).toMatch(/ON CONFLICT\(day_ts, metric, seed\) DO UPDATE SET value = value \+ 1/)
29
+ expect(bindMock).toHaveBeenCalledWith(EXPECTED_DAY_BUCKET, 'posts')
30
+ expect(runMock).toHaveBeenCalled()
31
+ })
32
+ })
33
+
34
+ describe('sumByMetric', () => {
35
+ it('binds requests metric, seed and since', async () => {
36
+ const { db, prepareMock, bindMock } = makeMockDb([], { total: 99 })
37
+ const total = await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).sumByMetric('requests', 'posts', 1)
38
+ expect(total).toBe(99)
39
+ const sql = prepareMock.mock.calls[0]![0] as string
40
+ expect(sql).toMatch(/SELECT SUM\(value\) as total/)
41
+ expect(sql).toMatch(/WHERE metric = \? AND seed = \? AND day_ts >= \?/)
42
+ expect(bindMock).toHaveBeenCalledWith('requests', 'posts', 1)
43
+ })
44
+
45
+ it('returns 0 when SUM is null', async () => {
46
+ const { db } = makeMockDb([], { total: null })
47
+ const total = await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).sumByMetric('visitors', '', 0)
48
+ expect(total).toBe(0)
49
+ })
50
+
51
+ it('returns 0 when no row matches', async () => {
52
+ const { db } = makeMockDb([], null)
53
+ const total = await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).sumByMetric('requests', '', 0)
54
+ expect(total).toBe(0)
55
+ })
56
+ })
57
+
58
+ describe('groupByMetric', () => {
59
+ it('returns a date_label → count map filtered to metric=requests', async () => {
60
+ const { db, prepareMock, bindMock } = makeMockDb([
61
+ { date_label: '2026-01-01', daily_count: 10 },
62
+ { date_label: '2026-01-02', daily_count: 20 },
63
+ ])
64
+ const result = await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).groupByMetric('posts', 1)
65
+ expect(result).toEqual({ '2026-01-01': 10, '2026-01-02': 20 })
66
+ const sql = prepareMock.mock.calls[0]![0] as string
67
+ expect(sql).toMatch(/strftime\('%Y-%m-%d', day_ts, 'unixepoch'\)/)
68
+ expect(sql).toMatch(/metric = 'requests'/)
69
+ expect(bindMock).toHaveBeenCalledWith('posts', 1)
70
+ })
71
+
72
+ it('skips rows with null date_label', async () => {
73
+ const { db } = makeMockDb([{ date_label: null, daily_count: 5 }])
74
+ const result = await new D1AnalyticsRepository(db, new FixedClock(FIXED_NOW_MS)).groupByMetric('', 0)
75
+ expect(result).toEqual({})
76
+ })
77
+ })
78
+ })
@@ -1,85 +1,85 @@
1
- // SPDX-License-Identifier: BUSL-1.1
2
- // Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
3
- // See LICENSE in the repository root for license terms.
4
-
5
- /// <reference types="@cloudflare/workers-types" />
6
- import type { IAnalyticsRepository, AnalyticsMetric, IClock } from '@beechcms/core'
7
-
8
- const SECONDS_PER_DAY = 86400
9
-
10
- /**
11
- * D1-backed implementation of {@link IAnalyticsRepository}.
12
- *
13
- * The underlying schema is long-format:
14
- * `analytics(day_ts, metric, seed, value)` with UNIQUE(day_ts, metric, seed).
15
- * Each row stores the counter for one (day, metric, seed) tuple. The
16
- * IAnalyticsRepository contract is metric-aware (the metric is selected via
17
- * a switch on the validated enum), and never interpolates user values into
18
- * SQL — the actual metric name is bound through a parameter.
19
- */
20
- export class D1AnalyticsRepository implements IAnalyticsRepository {
21
- constructor(
22
- private readonly database: D1Database,
23
- private readonly clock: IClock,
24
- ) {}
25
-
26
- async recordRequest(seedSlug: string): Promise<void> {
27
- const dayTimestamp = Math.floor(this.clock.nowSeconds() / SECONDS_PER_DAY) * SECONDS_PER_DAY
28
- await this.database
29
- .prepare(
30
- `INSERT INTO analytics (day_ts, metric, seed, value)
31
- VALUES (?, 'requests', ?, 1)
32
- ON CONFLICT(day_ts, metric, seed) DO UPDATE SET value = value + 1`,
33
- )
34
- .bind(dayTimestamp, seedSlug)
35
- .run()
36
- }
37
-
38
- async sumByMetric(
39
- metric: AnalyticsMetric,
40
- seedSlug: string,
41
- sinceTimestamp: number,
42
- ): Promise<number> {
43
- const metricName = this.resolveMetricName(metric)
44
- const row = await this.database
45
- .prepare(
46
- `SELECT SUM(value) as total
47
- FROM analytics
48
- WHERE metric = ? AND seed = ? AND day_ts >= ?`,
49
- )
50
- .bind(metricName, seedSlug, sinceTimestamp)
51
- .first<{ total: number | null }>()
52
- return row?.total ?? 0
53
- }
54
-
55
- async groupByMetric(
56
- seedSlug: string,
57
- sinceTimestamp: number,
58
- ): Promise<Record<string, number>> {
59
- const result = await this.database
60
- .prepare(
61
- `SELECT strftime('%Y-%m-%d', day_ts, 'unixepoch') as date_label,
62
- SUM(value) as daily_count
63
- FROM analytics
64
- WHERE metric = 'requests' AND seed = ? AND day_ts >= ?
65
- GROUP BY date_label
66
- ORDER BY date_label ASC`,
67
- )
68
- .bind(seedSlug, sinceTimestamp)
69
- .all<{ date_label: string | null; daily_count: number | null }>()
70
-
71
- const grouped: Record<string, number> = {}
72
- for (const row of result.results ?? []) {
73
- if (row.date_label === null) continue
74
- grouped[row.date_label] = row.daily_count ?? 0
75
- }
76
- return grouped
77
- }
78
-
79
- private resolveMetricName(metric: AnalyticsMetric): string {
80
- switch (metric) {
81
- case 'requests': return 'requests'
82
- case 'visitors': return 'visitors'
83
- }
84
- }
85
- }
1
+ // SPDX-License-Identifier: BUSL-1.1
2
+ // Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
3
+ // See LICENSE in the repository root for license terms.
4
+
5
+ /// <reference types="@cloudflare/workers-types" />
6
+ import type { IAnalyticsRepository, AnalyticsMetric, IClock } from '@beechcms/core'
7
+
8
+ const SECONDS_PER_DAY = 86400
9
+
10
+ /**
11
+ * D1-backed implementation of {@link IAnalyticsRepository}.
12
+ *
13
+ * The underlying schema is long-format:
14
+ * `analytics(day_ts, metric, seed, value)` with UNIQUE(day_ts, metric, seed).
15
+ * Each row stores the counter for one (day, metric, seed) tuple. The
16
+ * IAnalyticsRepository contract is metric-aware (the metric is selected via
17
+ * a switch on the validated enum), and never interpolates user values into
18
+ * SQL — the actual metric name is bound through a parameter.
19
+ */
20
+ export class D1AnalyticsRepository implements IAnalyticsRepository {
21
+ constructor(
22
+ private readonly database: D1Database,
23
+ private readonly clock: IClock,
24
+ ) {}
25
+
26
+ async recordRequest(seedSlug: string): Promise<void> {
27
+ const dayTimestamp = Math.floor(this.clock.nowSeconds() / SECONDS_PER_DAY) * SECONDS_PER_DAY
28
+ await this.database
29
+ .prepare(
30
+ `INSERT INTO analytics (day_ts, metric, seed, value)
31
+ VALUES (?, 'requests', ?, 1)
32
+ ON CONFLICT(day_ts, metric, seed) DO UPDATE SET value = value + 1`,
33
+ )
34
+ .bind(dayTimestamp, seedSlug)
35
+ .run()
36
+ }
37
+
38
+ async sumByMetric(
39
+ metric: AnalyticsMetric,
40
+ seedSlug: string,
41
+ sinceTimestamp: number,
42
+ ): Promise<number> {
43
+ const metricName = this.resolveMetricName(metric)
44
+ const row = await this.database
45
+ .prepare(
46
+ `SELECT SUM(value) as total
47
+ FROM analytics
48
+ WHERE metric = ? AND seed = ? AND day_ts >= ?`,
49
+ )
50
+ .bind(metricName, seedSlug, sinceTimestamp)
51
+ .first<{ total: number | null }>()
52
+ return row?.total ?? 0
53
+ }
54
+
55
+ async groupByMetric(
56
+ seedSlug: string,
57
+ sinceTimestamp: number,
58
+ ): Promise<Record<string, number>> {
59
+ const result = await this.database
60
+ .prepare(
61
+ `SELECT strftime('%Y-%m-%d', day_ts, 'unixepoch') as date_label,
62
+ SUM(value) as daily_count
63
+ FROM analytics
64
+ WHERE metric = 'requests' AND seed = ? AND day_ts >= ?
65
+ GROUP BY date_label
66
+ ORDER BY date_label ASC`,
67
+ )
68
+ .bind(seedSlug, sinceTimestamp)
69
+ .all<{ date_label: string | null; daily_count: number | null }>()
70
+
71
+ const grouped: Record<string, number> = {}
72
+ for (const row of result.results ?? []) {
73
+ if (row.date_label === null) continue
74
+ grouped[row.date_label] = row.daily_count ?? 0
75
+ }
76
+ return grouped
77
+ }
78
+
79
+ private resolveMetricName(metric: AnalyticsMetric): string {
80
+ switch (metric) {
81
+ case 'requests': return 'requests'
82
+ case 'visitors': return 'visitors'
83
+ }
84
+ }
85
+ }
@@ -1,80 +1,80 @@
1
- // SPDX-License-Identifier: BUSL-1.1
2
- // Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
3
- // See LICENSE in the repository root for license terms.
4
-
5
- import { describe, it, expect, vi } from 'vitest'
6
- import type { Seed } from '@beechcms/core'
7
- import { D1ContentScanRepository } from './d1-content-scan.repository'
8
-
9
- function makeMockDb(allResults: unknown[] = []) {
10
- const allMock = vi.fn().mockResolvedValue({ results: allResults })
11
- const prepareMock = vi.fn(() => ({ all: allMock }))
12
- return { db: { prepare: prepareMock } as any, prepareMock, allMock }
13
- }
14
-
15
- describe('D1ContentScanRepository', () => {
16
- it('returns empty set if seeds list is empty', async () => {
17
- const { db, prepareMock } = makeMockDb()
18
- const repo = new D1ContentScanRepository(db)
19
- const result = await repo.getReferencedMediaKeys([])
20
- expect(result.size).toBe(0)
21
- expect(prepareMock).not.toHaveBeenCalled()
22
- })
23
-
24
- it('skips seeds with no file branches', async () => {
25
- const { db, prepareMock } = makeMockDb()
26
- const repo = new D1ContentScanRepository(db)
27
- const seedWithoutFile: Seed = {
28
- slug: 'posts',
29
- label: 'Post',
30
- displayNameAlias: 'title',
31
- branches: [
32
- { id: 'br_01', alias: 'title', type: 'text', label: 'Title' },
33
- ],
34
- }
35
- const result = await repo.getReferencedMediaKeys([seedWithoutFile])
36
- expect(result.size).toBe(0)
37
- expect(prepareMock).not.toHaveBeenCalled()
38
- })
39
-
40
- it('extracts referenced media keys from file columns', async () => {
41
- const mockResults = [
42
- { cover: '/api/media/image1.jpg', gallery: '/api/media/img2.png /api/media/img3%20spaced.jpg' },
43
- { cover: null, gallery: 'no-media-here' },
44
- ]
45
- const { db, prepareMock } = makeMockDb(mockResults)
46
- const repo = new D1ContentScanRepository(db)
47
- const seedWithFiles: Seed = {
48
- slug: 'articles',
49
- label: 'Article',
50
- displayNameAlias: 'title',
51
- branches: [
52
- { id: 'br_01', alias: 'title', type: 'text', label: 'Title' },
53
- { id: 'br_02', alias: 'cover', type: 'file', label: 'Cover' },
54
- { id: 'br_03', alias: 'gallery', type: 'file', label: 'Gallery' },
55
- ],
56
- }
57
-
58
- const result = await repo.getReferencedMediaKeys([seedWithFiles])
59
- expect(prepareMock).toHaveBeenCalledWith('SELECT cover, gallery FROM content_articles')
60
- expect(result).toEqual(new Set(['image1.jpg', 'img2.png', 'img3 spaced.jpg']))
61
- })
62
-
63
- it('handles null or missing results gracefully', async () => {
64
- const allMock = vi.fn().mockResolvedValue({ results: null })
65
- const prepareMock = vi.fn(() => ({ all: allMock }))
66
- const db = { prepare: prepareMock } as any
67
- const repo = new D1ContentScanRepository(db)
68
- const seedWithFiles: Seed = {
69
- slug: 'articles',
70
- label: 'Article',
71
- displayNameAlias: 'title',
72
- branches: [
73
- { id: 'br_01', alias: 'cover', type: 'file', label: 'Cover' },
74
- ],
75
- }
76
-
77
- const result = await repo.getReferencedMediaKeys([seedWithFiles])
78
- expect(result.size).toBe(0)
79
- })
80
- })
1
+ // SPDX-License-Identifier: BUSL-1.1
2
+ // Copyright (c) 2024–2026 Flavio De Musso. All rights reserved.
3
+ // See LICENSE in the repository root for license terms.
4
+
5
+ import { describe, it, expect, vi } from 'vitest'
6
+ import type { Seed } from '@beechcms/core'
7
+ import { D1ContentScanRepository } from './d1-content-scan.repository'
8
+
9
+ function makeMockDb(allResults: unknown[] = []) {
10
+ const allMock = vi.fn().mockResolvedValue({ results: allResults })
11
+ const prepareMock = vi.fn(() => ({ all: allMock }))
12
+ return { db: { prepare: prepareMock } as any, prepareMock, allMock }
13
+ }
14
+
15
+ describe('D1ContentScanRepository', () => {
16
+ it('returns empty set if seeds list is empty', async () => {
17
+ const { db, prepareMock } = makeMockDb()
18
+ const repo = new D1ContentScanRepository(db)
19
+ const result = await repo.getReferencedMediaKeys([])
20
+ expect(result.size).toBe(0)
21
+ expect(prepareMock).not.toHaveBeenCalled()
22
+ })
23
+
24
+ it('skips seeds with no file branches', async () => {
25
+ const { db, prepareMock } = makeMockDb()
26
+ const repo = new D1ContentScanRepository(db)
27
+ const seedWithoutFile: Seed = {
28
+ slug: 'posts',
29
+ label: 'Post',
30
+ displayNameAlias: 'title',
31
+ branches: [
32
+ { id: 'br_01', alias: 'title', type: 'text', label: 'Title' },
33
+ ],
34
+ }
35
+ const result = await repo.getReferencedMediaKeys([seedWithoutFile])
36
+ expect(result.size).toBe(0)
37
+ expect(prepareMock).not.toHaveBeenCalled()
38
+ })
39
+
40
+ it('extracts referenced media keys from file columns', async () => {
41
+ const mockResults = [
42
+ { cover: '/api/media/image1.jpg', gallery: '/api/media/img2.png /api/media/img3%20spaced.jpg' },
43
+ { cover: null, gallery: 'no-media-here' },
44
+ ]
45
+ const { db, prepareMock } = makeMockDb(mockResults)
46
+ const repo = new D1ContentScanRepository(db)
47
+ const seedWithFiles: Seed = {
48
+ slug: 'articles',
49
+ label: 'Article',
50
+ displayNameAlias: 'title',
51
+ branches: [
52
+ { id: 'br_01', alias: 'title', type: 'text', label: 'Title' },
53
+ { id: 'br_02', alias: 'cover', type: 'file', label: 'Cover' },
54
+ { id: 'br_03', alias: 'gallery', type: 'file', label: 'Gallery' },
55
+ ],
56
+ }
57
+
58
+ const result = await repo.getReferencedMediaKeys([seedWithFiles])
59
+ expect(prepareMock).toHaveBeenCalledWith('SELECT cover, gallery FROM content_articles')
60
+ expect(result).toEqual(new Set(['image1.jpg', 'img2.png', 'img3 spaced.jpg']))
61
+ })
62
+
63
+ it('handles null or missing results gracefully', async () => {
64
+ const allMock = vi.fn().mockResolvedValue({ results: null })
65
+ const prepareMock = vi.fn(() => ({ all: allMock }))
66
+ const db = { prepare: prepareMock } as any
67
+ const repo = new D1ContentScanRepository(db)
68
+ const seedWithFiles: Seed = {
69
+ slug: 'articles',
70
+ label: 'Article',
71
+ displayNameAlias: 'title',
72
+ branches: [
73
+ { id: 'br_01', alias: 'cover', type: 'file', label: 'Cover' },
74
+ ],
75
+ }
76
+
77
+ const result = await repo.getReferencedMediaKeys([seedWithFiles])
78
+ expect(result.size).toBe(0)
79
+ })
80
+ })