@10x-media/analytics 1.0.0-beta.7 → 1.0.0-beta.9

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 (368) hide show
  1. package/CHANGELOG.md +118 -0
  2. package/LICENSE +21 -21
  3. package/README.md +10 -4
  4. package/dist/adapters/ga4/eventName.d.ts +15 -0
  5. package/dist/adapters/ga4/eventName.js +19 -0
  6. package/dist/adapters/ga4/eventName.js.map +1 -0
  7. package/dist/adapters/ga4/ga4.d.ts +5 -0
  8. package/dist/adapters/ga4/ga4.js +179 -70
  9. package/dist/adapters/ga4/ga4.js.map +1 -1
  10. package/dist/adapters/ga4/measurementId.js +15 -0
  11. package/dist/adapters/ga4/measurementId.js.map +1 -0
  12. package/dist/adapters/goalRead.js +126 -0
  13. package/dist/adapters/goalRead.js.map +1 -0
  14. package/dist/adapters/plausible/plausible.d.ts +15 -0
  15. package/dist/adapters/plausible/plausible.js +112 -43
  16. package/dist/adapters/plausible/plausible.js.map +1 -1
  17. package/dist/adapters/posthog/posthog.js +47 -25
  18. package/dist/adapters/posthog/posthog.js.map +1 -1
  19. package/dist/adapters/umami/umami.d.ts +8 -0
  20. package/dist/adapters/umami/umami.js +237 -28
  21. package/dist/adapters/umami/umami.js.map +1 -1
  22. package/dist/capture/slots.js +16 -5
  23. package/dist/capture/slots.js.map +1 -1
  24. package/dist/capture/trackerConfig.d.ts +1 -0
  25. package/dist/capture/trackerConfig.js +28 -3
  26. package/dist/capture/trackerConfig.js.map +1 -1
  27. package/dist/charts/BarList.d.ts +15 -1
  28. package/dist/charts/BarList.js +41 -19
  29. package/dist/charts/BarList.js.map +1 -1
  30. package/dist/charts/TrendChart.d.ts +16 -3
  31. package/dist/charts/TrendChart.js +172 -106
  32. package/dist/charts/TrendChart.js.map +1 -1
  33. package/dist/charts/bars.d.ts +2 -0
  34. package/dist/charts/bars.js +2 -1
  35. package/dist/charts/bars.js.map +1 -1
  36. package/dist/charts/bucket.js +10 -1
  37. package/dist/charts/bucket.js.map +1 -1
  38. package/dist/charts/spline.js +2 -2
  39. package/dist/charts/spline.js.map +1 -1
  40. package/dist/charts/styles.js +18 -1
  41. package/dist/charts/styles.js.map +1 -1
  42. package/dist/core/cacheKey.js +24 -2
  43. package/dist/core/cacheKey.js.map +1 -1
  44. package/dist/core/capabilities.js +7 -2
  45. package/dist/core/capabilities.js.map +1 -1
  46. package/dist/core/capture.d.ts +1 -1
  47. package/dist/core/contract.d.ts +46 -9
  48. package/dist/core/contract.js +29 -1
  49. package/dist/core/contract.js.map +1 -1
  50. package/dist/core/granularity.js +1 -1
  51. package/dist/core/options.d.ts +62 -7
  52. package/dist/core/options.js +63 -4
  53. package/dist/core/options.js.map +1 -1
  54. package/dist/core/scopedRead.js +33 -23
  55. package/dist/core/scopedRead.js.map +1 -1
  56. package/dist/core/serverEvent.d.ts +44 -0
  57. package/dist/core/serverEvent.js +12 -0
  58. package/dist/core/serverEvent.js.map +1 -0
  59. package/dist/exports/adapters/ga4.d.ts +2 -1
  60. package/dist/exports/adapters/ga4.js +2 -1
  61. package/dist/exports/client.d.ts +12 -3
  62. package/dist/exports/client.js +9 -1
  63. package/dist/exports/rsc.d.ts +7 -2
  64. package/dist/exports/rsc.js +6 -3
  65. package/dist/exports/tracker.d.ts +3 -2
  66. package/dist/exports/tracker.js +2 -1
  67. package/dist/exports/types.d.ts +13 -4
  68. package/dist/exports/types.js +3 -2
  69. package/dist/fields/AnalyticsPanelClient.js +1 -1
  70. package/dist/fields/AnalyticsPanelField.js +1 -1
  71. package/dist/fields/AnalyticsStatField.js +2 -2
  72. package/dist/fields/config/FilterDimensionSelectField.d.ts +14 -0
  73. package/dist/fields/config/FilterDimensionSelectField.js +77 -0
  74. package/dist/fields/config/FilterDimensionSelectField.js.map +1 -0
  75. package/dist/fields/config/FilterOperatorSelectField.d.ts +14 -0
  76. package/dist/fields/config/FilterOperatorSelectField.js +75 -0
  77. package/dist/fields/config/FilterOperatorSelectField.js.map +1 -0
  78. package/dist/fields/config/MetricSelectField.js +3 -3
  79. package/dist/fields/config/MetricSelectField.js.map +1 -1
  80. package/dist/fields/config/SourceSelectField.js +3 -3
  81. package/dist/fields/config/SourceSelectField.js.map +1 -1
  82. package/dist/fields/config/fetchSources.d.ts +5 -1
  83. package/dist/fields/config/sourcesState.js +19 -3
  84. package/dist/fields/config/sourcesState.js.map +1 -1
  85. package/dist/fields/config/useAnalyticsSources.d.ts +8 -3
  86. package/dist/fields/config/useAnalyticsSources.js +9 -6
  87. package/dist/fields/config/useAnalyticsSources.js.map +1 -1
  88. package/dist/fields/config/useFilterCapabilities.d.ts +28 -0
  89. package/dist/fields/config/useFilterCapabilities.js +52 -0
  90. package/dist/fields/config/useFilterCapabilities.js.map +1 -0
  91. package/dist/fields/readForDocument.d.ts +5 -0
  92. package/dist/fields/readForDocument.js +21 -9
  93. package/dist/fields/readForDocument.js.map +1 -1
  94. package/dist/goals/GoalSelectField.d.ts +7 -0
  95. package/dist/goals/GoalSelectField.js +77 -0
  96. package/dist/goals/GoalSelectField.js.map +1 -0
  97. package/dist/goals/collection.js +250 -0
  98. package/dist/goals/collection.js.map +1 -0
  99. package/dist/goals/currency.js +14 -0
  100. package/dist/goals/currency.js.map +1 -0
  101. package/dist/goals/fetchGoals.d.ts +18 -0
  102. package/dist/goals/fetchGoals.js +29 -0
  103. package/dist/goals/fetchGoals.js.map +1 -0
  104. package/dist/goals/goalField.d.ts +31 -0
  105. package/dist/goals/goalField.js +56 -0
  106. package/dist/goals/goalField.js.map +1 -0
  107. package/dist/goals/goalsEndpoint.d.ts +1 -0
  108. package/dist/goals/goalsEndpoint.js +55 -0
  109. package/dist/goals/goalsEndpoint.js.map +1 -0
  110. package/dist/goals/resolver.d.ts +8 -0
  111. package/dist/goals/resolver.js +147 -0
  112. package/dist/goals/resolver.js.map +1 -0
  113. package/dist/goals/trackGoalAction.d.ts +74 -0
  114. package/dist/goals/trackGoalAction.js +139 -0
  115. package/dist/goals/trackGoalAction.js.map +1 -0
  116. package/dist/goals/useAnalyticsGoals.d.ts +20 -0
  117. package/dist/goals/useAnalyticsGoals.js +67 -0
  118. package/dist/goals/useAnalyticsGoals.js.map +1 -0
  119. package/dist/index.d.ts +12 -3
  120. package/dist/index.js +75 -11
  121. package/dist/index.js.map +1 -1
  122. package/dist/native/collections/events.js +36 -0
  123. package/dist/native/collections/events.js.map +1 -1
  124. package/dist/native/eventScan.js +25 -0
  125. package/dist/native/eventScan.js.map +1 -0
  126. package/dist/native/ingest/browser.js +47 -0
  127. package/dist/native/ingest/browser.js.map +1 -0
  128. package/dist/native/ingest/device.js +11 -3
  129. package/dist/native/ingest/device.js.map +1 -1
  130. package/dist/native/ingest/endpoint.d.ts +1 -0
  131. package/dist/native/ingest/endpoint.js +2 -17
  132. package/dist/native/ingest/endpoint.js.map +1 -1
  133. package/dist/native/ingest/flushBatch.js +26 -26
  134. package/dist/native/ingest/flushBatch.js.map +1 -1
  135. package/dist/native/ingest/language.js +14 -0
  136. package/dist/native/ingest/language.js.map +1 -0
  137. package/dist/native/ingest/normalizeEvent.d.ts +26 -0
  138. package/dist/native/ingest/normalizeEvent.js +35 -7
  139. package/dist/native/ingest/normalizeEvent.js.map +1 -1
  140. package/dist/native/ingest/referrer.js +48 -0
  141. package/dist/native/ingest/referrer.js.map +1 -0
  142. package/dist/native/ingest/serverTrack.d.ts +20 -0
  143. package/dist/native/ingest/serverTrack.js +100 -0
  144. package/dist/native/ingest/serverTrack.js.map +1 -0
  145. package/dist/native/ingest/source.d.ts +7 -0
  146. package/dist/native/ingest/source.js +139 -14
  147. package/dist/native/ingest/source.js.map +1 -1
  148. package/dist/native/ingest/utm.js +33 -0
  149. package/dist/native/ingest/utm.js.map +1 -0
  150. package/dist/native/ingest/validate.js +27 -0
  151. package/dist/native/ingest/validate.js.map +1 -0
  152. package/dist/native/nativeAdapter.d.ts +1 -1
  153. package/dist/native/nativeAdapter.js +53 -36
  154. package/dist/native/nativeAdapter.js.map +1 -1
  155. package/dist/native/query/eventAgg.js +14 -1
  156. package/dist/native/query/eventAgg.js.map +1 -1
  157. package/dist/native/retention/pruneTask.js +1 -1
  158. package/dist/native/rollups/bucketKey.js +15 -0
  159. package/dist/native/rollups/bucketKey.js.map +1 -0
  160. package/dist/native/rollups/bumpRollups.js +116 -0
  161. package/dist/native/rollups/bumpRollups.js.map +1 -0
  162. package/dist/native/rollups/deltas.js +30 -15
  163. package/dist/native/rollups/deltas.js.map +1 -1
  164. package/dist/native/rollups/insertManyIfNew.js +93 -0
  165. package/dist/native/rollups/insertManyIfNew.js.map +1 -0
  166. package/dist/next/captureRewrites.d.ts +3 -2
  167. package/dist/next/captureRewrites.js +3 -2
  168. package/dist/next/captureRewrites.js.map +1 -1
  169. package/dist/plugin/documentEndpoint.js +52 -15
  170. package/dist/plugin/documentEndpoint.js.map +1 -1
  171. package/dist/plugin/goalHint.d.ts +1 -0
  172. package/dist/plugin/goalHint.js +24 -0
  173. package/dist/plugin/goalHint.js.map +1 -0
  174. package/dist/plugin/paths.js +5 -1
  175. package/dist/plugin/paths.js.map +1 -1
  176. package/dist/plugin/queryEndpoint.js +120 -0
  177. package/dist/plugin/queryEndpoint.js.map +1 -0
  178. package/dist/plugin/readContextForRequest.js +71 -0
  179. package/dist/plugin/readContextForRequest.js.map +1 -0
  180. package/dist/plugin/realtimeEndpoint.js +43 -15
  181. package/dist/plugin/realtimeEndpoint.js.map +1 -1
  182. package/dist/plugin/responses.js +17 -0
  183. package/dist/plugin/responses.js.map +1 -0
  184. package/dist/plugin/runtime.js +31 -1
  185. package/dist/plugin/runtime.js.map +1 -1
  186. package/dist/plugin/scopeFieldBoot.js +22 -0
  187. package/dist/plugin/scopeFieldBoot.js.map +1 -0
  188. package/dist/plugin/sourcesEndpoint.js +21 -52
  189. package/dist/plugin/sourcesEndpoint.js.map +1 -1
  190. package/dist/plugin/warmTask.js +0 -0
  191. package/dist/plugin/warmTask.js.map +1 -1
  192. package/dist/providers/collection.js +29 -13
  193. package/dist/providers/collection.js.map +1 -1
  194. package/dist/providers/factory.js +4 -2
  195. package/dist/providers/factory.js.map +1 -1
  196. package/dist/providers/resolver.js.map +1 -1
  197. package/dist/query/dates.js +64 -0
  198. package/dist/query/dates.js.map +1 -0
  199. package/dist/query/errors.d.ts +17 -0
  200. package/dist/query/errors.js +10 -0
  201. package/dist/query/errors.js.map +1 -0
  202. package/dist/query/fetchQuery.d.ts +59 -0
  203. package/dist/query/fetchQuery.js +110 -0
  204. package/dist/query/fetchQuery.js.map +1 -0
  205. package/dist/query/parse.d.ts +22 -0
  206. package/dist/query/parse.js +168 -0
  207. package/dist/query/parse.js.map +1 -0
  208. package/dist/query/response.d.ts +39 -0
  209. package/dist/query/response.js +11 -0
  210. package/dist/query/response.js.map +1 -0
  211. package/dist/surfacing/engine.js +1 -1
  212. package/dist/surfacing/engine.js.map +1 -1
  213. package/dist/testing/memoryAdapter.js +0 -1
  214. package/dist/testing/memoryAdapter.js.map +1 -1
  215. package/dist/timeframe/tz.js +17 -6
  216. package/dist/timeframe/tz.js.map +1 -1
  217. package/dist/tracker/createTracker.js +13 -1
  218. package/dist/tracker/createTracker.js.map +1 -1
  219. package/dist/tracker/sinks/ga4.d.ts +21 -0
  220. package/dist/tracker/sinks/ga4.js +26 -0
  221. package/dist/tracker/sinks/ga4.js.map +1 -0
  222. package/dist/tracker/types.d.ts +5 -0
  223. package/dist/translations/ar.js +127 -1
  224. package/dist/translations/ar.js.map +1 -1
  225. package/dist/translations/de.js +127 -1
  226. package/dist/translations/de.js.map +1 -1
  227. package/dist/translations/en.js +127 -1
  228. package/dist/translations/en.js.map +1 -1
  229. package/dist/translations/es.js +127 -1
  230. package/dist/translations/es.js.map +1 -1
  231. package/dist/translations/fr.js +127 -1
  232. package/dist/translations/fr.js.map +1 -1
  233. package/dist/translations/id.js +127 -1
  234. package/dist/translations/id.js.map +1 -1
  235. package/dist/translations/keys.d.ts +126 -0
  236. package/dist/translations/keys.js +127 -1
  237. package/dist/translations/keys.js.map +1 -1
  238. package/dist/translations/ko.js +127 -1
  239. package/dist/translations/ko.js.map +1 -1
  240. package/dist/translations/metricKeys.js +8 -2
  241. package/dist/translations/metricKeys.js.map +1 -1
  242. package/dist/translations/pt.js +127 -1
  243. package/dist/translations/pt.js.map +1 -1
  244. package/dist/translations/ru.js +127 -1
  245. package/dist/translations/ru.js.map +1 -1
  246. package/dist/translations/server.js.map +1 -1
  247. package/dist/translations/uk.js +127 -1
  248. package/dist/translations/uk.js.map +1 -1
  249. package/dist/translations/zh.js +127 -1
  250. package/dist/translations/zh.js.map +1 -1
  251. package/dist/view/AnalyticsNavLink.d.ts +19 -0
  252. package/dist/view/AnalyticsNavLink.js +40 -0
  253. package/dist/view/AnalyticsNavLink.js.map +1 -0
  254. package/dist/view/AnalyticsView.d.ts +23 -0
  255. package/dist/view/AnalyticsView.js +45 -0
  256. package/dist/view/AnalyticsView.js.map +1 -0
  257. package/dist/view/AnalyticsViewClient.d.ts +15 -0
  258. package/dist/view/AnalyticsViewClient.js +200 -0
  259. package/dist/view/AnalyticsViewClient.js.map +1 -0
  260. package/dist/view/authRedirect.js +32 -0
  261. package/dist/view/authRedirect.js.map +1 -0
  262. package/dist/view/conversionRate.js +18 -0
  263. package/dist/view/conversionRate.js.map +1 -0
  264. package/dist/view/dayRange.js +68 -0
  265. package/dist/view/dayRange.js.map +1 -0
  266. package/dist/view/gating.d.ts +1 -0
  267. package/dist/view/gating.js +142 -0
  268. package/dist/view/gating.js.map +1 -0
  269. package/dist/view/labels.js +64 -0
  270. package/dist/view/labels.js.map +1 -0
  271. package/dist/view/registerView.js +48 -0
  272. package/dist/view/registerView.js.map +1 -0
  273. package/dist/view/sections/Breakdowns.js +197 -0
  274. package/dist/view/sections/Breakdowns.js.map +1 -0
  275. package/dist/view/sections/EmptyStates.js +92 -0
  276. package/dist/view/sections/EmptyStates.js.map +1 -0
  277. package/dist/view/sections/FilterChips.js +46 -0
  278. package/dist/view/sections/FilterChips.js.map +1 -0
  279. package/dist/view/sections/GoalsPanel.js +82 -0
  280. package/dist/view/sections/GoalsPanel.js.map +1 -0
  281. package/dist/view/sections/OverviewCards.js +65 -0
  282. package/dist/view/sections/OverviewCards.js.map +1 -0
  283. package/dist/view/sections/RealtimeStrip.js +80 -0
  284. package/dist/view/sections/RealtimeStrip.js.map +1 -0
  285. package/dist/view/sections/Toolbar.js +186 -0
  286. package/dist/view/sections/Toolbar.js.map +1 -0
  287. package/dist/view/sections/Trend.js +125 -0
  288. package/dist/view/sections/Trend.js.map +1 -0
  289. package/dist/view/sections/styles.js +74 -0
  290. package/dist/view/sections/styles.js.map +1 -0
  291. package/dist/view/state.js +211 -0
  292. package/dist/view/state.js.map +1 -0
  293. package/dist/view/useViewQueries.js +153 -0
  294. package/dist/view/useViewQueries.js.map +1 -0
  295. package/dist/view/viewProps.d.ts +40 -0
  296. package/dist/view/viewProps.js +90 -0
  297. package/dist/view/viewProps.js.map +1 -0
  298. package/dist/widgets/AnalyticsBreakdownWidget.d.ts +2 -1
  299. package/dist/widgets/AnalyticsBreakdownWidget.js +78 -11
  300. package/dist/widgets/AnalyticsBreakdownWidget.js.map +1 -1
  301. package/dist/widgets/AnalyticsGoalsWidget.d.ts +14 -0
  302. package/dist/widgets/AnalyticsGoalsWidget.js +196 -0
  303. package/dist/widgets/AnalyticsGoalsWidget.js.map +1 -0
  304. package/dist/widgets/AnalyticsMetricWidget.d.ts +2 -1
  305. package/dist/widgets/AnalyticsMetricWidget.js +63 -13
  306. package/dist/widgets/AnalyticsMetricWidget.js.map +1 -1
  307. package/dist/widgets/AnalyticsRealtimeWidget.d.ts +2 -1
  308. package/dist/widgets/AnalyticsRealtimeWidget.js +44 -22
  309. package/dist/widgets/AnalyticsRealtimeWidget.js.map +1 -1
  310. package/dist/widgets/AnalyticsTrendWidget.d.ts +2 -1
  311. package/dist/widgets/AnalyticsTrendWidget.js +79 -16
  312. package/dist/widgets/AnalyticsTrendWidget.js.map +1 -1
  313. package/dist/widgets/RealtimeCounter.d.ts +4 -0
  314. package/dist/widgets/RealtimeCounter.js +10 -1
  315. package/dist/widgets/RealtimeCounter.js.map +1 -1
  316. package/dist/widgets/WidgetViewLink.js +17 -0
  317. package/dist/widgets/WidgetViewLink.js.map +1 -0
  318. package/dist/widgets/breakdownTypes.js +28 -1
  319. package/dist/widgets/breakdownTypes.js.map +1 -1
  320. package/dist/widgets/cardChrome.js +31 -7
  321. package/dist/widgets/cardChrome.js.map +1 -1
  322. package/dist/widgets/comparison.js +15 -1
  323. package/dist/widgets/comparison.js.map +1 -1
  324. package/dist/widgets/defaults.d.ts +6 -2
  325. package/dist/widgets/defaults.js +72 -25
  326. package/dist/widgets/defaults.js.map +1 -1
  327. package/dist/widgets/filterCaption.js +27 -0
  328. package/dist/widgets/filterCaption.js.map +1 -0
  329. package/dist/widgets/filterField.d.ts +19 -0
  330. package/dist/widgets/filterField.js +75 -0
  331. package/dist/widgets/filterField.js.map +1 -0
  332. package/dist/widgets/prepareWidgetRead.d.ts +7 -0
  333. package/dist/widgets/prepareWidgetRead.js +74 -0
  334. package/dist/widgets/prepareWidgetRead.js.map +1 -0
  335. package/dist/widgets/range.js +43 -12
  336. package/dist/widgets/range.js.map +1 -1
  337. package/dist/widgets/readForWidget.d.ts +24 -2
  338. package/dist/widgets/readForWidget.js +34 -48
  339. package/dist/widgets/readForWidget.js.map +1 -1
  340. package/dist/widgets/readForWidgetBreakdown.d.ts +32 -1
  341. package/dist/widgets/readForWidgetBreakdown.js +32 -42
  342. package/dist/widgets/readForWidgetBreakdown.js.map +1 -1
  343. package/dist/widgets/readForWidgetGoals.d.ts +67 -0
  344. package/dist/widgets/readForWidgetGoals.js +140 -0
  345. package/dist/widgets/readForWidgetGoals.js.map +1 -0
  346. package/dist/widgets/readForWidgetRealtime.d.ts +8 -0
  347. package/dist/widgets/readForWidgetRealtime.js +21 -20
  348. package/dist/widgets/readForWidgetRealtime.js.map +1 -1
  349. package/dist/widgets/readForWidgetSeries.d.ts +24 -1
  350. package/dist/widgets/readForWidgetSeries.js +63 -56
  351. package/dist/widgets/readForWidgetSeries.js.map +1 -1
  352. package/dist/widgets/readMeta.js +18 -0
  353. package/dist/widgets/readMeta.js.map +1 -0
  354. package/dist/widgets/registerWidgets.js +53 -7
  355. package/dist/widgets/registerWidgets.js.map +1 -1
  356. package/dist/widgets/types.d.ts +15 -0
  357. package/dist/widgets/types.js +12 -1
  358. package/dist/widgets/types.js.map +1 -1
  359. package/dist/widgets/viewLink.d.ts +22 -0
  360. package/dist/widgets/viewLink.js +86 -0
  361. package/dist/widgets/viewLink.js.map +1 -0
  362. package/package.json +9 -4
  363. package/dist/native/rollups/applyDistinctDeltas.js +0 -9
  364. package/dist/native/rollups/applyDistinctDeltas.js.map +0 -1
  365. package/dist/native/rollups/bumpRollup.js +0 -73
  366. package/dist/native/rollups/bumpRollup.js.map +0 -1
  367. package/dist/native/rollups/insertIfNew.js +0 -19
  368. package/dist/native/rollups/insertIfNew.js.map +0 -1
