@10x-media/analytics 1.0.0-beta.6 → 1.0.0-beta.8
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.
- package/CHANGELOG.md +73 -0
- package/README.md +13 -3
- package/dist/adapters/ga4/ga4.js +3 -2
- package/dist/adapters/ga4/ga4.js.map +1 -1
- package/dist/adapters/http/fetchJson.js +1 -1
- package/dist/adapters/plausible/plausible.d.ts +10 -0
- package/dist/adapters/plausible/plausible.js +42 -1
- package/dist/adapters/plausible/plausible.js.map +1 -1
- package/dist/adapters/posthog/posthog.d.ts +10 -1
- package/dist/adapters/posthog/posthog.js +47 -0
- package/dist/adapters/posthog/posthog.js.map +1 -1
- package/dist/adapters/umami/umami.d.ts +5 -1
- package/dist/adapters/umami/umami.js +26 -0
- package/dist/adapters/umami/umami.js.map +1 -1
- package/dist/capture/getTrackerConfig.d.ts +20 -0
- package/dist/capture/getTrackerConfig.js +31 -0
- package/dist/capture/getTrackerConfig.js.map +1 -0
- package/dist/capture/mountPath.js +14 -0
- package/dist/capture/mountPath.js.map +1 -0
- package/dist/capture/proxyEndpoint.js +123 -0
- package/dist/capture/proxyEndpoint.js.map +1 -0
- package/dist/capture/proxyRoutes.js +108 -0
- package/dist/capture/proxyRoutes.js.map +1 -0
- package/dist/capture/requestBody.js +68 -0
- package/dist/capture/requestBody.js.map +1 -0
- package/dist/capture/slots.d.ts +8 -0
- package/dist/capture/slots.js +54 -0
- package/dist/capture/slots.js.map +1 -0
- package/dist/capture/trackerConfig.d.ts +33 -0
- package/dist/capture/trackerConfig.js +95 -0
- package/dist/capture/trackerConfig.js.map +1 -0
- package/dist/capture/trackerEndpoint.js +35 -0
- package/dist/capture/trackerEndpoint.js.map +1 -0
- package/dist/charts/BarList.d.ts +15 -1
- package/dist/charts/BarList.js +34 -18
- package/dist/charts/BarList.js.map +1 -1
- package/dist/charts/TrendChart.d.ts +16 -3
- package/dist/charts/TrendChart.js +172 -106
- package/dist/charts/TrendChart.js.map +1 -1
- package/dist/charts/bars.d.ts +2 -0
- package/dist/charts/bars.js +2 -1
- package/dist/charts/bars.js.map +1 -1
- package/dist/charts/bucket.js +10 -1
- package/dist/charts/bucket.js.map +1 -1
- package/dist/charts/spline.js +2 -2
- package/dist/charts/spline.js.map +1 -1
- package/dist/charts/styles.js +18 -1
- package/dist/charts/styles.js.map +1 -1
- package/dist/core/cacheKey.js +13 -1
- package/dist/core/cacheKey.js.map +1 -1
- package/dist/core/capture.d.ts +49 -0
- package/dist/core/contract.d.ts +35 -4
- package/dist/core/contract.js +29 -1
- package/dist/core/contract.js.map +1 -1
- package/dist/core/granularity.js +1 -1
- package/dist/core/options.d.ts +148 -4
- package/dist/core/options.js +121 -3
- package/dist/core/options.js.map +1 -1
- package/dist/core/registry.d.ts +1 -0
- package/dist/core/scopeList.js +32 -0
- package/dist/core/scopeList.js.map +1 -0
- package/dist/core/scopedRead.js +45 -28
- package/dist/core/scopedRead.js.map +1 -1
- package/dist/core/serverEvent.d.ts +42 -0
- package/dist/core/serverEvent.js +12 -0
- package/dist/core/serverEvent.js.map +1 -0
- package/dist/exports/client.d.ts +8 -2
- package/dist/exports/client.js +6 -1
- package/dist/exports/next.d.ts +2 -1
- package/dist/exports/next.js +2 -1
- package/dist/exports/react.d.ts +4 -0
- package/dist/exports/react.js +5 -0
- package/dist/exports/rsc.d.ts +8 -1
- package/dist/exports/rsc.js +7 -2
- package/dist/exports/tracker.d.ts +18 -0
- package/dist/exports/tracker.js +12 -0
- package/dist/exports/types.d.ts +14 -3
- package/dist/exports/types.js +2 -2
- package/dist/fields/AnalyticsPanelClient.js +2 -2
- package/dist/fields/AnalyticsPanelField.js +1 -1
- package/dist/fields/AnalyticsStatField.js +2 -2
- package/dist/fields/config/MetricSelectField.js +2 -2
- package/dist/fields/config/MetricSelectField.js.map +1 -1
- package/dist/fields/config/SourceSelectField.js +2 -2
- package/dist/fields/config/SourceSelectField.js.map +1 -1
- package/dist/fields/config/fetchSources.d.ts +5 -1
- package/dist/fields/config/narrow.js +2 -0
- package/dist/fields/config/narrow.js.map +1 -1
- package/dist/fields/readForDocument.d.ts +5 -0
- package/dist/fields/readForDocument.js +6 -6
- package/dist/fields/readForDocument.js.map +1 -1
- package/dist/goals/GoalSelectField.d.ts +7 -0
- package/dist/goals/GoalSelectField.js +77 -0
- package/dist/goals/GoalSelectField.js.map +1 -0
- package/dist/goals/collection.js +250 -0
- package/dist/goals/collection.js.map +1 -0
- package/dist/goals/currency.js +14 -0
- package/dist/goals/currency.js.map +1 -0
- package/dist/goals/fetchGoals.d.ts +18 -0
- package/dist/goals/fetchGoals.js +29 -0
- package/dist/goals/fetchGoals.js.map +1 -0
- package/dist/goals/goalField.d.ts +31 -0
- package/dist/goals/goalField.js +56 -0
- package/dist/goals/goalField.js.map +1 -0
- package/dist/goals/goalsEndpoint.d.ts +1 -0
- package/dist/goals/goalsEndpoint.js +55 -0
- package/dist/goals/goalsEndpoint.js.map +1 -0
- package/dist/goals/match.js +64 -0
- package/dist/goals/match.js.map +1 -0
- package/dist/goals/resolver.d.ts +8 -0
- package/dist/goals/resolver.js +147 -0
- package/dist/goals/resolver.js.map +1 -0
- package/dist/goals/trackGoalAction.d.ts +74 -0
- package/dist/goals/trackGoalAction.js +139 -0
- package/dist/goals/trackGoalAction.js.map +1 -0
- package/dist/goals/types.d.ts +33 -0
- package/dist/goals/types.js +7 -0
- package/dist/goals/types.js.map +1 -0
- package/dist/goals/useAnalyticsGoals.d.ts +20 -0
- package/dist/goals/useAnalyticsGoals.js +67 -0
- package/dist/goals/useAnalyticsGoals.js.map +1 -0
- package/dist/index.d.ts +11 -3
- package/dist/index.js +104 -17
- package/dist/index.js.map +1 -1
- package/dist/native/collections/events.js +21 -1
- package/dist/native/collections/events.js.map +1 -1
- package/dist/native/collections/rollups.js +24 -0
- package/dist/native/collections/rollups.js.map +1 -1
- package/dist/native/geo/maxmindResolver.js +2 -4
- package/dist/native/geo/maxmindResolver.js.map +1 -1
- package/dist/native/ingest/clientIp.js +15 -0
- package/dist/native/ingest/clientIp.js.map +1 -0
- package/dist/native/ingest/device.js +11 -3
- package/dist/native/ingest/device.js.map +1 -1
- package/dist/native/ingest/endpoint.d.ts +1 -0
- package/dist/native/ingest/endpoint.js +25 -4
- package/dist/native/ingest/endpoint.js.map +1 -1
- package/dist/native/ingest/flushBatch.js +4 -13
- package/dist/native/ingest/flushBatch.js.map +1 -1
- package/dist/native/ingest/normalizeEvent.d.ts +20 -0
- package/dist/native/ingest/normalizeEvent.js +78 -10
- package/dist/native/ingest/normalizeEvent.js.map +1 -1
- package/dist/native/ingest/serverTrack.d.ts +20 -0
- package/dist/native/ingest/serverTrack.js +99 -0
- package/dist/native/ingest/serverTrack.js.map +1 -0
- package/dist/native/ingest/validate.js +27 -0
- package/dist/native/ingest/validate.js.map +1 -0
- package/dist/native/nativeAdapter.d.ts +1 -1
- package/dist/native/nativeAdapter.js +38 -11
- package/dist/native/nativeAdapter.js.map +1 -1
- package/dist/native/query/eventAgg.js +39 -13
- package/dist/native/query/eventAgg.js.map +1 -1
- package/dist/native/retention/pruneTask.js +1 -1
- package/dist/native/rollupAcc.js +12 -1
- package/dist/native/rollupAcc.js.map +1 -1
- package/dist/native/rollups/bumpRollup.js +5 -1
- package/dist/native/rollups/bumpRollup.js.map +1 -1
- package/dist/native/rollups/deltas.js +28 -6
- package/dist/native/rollups/deltas.js.map +1 -1
- package/dist/native/rollups/insertIfNew.js +36 -2
- package/dist/native/rollups/insertIfNew.js.map +1 -1
- package/dist/next/captureRewrites.d.ts +41 -0
- package/dist/next/captureRewrites.js +56 -0
- package/dist/next/captureRewrites.js.map +1 -0
- package/dist/next/posthogProxyRewrites.d.ts +5 -0
- package/dist/next/posthogProxyRewrites.js +16 -21
- package/dist/next/posthogProxyRewrites.js.map +1 -1
- package/dist/plugin/documentEndpoint.js +28 -10
- package/dist/plugin/documentEndpoint.js.map +1 -1
- package/dist/plugin/paths.js +15 -1
- package/dist/plugin/paths.js.map +1 -1
- package/dist/plugin/queryEndpoint.js +113 -0
- package/dist/plugin/queryEndpoint.js.map +1 -0
- package/dist/plugin/readContextForRequest.js +71 -0
- package/dist/plugin/readContextForRequest.js.map +1 -0
- package/dist/plugin/realtimeEndpoint.js +6 -3
- package/dist/plugin/realtimeEndpoint.js.map +1 -1
- package/dist/plugin/runtime.d.ts +1 -0
- package/dist/plugin/runtime.js +31 -1
- package/dist/plugin/runtime.js.map +1 -1
- package/dist/plugin/scopeFieldBoot.js +22 -0
- package/dist/plugin/scopeFieldBoot.js.map +1 -0
- package/dist/plugin/sourcesEndpoint.js +13 -39
- package/dist/plugin/sourcesEndpoint.js.map +1 -1
- package/dist/plugin/warmTask.js +0 -0
- package/dist/plugin/warmTask.js.map +1 -1
- package/dist/providers/collection.js +71 -25
- package/dist/providers/collection.js.map +1 -1
- package/dist/providers/factory.js +8 -2
- package/dist/providers/factory.js.map +1 -1
- package/dist/providers/resolver.js.map +1 -1
- package/dist/query/dates.js +64 -0
- package/dist/query/dates.js.map +1 -0
- package/dist/query/errors.d.ts +17 -0
- package/dist/query/errors.js +10 -0
- package/dist/query/errors.js.map +1 -0
- package/dist/query/fetchQuery.d.ts +59 -0
- package/dist/query/fetchQuery.js +110 -0
- package/dist/query/fetchQuery.js.map +1 -0
- package/dist/query/parse.d.ts +22 -0
- package/dist/query/parse.js +168 -0
- package/dist/query/parse.js.map +1 -0
- package/dist/query/response.d.ts +36 -0
- package/dist/react/AnalyticsProvider.d.ts +43 -0
- package/dist/react/AnalyticsProvider.js +66 -0
- package/dist/react/AnalyticsProvider.js.map +1 -0
- package/dist/react/TrackerBoot.d.ts +22 -0
- package/dist/react/TrackerBoot.js +30 -0
- package/dist/react/TrackerBoot.js.map +1 -0
- package/dist/react/useAnalytics.d.ts +17 -0
- package/dist/react/useAnalytics.js +36 -0
- package/dist/react/useAnalytics.js.map +1 -0
- package/dist/rsc/AnalyticsScripts.d.ts +30 -0
- package/dist/rsc/AnalyticsScripts.js +41 -0
- package/dist/rsc/AnalyticsScripts.js.map +1 -0
- package/dist/surfacing/cacheStore.d.ts +1 -0
- package/dist/surfacing/cacheStore.js +18 -2
- package/dist/surfacing/cacheStore.js.map +1 -1
- package/dist/surfacing/engine.d.ts +1 -0
- package/dist/surfacing/engine.js +44 -4
- package/dist/surfacing/engine.js.map +1 -1
- package/dist/surfacing/queue.js +22 -6
- package/dist/surfacing/queue.js.map +1 -1
- package/dist/surfacing/rateLimiter.js +130 -0
- package/dist/surfacing/rateLimiter.js.map +1 -0
- package/dist/surfacing/retryPolicy.js +15 -0
- package/dist/surfacing/retryPolicy.js.map +1 -0
- package/dist/sync/syncTask.js +60 -33
- package/dist/sync/syncTask.js.map +1 -1
- package/dist/testing/memoryAdapter.d.ts +2 -0
- package/dist/testing/memoryAdapter.js +10 -0
- package/dist/testing/memoryAdapter.js.map +1 -1
- package/dist/timeframe/tz.js +17 -6
- package/dist/timeframe/tz.js.map +1 -1
- package/dist/tracker/autoCapture.d.ts +48 -0
- package/dist/tracker/autoCapture.js +129 -0
- package/dist/tracker/autoCapture.js.map +1 -0
- package/dist/tracker/consent.d.ts +24 -0
- package/dist/tracker/consent.js +48 -0
- package/dist/tracker/consent.js.map +1 -0
- package/dist/tracker/createTracker.d.ts +18 -0
- package/dist/tracker/createTracker.js +163 -0
- package/dist/tracker/createTracker.js.map +1 -0
- package/dist/tracker/initTracker.d.ts +22 -0
- package/dist/tracker/initTracker.js +33 -0
- package/dist/tracker/initTracker.js.map +1 -0
- package/dist/tracker/loadScript.d.ts +14 -0
- package/dist/tracker/loadScript.js +41 -0
- package/dist/tracker/loadScript.js.map +1 -0
- package/dist/tracker/pageTracking.d.ts +17 -0
- package/dist/tracker/pageTracking.js +38 -0
- package/dist/tracker/pageTracking.js.map +1 -0
- package/dist/tracker/registry.d.ts +27 -0
- package/dist/tracker/registry.js +73 -0
- package/dist/tracker/registry.js.map +1 -0
- package/dist/tracker/sinks/native.d.ts +22 -0
- package/dist/tracker/sinks/native.js +56 -0
- package/dist/tracker/sinks/native.js.map +1 -0
- package/dist/tracker/sinks/plausible.d.ts +14 -0
- package/dist/tracker/sinks/plausible.js +25 -0
- package/dist/tracker/sinks/plausible.js.map +1 -0
- package/dist/tracker/sinks/posthog.d.ts +14 -0
- package/dist/tracker/sinks/posthog.js +18 -0
- package/dist/tracker/sinks/posthog.js.map +1 -0
- package/dist/tracker/sinks/umami.d.ts +13 -0
- package/dist/tracker/sinks/umami.js +17 -0
- package/dist/tracker/sinks/umami.js.map +1 -0
- package/dist/tracker/sinks/vendor.d.ts +14 -0
- package/dist/tracker/sinks/vendor.js +66 -0
- package/dist/tracker/sinks/vendor.js.map +1 -0
- package/dist/tracker/transport.js +28 -0
- package/dist/tracker/transport.js.map +1 -0
- package/dist/tracker/types.d.ts +66 -0
- package/dist/translations/ar.js +104 -1
- package/dist/translations/ar.js.map +1 -1
- package/dist/translations/de.js +104 -1
- package/dist/translations/de.js.map +1 -1
- package/dist/translations/en.js +104 -1
- package/dist/translations/en.js.map +1 -1
- package/dist/translations/es.js +104 -1
- package/dist/translations/es.js.map +1 -1
- package/dist/translations/fr.js +104 -1
- package/dist/translations/fr.js.map +1 -1
- package/dist/translations/id.js +104 -1
- package/dist/translations/id.js.map +1 -1
- package/dist/translations/keys.d.ts +103 -0
- package/dist/translations/keys.js +104 -1
- package/dist/translations/keys.js.map +1 -1
- package/dist/translations/ko.js +104 -1
- package/dist/translations/ko.js.map +1 -1
- package/dist/translations/metricKeys.js +1 -1
- package/dist/translations/metricKeys.js.map +1 -1
- package/dist/translations/pt.js +104 -1
- package/dist/translations/pt.js.map +1 -1
- package/dist/translations/ru.js +104 -1
- package/dist/translations/ru.js.map +1 -1
- package/dist/translations/uk.js +104 -1
- package/dist/translations/uk.js.map +1 -1
- package/dist/translations/zh.js +104 -1
- package/dist/translations/zh.js.map +1 -1
- package/dist/view/AnalyticsNavLink.d.ts +19 -0
- package/dist/view/AnalyticsNavLink.js +40 -0
- package/dist/view/AnalyticsNavLink.js.map +1 -0
- package/dist/view/AnalyticsView.d.ts +23 -0
- package/dist/view/AnalyticsView.js +45 -0
- package/dist/view/AnalyticsView.js.map +1 -0
- package/dist/view/AnalyticsViewClient.d.ts +15 -0
- package/dist/view/AnalyticsViewClient.js +189 -0
- package/dist/view/AnalyticsViewClient.js.map +1 -0
- package/dist/view/authRedirect.js +32 -0
- package/dist/view/authRedirect.js.map +1 -0
- package/dist/view/conversionRate.js +18 -0
- package/dist/view/conversionRate.js.map +1 -0
- package/dist/view/dayRange.js +68 -0
- package/dist/view/dayRange.js.map +1 -0
- package/dist/view/gating.d.ts +1 -0
- package/dist/view/gating.js +105 -0
- package/dist/view/gating.js.map +1 -0
- package/dist/view/labels.js +44 -0
- package/dist/view/labels.js.map +1 -0
- package/dist/view/registerView.js +48 -0
- package/dist/view/registerView.js.map +1 -0
- package/dist/view/sections/Breakdowns.js +157 -0
- package/dist/view/sections/Breakdowns.js.map +1 -0
- package/dist/view/sections/EmptyStates.js +92 -0
- package/dist/view/sections/EmptyStates.js.map +1 -0
- package/dist/view/sections/FilterChips.js +41 -0
- package/dist/view/sections/FilterChips.js.map +1 -0
- package/dist/view/sections/GoalsPanel.js +81 -0
- package/dist/view/sections/GoalsPanel.js.map +1 -0
- package/dist/view/sections/OverviewCards.js +65 -0
- package/dist/view/sections/OverviewCards.js.map +1 -0
- package/dist/view/sections/RealtimeStrip.js +77 -0
- package/dist/view/sections/RealtimeStrip.js.map +1 -0
- package/dist/view/sections/Toolbar.js +179 -0
- package/dist/view/sections/Toolbar.js.map +1 -0
- package/dist/view/sections/Trend.js +119 -0
- package/dist/view/sections/Trend.js.map +1 -0
- package/dist/view/sections/styles.js +74 -0
- package/dist/view/sections/styles.js.map +1 -0
- package/dist/view/state.js +206 -0
- package/dist/view/state.js.map +1 -0
- package/dist/view/useViewQueries.js +150 -0
- package/dist/view/useViewQueries.js.map +1 -0
- package/dist/view/viewProps.d.ts +40 -0
- package/dist/view/viewProps.js +90 -0
- package/dist/view/viewProps.js.map +1 -0
- package/dist/widgets/AnalyticsBreakdownWidget.d.ts +2 -1
- package/dist/widgets/AnalyticsBreakdownWidget.js +22 -4
- package/dist/widgets/AnalyticsBreakdownWidget.js.map +1 -1
- package/dist/widgets/AnalyticsGoalsWidget.d.ts +14 -0
- package/dist/widgets/AnalyticsGoalsWidget.js +188 -0
- package/dist/widgets/AnalyticsGoalsWidget.js.map +1 -0
- package/dist/widgets/AnalyticsMetricWidget.d.ts +2 -1
- package/dist/widgets/AnalyticsMetricWidget.js +35 -12
- package/dist/widgets/AnalyticsMetricWidget.js.map +1 -1
- package/dist/widgets/AnalyticsRealtimeWidget.d.ts +2 -1
- package/dist/widgets/AnalyticsRealtimeWidget.js +42 -22
- package/dist/widgets/AnalyticsRealtimeWidget.js.map +1 -1
- package/dist/widgets/AnalyticsTrendWidget.d.ts +2 -1
- package/dist/widgets/AnalyticsTrendWidget.js +51 -15
- package/dist/widgets/AnalyticsTrendWidget.js.map +1 -1
- package/dist/widgets/WidgetViewLink.js +17 -0
- package/dist/widgets/WidgetViewLink.js.map +1 -0
- package/dist/widgets/breakdownTypes.js +32 -0
- package/dist/widgets/breakdownTypes.js.map +1 -1
- package/dist/widgets/cardChrome.js +31 -7
- package/dist/widgets/cardChrome.js.map +1 -1
- package/dist/widgets/range.js +43 -12
- package/dist/widgets/range.js.map +1 -1
- package/dist/widgets/readForWidget.d.ts +12 -0
- package/dist/widgets/readForWidget.js +30 -19
- package/dist/widgets/readForWidget.js.map +1 -1
- package/dist/widgets/readForWidgetBreakdown.d.ts +15 -0
- package/dist/widgets/readForWidgetBreakdown.js +32 -20
- package/dist/widgets/readForWidgetBreakdown.js.map +1 -1
- package/dist/widgets/readForWidgetGoals.d.ts +57 -0
- package/dist/widgets/readForWidgetGoals.js +126 -0
- package/dist/widgets/readForWidgetGoals.js.map +1 -0
- package/dist/widgets/readForWidgetRealtime.js +1 -1
- package/dist/widgets/readForWidgetSeries.d.ts +13 -0
- package/dist/widgets/readForWidgetSeries.js +56 -28
- package/dist/widgets/readForWidgetSeries.js.map +1 -1
- package/dist/widgets/registerWidgets.js +58 -9
- package/dist/widgets/registerWidgets.js.map +1 -1
- package/dist/widgets/types.js +16 -2
- package/dist/widgets/types.js.map +1 -1
- package/dist/widgets/viewLink.d.ts +22 -0
- package/dist/widgets/viewLink.js +83 -0
- package/dist/widgets/viewLink.js.map +1 -0
- package/package.json +25 -5
|
@@ -21,33 +21,48 @@ const FILTER_OPERATOR = {
|
|
|
21
21
|
* this is just the safety net so a stray unsupported filter never throws.
|
|
22
22
|
* `contains` is case-insensitive on both DBs; on Postgres its value is a raw ILIKE
|
|
23
23
|
* pattern (`%`/`_` act as wildcards), while Mongo regex-escapes the value first.
|
|
24
|
+
* One fragment per filter under `and`, not merged by key: two filters on the same field
|
|
25
|
+
* (e.g. two `eq` values) must both constrain the query rather than the later one silently
|
|
26
|
+
* overwriting the earlier one.
|
|
24
27
|
*/
|
|
25
28
|
const filtersToWhere = (filters) => {
|
|
26
|
-
const
|
|
29
|
+
const fragments = [];
|
|
27
30
|
for (const filter of filters) {
|
|
28
31
|
const field = EVENT_FIELD[filter.dimension];
|
|
29
32
|
if (!field || filter.operator === "matches") continue;
|
|
30
33
|
const op = FILTER_OPERATOR[filter.operator];
|
|
31
34
|
if (!op) continue;
|
|
32
|
-
|
|
33
|
-
...where[field],
|
|
34
|
-
[op]: filter.value
|
|
35
|
-
};
|
|
35
|
+
fragments.push({ [field]: { [op]: filter.value } });
|
|
36
36
|
}
|
|
37
|
-
return
|
|
37
|
+
return fragments.length > 0 ? { and: fragments } : {};
|
|
38
38
|
};
|
|
39
39
|
const emptyBucket = () => ({
|
|
40
40
|
pageviews: 0,
|
|
41
41
|
events: 0,
|
|
42
42
|
durationMs: 0,
|
|
43
43
|
visitors: /* @__PURE__ */ new Set(),
|
|
44
|
-
sessions: /* @__PURE__ */ new Set()
|
|
44
|
+
sessions: /* @__PURE__ */ new Set(),
|
|
45
|
+
conversions: 0,
|
|
46
|
+
revenue: 0,
|
|
47
|
+
scrollDepthSum: 0,
|
|
48
|
+
scrollSamples: 0
|
|
45
49
|
});
|
|
46
|
-
|
|
50
|
+
/**
|
|
51
|
+
* `completions` narrows what the event contributes to conversions/revenue: a goal breakdown
|
|
52
|
+
* row counts only its own goal, every other bucket counts all of them. Mirrors how
|
|
53
|
+
* computeRollupDeltas fills a `goal` bucket versus a site or page bucket.
|
|
54
|
+
*/
|
|
55
|
+
const addEvent = (bucket, event, completions = event.goals ?? []) => {
|
|
47
56
|
if (event.type === "pageview") {
|
|
48
57
|
bucket.pageviews++;
|
|
49
58
|
bucket.durationMs += event.durationMs ?? 0;
|
|
50
59
|
} else bucket.events++;
|
|
60
|
+
if (event.scrollDepth !== void 0) {
|
|
61
|
+
bucket.scrollDepthSum += event.scrollDepth;
|
|
62
|
+
bucket.scrollSamples++;
|
|
63
|
+
}
|
|
64
|
+
bucket.conversions += completions.length;
|
|
65
|
+
for (const completion of completions) bucket.revenue += completion.value;
|
|
51
66
|
bucket.visitors.add(event.visitorHash);
|
|
52
67
|
bucket.sessions.add(event.sessionId);
|
|
53
68
|
};
|
|
@@ -57,7 +72,10 @@ const selectMetrics = (bucket, wanted) => {
|
|
|
57
72
|
if (wanted.includes("events")) out.events = bucket.events;
|
|
58
73
|
if (wanted.includes("visitors")) out.visitors = bucket.visitors.size;
|
|
59
74
|
if (wanted.includes("sessions")) out.sessions = bucket.sessions.size;
|
|
75
|
+
if (wanted.includes("conversions")) out.conversions = bucket.conversions;
|
|
76
|
+
if (wanted.includes("revenue")) out.revenue = bucket.revenue;
|
|
60
77
|
if (wanted.includes("avgDuration")) out.avgDuration = bucket.pageviews > 0 ? Math.round(bucket.durationMs / bucket.pageviews) : 0;
|
|
78
|
+
if (wanted.includes("scrollDepth")) out.scrollDepth = bucket.scrollSamples > 0 ? Math.round(bucket.scrollDepthSum / bucket.scrollSamples) : 0;
|
|
61
79
|
return out;
|
|
62
80
|
};
|
|
63
81
|
/**
|
|
@@ -80,17 +98,25 @@ const aggregateEvents = (events, { metrics, dimension, granularity, timezone = "
|
|
|
80
98
|
for (const event of events) addEvent(totalsBucket, event);
|
|
81
99
|
const totals = selectMetrics(totalsBucket, metrics);
|
|
82
100
|
const field = dimension ? EVENT_FIELD[dimension] : void 0;
|
|
83
|
-
if (dimension && field) {
|
|
101
|
+
if (dimension && (field || dimension === "goal")) {
|
|
84
102
|
const groups = /* @__PURE__ */ new Map();
|
|
85
|
-
|
|
86
|
-
const value = event[field];
|
|
87
|
-
if (!value) continue;
|
|
103
|
+
const bucketFor = (value) => {
|
|
88
104
|
let bucket = groups.get(value);
|
|
89
105
|
if (!bucket) {
|
|
90
106
|
bucket = emptyBucket();
|
|
91
107
|
groups.set(value, bucket);
|
|
92
108
|
}
|
|
93
|
-
|
|
109
|
+
return bucket;
|
|
110
|
+
};
|
|
111
|
+
for (const event of events) {
|
|
112
|
+
if (dimension === "goal") {
|
|
113
|
+
for (const completion of event.goals ?? []) addEvent(bucketFor(completion.slug), event, [completion]);
|
|
114
|
+
continue;
|
|
115
|
+
}
|
|
116
|
+
if (!field || field === "name" && event.type !== "event") continue;
|
|
117
|
+
const value = event[field];
|
|
118
|
+
if (!value) continue;
|
|
119
|
+
addEvent(bucketFor(value), event);
|
|
94
120
|
}
|
|
95
121
|
let rows = [...groups].map(([value, bucket]) => ({
|
|
96
122
|
dimensions: { [dimension]: value },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eventAgg.js","names":[],"sources":["../../../src/native/query/eventAgg.ts"],"sourcesContent":["import type { AnalyticsFilter, AnalyticsRow, DimensionKey, MetricKey } from '../../core/contract'\nimport { DEFAULT_TIMEZONE, startOfDayInTz } from '../../timeframe/tz'\n\n/** Raw event shape aggregateEvents/filtersToWhere operate on; matches StoredEvent as read back from the events collection (timestamp comes back as an ISO string). */\nexport interface EventLike {\n\ttimestamp: string | Date\n\ttype: 'pageview' | 'event'\n\tname?: string\n\tpath: string\n\tdevice?: string\n\tsource?: string\n\tcountry?: string\n\tregion?: string\n\tcity?: string\n\tvisitorHash: string\n\tsessionId: string\n\tdurationMs?: number\n}\n\nconst HOUR_MS = 3_600_000\n\ntype EventStringField = 'path' | 'country' | 'region' | 'city' | 'device' | 'source' | 'name'\n\n/** Dimensions native can filter/group on directly against the events collection. */\nconst EVENT_FIELD: Partial<Record<DimensionKey, EventStringField>> = {\n\tpage: 'path',\n\tcountry: 'country',\n\tregion: 'region',\n\tcity: 'city',\n\tdevice: 'device',\n\tsource: 'source',\n\tevent: 'name',\n}\n\nconst FILTER_OPERATOR: Record<'eq' | 'contains', string> = { eq: 'equals', contains: 'contains' }\n\n/**\n * Payload where fragment for supported filters; unsupported dimensions/operators are\n * dropped. Capability gating (`filters`/`filterOperators`) is the real contract upstream,\n * this is just the safety net so a stray unsupported filter never throws.\n * `contains` is case-insensitive on both DBs; on Postgres its value is a raw ILIKE\n * pattern (`%`/`_` act as wildcards), while Mongo regex-escapes the value first.\n */\nexport const filtersToWhere = (filters: AnalyticsFilter[]): Record<string, unknown> => {\n\tconst where: Record<string, unknown> = {}\n\tfor (const filter of filters) {\n\t\tconst field = EVENT_FIELD[filter.dimension]\n\t\tif (!field || filter.operator === 'matches') {\n\t\t\tcontinue\n\t\t}\n\t\tconst op = FILTER_OPERATOR[filter.operator]\n\t\tif (!op) {\n\t\t\tcontinue\n\t\t}\n\t\twhere[field] = { ...(where[field] as object | undefined), [op]: filter.value }\n\t}\n\treturn where\n}\n\ninterface Bucket {\n\tpageviews: number\n\tevents: number\n\tdurationMs: number\n\tvisitors: Set<string>\n\tsessions: Set<string>\n}\n\nconst emptyBucket = (): Bucket => ({\n\tpageviews: 0,\n\tevents: 0,\n\tdurationMs: 0,\n\tvisitors: new Set(),\n\tsessions: new Set(),\n})\n\nconst addEvent = (bucket: Bucket, event: EventLike): void => {\n\tif (event.type === 'pageview') {\n\t\tbucket.pageviews++\n\t\tbucket.durationMs += event.durationMs ?? 0\n\t} else {\n\t\tbucket.events++\n\t}\n\tbucket.visitors.add(event.visitorHash)\n\tbucket.sessions.add(event.sessionId)\n}\n\nconst selectMetrics = (bucket: Bucket, wanted: MetricKey[]): Partial<Record<MetricKey, number>> => {\n\tconst out: Partial<Record<MetricKey, number>> = {}\n\tif (wanted.includes('pageviews')) out.pageviews = bucket.pageviews\n\tif (wanted.includes('events')) out.events = bucket.events\n\tif (wanted.includes('visitors')) out.visitors = bucket.visitors.size\n\tif (wanted.includes('sessions')) out.sessions = bucket.sessions.size\n\tif (wanted.includes('avgDuration')) {\n\t\tout.avgDuration = bucket.pageviews > 0 ? Math.round(bucket.durationMs / bucket.pageviews) : 0\n\t}\n\treturn out\n}\n\nexport interface AggregateEventsArgs {\n\tmetrics: MetricKey[]\n\tdimension?: DimensionKey\n\tgranularity?: 'hour' | 'day'\n\ttimezone?: string\n\t/** Sort for dimension breakdown rows; defaults to pageviews desc, same as the rollup path. */\n\torder?: { metric: MetricKey; direction: 'asc' | 'desc' }\n\t/** Row cap for dimension breakdown rows, applied after sorting. */\n\tlimit?: number\n}\n\nexport interface AggregateEventsResult {\n\trows: AnalyticsRow[]\n\ttotals: Partial<Record<MetricKey, number>>\n}\n\n/**\n * Hour buckets are UTC-hour floors regardless of `timezone`; sub-day bucketing ignoring\n * the reporting timezone is a documented v1 limitation. Day buckets floor in `timezone`\n * to stay aligned with native rollup day boundaries.\n */\nconst bucketKeyFor = (event: EventLike, granularity: 'hour' | 'day', timezone: string): string => {\n\tconst ts = new Date(event.timestamp)\n\tif (granularity === 'hour') {\n\t\treturn new Date(Math.floor(ts.getTime() / HOUR_MS) * HOUR_MS).toISOString()\n\t}\n\treturn startOfDayInTz(ts, timezone).toISOString()\n}\n\n/**\n * Aggregate raw events into totals, plus one of: dimension breakdown rows or hour/day\n * series rows (dimension wins if both are requested). Totals always cover every event\n * passed in, independent of which rows a breakdown or series produces.\n */\nexport const aggregateEvents = (\n\tevents: EventLike[],\n\t{\n\t\tmetrics,\n\t\tdimension,\n\t\tgranularity,\n\t\ttimezone = DEFAULT_TIMEZONE,\n\t\torder,\n\t\tlimit,\n\t}: AggregateEventsArgs\n): AggregateEventsResult => {\n\tconst totalsBucket = emptyBucket()\n\tfor (const event of events) {\n\t\taddEvent(totalsBucket, event)\n\t}\n\tconst totals = selectMetrics(totalsBucket, metrics)\n\n\tconst field = dimension ? EVENT_FIELD[dimension] : undefined\n\tif (dimension && field) {\n\t\tconst groups = new Map<string, Bucket>()\n\t\tfor (const event of events) {\n\t\t\tconst value = event[field]\n\t\t\tif (!value) {\n\t\t\t\tcontinue\n\t\t\t}\n\t\t\tlet bucket = groups.get(value)\n\t\t\tif (!bucket) {\n\t\t\t\tbucket = emptyBucket()\n\t\t\t\tgroups.set(value, bucket)\n\t\t\t}\n\t\t\taddEvent(bucket, event)\n\t\t}\n\t\tlet rows: AnalyticsRow[] = [...groups].map(([value, bucket]) => ({\n\t\t\tdimensions: { [dimension]: value } as Partial<Record<DimensionKey, string>>,\n\t\t\tmetrics: selectMetrics(bucket, metrics),\n\t\t}))\n\t\tconst sortMetric = order?.metric ?? 'pageviews'\n\t\tconst direction = (order?.direction ?? 'desc') === 'asc' ? 1 : -1\n\t\trows.sort((a, b) => ((a.metrics[sortMetric] ?? 0) - (b.metrics[sortMetric] ?? 0)) * direction)\n\t\tif (limit) {\n\t\t\trows = rows.slice(0, limit)\n\t\t}\n\t\treturn { rows, totals }\n\t}\n\n\tif (granularity) {\n\t\tconst buckets = new Map<string, Bucket>()\n\t\tfor (const event of events) {\n\t\t\tconst key = bucketKeyFor(event, granularity, timezone)\n\t\t\tlet bucket = buckets.get(key)\n\t\t\tif (!bucket) {\n\t\t\t\tbucket = emptyBucket()\n\t\t\t\tbuckets.set(key, bucket)\n\t\t\t}\n\t\t\taddEvent(bucket, event)\n\t\t}\n\t\tconst rows: AnalyticsRow[] = [...buckets.entries()]\n\t\t\t.sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))\n\t\t\t.map(([timestamp, bucket]) => ({ timestamp, metrics: selectMetrics(bucket, metrics) }))\n\t\treturn { rows, totals }\n\t}\n\n\treturn { rows: [{ metrics: totals }], totals }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"eventAgg.js","names":[],"sources":["../../../src/native/query/eventAgg.ts"],"sourcesContent":["import type { AnalyticsFilter, AnalyticsRow, DimensionKey, MetricKey } from '../../core/contract'\nimport { DEFAULT_TIMEZONE, startOfDayInTz } from '../../timeframe/tz'\n\n/** Raw event shape aggregateEvents/filtersToWhere operate on; matches StoredEvent as read back from the events collection (timestamp comes back as an ISO string). */\nexport interface EventLike {\n\ttimestamp: string | Date\n\ttype: 'pageview' | 'event' | 'goal'\n\tname?: string\n\tpath: string\n\tdevice?: string\n\tsource?: string\n\tcountry?: string\n\tregion?: string\n\tcity?: string\n\tvisitorHash: string\n\tsessionId: string\n\tdurationMs?: number\n\tscrollDepth?: number\n\t/** Goal completions stamped at ingest; the source of conversions/revenue on this path. */\n\tgoals?: Array<{ slug: string; value: number }>\n}\n\nconst HOUR_MS = 3_600_000\n\ntype EventStringField = 'path' | 'country' | 'region' | 'city' | 'device' | 'source' | 'name'\n\n/** Dimensions native can filter/group on directly against the events collection. */\nconst EVENT_FIELD: Partial<Record<DimensionKey, EventStringField>> = {\n\tpage: 'path',\n\tcountry: 'country',\n\tregion: 'region',\n\tcity: 'city',\n\tdevice: 'device',\n\tsource: 'source',\n\tevent: 'name',\n}\n\nconst FILTER_OPERATOR: Record<'eq' | 'contains', string> = { eq: 'equals', contains: 'contains' }\n\n/**\n * Payload where fragment for supported filters; unsupported dimensions/operators are\n * dropped. Capability gating (`filters`/`filterOperators`) is the real contract upstream,\n * this is just the safety net so a stray unsupported filter never throws.\n * `contains` is case-insensitive on both DBs; on Postgres its value is a raw ILIKE\n * pattern (`%`/`_` act as wildcards), while Mongo regex-escapes the value first.\n * One fragment per filter under `and`, not merged by key: two filters on the same field\n * (e.g. two `eq` values) must both constrain the query rather than the later one silently\n * overwriting the earlier one.\n */\nexport const filtersToWhere = (filters: AnalyticsFilter[]): Record<string, unknown> => {\n\tconst fragments: Record<string, unknown>[] = []\n\tfor (const filter of filters) {\n\t\tconst field = EVENT_FIELD[filter.dimension]\n\t\tif (!field || filter.operator === 'matches') {\n\t\t\tcontinue\n\t\t}\n\t\tconst op = FILTER_OPERATOR[filter.operator]\n\t\tif (!op) {\n\t\t\tcontinue\n\t\t}\n\t\tfragments.push({ [field]: { [op]: filter.value } })\n\t}\n\treturn fragments.length > 0 ? { and: fragments } : {}\n}\n\ninterface Bucket {\n\tpageviews: number\n\tevents: number\n\tdurationMs: number\n\tvisitors: Set<string>\n\tsessions: Set<string>\n\tconversions: number\n\trevenue: number\n\tscrollDepthSum: number\n\tscrollSamples: number\n}\n\nconst emptyBucket = (): Bucket => ({\n\tpageviews: 0,\n\tevents: 0,\n\tdurationMs: 0,\n\tvisitors: new Set(),\n\tsessions: new Set(),\n\tconversions: 0,\n\trevenue: 0,\n\tscrollDepthSum: 0,\n\tscrollSamples: 0,\n})\n\n/**\n * `completions` narrows what the event contributes to conversions/revenue: a goal breakdown\n * row counts only its own goal, every other bucket counts all of them. Mirrors how\n * computeRollupDeltas fills a `goal` bucket versus a site or page bucket.\n */\nconst addEvent = (bucket: Bucket, event: EventLike, completions = event.goals ?? []): void => {\n\tif (event.type === 'pageview') {\n\t\tbucket.pageviews++\n\t\tbucket.durationMs += event.durationMs ?? 0\n\t} else {\n\t\tbucket.events++\n\t}\n\tif (event.scrollDepth !== undefined) {\n\t\tbucket.scrollDepthSum += event.scrollDepth\n\t\tbucket.scrollSamples++\n\t}\n\tbucket.conversions += completions.length\n\tfor (const completion of completions) {\n\t\tbucket.revenue += completion.value\n\t}\n\tbucket.visitors.add(event.visitorHash)\n\tbucket.sessions.add(event.sessionId)\n}\n\nconst selectMetrics = (bucket: Bucket, wanted: MetricKey[]): Partial<Record<MetricKey, number>> => {\n\tconst out: Partial<Record<MetricKey, number>> = {}\n\tif (wanted.includes('pageviews')) out.pageviews = bucket.pageviews\n\tif (wanted.includes('events')) out.events = bucket.events\n\tif (wanted.includes('visitors')) out.visitors = bucket.visitors.size\n\tif (wanted.includes('sessions')) out.sessions = bucket.sessions.size\n\tif (wanted.includes('conversions')) out.conversions = bucket.conversions\n\tif (wanted.includes('revenue')) out.revenue = bucket.revenue\n\tif (wanted.includes('avgDuration')) {\n\t\tout.avgDuration = bucket.pageviews > 0 ? Math.round(bucket.durationMs / bucket.pageviews) : 0\n\t}\n\tif (wanted.includes('scrollDepth')) {\n\t\tout.scrollDepth =\n\t\t\tbucket.scrollSamples > 0 ? Math.round(bucket.scrollDepthSum / bucket.scrollSamples) : 0\n\t}\n\treturn out\n}\n\nexport interface AggregateEventsArgs {\n\tmetrics: MetricKey[]\n\tdimension?: DimensionKey\n\tgranularity?: 'hour' | 'day'\n\ttimezone?: string\n\t/** Sort for dimension breakdown rows; defaults to pageviews desc, same as the rollup path. */\n\torder?: { metric: MetricKey; direction: 'asc' | 'desc' }\n\t/** Row cap for dimension breakdown rows, applied after sorting. */\n\tlimit?: number\n}\n\nexport interface AggregateEventsResult {\n\trows: AnalyticsRow[]\n\ttotals: Partial<Record<MetricKey, number>>\n}\n\n/**\n * Hour buckets are UTC-hour floors regardless of `timezone`; sub-day bucketing ignoring\n * the reporting timezone is a documented v1 limitation. Day buckets floor in `timezone`\n * to stay aligned with native rollup day boundaries.\n */\nconst bucketKeyFor = (event: EventLike, granularity: 'hour' | 'day', timezone: string): string => {\n\tconst ts = new Date(event.timestamp)\n\tif (granularity === 'hour') {\n\t\treturn new Date(Math.floor(ts.getTime() / HOUR_MS) * HOUR_MS).toISOString()\n\t}\n\treturn startOfDayInTz(ts, timezone).toISOString()\n}\n\n/**\n * Aggregate raw events into totals, plus one of: dimension breakdown rows or hour/day\n * series rows (dimension wins if both are requested). Totals always cover every event\n * passed in, independent of which rows a breakdown or series produces.\n */\nexport const aggregateEvents = (\n\tevents: EventLike[],\n\t{\n\t\tmetrics,\n\t\tdimension,\n\t\tgranularity,\n\t\ttimezone = DEFAULT_TIMEZONE,\n\t\torder,\n\t\tlimit,\n\t}: AggregateEventsArgs\n): AggregateEventsResult => {\n\tconst totalsBucket = emptyBucket()\n\tfor (const event of events) {\n\t\taddEvent(totalsBucket, event)\n\t}\n\tconst totals = selectMetrics(totalsBucket, metrics)\n\n\tconst field = dimension ? EVENT_FIELD[dimension] : undefined\n\tif (dimension && (field || dimension === 'goal')) {\n\t\tconst groups = new Map<string, Bucket>()\n\t\tconst bucketFor = (value: string): Bucket => {\n\t\t\tlet bucket = groups.get(value)\n\t\t\tif (!bucket) {\n\t\t\t\tbucket = emptyBucket()\n\t\t\t\tgroups.set(value, bucket)\n\t\t\t}\n\t\t\treturn bucket\n\t\t}\n\t\tfor (const event of events) {\n\t\t\tif (dimension === 'goal') {\n\t\t\t\tfor (const completion of event.goals ?? []) {\n\t\t\t\t\taddEvent(bucketFor(completion.slug), event, [completion])\n\t\t\t\t}\n\t\t\t\tcontinue\n\t\t\t}\n\t\t\t// The event dimension reports named custom events only: a goal event's name is a\n\t\t\t// goal slug and belongs to the goal dimension instead.\n\t\t\tif (!field || (field === 'name' && event.type !== 'event')) {\n\t\t\t\tcontinue\n\t\t\t}\n\t\t\tconst value = event[field]\n\t\t\tif (!value) {\n\t\t\t\tcontinue\n\t\t\t}\n\t\t\taddEvent(bucketFor(value), event)\n\t\t}\n\t\tlet rows: AnalyticsRow[] = [...groups].map(([value, bucket]) => ({\n\t\t\tdimensions: { [dimension]: value } as Partial<Record<DimensionKey, string>>,\n\t\t\tmetrics: selectMetrics(bucket, metrics),\n\t\t}))\n\t\tconst sortMetric = order?.metric ?? 'pageviews'\n\t\tconst direction = (order?.direction ?? 'desc') === 'asc' ? 1 : -1\n\t\trows.sort((a, b) => ((a.metrics[sortMetric] ?? 0) - (b.metrics[sortMetric] ?? 0)) * direction)\n\t\tif (limit) {\n\t\t\trows = rows.slice(0, limit)\n\t\t}\n\t\treturn { rows, totals }\n\t}\n\n\tif (granularity) {\n\t\tconst buckets = new Map<string, Bucket>()\n\t\tfor (const event of events) {\n\t\t\tconst key = bucketKeyFor(event, granularity, timezone)\n\t\t\tlet bucket = buckets.get(key)\n\t\t\tif (!bucket) {\n\t\t\t\tbucket = emptyBucket()\n\t\t\t\tbuckets.set(key, bucket)\n\t\t\t}\n\t\t\taddEvent(bucket, event)\n\t\t}\n\t\tconst rows: AnalyticsRow[] = [...buckets.entries()]\n\t\t\t.sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))\n\t\t\t.map(([timestamp, bucket]) => ({ timestamp, metrics: selectMetrics(bucket, metrics) }))\n\t\treturn { rows, totals }\n\t}\n\n\treturn { rows: [{ metrics: totals }], totals }\n}\n"],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { EVENTS_SLUG } from "../collections/events.js";
|
|
2
1
|
import { SEEN_SLUG } from "../collections/seen.js";
|
|
2
|
+
import { EVENTS_SLUG } from "../collections/events.js";
|
|
3
3
|
//#region src/native/retention/pruneTask.ts
|
|
4
4
|
const PRUNE_TASK_SLUG = "analytics-prune-events";
|
|
5
5
|
const pruneEventsTask = (retentionDays) => ({
|
package/dist/native/rollupAcc.js
CHANGED
|
@@ -5,7 +5,11 @@ const emptyAcc = () => ({
|
|
|
5
5
|
events: 0,
|
|
6
6
|
durationMs: 0,
|
|
7
7
|
visitors: 0,
|
|
8
|
-
sessions: 0
|
|
8
|
+
sessions: 0,
|
|
9
|
+
conversions: 0,
|
|
10
|
+
revenue: 0,
|
|
11
|
+
scrollDepthSum: 0,
|
|
12
|
+
scrollSamples: 0
|
|
9
13
|
});
|
|
10
14
|
const add = (acc, d) => {
|
|
11
15
|
acc.pageviews += d.pageviews;
|
|
@@ -13,6 +17,10 @@ const add = (acc, d) => {
|
|
|
13
17
|
acc.durationMs += d.durationMs;
|
|
14
18
|
acc.visitors += d.visitors;
|
|
15
19
|
acc.sessions += d.sessions;
|
|
20
|
+
acc.conversions += d.conversions ?? 0;
|
|
21
|
+
acc.revenue += d.revenue ?? 0;
|
|
22
|
+
acc.scrollDepthSum += d.scrollDepthSum ?? 0;
|
|
23
|
+
acc.scrollSamples += d.scrollSamples ?? 0;
|
|
16
24
|
};
|
|
17
25
|
const selectMetrics = (acc, wanted) => {
|
|
18
26
|
const out = {};
|
|
@@ -20,7 +28,10 @@ const selectMetrics = (acc, wanted) => {
|
|
|
20
28
|
if (wanted.includes("events")) out.events = acc.events;
|
|
21
29
|
if (wanted.includes("visitors")) out.visitors = acc.visitors;
|
|
22
30
|
if (wanted.includes("sessions")) out.sessions = acc.sessions;
|
|
31
|
+
if (wanted.includes("conversions")) out.conversions = acc.conversions;
|
|
32
|
+
if (wanted.includes("revenue")) out.revenue = acc.revenue;
|
|
23
33
|
if (wanted.includes("avgDuration")) out.avgDuration = acc.pageviews > 0 ? Math.round(acc.durationMs / acc.pageviews) : 0;
|
|
34
|
+
if (wanted.includes("scrollDepth")) out.scrollDepth = acc.scrollSamples > 0 ? Math.round(acc.scrollDepthSum / acc.scrollSamples) : 0;
|
|
24
35
|
return out;
|
|
25
36
|
};
|
|
26
37
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rollupAcc.js","names":[],"sources":["../../src/native/rollupAcc.ts"],"sourcesContent":["import type { AnalyticsRow, MetricKey } from '../core/contract'\nimport { DEFAULT_TIMEZONE, startOfDayInTz } from '../timeframe/tz'\n\nexport interface RollupDoc {\n\tpath: string\n\tdimvalue: string\n\tperiod: string | Date\n\tpageviews: number\n\tevents: number\n\tdurationMs: number\n\tvisitors: number\n\tsessions: number\n}\n\nexport interface Acc {\n\tpageviews: number\n\tevents: number\n\tdurationMs: number\n\tvisitors: number\n\tsessions: number\n}\n\nexport const emptyAcc = (): Acc => ({\n\tpageviews: 0,\n\tevents: 0,\n\tdurationMs: 0,\n\tvisitors: 0,\n\tsessions: 0,\n})\n\nexport const add = (acc: Acc, d: Acc): void => {\n\tacc.pageviews += d.pageviews\n\tacc.events += d.events\n\tacc.durationMs += d.durationMs\n\tacc.visitors += d.visitors\n\tacc.sessions += d.sessions\n}\n\nexport const selectMetrics = (\n\tacc: Acc,\n\twanted: MetricKey[]\n): Partial<Record<MetricKey, number>> => {\n\tconst out: Partial<Record<MetricKey, number>> = {}\n\tif (wanted.includes('pageviews')) out.pageviews = acc.pageviews\n\tif (wanted.includes('events')) out.events = acc.events\n\tif (wanted.includes('visitors')) out.visitors = acc.visitors\n\tif (wanted.includes('sessions')) out.sessions = acc.sessions\n\tif (wanted.includes('avgDuration')) {\n\t\tout.avgDuration = acc.pageviews > 0 ? Math.round(acc.durationMs / acc.pageviews) : 0\n\t}\n\treturn out\n}\n\n/**\n * Collapse per-day rollup docs into one time-series row per day in `tz` (UTC by\n * default), ascending by day. Rollups are already bucketed to their reporting-timezone\n * day at ingest, so flooring in the same `tz` is idempotent; passing the read's timezone\n * keeps a trend aligned to that zone. Distinct metrics (visitors/sessions) come from each\n * day's own rollup and are never summed across days, so a daily trend shows that day's\n * uniques.\n */\nexport const seriesFromRollups = (\n\tdocs: RollupDoc[],\n\tmetrics: MetricKey[],\n\ttz: string = DEFAULT_TIMEZONE\n): AnalyticsRow[] => {\n\tconst byDay = new Map<string, Acc>()\n\tfor (const d of docs) {\n\t\tconst day = startOfDayInTz(new Date(d.period), tz).toISOString()\n\t\tlet acc = byDay.get(day)\n\t\tif (!acc) {\n\t\t\tacc = emptyAcc()\n\t\t\tbyDay.set(day, acc)\n\t\t}\n\t\tadd(acc, d)\n\t}\n\treturn [...byDay.entries()]\n\t\t.sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))\n\t\t.map(([day, acc]) => ({ timestamp: day, metrics: selectMetrics(acc, metrics) }))\n}\n"],"mappings":";;
|
|
1
|
+
{"version":3,"file":"rollupAcc.js","names":[],"sources":["../../src/native/rollupAcc.ts"],"sourcesContent":["import type { AnalyticsRow, MetricKey } from '../core/contract'\nimport { DEFAULT_TIMEZONE, startOfDayInTz } from '../timeframe/tz'\n\nexport interface RollupDoc {\n\tpath: string\n\tdimvalue: string\n\tperiod: string | Date\n\tpageviews: number\n\tevents: number\n\tdurationMs: number\n\tvisitors: number\n\tsessions: number\n\t/** Optional: rows written before the goal-counter migration carry none of these. */\n\tconversions?: number\n\trevenue?: number\n\tscrollDepthSum?: number\n\tscrollSamples?: number\n}\n\nexport interface Acc {\n\tpageviews: number\n\tevents: number\n\tdurationMs: number\n\tvisitors: number\n\tsessions: number\n\tconversions: number\n\trevenue: number\n\tscrollDepthSum: number\n\t/** Pageviews that reported a scroll depth; the `scrollDepth` average's denominator. */\n\tscrollSamples: number\n}\n\nexport const emptyAcc = (): Acc => ({\n\tpageviews: 0,\n\tevents: 0,\n\tdurationMs: 0,\n\tvisitors: 0,\n\tsessions: 0,\n\tconversions: 0,\n\trevenue: 0,\n\tscrollDepthSum: 0,\n\tscrollSamples: 0,\n})\n\nexport const add = (acc: Acc, d: RollupDoc | Acc): void => {\n\tacc.pageviews += d.pageviews\n\tacc.events += d.events\n\tacc.durationMs += d.durationMs\n\tacc.visitors += d.visitors\n\tacc.sessions += d.sessions\n\tacc.conversions += d.conversions ?? 0\n\tacc.revenue += d.revenue ?? 0\n\tacc.scrollDepthSum += d.scrollDepthSum ?? 0\n\tacc.scrollSamples += d.scrollSamples ?? 0\n}\n\nexport const selectMetrics = (\n\tacc: Acc,\n\twanted: MetricKey[]\n): Partial<Record<MetricKey, number>> => {\n\tconst out: Partial<Record<MetricKey, number>> = {}\n\tif (wanted.includes('pageviews')) out.pageviews = acc.pageviews\n\tif (wanted.includes('events')) out.events = acc.events\n\tif (wanted.includes('visitors')) out.visitors = acc.visitors\n\tif (wanted.includes('sessions')) out.sessions = acc.sessions\n\tif (wanted.includes('conversions')) out.conversions = acc.conversions\n\tif (wanted.includes('revenue')) out.revenue = acc.revenue\n\tif (wanted.includes('avgDuration')) {\n\t\tout.avgDuration = acc.pageviews > 0 ? Math.round(acc.durationMs / acc.pageviews) : 0\n\t}\n\tif (wanted.includes('scrollDepth')) {\n\t\t// Averaged over the pageviews that reported a depth, never over every pageview: a\n\t\t// tracker that never got to send one must not drag the average down.\n\t\tout.scrollDepth = acc.scrollSamples > 0 ? Math.round(acc.scrollDepthSum / acc.scrollSamples) : 0\n\t}\n\treturn out\n}\n\n/**\n * Collapse per-day rollup docs into one time-series row per day in `tz` (UTC by\n * default), ascending by day. Rollups are already bucketed to their reporting-timezone\n * day at ingest, so flooring in the same `tz` is idempotent; passing the read's timezone\n * keeps a trend aligned to that zone. Distinct metrics (visitors/sessions) come from each\n * day's own rollup and are never summed across days, so a daily trend shows that day's\n * uniques.\n */\nexport const seriesFromRollups = (\n\tdocs: RollupDoc[],\n\tmetrics: MetricKey[],\n\ttz: string = DEFAULT_TIMEZONE\n): AnalyticsRow[] => {\n\tconst byDay = new Map<string, Acc>()\n\tfor (const d of docs) {\n\t\tconst day = startOfDayInTz(new Date(d.period), tz).toISOString()\n\t\tlet acc = byDay.get(day)\n\t\tif (!acc) {\n\t\t\tacc = emptyAcc()\n\t\t\tbyDay.set(day, acc)\n\t\t}\n\t\tadd(acc, d)\n\t}\n\treturn [...byDay.entries()]\n\t\t.sort(([a], [b]) => (a < b ? -1 : a > b ? 1 : 0))\n\t\t.map(([day, acc]) => ({ timestamp: day, metrics: selectMetrics(acc, metrics) }))\n}\n"],"mappings":";;AAgCA,MAAa,kBAAuB;CACnC,WAAW;CACX,QAAQ;CACR,YAAY;CACZ,UAAU;CACV,UAAU;CACV,aAAa;CACb,SAAS;CACT,gBAAgB;CAChB,eAAe;AAChB;AAEA,MAAa,OAAO,KAAU,MAA6B;CAC1D,IAAI,aAAa,EAAE;CACnB,IAAI,UAAU,EAAE;CAChB,IAAI,cAAc,EAAE;CACpB,IAAI,YAAY,EAAE;CAClB,IAAI,YAAY,EAAE;CAClB,IAAI,eAAe,EAAE,eAAe;CACpC,IAAI,WAAW,EAAE,WAAW;CAC5B,IAAI,kBAAkB,EAAE,kBAAkB;CAC1C,IAAI,iBAAiB,EAAE,iBAAiB;AACzC;AAEA,MAAa,iBACZ,KACA,WACwC;CACxC,MAAM,MAA0C,CAAC;CACjD,IAAI,OAAO,SAAS,WAAW,GAAG,IAAI,YAAY,IAAI;CACtD,IAAI,OAAO,SAAS,QAAQ,GAAG,IAAI,SAAS,IAAI;CAChD,IAAI,OAAO,SAAS,UAAU,GAAG,IAAI,WAAW,IAAI;CACpD,IAAI,OAAO,SAAS,UAAU,GAAG,IAAI,WAAW,IAAI;CACpD,IAAI,OAAO,SAAS,aAAa,GAAG,IAAI,cAAc,IAAI;CAC1D,IAAI,OAAO,SAAS,SAAS,GAAG,IAAI,UAAU,IAAI;CAClD,IAAI,OAAO,SAAS,aAAa,GAChC,IAAI,cAAc,IAAI,YAAY,IAAI,KAAK,MAAM,IAAI,aAAa,IAAI,SAAS,IAAI;CAEpF,IAAI,OAAO,SAAS,aAAa,GAGhC,IAAI,cAAc,IAAI,gBAAgB,IAAI,KAAK,MAAM,IAAI,iBAAiB,IAAI,aAAa,IAAI;CAEhG,OAAO;AACR;;;;;;;;;AAUA,MAAa,qBACZ,MACA,SACA,KAAA,UACoB;CACpB,MAAM,wBAAQ,IAAI,IAAiB;CACnC,KAAK,MAAM,KAAK,MAAM;EACrB,MAAM,MAAM,eAAe,IAAI,KAAK,EAAE,MAAM,GAAG,EAAE,EAAE,YAAY;EAC/D,IAAI,MAAM,MAAM,IAAI,GAAG;EACvB,IAAI,CAAC,KAAK;GACT,MAAM,SAAS;GACf,MAAM,IAAI,KAAK,GAAG;EACnB;EACA,IAAI,KAAK,CAAC;CACX;CACA,OAAO,CAAC,GAAG,MAAM,QAAQ,CAAC,EACxB,MAAM,CAAC,IAAI,CAAC,OAAQ,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,CAAE,EAC/C,KAAK,CAAC,KAAK,UAAU;EAAE,WAAW;EAAK,SAAS,cAAc,KAAK,OAAO;CAAE,EAAE;AACjF"}
|
|
@@ -23,7 +23,11 @@ const ZERO = {
|
|
|
23
23
|
durationMs: 0,
|
|
24
24
|
samples: 0,
|
|
25
25
|
visitors: 0,
|
|
26
|
-
sessions: 0
|
|
26
|
+
sessions: 0,
|
|
27
|
+
conversions: 0,
|
|
28
|
+
revenue: 0,
|
|
29
|
+
scrollDepthSum: 0,
|
|
30
|
+
scrollSamples: 0
|
|
27
31
|
};
|
|
28
32
|
async function bumpRollup(payload, key, inc) {
|
|
29
33
|
if (payload.db.name === "mongoose") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bumpRollup.js","names":[],"sources":["../../../src/native/rollups/bumpRollup.ts"],"sourcesContent":["import type { Payload } from 'payload'\nimport { ROLLUPS_SLUG } from '../collections/rollups'\nimport type { RollupKey, RollupMetric } from './deltas'\n\nconst PG_TABLE_KEY = 'analytics_rollups'\n\ntype PostgresSqlModule = { sql: typeof import('@payloadcms/db-postgres')['sql'] }\n\n/**\n * Loads the optional Postgres peer without a literal specifier: bundlers (Turbopack, webpack,\n * Vite) resolve literal dynamic imports at build time, which fails a Mongo host's build even\n * though this branch is unreachable there. The function-built specifier is opaque to their\n * analyzers, the ignore comments cover bundlers that would still warn, and the type-only\n * reference above erases at compile time, so the package is touched only when the Postgres\n * branch actually runs.\n */\nconst importPostgresSql = (): Promise<PostgresSqlModule> => {\n\tconst specifier = ['@payloadcms', 'db-postgres'].join('/')\n\treturn import(\n\t\t/* webpackIgnore: true */ /* turbopackIgnore: true */ /* @vite-ignore */ specifier\n\t) as Promise<PostgresSqlModule>\n}\n\n// payload.db raw-access shapes are intentionally loose; these narrow casts reach the\n// Mongoose driver collection / Drizzle instance for atomic upserts (no public typed API).\ntype MongoDb = {\n\tname: 'mongoose'\n\tcollections: Record<\n\t\tstring,\n\t\t{ collection: { updateOne: (f: object, u: object, o: object) => Promise<unknown> } }\n\t>\n}\ntype PgDb = {\n\tname: 'postgres'\n\tdrizzle: {\n\t\tinsert: (t: unknown) => {\n\t\t\tvalues: (v: unknown) => { onConflictDoUpdate: (c: unknown) => Promise<unknown> }\n\t\t}\n\t}\n\ttables: Record<string, Record<string, unknown>>\n\ttableNameMap: Map<string, string>\n}\n\nconst ZERO: Record<RollupMetric, number> = {\n\tpageviews: 0,\n\tevents: 0,\n\tdurationMs: 0,\n\tsamples: 0,\n\tvisitors: 0,\n\tsessions: 0,\n}\n\n// Always seed every metric on insert: Payload's defaultValue is applied app-side, not as\n// a SQL default, so a raw insert that omits a NOT NULL metric column would fail on Postgres.\nexport async function bumpRollup(\n\tpayload: Payload,\n\tkey: RollupKey,\n\tinc: Partial<Record<RollupMetric, number>>\n): Promise<void> {\n\tif (payload.db.name === 'mongoose') {\n\t\tconst db = payload.db as unknown as MongoDb\n\t\tconst model = db.collections[ROLLUPS_SLUG]\n\t\tif (!model) throw new Error(`analytics: mongoose collection \"${ROLLUPS_SLUG}\" not found`)\n\t\tconst setOnInsert: Record<string, unknown> = { ...key }\n\t\tfor (const [metric, zero] of Object.entries(ZERO)) {\n\t\t\tif (!(metric in inc)) setOnInsert[metric] = zero\n\t\t}\n\t\tawait model.collection.updateOne(\n\t\t\tkey,\n\t\t\t{ $inc: inc, $setOnInsert: setOnInsert },\n\t\t\t{ upsert: true }\n\t\t)\n\t\treturn\n\t}\n\tconst { sql } = await importPostgresSql()\n\tconst db = payload.db as unknown as PgDb\n\tconst tableName = db.tableNameMap.get(PG_TABLE_KEY)\n\tif (!tableName) throw new Error(`analytics: drizzle table \"${PG_TABLE_KEY}\" not found`)\n\tconst table = db.tables[tableName]\n\tif (!table) throw new Error(`analytics: drizzle table object for \"${tableName}\" not found`)\n\tconst set: Record<string, unknown> = {}\n\tfor (const [metric, amount] of Object.entries(inc)) {\n\t\tset[metric] = sql`${table[metric]} + ${amount}`\n\t}\n\t// The conflict target must match the unique index exactly, which includes the\n\t// scope column only in scoped installs (mirrored by a scope key on RollupKey).\n\tconst target = [\n\t\ttable.granularity,\n\t\ttable.period,\n\t\ttable.path,\n\t\ttable.dimension,\n\t\ttable.dimvalue,\n\t\ttable.hostname,\n\t]\n\tif (key.scope !== undefined) {\n\t\ttarget.push(table.scope)\n\t}\n\tawait db.drizzle\n\t\t.insert(table)\n\t\t.values({ ...key, ...ZERO, ...inc })\n\t\t.onConflictDoUpdate({ target, set })\n}\n"],"mappings":";;AAIA,MAAM,eAAe;;;;;;;;;AAYrB,MAAM,0BAAsD;CAE3D,OAAO;;;;EADW,CAAC,eAAe,aAAa,EAAE,KAAK,GAE4B;;AAEnF;AAsBA,MAAM,OAAqC;CAC1C,WAAW;CACX,QAAQ;CACR,YAAY;CACZ,SAAS;CACT,UAAU;CACV,UAAU;
|
|
1
|
+
{"version":3,"file":"bumpRollup.js","names":[],"sources":["../../../src/native/rollups/bumpRollup.ts"],"sourcesContent":["import type { Payload } from 'payload'\nimport { ROLLUPS_SLUG } from '../collections/rollups'\nimport type { RollupKey, RollupMetric } from './deltas'\n\nconst PG_TABLE_KEY = 'analytics_rollups'\n\ntype PostgresSqlModule = { sql: typeof import('@payloadcms/db-postgres')['sql'] }\n\n/**\n * Loads the optional Postgres peer without a literal specifier: bundlers (Turbopack, webpack,\n * Vite) resolve literal dynamic imports at build time, which fails a Mongo host's build even\n * though this branch is unreachable there. The function-built specifier is opaque to their\n * analyzers, the ignore comments cover bundlers that would still warn, and the type-only\n * reference above erases at compile time, so the package is touched only when the Postgres\n * branch actually runs.\n */\nconst importPostgresSql = (): Promise<PostgresSqlModule> => {\n\tconst specifier = ['@payloadcms', 'db-postgres'].join('/')\n\treturn import(\n\t\t/* webpackIgnore: true */ /* turbopackIgnore: true */ /* @vite-ignore */ specifier\n\t) as Promise<PostgresSqlModule>\n}\n\n// payload.db raw-access shapes are intentionally loose; these narrow casts reach the\n// Mongoose driver collection / Drizzle instance for atomic upserts (no public typed API).\ntype MongoDb = {\n\tname: 'mongoose'\n\tcollections: Record<\n\t\tstring,\n\t\t{ collection: { updateOne: (f: object, u: object, o: object) => Promise<unknown> } }\n\t>\n}\ntype PgDb = {\n\tname: 'postgres'\n\tdrizzle: {\n\t\tinsert: (t: unknown) => {\n\t\t\tvalues: (v: unknown) => { onConflictDoUpdate: (c: unknown) => Promise<unknown> }\n\t\t}\n\t}\n\ttables: Record<string, Record<string, unknown>>\n\ttableNameMap: Map<string, string>\n}\n\nconst ZERO: Record<RollupMetric, number> = {\n\tpageviews: 0,\n\tevents: 0,\n\tdurationMs: 0,\n\tsamples: 0,\n\tvisitors: 0,\n\tsessions: 0,\n\tconversions: 0,\n\trevenue: 0,\n\tscrollDepthSum: 0,\n\tscrollSamples: 0,\n}\n\n// Always seed every metric on insert: Payload's defaultValue is applied app-side, not as\n// a SQL default, so a raw insert that omits a NOT NULL metric column would fail on Postgres.\nexport async function bumpRollup(\n\tpayload: Payload,\n\tkey: RollupKey,\n\tinc: Partial<Record<RollupMetric, number>>\n): Promise<void> {\n\tif (payload.db.name === 'mongoose') {\n\t\tconst db = payload.db as unknown as MongoDb\n\t\tconst model = db.collections[ROLLUPS_SLUG]\n\t\tif (!model) throw new Error(`analytics: mongoose collection \"${ROLLUPS_SLUG}\" not found`)\n\t\tconst setOnInsert: Record<string, unknown> = { ...key }\n\t\tfor (const [metric, zero] of Object.entries(ZERO)) {\n\t\t\tif (!(metric in inc)) setOnInsert[metric] = zero\n\t\t}\n\t\tawait model.collection.updateOne(\n\t\t\tkey,\n\t\t\t{ $inc: inc, $setOnInsert: setOnInsert },\n\t\t\t{ upsert: true }\n\t\t)\n\t\treturn\n\t}\n\tconst { sql } = await importPostgresSql()\n\tconst db = payload.db as unknown as PgDb\n\tconst tableName = db.tableNameMap.get(PG_TABLE_KEY)\n\tif (!tableName) throw new Error(`analytics: drizzle table \"${PG_TABLE_KEY}\" not found`)\n\tconst table = db.tables[tableName]\n\tif (!table) throw new Error(`analytics: drizzle table object for \"${tableName}\" not found`)\n\tconst set: Record<string, unknown> = {}\n\tfor (const [metric, amount] of Object.entries(inc)) {\n\t\tset[metric] = sql`${table[metric]} + ${amount}`\n\t}\n\t// The conflict target must match the unique index exactly, which includes the\n\t// scope column only in scoped installs (mirrored by a scope key on RollupKey).\n\tconst target = [\n\t\ttable.granularity,\n\t\ttable.period,\n\t\ttable.path,\n\t\ttable.dimension,\n\t\ttable.dimvalue,\n\t\ttable.hostname,\n\t]\n\tif (key.scope !== undefined) {\n\t\ttarget.push(table.scope)\n\t}\n\tawait db.drizzle\n\t\t.insert(table)\n\t\t.values({ ...key, ...ZERO, ...inc })\n\t\t.onConflictDoUpdate({ target, set })\n}\n"],"mappings":";;AAIA,MAAM,eAAe;;;;;;;;;AAYrB,MAAM,0BAAsD;CAE3D,OAAO;;;;EADW,CAAC,eAAe,aAAa,EAAE,KAAK,GAE4B;;AAEnF;AAsBA,MAAM,OAAqC;CAC1C,WAAW;CACX,QAAQ;CACR,YAAY;CACZ,SAAS;CACT,UAAU;CACV,UAAU;CACV,aAAa;CACb,SAAS;CACT,gBAAgB;CAChB,eAAe;AAChB;AAIA,eAAsB,WACrB,SACA,KACA,KACgB;CAChB,IAAI,QAAQ,GAAG,SAAS,YAAY;EAEnC,MAAM,QADK,QAAQ,GACF,YAAY;EAC7B,IAAI,CAAC,OAAO,MAAM,IAAI,MAAM,mCAAmC,aAAa,YAAY;EACxF,MAAM,cAAuC,EAAE,GAAG,IAAI;EACtD,KAAK,MAAM,CAAC,QAAQ,SAAS,OAAO,QAAQ,IAAI,GAC/C,IAAI,EAAE,UAAU,MAAM,YAAY,UAAU;EAE7C,MAAM,MAAM,WAAW,UACtB,KACA;GAAE,MAAM;GAAK,cAAc;EAAY,GACvC,EAAE,QAAQ,KAAK,CAChB;EACA;CACD;CACA,MAAM,EAAE,QAAQ,MAAM,kBAAkB;CACxC,MAAM,KAAK,QAAQ;CACnB,MAAM,YAAY,GAAG,aAAa,IAAI,YAAY;CAClD,IAAI,CAAC,WAAW,MAAM,IAAI,MAAM,6BAA6B,aAAa,YAAY;CACtF,MAAM,QAAQ,GAAG,OAAO;CACxB,IAAI,CAAC,OAAO,MAAM,IAAI,MAAM,wCAAwC,UAAU,YAAY;CAC1F,MAAM,MAA+B,CAAC;CACtC,KAAK,MAAM,CAAC,QAAQ,WAAW,OAAO,QAAQ,GAAG,GAChD,IAAI,UAAU,GAAG,GAAG,MAAM,QAAQ,KAAK;CAIxC,MAAM,SAAS;EACd,MAAM;EACN,MAAM;EACN,MAAM;EACN,MAAM;EACN,MAAM;EACN,MAAM;CACP;CACA,IAAI,IAAI,UAAU,KAAA,GACjB,OAAO,KAAK,MAAM,KAAK;CAExB,MAAM,GAAG,QACP,OAAO,KAAK,EACZ,OAAO;EAAE,GAAG;EAAK,GAAG;EAAM,GAAG;CAAI,CAAC,EAClC,mBAAmB;EAAE;EAAQ;CAAI,CAAC;AACrC"}
|
|
@@ -8,16 +8,26 @@ import { startOfDayInTz } from "../../timeframe/tz.js";
|
|
|
8
8
|
* reads use, and once more in the exact-hostname family that a hostname-scoped read uses.
|
|
9
9
|
* Both families stay per-bucket exact at the cost of one extra bucket set per distinct
|
|
10
10
|
* hostname a site sees.
|
|
11
|
+
*
|
|
12
|
+
* Goal completions add one `('', 'goal', slug)` bucket each, carrying that goal's own single
|
|
13
|
+
* conversion, while every other bucket carries the event's whole conversion count, so a
|
|
14
|
+
* site-wide or per-page total never has to scan the goal buckets.
|
|
11
15
|
*/
|
|
12
16
|
function computeRollupDeltas(event) {
|
|
13
17
|
const period = startOfDayInTz(event.timestamp, event.timezone);
|
|
18
|
+
const completions = event.goals ?? [];
|
|
19
|
+
const reportedDepth = event.scrollDepth !== void 0;
|
|
14
20
|
const inc = {
|
|
15
21
|
pageviews: event.type === "pageview" ? 1 : 0,
|
|
16
|
-
events: event.type === "
|
|
22
|
+
events: event.type === "pageview" ? 0 : 1,
|
|
17
23
|
durationMs: event.durationMs ?? 0,
|
|
18
|
-
samples: 1
|
|
24
|
+
samples: 1,
|
|
25
|
+
conversions: completions.length,
|
|
26
|
+
revenue: completions.reduce((sum, goal) => sum + goal.value, 0),
|
|
27
|
+
scrollDepthSum: reportedDepth ? event.scrollDepth ?? 0 : 0,
|
|
28
|
+
scrollSamples: reportedDepth ? 1 : 0
|
|
19
29
|
};
|
|
20
|
-
const make = (bucket, hostname) => ({
|
|
30
|
+
const make = (bucket, hostname, over) => ({
|
|
21
31
|
key: {
|
|
22
32
|
granularity: "day",
|
|
23
33
|
period,
|
|
@@ -27,7 +37,10 @@ function computeRollupDeltas(event) {
|
|
|
27
37
|
hostname,
|
|
28
38
|
...event.scope !== void 0 ? { scope: event.scope } : {}
|
|
29
39
|
},
|
|
30
|
-
inc: {
|
|
40
|
+
inc: {
|
|
41
|
+
...inc,
|
|
42
|
+
...over
|
|
43
|
+
}
|
|
31
44
|
});
|
|
32
45
|
const buckets = [[
|
|
33
46
|
event.path,
|
|
@@ -58,8 +71,17 @@ function computeRollupDeltas(event) {
|
|
|
58
71
|
"source",
|
|
59
72
|
event.source
|
|
60
73
|
]);
|
|
61
|
-
const
|
|
62
|
-
|
|
74
|
+
const families = event.hostname ? ["", event.hostname] : [""];
|
|
75
|
+
const deltas = [];
|
|
76
|
+
for (const hostname of families) deltas.push(...buckets.map((bucket) => make(bucket, hostname)));
|
|
77
|
+
for (const hostname of families) for (const completion of completions) deltas.push(make([
|
|
78
|
+
"",
|
|
79
|
+
"goal",
|
|
80
|
+
completion.slug
|
|
81
|
+
], hostname, {
|
|
82
|
+
conversions: 1,
|
|
83
|
+
revenue: completion.value
|
|
84
|
+
}));
|
|
63
85
|
return deltas;
|
|
64
86
|
}
|
|
65
87
|
//#endregion
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deltas.js","names":[],"sources":["../../../src/native/rollups/deltas.ts"],"sourcesContent":["import { startOfDayInTz } from '../../timeframe/tz'\nimport type { StoredEvent } from '../ingest/normalizeEvent'\n\nexport interface RollupKey {\n\tgranularity: 'day'\n\tperiod: Date\n\tpath: string\n\tdimension: string\n\tdimvalue: string\n\t/** '' is the hostname-less bucket family; a real hostname is its own family. */\n\thostname: string\n\t/** Present only in scoped installs, where it is part of the unique bucket. */\n\tscope?: string\n}\n\nexport type RollupMetric =\n\t| 'pageviews'\n\t| 'events'\n\t| 'durationMs'\n\t| 'samples'\n\t| 'visitors'\n\t| 'sessions'\n\nexport
|
|
1
|
+
{"version":3,"file":"deltas.js","names":[],"sources":["../../../src/native/rollups/deltas.ts"],"sourcesContent":["import { startOfDayInTz } from '../../timeframe/tz'\nimport type { StoredEvent } from '../ingest/normalizeEvent'\n\nexport interface RollupKey {\n\tgranularity: 'day'\n\tperiod: Date\n\tpath: string\n\tdimension: string\n\tdimvalue: string\n\t/** '' is the hostname-less bucket family; a real hostname is its own family. */\n\thostname: string\n\t/** Present only in scoped installs, where it is part of the unique bucket. */\n\tscope?: string\n}\n\nexport type RollupMetric =\n\t| 'pageviews'\n\t| 'events'\n\t| 'durationMs'\n\t| 'samples'\n\t| 'visitors'\n\t| 'sessions'\n\t| 'conversions'\n\t| 'revenue'\n\t| 'scrollDepthSum'\n\t| 'scrollSamples'\n\n/**\n * `samples` counts every event in the bucket, so it cannot be the scroll-depth denominator:\n * `scrollSamples` counts only the pageviews that actually reported a depth, which is what\n * keeps the `scrollDepth` average honest when the tracker never got to send one.\n */\nexport type RollupInc = {\n\tpageviews: number\n\tevents: number\n\tdurationMs: number\n\tsamples: number\n\tconversions: number\n\trevenue: number\n\tscrollDepthSum: number\n\tscrollSamples: number\n}\n\nexport interface RollupDelta {\n\tkey: RollupKey\n\tinc: RollupInc\n}\n\n/**\n * Distinct metrics (visitors, sessions) are exact per bucket and must never be summed\n * across buckets, so an unfiltered read has to hit its own exact family rather than\n * derive from a hostname-scoped one (or vice versa). Every bucket is therefore emitted\n * twice when a hostname is present: once in the hostname-less ('') family that unfiltered\n * reads use, and once more in the exact-hostname family that a hostname-scoped read uses.\n * Both families stay per-bucket exact at the cost of one extra bucket set per distinct\n * hostname a site sees.\n *\n * Goal completions add one `('', 'goal', slug)` bucket each, carrying that goal's own single\n * conversion, while every other bucket carries the event's whole conversion count, so a\n * site-wide or per-page total never has to scan the goal buckets.\n */\nexport function computeRollupDeltas(event: StoredEvent): RollupDelta[] {\n\t// Bucket into the event's reporting-timezone day (UTC when unset), fixing the day\n\t// boundary at ingest. Existing rollups are not re-bucketed if the timezone changes.\n\tconst period = startOfDayInTz(event.timestamp, event.timezone)\n\tconst completions = event.goals ?? []\n\tconst reportedDepth = event.scrollDepth !== undefined\n\tconst inc: RollupInc = {\n\t\tpageviews: event.type === 'pageview' ? 1 : 0,\n\t\t// A `goal` event is a non-pageview hit like a custom event; it stays out of the\n\t\t// `event` dimension breakdown, which reports named custom events only.\n\t\tevents: event.type === 'pageview' ? 0 : 1,\n\t\tdurationMs: event.durationMs ?? 0,\n\t\tsamples: 1,\n\t\tconversions: completions.length,\n\t\trevenue: completions.reduce((sum, goal) => sum + goal.value, 0),\n\t\tscrollDepthSum: reportedDepth ? (event.scrollDepth ?? 0) : 0,\n\t\tscrollSamples: reportedDepth ? 1 : 0,\n\t}\n\tconst make = (\n\t\tbucket: [path: string, dimension: string, dimvalue: string],\n\t\thostname: string,\n\t\tover?: Partial<RollupInc>\n\t): RollupDelta => ({\n\t\tkey: {\n\t\t\tgranularity: 'day',\n\t\t\tperiod,\n\t\t\tpath: bucket[0],\n\t\t\tdimension: bucket[1],\n\t\t\tdimvalue: bucket[2],\n\t\t\thostname,\n\t\t\t...(event.scope !== undefined ? { scope: event.scope } : {}),\n\t\t},\n\t\tinc: { ...inc, ...over },\n\t})\n\tconst buckets: Array<[path: string, dimension: string, dimvalue: string]> = [\n\t\t[event.path, '', ''],\n\t\t['', '', ''],\n\t]\n\tif (event.type === 'event' && event.name) {\n\t\tbuckets.push(['', 'event', event.name])\n\t}\n\tif (event.country) {\n\t\tbuckets.push(['', 'country', event.country])\n\t}\n\tif (event.device) {\n\t\tbuckets.push(['', 'device', event.device])\n\t}\n\tif (event.source) {\n\t\tbuckets.push(['', 'source', event.source])\n\t}\n\tconst families = event.hostname ? ['', event.hostname] : ['']\n\tconst deltas: RollupDelta[] = []\n\tfor (const hostname of families) {\n\t\tdeltas.push(...buckets.map((bucket) => make(bucket, hostname)))\n\t}\n\tfor (const hostname of families) {\n\t\tfor (const completion of completions) {\n\t\t\tdeltas.push(\n\t\t\t\tmake(['', 'goal', completion.slug], hostname, {\n\t\t\t\t\tconversions: 1,\n\t\t\t\t\trevenue: completion.value,\n\t\t\t\t})\n\t\t\t)\n\t\t}\n\t}\n\treturn deltas\n}\n"],"mappings":";;;;;;;;;;;;;;;AA6DA,SAAgB,oBAAoB,OAAmC;CAGtE,MAAM,SAAS,eAAe,MAAM,WAAW,MAAM,QAAQ;CAC7D,MAAM,cAAc,MAAM,SAAS,CAAC;CACpC,MAAM,gBAAgB,MAAM,gBAAgB,KAAA;CAC5C,MAAM,MAAiB;EACtB,WAAW,MAAM,SAAS,aAAa,IAAI;EAG3C,QAAQ,MAAM,SAAS,aAAa,IAAI;EACxC,YAAY,MAAM,cAAc;EAChC,SAAS;EACT,aAAa,YAAY;EACzB,SAAS,YAAY,QAAQ,KAAK,SAAS,MAAM,KAAK,OAAO,CAAC;EAC9D,gBAAgB,gBAAiB,MAAM,eAAe,IAAK;EAC3D,eAAe,gBAAgB,IAAI;CACpC;CACA,MAAM,QACL,QACA,UACA,UACkB;EAClB,KAAK;GACJ,aAAa;GACb;GACA,MAAM,OAAO;GACb,WAAW,OAAO;GAClB,UAAU,OAAO;GACjB;GACA,GAAI,MAAM,UAAU,KAAA,IAAY,EAAE,OAAO,MAAM,MAAM,IAAI,CAAC;EAC3D;EACA,KAAK;GAAE,GAAG;GAAK,GAAG;EAAK;CACxB;CACA,MAAM,UAAsE,CAC3E;EAAC,MAAM;EAAM;EAAI;CAAE,GACnB;EAAC;EAAI;EAAI;CAAE,CACZ;CACA,IAAI,MAAM,SAAS,WAAW,MAAM,MACnC,QAAQ,KAAK;EAAC;EAAI;EAAS,MAAM;CAAI,CAAC;CAEvC,IAAI,MAAM,SACT,QAAQ,KAAK;EAAC;EAAI;EAAW,MAAM;CAAO,CAAC;CAE5C,IAAI,MAAM,QACT,QAAQ,KAAK;EAAC;EAAI;EAAU,MAAM;CAAM,CAAC;CAE1C,IAAI,MAAM,QACT,QAAQ,KAAK;EAAC;EAAI;EAAU,MAAM;CAAM,CAAC;CAE1C,MAAM,WAAW,MAAM,WAAW,CAAC,IAAI,MAAM,QAAQ,IAAI,CAAC,EAAE;CAC5D,MAAM,SAAwB,CAAC;CAC/B,KAAK,MAAM,YAAY,UACtB,OAAO,KAAK,GAAG,QAAQ,KAAK,WAAW,KAAK,QAAQ,QAAQ,CAAC,CAAC;CAE/D,KAAK,MAAM,YAAY,UACtB,KAAK,MAAM,cAAc,aACxB,OAAO,KACN,KAAK;EAAC;EAAI;EAAQ,WAAW;CAAI,GAAG,UAAU;EAC7C,aAAa;EACb,SAAS,WAAW;CACrB,CAAC,CACF;CAGF,OAAO;AACR"}
|
|
@@ -1,9 +1,38 @@
|
|
|
1
1
|
//#region src/native/rollups/insertIfNew.ts
|
|
2
|
+
/** Mongo duplicate key. */
|
|
3
|
+
const MONGO_DUPLICATE = 11e3;
|
|
4
|
+
/** Postgres unique_violation. */
|
|
5
|
+
const PG_UNIQUE_VIOLATION = "23505";
|
|
6
|
+
/**
|
|
7
|
+
* Drizzle wraps driver errors in a `DrizzleQueryError` and Mongoose can wrap a write error in
|
|
8
|
+
* turn, so the cause chain is walked rather than only the error handed to the catch.
|
|
9
|
+
*/
|
|
10
|
+
const isDuplicateKeyError = (err, code) => {
|
|
11
|
+
let current = err;
|
|
12
|
+
for (let depth = 0; depth < 4; depth++) {
|
|
13
|
+
if (typeof current !== "object" || current === null) return false;
|
|
14
|
+
if (current.code === code) return true;
|
|
15
|
+
current = current.cause;
|
|
16
|
+
}
|
|
17
|
+
return false;
|
|
18
|
+
};
|
|
19
|
+
/**
|
|
20
|
+
* Returns true iff the row was newly inserted (the key had not been seen). Single statement on
|
|
21
|
+
* both adapters, and the unique index on the key is what makes it concurrency-safe: two writers
|
|
22
|
+
* racing the same key means one of them loses, either quietly (no upsert, no insert) or with a
|
|
23
|
+
* duplicate-key error the driver raises after the index rejects its write. Both outcomes mean
|
|
24
|
+
* "already seen", so the error is caught here rather than escaping into the ingest response.
|
|
25
|
+
*/
|
|
2
26
|
async function insertIfNew(payload, slug, key) {
|
|
3
27
|
if (payload.db.name === "mongoose") {
|
|
4
28
|
const model = payload.db.collections[slug];
|
|
5
29
|
if (!model) throw new Error(`analytics: mongoose collection "${slug}" not found`);
|
|
6
|
-
|
|
30
|
+
try {
|
|
31
|
+
return (await model.collection.updateOne(key, { $setOnInsert: key }, { upsert: true })).upsertedCount === 1;
|
|
32
|
+
} catch (err) {
|
|
33
|
+
if (isDuplicateKeyError(err, MONGO_DUPLICATE)) return false;
|
|
34
|
+
throw err;
|
|
35
|
+
}
|
|
7
36
|
}
|
|
8
37
|
const db = payload.db;
|
|
9
38
|
const tableKey = slug.replace(/-/g, "_");
|
|
@@ -11,7 +40,12 @@ async function insertIfNew(payload, slug, key) {
|
|
|
11
40
|
if (!tableName) throw new Error(`analytics: drizzle table "${tableKey}" not found`);
|
|
12
41
|
const table = db.tables[tableName];
|
|
13
42
|
if (!table) throw new Error(`analytics: drizzle table object for "${tableName}" not found`);
|
|
14
|
-
|
|
43
|
+
try {
|
|
44
|
+
return (await db.drizzle.insert(table).values(key).onConflictDoNothing().returning()).length === 1;
|
|
45
|
+
} catch (err) {
|
|
46
|
+
if (isDuplicateKeyError(err, PG_UNIQUE_VIOLATION)) return false;
|
|
47
|
+
throw err;
|
|
48
|
+
}
|
|
15
49
|
}
|
|
16
50
|
//#endregion
|
|
17
51
|
export { insertIfNew };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"insertIfNew.js","names":[],"sources":["../../../src/native/rollups/insertIfNew.ts"],"sourcesContent":["import type { Payload } from 'payload'\n\n// payload.db raw-access shapes are intentionally loose; these narrow casts reach the\n// Mongoose driver collection / Drizzle instance directly (no public typed API).\ntype MongoDb = {\n\tname: 'mongoose'\n\tcollections: Record<\n\t\tstring,\n\t\t{\n\t\t\tcollection: {\n\t\t\t\tupdateOne: (f: object, u: object, o: object) => Promise<{ upsertedCount: number }>\n\t\t\t}\n\t\t}\n\t>\n}\ntype PgDb = {\n\tname: 'postgres'\n\tdrizzle: {\n\t\tinsert: (t: unknown) => {\n\t\t\tvalues: (v: unknown) => { onConflictDoNothing: () => { returning: () => Promise<unknown[]> } }\n\t\t}\n\t}\n\ttables: Record<string, Record<string, unknown>>\n\ttableNameMap: Map<string, string>\n}\n\n
|
|
1
|
+
{"version":3,"file":"insertIfNew.js","names":[],"sources":["../../../src/native/rollups/insertIfNew.ts"],"sourcesContent":["import type { Payload } from 'payload'\n\n// payload.db raw-access shapes are intentionally loose; these narrow casts reach the\n// Mongoose driver collection / Drizzle instance directly (no public typed API).\ntype MongoDb = {\n\tname: 'mongoose'\n\tcollections: Record<\n\t\tstring,\n\t\t{\n\t\t\tcollection: {\n\t\t\t\tupdateOne: (f: object, u: object, o: object) => Promise<{ upsertedCount: number }>\n\t\t\t}\n\t\t}\n\t>\n}\ntype PgDb = {\n\tname: 'postgres'\n\tdrizzle: {\n\t\tinsert: (t: unknown) => {\n\t\t\tvalues: (v: unknown) => { onConflictDoNothing: () => { returning: () => Promise<unknown[]> } }\n\t\t}\n\t}\n\ttables: Record<string, Record<string, unknown>>\n\ttableNameMap: Map<string, string>\n}\n\n/** Mongo duplicate key. */\nconst MONGO_DUPLICATE = 11000\n/** Postgres unique_violation. */\nconst PG_UNIQUE_VIOLATION = '23505'\n\n/**\n * Drizzle wraps driver errors in a `DrizzleQueryError` and Mongoose can wrap a write error in\n * turn, so the cause chain is walked rather than only the error handed to the catch.\n */\nconst isDuplicateKeyError = (err: unknown, code: number | string): boolean => {\n\tlet current: unknown = err\n\tfor (let depth = 0; depth < 4; depth++) {\n\t\tif (typeof current !== 'object' || current === null) {\n\t\t\treturn false\n\t\t}\n\t\tif ((current as { code?: unknown }).code === code) {\n\t\t\treturn true\n\t\t}\n\t\tcurrent = (current as { cause?: unknown }).cause\n\t}\n\treturn false\n}\n\n/**\n * Returns true iff the row was newly inserted (the key had not been seen). Single statement on\n * both adapters, and the unique index on the key is what makes it concurrency-safe: two writers\n * racing the same key means one of them loses, either quietly (no upsert, no insert) or with a\n * duplicate-key error the driver raises after the index rejects its write. Both outcomes mean\n * \"already seen\", so the error is caught here rather than escaping into the ingest response.\n */\nexport async function insertIfNew(\n\tpayload: Payload,\n\tslug: string,\n\tkey: Record<string, unknown>\n): Promise<boolean> {\n\tif (payload.db.name === 'mongoose') {\n\t\tconst db = payload.db as unknown as MongoDb\n\t\tconst model = db.collections[slug]\n\t\tif (!model) throw new Error(`analytics: mongoose collection \"${slug}\" not found`)\n\t\ttry {\n\t\t\tconst res = await model.collection.updateOne(key, { $setOnInsert: key }, { upsert: true })\n\t\t\treturn res.upsertedCount === 1\n\t\t} catch (err) {\n\t\t\tif (isDuplicateKeyError(err, MONGO_DUPLICATE)) return false\n\t\t\tthrow err\n\t\t}\n\t}\n\tconst db = payload.db as unknown as PgDb\n\tconst tableKey = slug.replace(/-/g, '_')\n\tconst tableName = db.tableNameMap.get(tableKey)\n\tif (!tableName) throw new Error(`analytics: drizzle table \"${tableKey}\" not found`)\n\tconst table = db.tables[tableName]\n\tif (!table) throw new Error(`analytics: drizzle table object for \"${tableName}\" not found`)\n\ttry {\n\t\tconst inserted = await db.drizzle.insert(table).values(key).onConflictDoNothing().returning()\n\t\treturn inserted.length === 1\n\t} catch (err) {\n\t\tif (isDuplicateKeyError(err, PG_UNIQUE_VIOLATION)) return false\n\t\tthrow err\n\t}\n}\n"],"mappings":";;AA2BA,MAAM,kBAAkB;;AAExB,MAAM,sBAAsB;;;;;AAM5B,MAAM,uBAAuB,KAAc,SAAmC;CAC7E,IAAI,UAAmB;CACvB,KAAK,IAAI,QAAQ,GAAG,QAAQ,GAAG,SAAS;EACvC,IAAI,OAAO,YAAY,YAAY,YAAY,MAC9C,OAAO;EAER,IAAK,QAA+B,SAAS,MAC5C,OAAO;EAER,UAAW,QAAgC;CAC5C;CACA,OAAO;AACR;;;;;;;;AASA,eAAsB,YACrB,SACA,MACA,KACmB;CACnB,IAAI,QAAQ,GAAG,SAAS,YAAY;EAEnC,MAAM,QADK,QAAQ,GACF,YAAY;EAC7B,IAAI,CAAC,OAAO,MAAM,IAAI,MAAM,mCAAmC,KAAK,YAAY;EAChF,IAAI;GAEH,QAAO,MADW,MAAM,WAAW,UAAU,KAAK,EAAE,cAAc,IAAI,GAAG,EAAE,QAAQ,KAAK,CAAC,GAC9E,kBAAkB;EAC9B,SAAS,KAAK;GACb,IAAI,oBAAoB,KAAK,eAAe,GAAG,OAAO;GACtD,MAAM;EACP;CACD;CACA,MAAM,KAAK,QAAQ;CACnB,MAAM,WAAW,KAAK,QAAQ,MAAM,GAAG;CACvC,MAAM,YAAY,GAAG,aAAa,IAAI,QAAQ;CAC9C,IAAI,CAAC,WAAW,MAAM,IAAI,MAAM,6BAA6B,SAAS,YAAY;CAClF,MAAM,QAAQ,GAAG,OAAO;CACxB,IAAI,CAAC,OAAO,MAAM,IAAI,MAAM,wCAAwC,UAAU,YAAY;CAC1F,IAAI;EAEH,QAAO,MADgB,GAAG,QAAQ,OAAO,KAAK,EAAE,OAAO,GAAG,EAAE,oBAAoB,EAAE,UAAU,GAC5E,WAAW;CAC5B,SAAS,KAAK;EACb,IAAI,oBAAoB,KAAK,mBAAmB,GAAG,OAAO;EAC1D,MAAM;CACP;AACD"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { AnalyticsAdapter } from "../core/contract.js";
|
|
2
|
+
|
|
3
|
+
//#region src/next/captureRewrites.d.ts
|
|
4
|
+
/** One Next.js rewrite entry (the shape `next.config` `rewrites()` returns). */
|
|
5
|
+
interface CaptureRewrite {
|
|
6
|
+
source: string;
|
|
7
|
+
destination: string;
|
|
8
|
+
}
|
|
9
|
+
/** An adapter's capture proxy mounted at a base path in the consumer's Next app. */
|
|
10
|
+
interface CaptureRewriteMount {
|
|
11
|
+
/** Base path this adapter's proxy is mounted at, e.g. '/ph' or '/api/analytics/p/global'. */
|
|
12
|
+
path: string;
|
|
13
|
+
adapter: AnalyticsAdapter;
|
|
14
|
+
}
|
|
15
|
+
/**
|
|
16
|
+
* Next.js `rewrites()` entries for every adapter's capture proxy, one mount at a time.
|
|
17
|
+
* Each route's `source`/`upstream` already share `path-to-regexp` param names (e.g.
|
|
18
|
+
* `:p*`), so no translation happens beyond prefixing `source` with the mount's
|
|
19
|
+
* (normalized) path; `upstream` is used verbatim as `destination`. Next always strips a
|
|
20
|
+
* trailing slash from the matched path before substituting it into `destination` (unlike
|
|
21
|
+
* the runtime proxy, which can be told to keep one via `trailingSlashes`); harmless for
|
|
22
|
+
* every vendor this helper supports today.
|
|
23
|
+
*
|
|
24
|
+
* An adapter without `capture` (GA4) or with no proxy routes (the native adapter)
|
|
25
|
+
* contributes nothing rather than throwing, so one broken slot never blanks the rest.
|
|
26
|
+
* Output preserves mount order, then each mount's declared route order.
|
|
27
|
+
*
|
|
28
|
+
* Throws for a mount path that normalizes to the site root (an unprefixed catch-all
|
|
29
|
+
* route would swallow the whole app) or for two mounts whose normalized paths are equal
|
|
30
|
+
* or nested (Next matches rewrites first-match-wins, so an earlier catch-all would
|
|
31
|
+
* silently shadow a later mount's routes). Distinct sibling paths that merely share a
|
|
32
|
+
* string prefix, e.g. `/ph` and `/phx`, are unaffected.
|
|
33
|
+
*
|
|
34
|
+
* When any mounted adapter's descriptor sets `capture.proxy.trailingSlashes`, add
|
|
35
|
+
* `skipTrailingSlashRedirect: true` to `next.config` (see `posthogProxyRewrites`'s
|
|
36
|
+
* JSDoc for why PostHog needs it).
|
|
37
|
+
*/
|
|
38
|
+
declare const captureRewrites: (mounts: CaptureRewriteMount[]) => CaptureRewrite[];
|
|
39
|
+
//#endregion
|
|
40
|
+
export { CaptureRewrite, CaptureRewriteMount, captureRewrites };
|
|
41
|
+
//# sourceMappingURL=captureRewrites.d.ts.map
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { normalizeMountPath } from "../capture/mountPath.js";
|
|
2
|
+
//#region src/next/captureRewrites.ts
|
|
3
|
+
const assertNotRoot = (path) => {
|
|
4
|
+
if (path === "/") throw new Error("captureRewrites: mount path must not be the site root");
|
|
5
|
+
};
|
|
6
|
+
const isPrefixOrEqual = (a, b) => a === b || b.startsWith(`${a}/`);
|
|
7
|
+
const assertNoCollisions = (paths) => {
|
|
8
|
+
for (let i = 0; i < paths.length; i++) for (let j = i + 1; j < paths.length; j++) {
|
|
9
|
+
const a = paths[i];
|
|
10
|
+
const b = paths[j];
|
|
11
|
+
if (isPrefixOrEqual(a, b) || isPrefixOrEqual(b, a)) throw new Error(`captureRewrites: mount paths collide: '${a}' and '${b}'`);
|
|
12
|
+
}
|
|
13
|
+
};
|
|
14
|
+
/**
|
|
15
|
+
* Next.js `rewrites()` entries for every adapter's capture proxy, one mount at a time.
|
|
16
|
+
* Each route's `source`/`upstream` already share `path-to-regexp` param names (e.g.
|
|
17
|
+
* `:p*`), so no translation happens beyond prefixing `source` with the mount's
|
|
18
|
+
* (normalized) path; `upstream` is used verbatim as `destination`. Next always strips a
|
|
19
|
+
* trailing slash from the matched path before substituting it into `destination` (unlike
|
|
20
|
+
* the runtime proxy, which can be told to keep one via `trailingSlashes`); harmless for
|
|
21
|
+
* every vendor this helper supports today.
|
|
22
|
+
*
|
|
23
|
+
* An adapter without `capture` (GA4) or with no proxy routes (the native adapter)
|
|
24
|
+
* contributes nothing rather than throwing, so one broken slot never blanks the rest.
|
|
25
|
+
* Output preserves mount order, then each mount's declared route order.
|
|
26
|
+
*
|
|
27
|
+
* Throws for a mount path that normalizes to the site root (an unprefixed catch-all
|
|
28
|
+
* route would swallow the whole app) or for two mounts whose normalized paths are equal
|
|
29
|
+
* or nested (Next matches rewrites first-match-wins, so an earlier catch-all would
|
|
30
|
+
* silently shadow a later mount's routes). Distinct sibling paths that merely share a
|
|
31
|
+
* string prefix, e.g. `/ph` and `/phx`, are unaffected.
|
|
32
|
+
*
|
|
33
|
+
* When any mounted adapter's descriptor sets `capture.proxy.trailingSlashes`, add
|
|
34
|
+
* `skipTrailingSlashRedirect: true` to `next.config` (see `posthogProxyRewrites`'s
|
|
35
|
+
* JSDoc for why PostHog needs it).
|
|
36
|
+
*/
|
|
37
|
+
const captureRewrites = (mounts) => {
|
|
38
|
+
const normalized = mounts.map((mount) => normalizeMountPath(mount.path));
|
|
39
|
+
for (const path of normalized) assertNotRoot(path);
|
|
40
|
+
assertNoCollisions(normalized);
|
|
41
|
+
const rewrites = [];
|
|
42
|
+
for (let i = 0; i < mounts.length; i++) {
|
|
43
|
+
const routes = mounts[i].adapter.capture?.proxy.routes;
|
|
44
|
+
if (!routes?.length) continue;
|
|
45
|
+
const base = normalized[i];
|
|
46
|
+
for (const route of routes) rewrites.push({
|
|
47
|
+
source: `${base}${route.source}`,
|
|
48
|
+
destination: route.upstream
|
|
49
|
+
});
|
|
50
|
+
}
|
|
51
|
+
return rewrites;
|
|
52
|
+
};
|
|
53
|
+
//#endregion
|
|
54
|
+
export { captureRewrites };
|
|
55
|
+
|
|
56
|
+
//# sourceMappingURL=captureRewrites.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"captureRewrites.js","names":[],"sources":["../../src/next/captureRewrites.ts"],"sourcesContent":["import { normalizeMountPath } from '../capture/mountPath'\nimport type { AnalyticsAdapter } from '../core/contract'\n\n/** One Next.js rewrite entry (the shape `next.config` `rewrites()` returns). */\nexport interface CaptureRewrite {\n\tsource: string\n\tdestination: string\n}\n\n/** An adapter's capture proxy mounted at a base path in the consumer's Next app. */\nexport interface CaptureRewriteMount {\n\t/** Base path this adapter's proxy is mounted at, e.g. '/ph' or '/api/analytics/p/global'. */\n\tpath: string\n\tadapter: AnalyticsAdapter\n}\n\nconst assertNotRoot = (path: string): void => {\n\tif (path === '/') {\n\t\tthrow new Error('captureRewrites: mount path must not be the site root')\n\t}\n}\n\n// One base is a prefix of another when they're equal or the longer one continues past a\n// '/' boundary, so '/ph' collides with '/ph' and '/ph/x' but not the mere string-prefix\n// sibling '/phx'.\nconst isPrefixOrEqual = (a: string, b: string): boolean => a === b || b.startsWith(`${a}/`)\n\nconst assertNoCollisions = (paths: string[]): void => {\n\tfor (let i = 0; i < paths.length; i++) {\n\t\tfor (let j = i + 1; j < paths.length; j++) {\n\t\t\tconst a = paths[i] as string\n\t\t\tconst b = paths[j] as string\n\t\t\tif (isPrefixOrEqual(a, b) || isPrefixOrEqual(b, a)) {\n\t\t\t\tthrow new Error(`captureRewrites: mount paths collide: '${a}' and '${b}'`)\n\t\t\t}\n\t\t}\n\t}\n}\n\n/**\n * Next.js `rewrites()` entries for every adapter's capture proxy, one mount at a time.\n * Each route's `source`/`upstream` already share `path-to-regexp` param names (e.g.\n * `:p*`), so no translation happens beyond prefixing `source` with the mount's\n * (normalized) path; `upstream` is used verbatim as `destination`. Next always strips a\n * trailing slash from the matched path before substituting it into `destination` (unlike\n * the runtime proxy, which can be told to keep one via `trailingSlashes`); harmless for\n * every vendor this helper supports today.\n *\n * An adapter without `capture` (GA4) or with no proxy routes (the native adapter)\n * contributes nothing rather than throwing, so one broken slot never blanks the rest.\n * Output preserves mount order, then each mount's declared route order.\n *\n * Throws for a mount path that normalizes to the site root (an unprefixed catch-all\n * route would swallow the whole app) or for two mounts whose normalized paths are equal\n * or nested (Next matches rewrites first-match-wins, so an earlier catch-all would\n * silently shadow a later mount's routes). Distinct sibling paths that merely share a\n * string prefix, e.g. `/ph` and `/phx`, are unaffected.\n *\n * When any mounted adapter's descriptor sets `capture.proxy.trailingSlashes`, add\n * `skipTrailingSlashRedirect: true` to `next.config` (see `posthogProxyRewrites`'s\n * JSDoc for why PostHog needs it).\n */\nexport const captureRewrites = (mounts: CaptureRewriteMount[]): CaptureRewrite[] => {\n\tconst normalized = mounts.map((mount) => normalizeMountPath(mount.path))\n\tfor (const path of normalized) {\n\t\tassertNotRoot(path)\n\t}\n\tassertNoCollisions(normalized)\n\n\tconst rewrites: CaptureRewrite[] = []\n\tfor (let i = 0; i < mounts.length; i++) {\n\t\tconst mount = mounts[i] as CaptureRewriteMount\n\t\tconst routes = mount.adapter.capture?.proxy.routes\n\t\tif (!routes?.length) {\n\t\t\tcontinue\n\t\t}\n\t\tconst base = normalized[i] as string\n\t\tfor (const route of routes) {\n\t\t\trewrites.push({ source: `${base}${route.source}`, destination: route.upstream })\n\t\t}\n\t}\n\treturn rewrites\n}\n"],"mappings":";;AAgBA,MAAM,iBAAiB,SAAuB;CAC7C,IAAI,SAAS,KACZ,MAAM,IAAI,MAAM,uDAAuD;AAEzE;AAKA,MAAM,mBAAmB,GAAW,MAAuB,MAAM,KAAK,EAAE,WAAW,GAAG,EAAE,EAAE;AAE1F,MAAM,sBAAsB,UAA0B;CACrD,KAAK,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KACjC,KAAK,IAAI,IAAI,IAAI,GAAG,IAAI,MAAM,QAAQ,KAAK;EAC1C,MAAM,IAAI,MAAM;EAChB,MAAM,IAAI,MAAM;EAChB,IAAI,gBAAgB,GAAG,CAAC,KAAK,gBAAgB,GAAG,CAAC,GAChD,MAAM,IAAI,MAAM,0CAA0C,EAAE,SAAS,EAAE,EAAE;CAE3E;AAEF;;;;;;;;;;;;;;;;;;;;;;;;AAyBA,MAAa,mBAAmB,WAAoD;CACnF,MAAM,aAAa,OAAO,KAAK,UAAU,mBAAmB,MAAM,IAAI,CAAC;CACvE,KAAK,MAAM,QAAQ,YAClB,cAAc,IAAI;CAEnB,mBAAmB,UAAU;CAE7B,MAAM,WAA6B,CAAC;CACpC,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,QAAQ,KAAK;EAEvC,MAAM,SADQ,OAAO,GACA,QAAQ,SAAS,MAAM;EAC5C,IAAI,CAAC,QAAQ,QACZ;EAED,MAAM,OAAO,WAAW;EACxB,KAAK,MAAM,SAAS,QACnB,SAAS,KAAK;GAAE,QAAQ,GAAG,OAAO,MAAM;GAAU,aAAa,MAAM;EAAS,CAAC;CAEjF;CACA,OAAO;AACR"}
|
|
@@ -29,6 +29,11 @@ type PosthogProxyRewritesOptions = {
|
|
|
29
29
|
* ```
|
|
30
30
|
*
|
|
31
31
|
* Point the snippet at it with `api_host: '/ph'` (plus `ui_host` for the region).
|
|
32
|
+
*
|
|
33
|
+
* @deprecated Use `captureRewrites` with a `posthog()` adapter instance instead: this
|
|
34
|
+
* helper is now a thin wrapper over it, kept only so existing `next.config` files don't
|
|
35
|
+
* break. `captureRewrites` also covers Plausible, Umami, and any adapter that mixes
|
|
36
|
+
* PostHog with another vendor across multiple mount paths.
|
|
32
37
|
*/
|
|
33
38
|
declare const posthogProxyRewrites: (options?: PosthogProxyRewritesOptions) => PosthogProxyRewrite[];
|
|
34
39
|
//#endregion
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
+
import { posthog } from "../adapters/posthog/posthog.js";
|
|
2
|
+
import { captureRewrites } from "./captureRewrites.js";
|
|
1
3
|
//#region src/next/posthogProxyRewrites.ts
|
|
2
|
-
const normalizePath = (path) => {
|
|
3
|
-
const trimmed = (path.startsWith("/") ? path : `/${path}`).replace(/\/+$/, "");
|
|
4
|
-
return trimmed === "" ? "/" : trimmed;
|
|
5
|
-
};
|
|
6
4
|
/**
|
|
7
5
|
* Next.js rewrites for a first-party PostHog reverse proxy, per PostHog's own
|
|
8
6
|
* guidance: static assets and the array loader route to the region's assets host,
|
|
@@ -23,26 +21,23 @@ const normalizePath = (path) => {
|
|
|
23
21
|
* ```
|
|
24
22
|
*
|
|
25
23
|
* Point the snippet at it with `api_host: '/ph'` (plus `ui_host` for the region).
|
|
24
|
+
*
|
|
25
|
+
* @deprecated Use `captureRewrites` with a `posthog()` adapter instance instead: this
|
|
26
|
+
* helper is now a thin wrapper over it, kept only so existing `next.config` files don't
|
|
27
|
+
* break. `captureRewrites` also covers Plausible, Umami, and any adapter that mixes
|
|
28
|
+
* PostHog with another vendor across multiple mount paths.
|
|
26
29
|
*/
|
|
27
30
|
const posthogProxyRewrites = (options = {}) => {
|
|
28
31
|
const region = options.region ?? "eu";
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
source: `${path}/array/:path*`,
|
|
39
|
-
destination: `${assets}/array/:path*`
|
|
40
|
-
},
|
|
41
|
-
{
|
|
42
|
-
source: `${path}/:path*`,
|
|
43
|
-
destination: `${ingest}/:path*`
|
|
44
|
-
}
|
|
45
|
-
];
|
|
32
|
+
return captureRewrites([{
|
|
33
|
+
path: options.path ?? "/ph",
|
|
34
|
+
adapter: posthog({
|
|
35
|
+
projectId: "",
|
|
36
|
+
apiKey: "",
|
|
37
|
+
region,
|
|
38
|
+
projectToken: "rewrites-only"
|
|
39
|
+
})
|
|
40
|
+
}]);
|
|
46
41
|
};
|
|
47
42
|
//#endregion
|
|
48
43
|
export { posthogProxyRewrites };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"posthogProxyRewrites.js","names":[],"sources":["../../src/next/posthogProxyRewrites.ts"],"sourcesContent":["
|
|
1
|
+
{"version":3,"file":"posthogProxyRewrites.js","names":[],"sources":["../../src/next/posthogProxyRewrites.ts"],"sourcesContent":["import { posthog } from '../adapters/posthog/posthog'\nimport { captureRewrites } from './captureRewrites'\n\nexport type PosthogProxyRegion = 'eu' | 'us'\n\n/** One Next.js rewrite entry (the shape `next.config` `rewrites()` returns). */\nexport type PosthogProxyRewrite = { source: string; destination: string }\n\nexport type PosthogProxyRewritesOptions = {\n\t/** First-party base path the snippet's `api_host` points at. Default '/ph'. */\n\tpath?: string\n\t/** PostHog Cloud region. Default 'eu'. */\n\tregion?: PosthogProxyRegion\n}\n\n/**\n * Next.js rewrites for a first-party PostHog reverse proxy, per PostHog's own\n * guidance: static assets and the array loader route to the region's assets host,\n * everything else to the ingest host. Order matters (Next evaluates rewrites in\n * order), and the app should also set `skipTrailingSlashRedirect: true` because\n * PostHog's capture endpoints use trailing slashes.\n *\n * ```ts\n * // next.config.ts\n * import { posthogProxyRewrites } from '@10x-media/analytics/next'\n *\n * const nextConfig = {\n * skipTrailingSlashRedirect: true,\n * async rewrites() {\n * return posthogProxyRewrites({ path: '/ph', region: 'eu' })\n * },\n * }\n * ```\n *\n * Point the snippet at it with `api_host: '/ph'` (plus `ui_host` for the region).\n *\n * @deprecated Use `captureRewrites` with a `posthog()` adapter instance instead: this\n * helper is now a thin wrapper over it, kept only so existing `next.config` files don't\n * break. `captureRewrites` also covers Plausible, Umami, and any adapter that mixes\n * PostHog with another vendor across multiple mount paths.\n */\nexport const posthogProxyRewrites = (\n\toptions: PosthogProxyRewritesOptions = {}\n): PosthogProxyRewrite[] => {\n\tconst region = options.region ?? 'eu'\n\tconst path = options.path ?? '/ph'\n\t// A token is what makes an adapter declare capture, and only the capture descriptor's\n\t// routes are read here; the placeholder never reaches a snippet or a browser.\n\tconst adapter = posthog({ projectId: '', apiKey: '', region, projectToken: 'rewrites-only' })\n\treturn captureRewrites([{ path, adapter }])\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAyCA,MAAa,wBACZ,UAAuC,CAAC,MACb;CAC3B,MAAM,SAAS,QAAQ,UAAU;CAKjC,OAAO,gBAAgB,CAAC;EAAE,MAJb,QAAQ,QAAQ;EAIG,SADhB,QAAQ;GAAE,WAAW;GAAI,QAAQ;GAAI;GAAQ,cAAc;EAAgB,CACrD;CAAE,CAAC,CAAC;AAC3C"}
|