@@ -1,3 +1,4 @@
1
+ import { emptyGoalBreakdown, goalHint, hintFailed, hintSlugs } from "../goalRead.js";
1
2
  import { dayIso } from "../series.js";
2
3
  import { fetchJson } from "../http/fetchJson.js";
3
4
  //#region src/adapters/umami/umami.ts
@@ -33,21 +34,115 @@ const umamiMetrics = new Set([
33
34
  "visits",
34
35
  "sessions",
35
36
  "bounceRate",
36
- "avgDuration"
37
+ "avgDuration",
38
+ "conversions"
37
39
  ]);
38
- const umamiDimensions = new Set(["page"]);
40
+ const DIMENSION_MAP = {
41
+ page: {
42
+ param: "path",
43
+ metric: "visitors"
44
+ },
45
+ referrer: {
46
+ param: "referrer",
47
+ metric: "visitors"
48
+ },
49
+ browser: {
50
+ param: "browser",
51
+ metric: "visitors"
52
+ },
53
+ os: {
54
+ param: "os",
55
+ metric: "visitors"
56
+ },
57
+ device: {
58
+ param: "device",
59
+ metric: "visitors"
60
+ },
61
+ country: {
62
+ param: "country",
63
+ metric: "visitors"
64
+ },
65
+ region: {
66
+ param: "region",
67
+ metric: "visitors"
68
+ },
69
+ city: {
70
+ param: "city",
71
+ metric: "visitors"
72
+ },
73
+ language: {
74
+ param: "language",
75
+ metric: "visitors"
76
+ },
77
+ event: {
78
+ param: "event",
79
+ metric: "events"
80
+ },
81
+ utmSource: {
82
+ param: "utmSource",
83
+ metric: "visitors"
84
+ },
85
+ utmMedium: {
86
+ param: "utmMedium",
87
+ metric: "visitors"
88
+ },
89
+ utmCampaign: {
90
+ param: "utmCampaign",
91
+ metric: "visitors"
92
+ },
93
+ utmContent: {
94
+ param: "utmContent",
95
+ metric: "visitors"
96
+ },
97
+ utmTerm: {
98
+ param: "utmTerm",
99
+ metric: "visitors"
100
+ }
101
+ };
102
+ /**
103
+ * Goals are custom events here, counted by `/metrics?type=event`, whose y is the number of
104
+ * occurrences: a plugin goal's slug must equal the captured event's name. It is the one
105
+ * shape that answers `conversions`, so a breakdown by any other dimension and the daily
106
+ * series report none.
107
+ */
108
+ const GOAL_DIMENSION = {
109
+ param: "event",
110
+ metric: "conversions"
111
+ };
112
+ /**
113
+ * Umami's `re.` is `~*`: a case-insensitive partial match, so an unanchored pattern hits
114
+ * anywhere in the value. `c.` is `ilike`, also case-insensitive.
115
+ */
116
+ const OPERATOR_PREFIX = {
117
+ eq: "eq.",
118
+ contains: "c.",
119
+ matches: "re."
120
+ };
121
+ const umamiFilters = new Set(Object.keys(DIMENSION_MAP));
122
+ const umamiDimensions = new Set([...[...umamiFilters].filter((dimension) => dimension !== "event"), "goal"]);
123
+ /**
124
+ * Targets Umami 3.x (cloud and self-hosted): filter values carry an operator prefix, and
125
+ * `eq.` is always written explicitly. Umami parses any of `eq`, `neq`, `c`, `dnc`, `re`,
126
+ * `nre`, `s`, `ns`, `t`, `f`, `gt`, `lt`, `gte`, `lte`, `bf` and `af` followed by a dot as
127
+ * the operator, so a bare value beginning with one (`s.example.com`) would change meaning;
128
+ * written as `eq.s.example.com` it stays a literal. Umami splits an `eq.` value on commas
129
+ * into a value list, with no escape.
130
+ */
39
131
  function umami(config) {
40
132
  const base = config.host ?? CLOUD_BASE;
41
133
  const capabilities = {
42
134
  perPageQuery: true,
43
135
  realtime: false,
44
- comparison: false,
45
136
  minGranularity: "day",
46
137
  maxLookbackDays: config.maxLookbackDays !== void 0 ? config.maxLookbackDays : 730,
47
138
  metrics: umamiMetrics,
48
139
  dimensions: umamiDimensions,
49
- filters: /* @__PURE__ */ new Set(),
50
- filterOperators: new Set(["eq"]),
140
+ filters: umamiFilters,
141
+ filterOperators: new Set([
142
+ "eq",
143
+ "contains",
144
+ "matches"
145
+ ]),
51
146
  batchPageReport: true,
52
147
  rateLimit: null,
53
148
  recommendedTtl: {
@@ -56,13 +151,62 @@ function umami(config) {
56
151
  }
57
152
  };
58
153
  const authHeaders = () => config.apiKey ? { "x-umami-api-key": config.apiKey } : config.token ? { authorization: `Bearer ${config.token}` } : {};
154
+ /**
155
+ * Umami takes one value per query param, so filters that land on the same param cannot
156
+ * all be sent. Two `eq` values on one param are an AND that matches nothing, which the
157
+ * read answers as empty without calling the API; anything else keeps the first filter,
158
+ * except that `q.path` always wins the `path` param so a per-page read stays scoped to
159
+ * its page. An `eq` value carrying a comma is dropped too: Umami reads such a value as a
160
+ * list and offers no escape, so sending it would answer a wider question than the one
161
+ * asked. Whatever was dropped travels back in `meta.unappliedFilters`.
162
+ */
59
163
  const params = (q) => {
60
164
  const p = new URLSearchParams({
61
165
  startAt: String(q.dateRange.start.getTime()),
62
166
  endAt: String(q.dateRange.end.getTime())
63
167
  });
64
- if (q.path) p.set("path", q.path);
65
- return p;
168
+ const unapplied = [];
169
+ const eqValues = /* @__PURE__ */ new Map();
170
+ for (const filter of q.filters ?? []) {
171
+ const mapped = DIMENSION_MAP[filter.dimension];
172
+ if (!mapped || filter.operator !== "eq") continue;
173
+ const held = eqValues.get(mapped.param);
174
+ if (held !== void 0 && held !== filter.value) return {
175
+ search: p,
176
+ unapplied,
177
+ empty: true
178
+ };
179
+ eqValues.set(mapped.param, filter.value);
180
+ }
181
+ const held = /* @__PURE__ */ new Map();
182
+ for (const filter of q.filters ?? []) {
183
+ const mapped = DIMENSION_MAP[filter.dimension];
184
+ if (!mapped) continue;
185
+ if (filter.operator === "eq" && filter.value.includes(",")) {
186
+ unapplied.push(filter);
187
+ continue;
188
+ }
189
+ const value = `${OPERATOR_PREFIX[filter.operator]}${filter.value}`;
190
+ const first = held.get(mapped.param);
191
+ if (first === void 0) {
192
+ held.set(mapped.param, {
193
+ value,
194
+ filter
195
+ });
196
+ p.set(mapped.param, value);
197
+ } else if (first.value !== value) unapplied.push(filter);
198
+ }
199
+ if (q.path) {
200
+ const value = `eq.${q.path}`;
201
+ const first = held.get("path");
202
+ if (first !== void 0 && first.value !== value) unapplied.push(first.filter);
203
+ p.set("path", value);
204
+ }
205
+ return {
206
+ search: p,
207
+ unapplied,
208
+ empty: false
209
+ };
66
210
  };
67
211
  return {
68
212
  id: "umami",
@@ -73,34 +217,105 @@ function umami(config) {
73
217
  async query(q, ctx) {
74
218
  const fetchedAt = q.dateRange.end.toISOString();
75
219
  const headers = authHeaders();
76
- if ((q.dimensions ?? []).includes("page")) {
77
- const p = params(q);
78
- p.set("type", "url");
220
+ const goalBreakdown = (q.dimensions ?? []).includes("goal");
221
+ const hint = goalHint(q);
222
+ const slugs = hintSlugs(hint);
223
+ const plan = params(q);
224
+ let breakdown;
225
+ for (const dimension of q.dimensions ?? []) {
226
+ const mapped = DIMENSION_MAP[dimension];
227
+ if (mapped) {
228
+ breakdown = {
229
+ dimension,
230
+ ...mapped
231
+ };
232
+ break;
233
+ }
234
+ }
235
+ const askable = (slugs ?? []).filter((slug) => !slug.includes(","));
236
+ const eventValue = `eq.${askable.join(",")}`;
237
+ const eventFilter = (q.filters ?? []).find((f) => f.dimension === "event");
238
+ const readsGoals = goalBreakdown || !breakdown && q.metrics.includes("conversions") && slugs !== null;
239
+ const unapplied = [
240
+ ...plan.unapplied,
241
+ ...(slugs ?? []).filter((slug) => slug.includes(",")).map((slug) => ({
242
+ dimension: "goal",
243
+ operator: "eq",
244
+ value: slug
245
+ })),
246
+ ...readsGoals && eventFilter && `${OPERATOR_PREFIX[eventFilter.operator]}${eventFilter.value}` !== eventValue ? [eventFilter] : []
247
+ ];
248
+ const unresolved = q.metrics.includes("conversions") && hintFailed(hint);
249
+ const unappliedMeta = unapplied.length > 0 ? { unappliedFilters: unapplied } : {};
250
+ const empty = goalBreakdown ? emptyGoalBreakdown({
251
+ provider: "umami",
252
+ q,
253
+ hint,
254
+ meta: unappliedMeta
255
+ }) : null;
256
+ if (empty) return empty;
257
+ const meta = {
258
+ provider: "umami",
259
+ fetchedAt,
260
+ ...unappliedMeta,
261
+ ...unresolved ? { goalsUnresolved: true } : {}
262
+ };
263
+ if (plan.empty) return {
264
+ rows: [],
265
+ totals: void 0,
266
+ meta
267
+ };
268
+ const search = () => new URLSearchParams(plan.search);
269
+ /**
270
+ * The goal rows for the hint, narrowed to it again on the way back so nothing the API
271
+ * did not restrict can arrive as a goal.
272
+ */
273
+ const fetchGoalRows = async () => {
274
+ if (askable.length === 0) return [];
275
+ const p = search();
276
+ p.set("type", GOAL_DIMENSION.param);
277
+ p.set(GOAL_DIMENSION.param, eventValue);
79
278
  const data = await fetchJson(`${base}/websites/${config.websiteId}/metrics?${p.toString()}`, {
80
279
  headers,
81
280
  signal: ctx.signal,
82
281
  provider: "umami"
83
282
  });
84
- const metric = q.metrics.includes("pageviews") ? "pageviews" : "visitors";
283
+ const wanted = new Set(askable);
284
+ return data.filter((row) => wanted.has(row.x));
285
+ };
286
+ if (goalBreakdown) return {
287
+ rows: (await fetchGoalRows()).map((row) => ({
288
+ dimensions: { goal: row.x },
289
+ metrics: { [GOAL_DIMENSION.metric]: row.y }
290
+ })),
291
+ totals: void 0,
292
+ meta
293
+ };
294
+ if (breakdown) {
295
+ const { dimension, param, metric } = breakdown;
296
+ const p = search();
297
+ p.set("type", param);
85
298
  return {
86
- rows: data.map((row) => ({
87
- dimensions: { page: row.x },
299
+ rows: (await fetchJson(`${base}/websites/${config.websiteId}/metrics?${p.toString()}`, {
300
+ headers,
301
+ signal: ctx.signal,
302
+ provider: "umami"
303
+ })).map((row) => ({
304
+ dimensions: { [dimension]: row.x },
88
305
  metrics: { [metric]: row.y }
89
306
  })),
90
307
  totals: void 0,
91
- meta: {
92
- provider: "umami",
93
- fetchedAt
94
- }
308
+ meta
95
309
  };
96
310
  }
97
311
  const fetchTotals = async () => {
98
- const stats = await fetchJson(`${base}/websites/${config.websiteId}/stats?${params(q).toString()}`, {
312
+ const [stats, goalRows] = await Promise.all([fetchJson(`${base}/websites/${config.websiteId}/stats?${search().toString()}`, {
99
313
  headers,
100
314
  signal: ctx.signal,
101
315
  provider: "umami"
102
- });
316
+ }), q.metrics.includes("conversions") && slugs ? fetchGoalRows() : void 0]);
103
317
  const all = {
318
+ ...goalRows ? { conversions: goalRows.reduce((sum, row) => sum + row.y, 0) } : {},
104
319
  pageviews: stats.pageviews,
105
320
  visitors: stats.visitors,
106
321
  visits: stats.visits,
@@ -113,7 +328,7 @@ function umami(config) {
113
328
  return totals;
114
329
  };
115
330
  if (q.granularity === "day") {
116
- const p = params(q);
331
+ const p = search();
117
332
  p.set("unit", "day");
118
333
  p.set("timezone", q.timezone ?? "UTC");
119
334
  const fetchSeries = () => fetchJson(`${base}/websites/${config.websiteId}/pageviews?${p.toString()}`, {
@@ -143,20 +358,14 @@ function umami(config) {
143
358
  return {
144
359
  rows,
145
360
  totals,
146
- meta: {
147
- provider: "umami",
148
- fetchedAt
149
- }
361
+ meta
150
362
  };
151
363
  }
152
364
  const totals = await fetchTotals();
153
365
  return {
154
366
  rows: [{ metrics: totals }],
155
367
  totals,
156
- meta: {
157
- provider: "umami",
158
- fetchedAt
159
- }
368
+ meta
160
369
  };
161
370
  }
162
371
  };
@@ -1 +1 @@
1
- {"version":3,"file":"umami.js","names":[],"sources":["../../../src/adapters/umami/umami.ts"],"sourcesContent":["import type { CaptureSupport } from '../../core/capture'\nimport type {\n\tAdapterContext,\n\tAnalyticsAdapter,\n\tAnalyticsCapabilities,\n\tAnalyticsQuery,\n\tAnalyticsResult,\n\tAnalyticsRow,\n\tDimensionKey,\n\tMetricKey,\n} from '../../core/contract'\nimport { fetchJson } from '../http/fetchJson'\nimport { dayIso } from '../series'\n\nexport interface UmamiConfig {\n\twebsiteId: string\n\t/** Umami Cloud API key (sent as x-umami-api-key). */\n\tapiKey?: string\n\t/** Self-hosted bearer token (from POST /api/auth/login). */\n\ttoken?: string\n\t/**\n\t * API base URL. Defaults to Umami Cloud (https://api.umami.is/v1). Self-hosted is\n\t * e.g. https://site/api. Capture derives the app origin from this (a trailing `/api`\n\t * is stripped), so one `host` value serves both the Stats API and the tracker.\n\t */\n\thost?: string\n\t/** Maximum days of historical data. Defaults to 730. Pass null to disable clamping. */\n\tmaxLookbackDays?: number | null\n}\n\nconst CLOUD_BASE = 'https://api.umami.is/v1'\nconst CLOUD_SCRIPT = 'https://cloud.umami.is/script.js'\nconst CLOUD_SEND = 'https://gateway.umami.is/api/send'\n\nfunction buildCapture(config: UmamiConfig): CaptureSupport {\n\tconst origin = config.host ? config.host.replace(/\\/api\\/?$/, '').replace(/\\/+$/, '') : null\n\tconst scriptUpstream = origin ? `${origin}/script.js` : CLOUD_SCRIPT\n\tconst sendUpstream = origin ? `${origin}/api/send` : CLOUD_SEND\n\treturn {\n\t\tproxy: {\n\t\t\troutes: [\n\t\t\t\t{ source: '/script.js', upstream: scriptUpstream },\n\t\t\t\t{ source: '/api/send', upstream: sendUpstream },\n\t\t\t],\n\t\t},\n\t\tsnippet: ({ path }) => ({\n\t\t\tscripts: [\n\t\t\t\t{\n\t\t\t\t\tsrc: `${path}/script.js`,\n\t\t\t\t\tdefer: true,\n\t\t\t\t\tattrs: { 'data-website-id': config.websiteId, 'data-host-url': path },\n\t\t\t\t},\n\t\t\t],\n\t\t}),\n\t\tclient: { kind: 'umami' },\n\t}\n}\n\nconst umamiMetrics: ReadonlySet<MetricKey> = new Set<MetricKey>([\n\t'pageviews',\n\t'visitors',\n\t'visits',\n\t'sessions',\n\t'bounceRate',\n\t'avgDuration',\n])\nconst umamiDimensions: ReadonlySet<DimensionKey> = new Set<DimensionKey>(['page'])\n\ninterface UmamiStats {\n\tpageviews: number\n\tvisitors: number\n\tvisits: number\n\tbounces: number\n\ttotaltime: number\n}\n\nexport function umami(config: UmamiConfig): AnalyticsAdapter {\n\tconst base = config.host ?? CLOUD_BASE\n\tconst maxLookbackDays = config.maxLookbackDays !== undefined ? config.maxLookbackDays : 730\n\n\tconst capabilities: AnalyticsCapabilities = {\n\t\tperPageQuery: true,\n\t\trealtime: false,\n\t\tcomparison: false,\n\t\tminGranularity: 'day',\n\t\tmaxLookbackDays,\n\t\tmetrics: umamiMetrics,\n\t\tdimensions: umamiDimensions,\n\t\tfilters: new Set(),\n\t\tfilterOperators: new Set(['eq']),\n\t\tbatchPageReport: true,\n\t\trateLimit: null,\n\t\trecommendedTtl: { realtime: 300, aggregate: 3600 },\n\t}\n\t// Cloud authenticates with x-umami-api-key; self-hosted with a bearer token.\n\t// NOTE: the cloud header name and the per-URL `path` filter (set in params(), also\n\t// sent to /metrics) match the documented v2 shape but are unvalidated against a live\n\t// instance; confirm both before relying on per-URL provider data in production.\n\tconst authHeaders = (): Record<string, string> =>\n\t\tconfig.apiKey\n\t\t\t? { 'x-umami-api-key': config.apiKey }\n\t\t\t: config.token\n\t\t\t\t? { authorization: `Bearer ${config.token}` }\n\t\t\t\t: {}\n\n\tconst params = (q: AnalyticsQuery): URLSearchParams => {\n\t\tconst p = new URLSearchParams({\n\t\t\tstartAt: String(q.dateRange.start.getTime()),\n\t\t\tendAt: String(q.dateRange.end.getTime()),\n\t\t})\n\t\tif (q.path) {\n\t\t\tp.set('path', q.path)\n\t\t}\n\t\treturn p\n\t}\n\n\treturn {\n\t\tid: 'umami',\n\t\tlabel: 'Umami',\n\t\tcapabilities,\n\t\tcapture: buildCapture(config),\n\t\tisConfigured: () => Boolean(config.websiteId && (config.apiKey || config.token)),\n\t\tasync query(q: AnalyticsQuery, ctx: AdapterContext): Promise<AnalyticsResult> {\n\t\t\tconst fetchedAt = q.dateRange.end.toISOString()\n\t\t\tconst headers = authHeaders()\n\t\t\tconst wantsPageBreakdown = (q.dimensions ?? []).includes('page')\n\n\t\t\tif (wantsPageBreakdown) {\n\t\t\t\tconst p = params(q)\n\t\t\t\tp.set('type', 'url')\n\t\t\t\tconst data = await fetchJson<Array<{ x: string; y: number }>>(\n\t\t\t\t\t`${base}/websites/${config.websiteId}/metrics?${p.toString()}`,\n\t\t\t\t\t{ headers, signal: ctx.signal, provider: 'umami' }\n\t\t\t\t)\n\t\t\t\tconst metric: MetricKey = q.metrics.includes('pageviews') ? 'pageviews' : 'visitors'\n\t\t\t\tconst rows: AnalyticsRow[] = data.map((row) => ({\n\t\t\t\t\tdimensions: { page: row.x },\n\t\t\t\t\tmetrics: { [metric]: row.y } as Partial<Record<MetricKey, number>>,\n\t\t\t\t}))\n\t\t\t\treturn { rows, totals: undefined, meta: { provider: 'umami', fetchedAt } }\n\t\t\t}\n\n\t\t\tconst fetchTotals = async (): Promise<Partial<Record<MetricKey, number>>> => {\n\t\t\t\tconst stats = await fetchJson<UmamiStats>(\n\t\t\t\t\t`${base}/websites/${config.websiteId}/stats?${params(q).toString()}`,\n\t\t\t\t\t{ headers, signal: ctx.signal, provider: 'umami' }\n\t\t\t\t)\n\t\t\t\tconst all: Partial<Record<MetricKey, number>> = {\n\t\t\t\t\tpageviews: stats.pageviews,\n\t\t\t\t\tvisitors: stats.visitors,\n\t\t\t\t\tvisits: stats.visits,\n\t\t\t\t\tsessions: stats.visits,\n\t\t\t\t\t// Derived ratios are omitted (not zeroed) when there are no visits, so the\n\t\t\t\t\t// display layer shows a \"no data\" state instead of a misleading 0.\n\t\t\t\t\tbounceRate:\n\t\t\t\t\t\tstats.visits > 0 ? Math.round((stats.bounces / stats.visits) * 100) : undefined,\n\t\t\t\t\tavgDuration:\n\t\t\t\t\t\tstats.visits > 0 ? Math.round((stats.totaltime / stats.visits) * 1000) : undefined,\n\t\t\t\t}\n\t\t\t\tconst totals: Partial<Record<MetricKey, number>> = {}\n\t\t\t\tfor (const m of q.metrics) {\n\t\t\t\t\tif (all[m] !== undefined) {\n\t\t\t\t\t\ttotals[m] = all[m]\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\treturn totals\n\t\t\t}\n\n\t\t\t// Umami's only time-series endpoint reports pageviews and sessions per interval;\n\t\t\t// visitors/bounceRate/avgDuration have no per-day source, so a trend on those\n\t\t\t// metrics keeps a correct headline (from /stats) but an empty series.\n\t\t\tif (q.granularity === 'day') {\n\t\t\t\tconst p = params(q)\n\t\t\t\tp.set('unit', 'day')\n\t\t\t\tp.set('timezone', q.timezone ?? 'UTC')\n\t\t\t\tconst fetchSeries = () =>\n\t\t\t\t\tfetchJson<{\n\t\t\t\t\t\tpageviews: Array<{ x: string; y: number }>\n\t\t\t\t\t\tsessions: Array<{ x: string; y: number }>\n\t\t\t\t\t}>(`${base}/websites/${config.websiteId}/pageviews?${p.toString()}`, {\n\t\t\t\t\t\theaders,\n\t\t\t\t\t\tsignal: ctx.signal,\n\t\t\t\t\t\tprovider: 'umami',\n\t\t\t\t\t})\n\t\t\t\tconst [series, totals] = await Promise.all([fetchSeries(), fetchTotals()])\n\t\t\t\tconst sessionsByX = new Map(series.sessions.map((s) => [s.x, s.y]))\n\t\t\t\tconst rows: AnalyticsRow[] = []\n\t\t\t\tfor (const pv of series.pageviews) {\n\t\t\t\t\tconst ts = dayIso(pv.x)\n\t\t\t\t\tif (!ts) {\n\t\t\t\t\t\tcontinue\n\t\t\t\t\t}\n\t\t\t\t\tconst dayMetrics = sessionsByX.get(pv.x) ?? 0\n\t\t\t\t\tconst all: Partial<Record<MetricKey, number>> = {\n\t\t\t\t\t\tpageviews: pv.y,\n\t\t\t\t\t\tvisits: dayMetrics,\n\t\t\t\t\t\tsessions: dayMetrics,\n\t\t\t\t\t}\n\t\t\t\t\tconst metrics: Partial<Record<MetricKey, number>> = {}\n\t\t\t\t\tfor (const m of q.metrics) {\n\t\t\t\t\t\tif (all[m] !== undefined) {\n\t\t\t\t\t\t\tmetrics[m] = all[m]\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\trows.push({ timestamp: ts, metrics })\n\t\t\t\t}\n\t\t\t\treturn { rows, totals, meta: { provider: 'umami', fetchedAt } }\n\t\t\t}\n\n\t\t\tconst totals = await fetchTotals()\n\t\t\treturn { rows: [{ metrics: totals }], totals, meta: { provider: 'umami', fetchedAt } }\n\t\t},\n\t}\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"umami.js","names":[],"sources":["../../../src/adapters/umami/umami.ts"],"sourcesContent":["import type { CaptureSupport } from '../../core/capture'\nimport type {\n\tAdapterContext,\n\tAnalyticsAdapter,\n\tAnalyticsCapabilities,\n\tAnalyticsFilter,\n\tAnalyticsQuery,\n\tAnalyticsResult,\n\tAnalyticsRow,\n\tDimensionKey,\n\tFilterOperator,\n\tMetricKey,\n} from '../../core/contract'\nimport { emptyGoalBreakdown, goalHint, hintFailed, hintSlugs } from '../goalRead'\nimport { fetchJson } from '../http/fetchJson'\nimport { dayIso } from '../series'\n\nexport interface UmamiConfig {\n\twebsiteId: string\n\t/** Umami Cloud API key (sent as x-umami-api-key). */\n\tapiKey?: string\n\t/** Self-hosted bearer token (from POST /api/auth/login). */\n\ttoken?: string\n\t/**\n\t * API base URL. Defaults to Umami Cloud (https://api.umami.is/v1). Self-hosted is\n\t * e.g. https://site/api. Capture derives the app origin from this (a trailing `/api`\n\t * is stripped), so one `host` value serves both the Stats API and the tracker.\n\t */\n\thost?: string\n\t/** Maximum days of historical data. Defaults to 730. Pass null to disable clamping. */\n\tmaxLookbackDays?: number | null\n}\n\nconst CLOUD_BASE = 'https://api.umami.is/v1'\nconst CLOUD_SCRIPT = 'https://cloud.umami.is/script.js'\nconst CLOUD_SEND = 'https://gateway.umami.is/api/send'\n\nfunction buildCapture(config: UmamiConfig): CaptureSupport {\n\tconst origin = config.host ? config.host.replace(/\\/api\\/?$/, '').replace(/\\/+$/, '') : null\n\tconst scriptUpstream = origin ? `${origin}/script.js` : CLOUD_SCRIPT\n\tconst sendUpstream = origin ? `${origin}/api/send` : CLOUD_SEND\n\treturn {\n\t\tproxy: {\n\t\t\troutes: [\n\t\t\t\t{ source: '/script.js', upstream: scriptUpstream },\n\t\t\t\t{ source: '/api/send', upstream: sendUpstream },\n\t\t\t],\n\t\t},\n\t\tsnippet: ({ path }) => ({\n\t\t\tscripts: [\n\t\t\t\t{\n\t\t\t\t\tsrc: `${path}/script.js`,\n\t\t\t\t\tdefer: true,\n\t\t\t\t\tattrs: { 'data-website-id': config.websiteId, 'data-host-url': path },\n\t\t\t\t},\n\t\t\t],\n\t\t}),\n\t\tclient: { kind: 'umami' },\n\t}\n}\n\nconst umamiMetrics: ReadonlySet<MetricKey> = new Set<MetricKey>([\n\t'pageviews',\n\t'visitors',\n\t'visits',\n\t'sessions',\n\t'bounceRate',\n\t'avgDuration',\n\t'conversions',\n])\n\ninterface UmamiDimension {\n\t/** Umami filter param, which doubles as the /metrics `type` value. */\n\tparam: string\n\t/** The one metric /metrics reports for this type: y is nothing else. */\n\tmetric: MetricKey\n}\n\n// y is count(distinct session_id) on every pageview and session type, and event\n// occurrences on `type=event`.\nconst DIMENSION_MAP: Partial<Record<DimensionKey, UmamiDimension>> = {\n\tpage: { param: 'path', metric: 'visitors' },\n\treferrer: { param: 'referrer', metric: 'visitors' },\n\tbrowser: { param: 'browser', metric: 'visitors' },\n\tos: { param: 'os', metric: 'visitors' },\n\tdevice: { param: 'device', metric: 'visitors' },\n\tcountry: { param: 'country', metric: 'visitors' },\n\tregion: { param: 'region', metric: 'visitors' },\n\tcity: { param: 'city', metric: 'visitors' },\n\tlanguage: { param: 'language', metric: 'visitors' },\n\tevent: { param: 'event', metric: 'events' },\n\tutmSource: { param: 'utmSource', metric: 'visitors' },\n\tutmMedium: { param: 'utmMedium', metric: 'visitors' },\n\tutmCampaign: { param: 'utmCampaign', metric: 'visitors' },\n\tutmContent: { param: 'utmContent', metric: 'visitors' },\n\tutmTerm: { param: 'utmTerm', metric: 'visitors' },\n}\n\n/**\n * Goals are custom events here, counted by `/metrics?type=event`, whose y is the number of\n * occurrences: a plugin goal's slug must equal the captured event's name. It is the one\n * shape that answers `conversions`, so a breakdown by any other dimension and the daily\n * series report none.\n */\nconst GOAL_DIMENSION: UmamiDimension = { param: 'event', metric: 'conversions' }\n\n/**\n * Umami's `re.` is `~*`: a case-insensitive partial match, so an unanchored pattern hits\n * anywhere in the value. `c.` is `ilike`, also case-insensitive.\n */\nconst OPERATOR_PREFIX: Record<FilterOperator, string> = {\n\teq: 'eq.',\n\tcontains: 'c.',\n\tmatches: 're.',\n}\n\nconst umamiFilters: ReadonlySet<DimensionKey> = new Set(\n\tObject.keys(DIMENSION_MAP) as DimensionKey[]\n)\n\n// `event` is filterable but not a group: /metrics counts event occurrences for it, and the\n// adapter cannot declare `events` as a metric because /stats reports no such number. `goal`\n// is the reverse, a group the read's own slugs narrow rather than a filter a caller writes.\nconst umamiDimensions: ReadonlySet<DimensionKey> = new Set([\n\t...[...umamiFilters].filter((dimension) => dimension !== 'event'),\n\t'goal' as DimensionKey,\n])\n\ninterface UmamiParams {\n\tsearch: URLSearchParams\n\t/** Filters a one-value-per-param request could not carry. */\n\tunapplied: AnalyticsFilter[]\n\t/** Two `eq` values on one param: the AND matches nothing, so the read serves no rows. */\n\tempty: boolean\n}\n\ninterface UmamiStats {\n\tpageviews: number\n\tvisitors: number\n\tvisits: number\n\tbounces: number\n\ttotaltime: number\n}\n\n/**\n * Targets Umami 3.x (cloud and self-hosted): filter values carry an operator prefix, and\n * `eq.` is always written explicitly. Umami parses any of `eq`, `neq`, `c`, `dnc`, `re`,\n * `nre`, `s`, `ns`, `t`, `f`, `gt`, `lt`, `gte`, `lte`, `bf` and `af` followed by a dot as\n * the operator, so a bare value beginning with one (`s.example.com`) would change meaning;\n * written as `eq.s.example.com` it stays a literal. Umami splits an `eq.` value on commas\n * into a value list, with no escape.\n */\nexport function umami(config: UmamiConfig): AnalyticsAdapter {\n\tconst base = config.host ?? CLOUD_BASE\n\tconst maxLookbackDays = config.maxLookbackDays !== undefined ? config.maxLookbackDays : 730\n\n\tconst capabilities: AnalyticsCapabilities = {\n\t\tperPageQuery: true,\n\t\trealtime: false,\n\t\tminGranularity: 'day',\n\t\tmaxLookbackDays,\n\t\tmetrics: umamiMetrics,\n\t\tdimensions: umamiDimensions,\n\t\tfilters: umamiFilters,\n\t\tfilterOperators: new Set(['eq', 'contains', 'matches']),\n\t\tbatchPageReport: true,\n\t\trateLimit: null,\n\t\trecommendedTtl: { realtime: 300, aggregate: 3600 },\n\t}\n\t// Cloud authenticates with x-umami-api-key; self-hosted with a bearer token.\n\tconst authHeaders = (): Record<string, string> =>\n\t\tconfig.apiKey\n\t\t\t? { 'x-umami-api-key': config.apiKey }\n\t\t\t: config.token\n\t\t\t\t? { authorization: `Bearer ${config.token}` }\n\t\t\t\t: {}\n\n\t/**\n\t * Umami takes one value per query param, so filters that land on the same param cannot\n\t * all be sent. Two `eq` values on one param are an AND that matches nothing, which the\n\t * read answers as empty without calling the API; anything else keeps the first filter,\n\t * except that `q.path` always wins the `path` param so a per-page read stays scoped to\n\t * its page. An `eq` value carrying a comma is dropped too: Umami reads such a value as a\n\t * list and offers no escape, so sending it would answer a wider question than the one\n\t * asked. Whatever was dropped travels back in `meta.unappliedFilters`.\n\t */\n\tconst params = (q: AnalyticsQuery): UmamiParams => {\n\t\tconst p = new URLSearchParams({\n\t\t\tstartAt: String(q.dateRange.start.getTime()),\n\t\t\tendAt: String(q.dateRange.end.getTime()),\n\t\t})\n\t\tconst unapplied: AnalyticsFilter[] = []\n\t\tconst eqValues = new Map<string, string>()\n\t\tfor (const filter of q.filters ?? []) {\n\t\t\tconst mapped = DIMENSION_MAP[filter.dimension]\n\t\t\tif (!mapped || filter.operator !== 'eq') {\n\t\t\t\tcontinue\n\t\t\t}\n\t\t\tconst held = eqValues.get(mapped.param)\n\t\t\tif (held !== undefined && held !== filter.value) {\n\t\t\t\treturn { search: p, unapplied, empty: true }\n\t\t\t}\n\t\t\teqValues.set(mapped.param, filter.value)\n\t\t}\n\t\tconst held = new Map<string, { value: string; filter: AnalyticsFilter }>()\n\t\tfor (const filter of q.filters ?? []) {\n\t\t\tconst mapped = DIMENSION_MAP[filter.dimension]\n\t\t\tif (!mapped) {\n\t\t\t\tcontinue\n\t\t\t}\n\t\t\tif (filter.operator === 'eq' && filter.value.includes(',')) {\n\t\t\t\tunapplied.push(filter)\n\t\t\t\tcontinue\n\t\t\t}\n\t\t\tconst value = `${OPERATOR_PREFIX[filter.operator]}${filter.value}`\n\t\t\tconst first = held.get(mapped.param)\n\t\t\tif (first === undefined) {\n\t\t\t\theld.set(mapped.param, { value, filter })\n\t\t\t\tp.set(mapped.param, value)\n\t\t\t} else if (first.value !== value) {\n\t\t\t\tunapplied.push(filter)\n\t\t\t}\n\t\t}\n\t\tif (q.path) {\n\t\t\tconst value = `eq.${q.path}`\n\t\t\tconst first = held.get('path')\n\t\t\tif (first !== undefined && first.value !== value) {\n\t\t\t\tunapplied.push(first.filter)\n\t\t\t}\n\t\t\tp.set('path', value)\n\t\t}\n\t\treturn { search: p, unapplied, empty: false }\n\t}\n\n\treturn {\n\t\tid: 'umami',\n\t\tlabel: 'Umami',\n\t\tcapabilities,\n\t\tcapture: buildCapture(config),\n\t\tisConfigured: () => Boolean(config.websiteId && (config.apiKey || config.token)),\n\t\tasync query(q: AnalyticsQuery, ctx: AdapterContext): Promise<AnalyticsResult> {\n\t\t\tconst fetchedAt = q.dateRange.end.toISOString()\n\t\t\tconst headers = authHeaders()\n\t\t\tconst goalBreakdown = (q.dimensions ?? []).includes('goal')\n\t\t\tconst hint = goalHint(q)\n\t\t\tconst slugs = hintSlugs(hint)\n\t\t\tconst plan = params(q)\n\t\t\tlet breakdown: ({ dimension: DimensionKey } & UmamiDimension) | undefined\n\t\t\tfor (const dimension of q.dimensions ?? []) {\n\t\t\t\tconst mapped = DIMENSION_MAP[dimension]\n\t\t\t\tif (mapped) {\n\t\t\t\t\tbreakdown = { dimension, ...mapped }\n\t\t\t\t\tbreak\n\t\t\t\t}\n\t\t\t}\n\t\t\t// Umami splits an `eq.` value list on commas and offers no escape, so a slug carrying\n\t\t\t// one cannot be asked for: it is left out of the request and reported, rather than\n\t\t\t// widening the read to every event.\n\t\t\tconst askable = (slugs ?? []).filter((slug) => !slug.includes(','))\n\t\t\tconst eventValue = `eq.${askable.join(',')}`\n\t\t\t// The goal rows come from the `event` param, so a caller's own filter on it would\n\t\t\t// contradict the hint. The hint wins and that filter is reported unapplied, but only\n\t\t\t// on a read that fetches goal rows at all: a breakdown by another dimension never\n\t\t\t// does, so its event filter travels with the request as written.\n\t\t\tconst eventFilter = (q.filters ?? []).find((f) => f.dimension === 'event')\n\t\t\tconst readsGoals =\n\t\t\t\tgoalBreakdown || (!breakdown && q.metrics.includes('conversions') && slugs !== null)\n\t\t\tconst unapplied: AnalyticsFilter[] = [\n\t\t\t\t...plan.unapplied,\n\t\t\t\t...(slugs ?? [])\n\t\t\t\t\t.filter((slug) => slug.includes(','))\n\t\t\t\t\t.map((slug) => ({\n\t\t\t\t\t\tdimension: 'goal' as const,\n\t\t\t\t\t\toperator: 'eq' as const,\n\t\t\t\t\t\tvalue: slug,\n\t\t\t\t\t})),\n\t\t\t\t...(readsGoals &&\n\t\t\t\teventFilter &&\n\t\t\t\t`${OPERATOR_PREFIX[eventFilter.operator]}${eventFilter.value}` !== eventValue\n\t\t\t\t\t? [eventFilter]\n\t\t\t\t\t: []),\n\t\t\t]\n\t\t\tconst unresolved = q.metrics.includes('conversions') && hintFailed(hint)\n\t\t\tconst unappliedMeta = unapplied.length > 0 ? { unappliedFilters: unapplied } : {}\n\t\t\tconst empty = goalBreakdown\n\t\t\t\t? emptyGoalBreakdown({ provider: 'umami', q, hint, meta: unappliedMeta })\n\t\t\t\t: null\n\t\t\tif (empty) {\n\t\t\t\treturn empty\n\t\t\t}\n\t\t\tconst meta: AnalyticsResult['meta'] = {\n\t\t\t\tprovider: 'umami',\n\t\t\t\tfetchedAt,\n\t\t\t\t...unappliedMeta,\n\t\t\t\t...(unresolved ? { goalsUnresolved: true as const } : {}),\n\t\t\t}\n\t\t\t// Totals are left undefined rather than zeroed, the same as every other number this\n\t\t\t// adapter cannot report, so the display layer shows \"no data\" instead of a real 0.\n\t\t\tif (plan.empty) {\n\t\t\t\treturn { rows: [], totals: undefined, meta }\n\t\t\t}\n\t\t\tconst search = (): URLSearchParams => new URLSearchParams(plan.search)\n\n\t\t\t/**\n\t\t\t * The goal rows for the hint, narrowed to it again on the way back so nothing the API\n\t\t\t * did not restrict can arrive as a goal.\n\t\t\t */\n\t\t\tconst fetchGoalRows = async (): Promise<Array<{ x: string; y: number }>> => {\n\t\t\t\tif (askable.length === 0) {\n\t\t\t\t\treturn []\n\t\t\t\t}\n\t\t\t\tconst p = search()\n\t\t\t\tp.set('type', GOAL_DIMENSION.param)\n\t\t\t\tp.set(GOAL_DIMENSION.param, eventValue)\n\t\t\t\tconst data = await fetchJson<Array<{ x: string; y: number }>>(\n\t\t\t\t\t`${base}/websites/${config.websiteId}/metrics?${p.toString()}`,\n\t\t\t\t\t{ headers, signal: ctx.signal, provider: 'umami' }\n\t\t\t\t)\n\t\t\t\tconst wanted = new Set(askable)\n\t\t\t\treturn data.filter((row) => wanted.has(row.x))\n\t\t\t}\n\n\t\t\tif (goalBreakdown) {\n\t\t\t\tconst data = await fetchGoalRows()\n\t\t\t\tconst rows: AnalyticsRow[] = data.map((row) => ({\n\t\t\t\t\tdimensions: { goal: row.x },\n\t\t\t\t\tmetrics: { [GOAL_DIMENSION.metric]: row.y },\n\t\t\t\t}))\n\t\t\t\treturn { rows, totals: undefined, meta }\n\t\t\t}\n\n\t\t\tif (breakdown) {\n\t\t\t\tconst { dimension, param, metric } = breakdown\n\t\t\t\tconst p = search()\n\t\t\t\tp.set('type', param)\n\t\t\t\tconst data = await fetchJson<Array<{ x: string; y: number }>>(\n\t\t\t\t\t`${base}/websites/${config.websiteId}/metrics?${p.toString()}`,\n\t\t\t\t\t{ headers, signal: ctx.signal, provider: 'umami' }\n\t\t\t\t)\n\t\t\t\t// /metrics reports exactly one number per row, and rows always carry it under the\n\t\t\t\t// name it actually holds. A requested metric Umami has no per-row source for is\n\t\t\t\t// absent rather than labelled with a number it is not.\n\t\t\t\tconst rows: AnalyticsRow[] = data.map((row) => ({\n\t\t\t\t\tdimensions: { [dimension]: row.x },\n\t\t\t\t\tmetrics: { [metric]: row.y },\n\t\t\t\t}))\n\t\t\t\treturn { rows, totals: undefined, meta }\n\t\t\t}\n\n\t\t\tconst fetchTotals = async (): Promise<Partial<Record<MetricKey, number>>> => {\n\t\t\t\t// Conversions have no place in /stats: their total is the goal rows summed.\n\t\t\t\tconst [stats, goalRows] = await Promise.all([\n\t\t\t\t\tfetchJson<UmamiStats>(\n\t\t\t\t\t\t`${base}/websites/${config.websiteId}/stats?${search().toString()}`,\n\t\t\t\t\t\t{ headers, signal: ctx.signal, provider: 'umami' }\n\t\t\t\t\t),\n\t\t\t\t\tq.metrics.includes('conversions') && slugs ? fetchGoalRows() : undefined,\n\t\t\t\t])\n\t\t\t\tconst all: Partial<Record<MetricKey, number>> = {\n\t\t\t\t\t...(goalRows ? { conversions: goalRows.reduce((sum, row) => sum + row.y, 0) } : {}),\n\t\t\t\t\tpageviews: stats.pageviews,\n\t\t\t\t\tvisitors: stats.visitors,\n\t\t\t\t\tvisits: stats.visits,\n\t\t\t\t\tsessions: stats.visits,\n\t\t\t\t\t// Derived ratios are omitted (not zeroed) when there are no visits, so the\n\t\t\t\t\t// display layer shows a \"no data\" state instead of a misleading 0.\n\t\t\t\t\tbounceRate:\n\t\t\t\t\t\tstats.visits > 0 ? Math.round((stats.bounces / stats.visits) * 100) : undefined,\n\t\t\t\t\tavgDuration:\n\t\t\t\t\t\tstats.visits > 0 ? Math.round((stats.totaltime / stats.visits) * 1000) : undefined,\n\t\t\t\t}\n\t\t\t\tconst totals: Partial<Record<MetricKey, number>> = {}\n\t\t\t\tfor (const m of q.metrics) {\n\t\t\t\t\tif (all[m] !== undefined) {\n\t\t\t\t\t\ttotals[m] = all[m]\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\treturn totals\n\t\t\t}\n\n\t\t\t// Umami's only time-series endpoint reports pageviews and sessions per interval;\n\t\t\t// visitors/bounceRate/avgDuration have no per-day source, so a trend on those\n\t\t\t// metrics keeps a correct headline (from /stats) but an empty series.\n\t\t\tif (q.granularity === 'day') {\n\t\t\t\tconst p = search()\n\t\t\t\tp.set('unit', 'day')\n\t\t\t\tp.set('timezone', q.timezone ?? 'UTC')\n\t\t\t\tconst fetchSeries = () =>\n\t\t\t\t\tfetchJson<{\n\t\t\t\t\t\tpageviews: Array<{ x: string; y: number }>\n\t\t\t\t\t\tsessions: Array<{ x: string; y: number }>\n\t\t\t\t\t}>(`${base}/websites/${config.websiteId}/pageviews?${p.toString()}`, {\n\t\t\t\t\t\theaders,\n\t\t\t\t\t\tsignal: ctx.signal,\n\t\t\t\t\t\tprovider: 'umami',\n\t\t\t\t\t})\n\t\t\t\tconst [series, totals] = await Promise.all([fetchSeries(), fetchTotals()])\n\t\t\t\tconst sessionsByX = new Map(series.sessions.map((s) => [s.x, s.y]))\n\t\t\t\tconst rows: AnalyticsRow[] = []\n\t\t\t\tfor (const pv of series.pageviews) {\n\t\t\t\t\tconst ts = dayIso(pv.x)\n\t\t\t\t\tif (!ts) {\n\t\t\t\t\t\tcontinue\n\t\t\t\t\t}\n\t\t\t\t\tconst dayMetrics = sessionsByX.get(pv.x) ?? 0\n\t\t\t\t\tconst all: Partial<Record<MetricKey, number>> = {\n\t\t\t\t\t\tpageviews: pv.y,\n\t\t\t\t\t\tvisits: dayMetrics,\n\t\t\t\t\t\tsessions: dayMetrics,\n\t\t\t\t\t}\n\t\t\t\t\tconst metrics: Partial<Record<MetricKey, number>> = {}\n\t\t\t\t\tfor (const m of q.metrics) {\n\t\t\t\t\t\tif (all[m] !== undefined) {\n\t\t\t\t\t\t\tmetrics[m] = all[m]\n\t\t\t\t\t\t}\n\t\t\t\t\t}\n\t\t\t\t\trows.push({ timestamp: ts, metrics })\n\t\t\t\t}\n\t\t\t\treturn { rows, totals, meta }\n\t\t\t}\n\n\t\t\tconst totals = await fetchTotals()\n\t\t\treturn { rows: [{ metrics: totals }], totals, meta }\n\t\t},\n\t}\n}\n"],"mappings":"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"}
@@ -13,8 +13,13 @@ const isCaptureSlot = (value) => CAPTURE_SLOTS.includes(value);
13
13
  *
14
14
  * A slot configured `false` is null before any of that runs: an explicit disable outranks
15
15
  * every default, and nothing happens on its behalf, not even a scope lookup.
16
+ *
17
+ * `scope` passes in an already-resolved scope so a caller filling both slots (and the
18
+ * request's goals) calls the host's resolver once; omit it and the tenant slot resolves
19
+ * its own.
16
20
  */
17
- const resolveSlotAdapter = async (runtime, req, slot) => {
21
+ const resolveSlotAdapterFor = async (args) => {
22
+ const { runtime, req, slot, scope } = args;
18
23
  const configured = runtime.captureSlots?.[slot];
19
24
  if (configured === false) return null;
20
25
  try {
@@ -24,12 +29,12 @@ const resolveSlotAdapter = async (runtime, req, slot) => {
24
29
  const all = runtime.registry.all();
25
30
  return all.length === 1 ? all[0] : null;
26
31
  }
27
- const scope = await resolveScopeFor(runtime, req);
28
- if (scope === null) return null;
32
+ const resolved = scope === void 0 ? await resolveScopeFor(runtime, req) : scope;
33
+ if (resolved === null) return null;
29
34
  const registry = await resolveRegistryFor(runtime, {
30
35
  payload: req.payload,
31
36
  req,
32
- scope
37
+ scope: resolved
33
38
  });
34
39
  return configured ? registry.get(configured) : registry.default();
35
40
  } catch (err) {
@@ -37,7 +42,13 @@ const resolveSlotAdapter = async (runtime, req, slot) => {
37
42
  return null;
38
43
  }
39
44
  };
45
+ /** {@link resolveSlotAdapterFor} for a caller holding one slot and no scope of its own. */
46
+ const resolveSlotAdapter = (runtime, req, slot) => resolveSlotAdapterFor({
47
+ runtime,
48
+ req,
49
+ slot
50
+ });
40
51
  //#endregion
41
- export { CAPTURE_SLOTS, isCaptureSlot, resolveSlotAdapter };
52
+ export { CAPTURE_SLOTS, isCaptureSlot, resolveSlotAdapter, resolveSlotAdapterFor };
42
53
 
43
54
  //# sourceMappingURL=slots.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"slots.js","names":[],"sources":["../../src/capture/slots.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\nimport type { AnalyticsAdapter } from '../core/contract'\nimport { type AnalyticsRuntime, resolveRegistryFor, resolveScopeFor } from '../plugin/runtime'\n\n/** The two capture slots an install can fill: the platform's own and the tenant's. */\nexport type CaptureSlot = 'global' | 'tenant'\n\nexport const CAPTURE_SLOTS: readonly CaptureSlot[] = ['global', 'tenant']\n\nexport const isCaptureSlot = (value: string): value is CaptureSlot =>\n\t(CAPTURE_SLOTS as readonly string[]).includes(value)\n\n/**\n * The adapter filling one capture slot for this request, or null when the slot is\n * unfilled. `global` is install-wide, so it resolves out of the config registry only:\n * the `capture.slots.global` override, else the designated `platformAdapter`, else the\n * single config adapter when there is exactly one. `tenant` resolves out of the\n * request's own per-scope registry (which includes that scope's runtime providers) and\n * is null whenever no scope resolves. Any resolution failure degrades to null, so the\n * proxy 404s instead of throwing.\n *\n * A slot configured `false` is null before any of that runs: an explicit disable outranks\n * every default, and nothing happens on its behalf, not even a scope lookup.\n */\nexport const resolveSlotAdapter = async (\n\truntime: AnalyticsRuntime,\n\treq: PayloadRequest,\n\tslot: CaptureSlot\n): Promise<AnalyticsAdapter | null> => {\n\tconst configured = runtime.captureSlots?.[slot]\n\tif (configured === false) {\n\t\treturn null\n\t}\n\ttry {\n\t\tif (slot === 'global') {\n\t\t\tif (configured) {\n\t\t\t\treturn runtime.registry.get(configured)\n\t\t\t}\n\t\t\tif (runtime.platformAdapterId) {\n\t\t\t\treturn runtime.registry.get(runtime.platformAdapterId)\n\t\t\t}\n\t\t\tconst all = runtime.registry.all()\n\t\t\treturn all.length === 1 ? (all[0] as AnalyticsAdapter) : null\n\t\t}\n\t\tconst scope = await resolveScopeFor(runtime, req)\n\t\tif (scope === null) {\n\t\t\treturn null\n\t\t}\n\t\tconst registry = await resolveRegistryFor(runtime, { payload: req.payload, req, scope })\n\t\treturn configured ? registry.get(configured) : registry.default()\n\t} catch (err) {\n\t\treq.payload?.logger?.warn(`analytics: capture slot \"${slot}\" resolution failed: ${String(err)}`)\n\t\treturn null\n\t}\n}\n"],"mappings":";;AAOA,MAAa,gBAAwC,CAAC,UAAU,QAAQ;AAExE,MAAa,iBAAiB,UAC5B,cAAoC,SAAS,KAAK;;;;;;;;;;;;;AAcpD,MAAa,qBAAqB,OACjC,SACA,KACA,SACsC;CACtC,MAAM,aAAa,QAAQ,eAAe;CAC1C,IAAI,eAAe,OAClB,OAAO;CAER,IAAI;EACH,IAAI,SAAS,UAAU;GACtB,IAAI,YACH,OAAO,QAAQ,SAAS,IAAI,UAAU;GAEvC,IAAI,QAAQ,mBACX,OAAO,QAAQ,SAAS,IAAI,QAAQ,iBAAiB;GAEtD,MAAM,MAAM,QAAQ,SAAS,IAAI;GACjC,OAAO,IAAI,WAAW,IAAK,IAAI,KAA0B;EAC1D;EACA,MAAM,QAAQ,MAAM,gBAAgB,SAAS,GAAG;EAChD,IAAI,UAAU,MACb,OAAO;EAER,MAAM,WAAW,MAAM,mBAAmB,SAAS;GAAE,SAAS,IAAI;GAAS;GAAK;EAAM,CAAC;EACvF,OAAO,aAAa,SAAS,IAAI,UAAU,IAAI,SAAS,QAAQ;CACjE,SAAS,KAAK;EACb,IAAI,SAAS,QAAQ,KAAK,4BAA4B,KAAK,uBAAuB,OAAO,GAAG,GAAG;EAC/F,OAAO;CACR;AACD"}
1
+ {"version":3,"file":"slots.js","names":[],"sources":["../../src/capture/slots.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\nimport type { AnalyticsAdapter } from '../core/contract'\nimport { type AnalyticsRuntime, resolveRegistryFor, resolveScopeFor } from '../plugin/runtime'\n\n/** The two capture slots an install can fill: the platform's own and the tenant's. */\nexport type CaptureSlot = 'global' | 'tenant'\n\nexport const CAPTURE_SLOTS: readonly CaptureSlot[] = ['global', 'tenant']\n\nexport const isCaptureSlot = (value: string): value is CaptureSlot =>\n\t(CAPTURE_SLOTS as readonly string[]).includes(value)\n\n/**\n * The adapter filling one capture slot for this request, or null when the slot is\n * unfilled. `global` is install-wide, so it resolves out of the config registry only:\n * the `capture.slots.global` override, else the designated `platformAdapter`, else the\n * single config adapter when there is exactly one. `tenant` resolves out of the\n * request's own per-scope registry (which includes that scope's runtime providers) and\n * is null whenever no scope resolves. Any resolution failure degrades to null, so the\n * proxy 404s instead of throwing.\n *\n * A slot configured `false` is null before any of that runs: an explicit disable outranks\n * every default, and nothing happens on its behalf, not even a scope lookup.\n *\n * `scope` passes in an already-resolved scope so a caller filling both slots (and the\n * request's goals) calls the host's resolver once; omit it and the tenant slot resolves\n * its own.\n */\nexport const resolveSlotAdapterFor = async (args: {\n\truntime: AnalyticsRuntime\n\treq: PayloadRequest\n\tslot: CaptureSlot\n\tscope?: string | null\n}): Promise<AnalyticsAdapter | null> => {\n\tconst { runtime, req, slot, scope } = args\n\tconst configured = runtime.captureSlots?.[slot]\n\tif (configured === false) {\n\t\treturn null\n\t}\n\ttry {\n\t\tif (slot === 'global') {\n\t\t\tif (configured) {\n\t\t\t\treturn runtime.registry.get(configured)\n\t\t\t}\n\t\t\tif (runtime.platformAdapterId) {\n\t\t\t\treturn runtime.registry.get(runtime.platformAdapterId)\n\t\t\t}\n\t\t\tconst all = runtime.registry.all()\n\t\t\treturn all.length === 1 ? (all[0] as AnalyticsAdapter) : null\n\t\t}\n\t\tconst resolved = scope === undefined ? await resolveScopeFor(runtime, req) : scope\n\t\tif (resolved === null) {\n\t\t\treturn null\n\t\t}\n\t\tconst registry = await resolveRegistryFor(runtime, {\n\t\t\tpayload: req.payload,\n\t\t\treq,\n\t\t\tscope: resolved,\n\t\t})\n\t\treturn configured ? registry.get(configured) : registry.default()\n\t} catch (err) {\n\t\treq.payload?.logger?.warn(`analytics: capture slot \"${slot}\" resolution failed: ${String(err)}`)\n\t\treturn null\n\t}\n}\n\n/** {@link resolveSlotAdapterFor} for a caller holding one slot and no scope of its own. */\nexport const resolveSlotAdapter = (\n\truntime: AnalyticsRuntime,\n\treq: PayloadRequest,\n\tslot: CaptureSlot\n): Promise<AnalyticsAdapter | null> => resolveSlotAdapterFor({ runtime, req, slot })\n"],"mappings":";;AAOA,MAAa,gBAAwC,CAAC,UAAU,QAAQ;AAExE,MAAa,iBAAiB,UAC5B,cAAoC,SAAS,KAAK;;;;;;;;;;;;;;;;;AAkBpD,MAAa,wBAAwB,OAAO,SAKJ;CACvC,MAAM,EAAE,SAAS,KAAK,MAAM,UAAU;CACtC,MAAM,aAAa,QAAQ,eAAe;CAC1C,IAAI,eAAe,OAClB,OAAO;CAER,IAAI;EACH,IAAI,SAAS,UAAU;GACtB,IAAI,YACH,OAAO,QAAQ,SAAS,IAAI,UAAU;GAEvC,IAAI,QAAQ,mBACX,OAAO,QAAQ,SAAS,IAAI,QAAQ,iBAAiB;GAEtD,MAAM,MAAM,QAAQ,SAAS,IAAI;GACjC,OAAO,IAAI,WAAW,IAAK,IAAI,KAA0B;EAC1D;EACA,MAAM,WAAW,UAAU,KAAA,IAAY,MAAM,gBAAgB,SAAS,GAAG,IAAI;EAC7E,IAAI,aAAa,MAChB,OAAO;EAER,MAAM,WAAW,MAAM,mBAAmB,SAAS;GAClD,SAAS,IAAI;GACb;GACA,OAAO;EACR,CAAC;EACD,OAAO,aAAa,SAAS,IAAI,UAAU,IAAI,SAAS,QAAQ;CACjE,SAAS,KAAK;EACb,IAAI,SAAS,QAAQ,KAAK,4BAA4B,KAAK,uBAAuB,OAAO,GAAG,GAAG;EAC/F,OAAO;CACR;AACD;;AAGA,MAAa,sBACZ,SACA,KACA,SACsC,sBAAsB;CAAE;CAAS;CAAK;AAAK,CAAC"}
@@ -23,6 +23,7 @@ interface TrackerSlotConfig {
23
23
  interface TrackerConfig {
24
24
  slots: TrackerSlotConfig[];
25
25
  autoCapture: ResolvedAutoCapture;
26
+ /** The request scope's goals, config merged with the goals collection. */
26
27
  goals: TrackerGoal[];
27
28
  /** Where the native sink posts events, derived from the app's own `routes.api`. */
28
29
  ingestPath: string;
@@ -1,5 +1,6 @@
1
1
  import { INGEST_PATH, PROXY_PATH } from "../plugin/paths.js";
2
- import { CAPTURE_SLOTS, resolveSlotAdapter } from "./slots.js";
2
+ import { resolveGoalsFor, resolveScopeFor } from "../plugin/runtime.js";
3
+ import { CAPTURE_SLOTS, resolveSlotAdapterFor } from "./slots.js";
3
4
  import { DEFAULT_AUTO_CAPTURE, defaultConsentFor } from "../core/options.js";
4
5
  import { normalizeMountPath } from "./mountPath.js";
5
6
  //#region src/capture/trackerConfig.ts
@@ -10,6 +11,24 @@ const trackerGoals = (goals) => (goals ?? []).map(({ slug, match, value, currenc
10
11
  ...value ? { value } : {},
11
12
  ...currency ? { currency } : {}
12
13
  }));
14
+ /** The request's scope, or null when the host's resolver has none or throws. */
15
+ const scopeFor = async (runtime, req) => {
16
+ try {
17
+ return await resolveScopeFor(runtime, req);
18
+ } catch (err) {
19
+ req.payload?.logger?.warn(`analytics: tracker config scope resolution failed: ${String(err)}`);
20
+ return null;
21
+ }
22
+ };
23
+ /** The scope's merged goals, falling back to the config goals when the merge fails. */
24
+ const goalsFor = async (runtime, req, scope) => {
25
+ try {
26
+ return await resolveGoalsFor(runtime, req, scope);
27
+ } catch (err) {
28
+ req.payload?.logger?.warn(`analytics: tracker config goals resolution failed, falling back to config goals: ${String(err)}`);
29
+ return runtime.goals ?? [];
30
+ }
31
+ };
13
32
  /** The config for an install with no runtime yet: no slots, but still a usable ingest path. */
14
33
  const emptyTrackerConfig = (req) => ({
15
34
  slots: [],
@@ -33,10 +52,16 @@ const emptyTrackerConfig = (req) => ({
33
52
  const resolveTrackerConfig = async (args) => {
34
53
  const { runtime, req } = args;
35
54
  const base = apiRoute(req);
55
+ const scope = await scopeFor(runtime, req);
36
56
  const slots = [];
37
57
  const filled = /* @__PURE__ */ new Set();
38
58
  for (const slot of CAPTURE_SLOTS) {
39
- const adapter = await resolveSlotAdapter(runtime, req, slot);
59
+ const adapter = await resolveSlotAdapterFor({
60
+ runtime,
61
+ req,
62
+ slot,
63
+ scope
64
+ });
40
65
  const capture = adapter?.capture;
41
66
  if (!adapter || !capture || filled.has(adapter.id)) continue;
42
67
  const override = runtime.capturePaths?.[slot];
@@ -60,7 +85,7 @@ const resolveTrackerConfig = async (args) => {
60
85
  return {
61
86
  slots,
62
87
  autoCapture: runtime.autoCapture ?? DEFAULT_AUTO_CAPTURE,
63
- goals: trackerGoals(runtime.goals),
88
+ goals: trackerGoals(await goalsFor(runtime, req, scope)),
64
89
  ingestPath: `${base}${runtime.ingestPath ?? "/analytics/ingest"}`
65
90
  };
66
91
  };
@@ -1 +1 @@
1
- {"version":3,"file":"trackerConfig.js","names":[],"sources":["../../src/capture/trackerConfig.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\nimport type { CaptureClientKind, CaptureSnippet, CaptureSupport } from '../core/capture'\nimport { DEFAULT_AUTO_CAPTURE, defaultConsentFor, type ResolvedAutoCapture } from '../core/options'\nimport type { Goal, TrackerGoal } from '../goals/types'\nimport { INGEST_PATH, PROXY_PATH } from '../plugin/paths'\nimport type { AnalyticsRuntime } from '../plugin/runtime'\nimport { normalizeMountPath } from './mountPath'\nimport { CAPTURE_SLOTS, type CaptureSlot, resolveSlotAdapter } from './slots'\n\nexport interface TrackerSlotConfig {\n\tslot: CaptureSlot\n\tkind: CaptureClientKind\n\tadapterId: string\n\t/** Mount the snippet and the sink talk to: the runtime proxy, or a `capture.paths` override. */\n\tpath: string\n\tsnippet: CaptureSnippet\n\tclient: CaptureSupport['client']\n\trequiresConsent: boolean\n}\n\n/**\n * Everything the browser tracker needs, and nothing else. Serialized to any visitor by the\n * public tracker endpoint, so it carries only what an adapter puts in `capture.client` and\n * `capture.snippet`: never a query credential, never a goal's admin-facing name.\n */\nexport interface TrackerConfig {\n\tslots: TrackerSlotConfig[]\n\tautoCapture: ResolvedAutoCapture\n\tgoals: TrackerGoal[]\n\t/** Where the native sink posts events, derived from the app's own `routes.api`. */\n\tingestPath: string\n}\n\nconst apiRoute = (req: PayloadRequest): string => req.payload?.config?.routes?.api ?? '/api'\n\nconst trackerGoals = (goals: Goal[] | undefined): TrackerGoal[] =>\n\t(goals ?? []).map(({ slug, match, value, currency }) => ({\n\t\tslug,\n\t\tmatch,\n\t\t...(value ? { value } : {}),\n\t\t...(currency ? { currency } : {}),\n\t}))\n\n/** The config for an install with no runtime yet: no slots, but still a usable ingest path. */\nexport const emptyTrackerConfig = (req: PayloadRequest): TrackerConfig => ({\n\tslots: [],\n\tautoCapture: DEFAULT_AUTO_CAPTURE,\n\tgoals: [],\n\tingestPath: `${apiRoute(req)}${INGEST_PATH}`,\n})\n\n/**\n * The per-request tracker config: one entry per capture slot that resolves to an adapter\n * declaring `capture`, in slot order. A slot whose adapter does not resolve (no scope, an\n * unknown id, a throwing scope resolver) is simply absent, as is one whose snippet throws;\n * this runs on a public, unauthenticated path, so every failure degrades a slot away\n * rather than surfacing an error.\n *\n * One adapter fills at most one slot. A scoped install whose tenant registry defaults to\n * the same adapter the global slot names would otherwise hand the tracker two sinks for\n * it and send every event twice; the native adapter in particular resolves its scope from\n * the request, so one sink already covers both. The global slot iterates first and keeps\n * the entry.\n */\nexport const resolveTrackerConfig = async (args: {\n\truntime: AnalyticsRuntime\n\treq: PayloadRequest\n}): Promise<TrackerConfig> => {\n\tconst { runtime, req } = args\n\tconst base = apiRoute(req)\n\tconst slots: TrackerSlotConfig[] = []\n\tconst filled = new Set<string>()\n\tfor (const slot of CAPTURE_SLOTS) {\n\t\tconst adapter = await resolveSlotAdapter(runtime, req, slot)\n\t\tconst capture = adapter?.capture\n\t\tif (!adapter || !capture || filled.has(adapter.id)) {\n\t\t\tcontinue\n\t\t}\n\t\tconst override = runtime.capturePaths?.[slot]\n\t\tconst path = override ? normalizeMountPath(override) : `${base}${PROXY_PATH}/${slot}`\n\t\tconst kind = capture.client.kind\n\t\ttry {\n\t\t\tslots.push({\n\t\t\t\tslot,\n\t\t\t\tkind,\n\t\t\t\tadapterId: adapter.id,\n\t\t\t\tpath,\n\t\t\t\tsnippet: capture.snippet({ path }),\n\t\t\t\tclient: capture.client,\n\t\t\t\trequiresConsent:\n\t\t\t\t\t(runtime.consentFor?.(slot, adapter.id, kind) ?? defaultConsentFor(kind)) === 'required',\n\t\t\t})\n\t\t\tfilled.add(adapter.id)\n\t\t} catch (err) {\n\t\t\treq.payload?.logger?.warn(\n\t\t\t\t`analytics: capture snippet for \"${adapter.id}\" failed, dropping the ${slot} slot: ${String(err)}`\n\t\t\t)\n\t\t}\n\t}\n\treturn {\n\t\tslots,\n\t\tautoCapture: runtime.autoCapture ?? DEFAULT_AUTO_CAPTURE,\n\t\tgoals: trackerGoals(runtime.goals),\n\t\tingestPath: `${base}${runtime.ingestPath ?? INGEST_PATH}`,\n\t}\n}\n"],"mappings":";;;;;AAiCA,MAAM,YAAY,QAAgC,IAAI,SAAS,QAAQ,QAAQ,OAAO;AAEtF,MAAM,gBAAgB,WACpB,SAAS,CAAC,GAAG,KAAK,EAAE,MAAM,OAAO,OAAO,gBAAgB;CACxD;CACA;CACA,GAAI,QAAQ,EAAE,MAAM,IAAI,CAAC;CACzB,GAAI,WAAW,EAAE,SAAS,IAAI,CAAC;AAChC,EAAE;;AAGH,MAAa,sBAAsB,SAAwC;CAC1E,OAAO,CAAC;CACR,aAAa;CACb,OAAO,CAAC;CACR,YAAY,GAAG,SAAS,GAAG,IAAI;AAChC;;;;;;;;;;;;;;AAeA,MAAa,uBAAuB,OAAO,SAGb;CAC7B,MAAM,EAAE,SAAS,QAAQ;CACzB,MAAM,OAAO,SAAS,GAAG;CACzB,MAAM,QAA6B,CAAC;CACpC,MAAM,yBAAS,IAAI,IAAY;CAC/B,KAAK,MAAM,QAAQ,eAAe;EACjC,MAAM,UAAU,MAAM,mBAAmB,SAAS,KAAK,IAAI;EAC3D,MAAM,UAAU,SAAS;EACzB,IAAI,CAAC,WAAW,CAAC,WAAW,OAAO,IAAI,QAAQ,EAAE,GAChD;EAED,MAAM,WAAW,QAAQ,eAAe;EACxC,MAAM,OAAO,WAAW,mBAAmB,QAAQ,IAAI,GAAG,OAAO,WAAW,GAAG;EAC/E,MAAM,OAAO,QAAQ,OAAO;EAC5B,IAAI;GACH,MAAM,KAAK;IACV;IACA;IACA,WAAW,QAAQ;IACnB;IACA,SAAS,QAAQ,QAAQ,EAAE,KAAK,CAAC;IACjC,QAAQ,QAAQ;IAChB,kBACE,QAAQ,aAAa,MAAM,QAAQ,IAAI,IAAI,KAAK,kBAAkB,IAAI,OAAO;GAChF,CAAC;GACD,OAAO,IAAI,QAAQ,EAAE;EACtB,SAAS,KAAK;GACb,IAAI,SAAS,QAAQ,KACpB,mCAAmC,QAAQ,GAAG,yBAAyB,KAAK,SAAS,OAAO,GAAG,GAChG;EACD;CACD;CACA,OAAO;EACN;EACA,aAAa,QAAQ,eAAe;EACpC,OAAO,aAAa,QAAQ,KAAK;EACjC,YAAY,GAAG,OAAO,QAAQ,cAAA;CAC/B;AACD"}
1
+ {"version":3,"file":"trackerConfig.js","names":[],"sources":["../../src/capture/trackerConfig.ts"],"sourcesContent":["import type { PayloadRequest } from 'payload'\nimport type { CaptureClientKind, CaptureSnippet, CaptureSupport } from '../core/capture'\nimport { DEFAULT_AUTO_CAPTURE, defaultConsentFor, type ResolvedAutoCapture } from '../core/options'\nimport type { Goal, TrackerGoal } from '../goals/types'\nimport { INGEST_PATH, PROXY_PATH } from '../plugin/paths'\nimport { type AnalyticsRuntime, resolveGoalsFor, resolveScopeFor } from '../plugin/runtime'\nimport { normalizeMountPath } from './mountPath'\nimport { CAPTURE_SLOTS, type CaptureSlot, resolveSlotAdapterFor } from './slots'\n\nexport interface TrackerSlotConfig {\n\tslot: CaptureSlot\n\tkind: CaptureClientKind\n\tadapterId: string\n\t/** Mount the snippet and the sink talk to: the runtime proxy, or a `capture.paths` override. */\n\tpath: string\n\tsnippet: CaptureSnippet\n\tclient: CaptureSupport['client']\n\trequiresConsent: boolean\n}\n\n/**\n * Everything the browser tracker needs, and nothing else. Serialized to any visitor by the\n * public tracker endpoint, so it carries only what an adapter puts in `capture.client` and\n * `capture.snippet`: never a query credential, never a goal's admin-facing name.\n */\nexport interface TrackerConfig {\n\tslots: TrackerSlotConfig[]\n\tautoCapture: ResolvedAutoCapture\n\t/** The request scope's goals, config merged with the goals collection. */\n\tgoals: TrackerGoal[]\n\t/** Where the native sink posts events, derived from the app's own `routes.api`. */\n\tingestPath: string\n}\n\nconst apiRoute = (req: PayloadRequest): string => req.payload?.config?.routes?.api ?? '/api'\n\nconst trackerGoals = (goals: Goal[] | undefined): TrackerGoal[] =>\n\t(goals ?? []).map(({ slug, match, value, currency }) => ({\n\t\tslug,\n\t\tmatch,\n\t\t...(value ? { value } : {}),\n\t\t...(currency ? { currency } : {}),\n\t}))\n\n/** The request's scope, or null when the host's resolver has none or throws. */\nconst scopeFor = async (runtime: AnalyticsRuntime, req: PayloadRequest): Promise<string | null> => {\n\ttry {\n\t\treturn await resolveScopeFor(runtime, req)\n\t} catch (err) {\n\t\treq.payload?.logger?.warn(`analytics: tracker config scope resolution failed: ${String(err)}`)\n\t\treturn null\n\t}\n}\n\n/** The scope's merged goals, falling back to the config goals when the merge fails. */\nconst goalsFor = async (\n\truntime: AnalyticsRuntime,\n\treq: PayloadRequest,\n\tscope: string | null\n): Promise<Goal[]> => {\n\ttry {\n\t\treturn await resolveGoalsFor(runtime, req, scope)\n\t} catch (err) {\n\t\treq.payload?.logger?.warn(\n\t\t\t`analytics: tracker config goals resolution failed, falling back to config goals: ${String(err)}`\n\t\t)\n\t\treturn runtime.goals ?? []\n\t}\n}\n\n/** The config for an install with no runtime yet: no slots, but still a usable ingest path. */\nexport const emptyTrackerConfig = (req: PayloadRequest): TrackerConfig => ({\n\tslots: [],\n\tautoCapture: DEFAULT_AUTO_CAPTURE,\n\tgoals: [],\n\tingestPath: `${apiRoute(req)}${INGEST_PATH}`,\n})\n\n/**\n * The per-request tracker config: one entry per capture slot that resolves to an adapter\n * declaring `capture`, in slot order. A slot whose adapter does not resolve (no scope, an\n * unknown id, a throwing scope resolver) is simply absent, as is one whose snippet throws;\n * this runs on a public, unauthenticated path, so every failure degrades a slot away\n * rather than surfacing an error.\n *\n * One adapter fills at most one slot. A scoped install whose tenant registry defaults to\n * the same adapter the global slot names would otherwise hand the tracker two sinks for\n * it and send every event twice; the native adapter in particular resolves its scope from\n * the request, so one sink already covers both. The global slot iterates first and keeps\n * the entry.\n */\nexport const resolveTrackerConfig = async (args: {\n\truntime: AnalyticsRuntime\n\treq: PayloadRequest\n}): Promise<TrackerConfig> => {\n\tconst { runtime, req } = args\n\tconst base = apiRoute(req)\n\t// One scope resolution for the whole config: the slots and the goals must agree on it,\n\t// and the host's resolver can be as expensive as a database read.\n\tconst scope = await scopeFor(runtime, req)\n\tconst slots: TrackerSlotConfig[] = []\n\tconst filled = new Set<string>()\n\tfor (const slot of CAPTURE_SLOTS) {\n\t\tconst adapter = await resolveSlotAdapterFor({ runtime, req, slot, scope })\n\t\tconst capture = adapter?.capture\n\t\tif (!adapter || !capture || filled.has(adapter.id)) {\n\t\t\tcontinue\n\t\t}\n\t\tconst override = runtime.capturePaths?.[slot]\n\t\tconst path = override ? normalizeMountPath(override) : `${base}${PROXY_PATH}/${slot}`\n\t\tconst kind = capture.client.kind\n\t\ttry {\n\t\t\tslots.push({\n\t\t\t\tslot,\n\t\t\t\tkind,\n\t\t\t\tadapterId: adapter.id,\n\t\t\t\tpath,\n\t\t\t\tsnippet: capture.snippet({ path }),\n\t\t\t\tclient: capture.client,\n\t\t\t\trequiresConsent:\n\t\t\t\t\t(runtime.consentFor?.(slot, adapter.id, kind) ?? defaultConsentFor(kind)) === 'required',\n\t\t\t})\n\t\t\tfilled.add(adapter.id)\n\t\t} catch (err) {\n\t\t\treq.payload?.logger?.warn(\n\t\t\t\t`analytics: capture snippet for \"${adapter.id}\" failed, dropping the ${slot} slot: ${String(err)}`\n\t\t\t)\n\t\t}\n\t}\n\treturn {\n\t\tslots,\n\t\tautoCapture: runtime.autoCapture ?? DEFAULT_AUTO_CAPTURE,\n\t\tgoals: trackerGoals(await goalsFor(runtime, req, scope)),\n\t\tingestPath: `${base}${runtime.ingestPath ?? INGEST_PATH}`,\n\t}\n}\n"],"mappings":";;;;;;AAkCA,MAAM,YAAY,QAAgC,IAAI,SAAS,QAAQ,QAAQ,OAAO;AAEtF,MAAM,gBAAgB,WACpB,SAAS,CAAC,GAAG,KAAK,EAAE,MAAM,OAAO,OAAO,gBAAgB;CACxD;CACA;CACA,GAAI,QAAQ,EAAE,MAAM,IAAI,CAAC;CACzB,GAAI,WAAW,EAAE,SAAS,IAAI,CAAC;AAChC,EAAE;;AAGH,MAAM,WAAW,OAAO,SAA2B,QAAgD;CAClG,IAAI;EACH,OAAO,MAAM,gBAAgB,SAAS,GAAG;CAC1C,SAAS,KAAK;EACb,IAAI,SAAS,QAAQ,KAAK,sDAAsD,OAAO,GAAG,GAAG;EAC7F,OAAO;CACR;AACD;;AAGA,MAAM,WAAW,OAChB,SACA,KACA,UACqB;CACrB,IAAI;EACH,OAAO,MAAM,gBAAgB,SAAS,KAAK,KAAK;CACjD,SAAS,KAAK;EACb,IAAI,SAAS,QAAQ,KACpB,oFAAoF,OAAO,GAAG,GAC/F;EACA,OAAO,QAAQ,SAAS,CAAC;CAC1B;AACD;;AAGA,MAAa,sBAAsB,SAAwC;CAC1E,OAAO,CAAC;CACR,aAAa;CACb,OAAO,CAAC;CACR,YAAY,GAAG,SAAS,GAAG,IAAI;AAChC;;;;;;;;;;;;;;AAeA,MAAa,uBAAuB,OAAO,SAGb;CAC7B,MAAM,EAAE,SAAS,QAAQ;CACzB,MAAM,OAAO,SAAS,GAAG;CAGzB,MAAM,QAAQ,MAAM,SAAS,SAAS,GAAG;CACzC,MAAM,QAA6B,CAAC;CACpC,MAAM,yBAAS,IAAI,IAAY;CAC/B,KAAK,MAAM,QAAQ,eAAe;EACjC,MAAM,UAAU,MAAM,sBAAsB;GAAE;GAAS;GAAK;GAAM;EAAM,CAAC;EACzE,MAAM,UAAU,SAAS;EACzB,IAAI,CAAC,WAAW,CAAC,WAAW,OAAO,IAAI,QAAQ,EAAE,GAChD;EAED,MAAM,WAAW,QAAQ,eAAe;EACxC,MAAM,OAAO,WAAW,mBAAmB,QAAQ,IAAI,GAAG,OAAO,WAAW,GAAG;EAC/E,MAAM,OAAO,QAAQ,OAAO;EAC5B,IAAI;GACH,MAAM,KAAK;IACV;IACA;IACA,WAAW,QAAQ;IACnB;IACA,SAAS,QAAQ,QAAQ,EAAE,KAAK,CAAC;IACjC,QAAQ,QAAQ;IAChB,kBACE,QAAQ,aAAa,MAAM,QAAQ,IAAI,IAAI,KAAK,kBAAkB,IAAI,OAAO;GAChF,CAAC;GACD,OAAO,IAAI,QAAQ,EAAE;EACtB,SAAS,KAAK;GACb,IAAI,SAAS,QAAQ,KACpB,mCAAmC,QAAQ,GAAG,yBAAyB,KAAK,SAAS,OAAO,GAAG,GAChG;EACD;CACD;CACA,OAAO;EACN;EACA,aAAa,QAAQ,eAAe;EACpC,OAAO,aAAa,MAAM,SAAS,SAAS,KAAK,KAAK,CAAC;EACvD,YAAY,GAAG,OAAO,QAAQ,cAAA;CAC/B;AACD"}
@@ -4,6 +4,18 @@ import { BarDatum } from "./bars.js";
4
4
  interface BarListProps {
5
5
  data: BarDatum[];
6
6
  emptyLabel: string;
7
+ /**
8
+ * Makes every row a button reporting its index. Left out, rows are inert: a source that
9
+ * cannot filter by the dimension must not offer a click that would do nothing.
10
+ */
11
+ onSelect?: (index: number) => void;
12
+ /**
13
+ * `solid` (the default) fills the bar with the chart color and puts a white label inside
14
+ * it, which reads as long as every row has a bar to sit on. `soft` pales the fill and
15
+ * moves the label onto the elevation ramp, for a list whose rows can be zero-valued (a
16
+ * goal with no pageviews), where a zero-width bar leaves a white label on bare track.
17
+ */
18
+ fill?: 'solid' | 'soft';
7
19
  }
8
20
  /**
9
21
  * Ranked horizontal bar list (shadcn "custom label" style): each row is a filled,
@@ -13,7 +25,9 @@ interface BarListProps {
13
25
  */
14
26
  declare function BarList({
15
27
  data,
16
- emptyLabel
28
+ emptyLabel,
29
+ onSelect,
30
+ fill
17
31
  }: BarListProps): import("react/jsx-runtime").JSX.Element;
18
32
  //#endregion
19
33
  export { BarList, BarListProps };