@nextlytics/core 0.4.2-canary.105 → 0.4.2-canary.106

package/dist/anonymous-user.d.ts

@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server';
 import { RequestContext, ServerEventContext, NextlyticsConfig, AnonymousUserResult } from './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
+import 'next';
 
 type ResolveAnonymousUserParams = {
     ctx: RequestContext;

package/dist/api-handler.d.ts

@@ -2,6 +2,7 @@ import { NextRequest } from 'next/server';
 import { RequestContext, JavascriptTemplate, NextlyticsEvent, PageViewDelivery, DispatchResult, UserContext } from './types.js';
 import { NextlyticsConfigWithDefaults } from './config-helpers.js';
 import 'next/dist/server/web/spec-extension/cookies';
+import 'next';
 
 type DispatchEvent = (event: NextlyticsEvent, ctx: RequestContext, policyFilter?: PageViewDelivery | "client-actions") => DispatchResult;
 type UpdateEvent = (eventId: string, patch: Partial<NextlyticsEvent>, ctx: RequestContext) => Promise<void>;

package/dist/backends/clickhouse.d.ts

@@ -1,6 +1,7 @@
 import { NextlyticsBackend } from '../types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 /**
  * ClickHouse backend for Nextlytics

package/dist/backends/ga.d.ts

@@ -1,6 +1,7 @@
 import { NextlyticsBackendFactory } from '../types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 type GoogleAnalyticsBackendOptions = {
     /** GA4 Measurement ID (e.g. "G-XXXXXXXXXX") */

package/dist/backends/gtm.d.ts

@@ -1,6 +1,7 @@
 import { NextlyticsBackend } from '../types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 type GoogleTagManagerBackendOptions = {
     /** GTM Container ID (e.g. "GTM-XXXXXXX") */

package/dist/backends/lib/db.d.ts

@@ -1,6 +1,7 @@
 import { NextlyticsEvent, ClientContext, ServerEventContext } from '../../types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 declare const tableColumns: readonly [{
     readonly name: "timestamp";

package/dist/backends/logging.d.ts

@@ -1,6 +1,7 @@
 import { NextlyticsBackend } from '../types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 declare function loggingBackend(): NextlyticsBackend;
 

package/dist/backends/neon.d.ts

@@ -1,6 +1,7 @@
 import { NextlyticsBackend } from '../types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 type NeonBackendConfig = {
     databaseUrl: string;

package/dist/backends/postgrest.d.ts

@@ -2,6 +2,7 @@ import { NextlyticsBackend } from '../types.js';
 export { AnalyticsEventRow, generatePgCreateTableSQL } from './lib/db.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 /**
  * PostgREST backend for Nextlytics

package/dist/backends/posthog.d.ts

@@ -1,6 +1,7 @@
 import { NextlyticsBackend } from '../types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 type PosthogBackendOptions = {
     /** PostHog project API key */

package/dist/backends/segment.d.ts

@@ -1,6 +1,7 @@
 import { NextlyticsBackend } from '../types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 /**
  * Segment backend for Nextlytics

package/dist/client.d.ts

@@ -3,6 +3,7 @@ import { ReactNode } from 'react';
 import { TemplatizedScriptInsertion, JavascriptTemplate } from './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 /** Context object for Pages Router integration */
 type NextlyticsContext = {

package/dist/config-helpers.d.ts

@@ -1,6 +1,7 @@
 import { NextlyticsConfig } from './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 type NextlyticsConfigWithDefaults = Required<Pick<NextlyticsConfig, "excludeApiCalls" | "eventEndpoint" | "isApiPath" | "backends">> & NextlyticsConfig & {
     anonymousUsers: Required<NonNullable<NextlyticsConfig["anonymousUsers"]>>;

package/dist/index.d.ts

@@ -8,3 +8,4 @@ import 'react/jsx-runtime';
 import 'react';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';

package/dist/middleware.d.ts

@@ -3,6 +3,7 @@ import { NextlyticsConfigWithDefaults } from './config-helpers.js';
 import { DispatchEvent, UpdateEvent, CollectTemplates } from './api-handler.js';
 import './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
+import 'next';
 
 declare function createNextlyticsMiddleware(config: NextlyticsConfigWithDefaults, dispatchEvent: DispatchEvent, updateEvent: UpdateEvent, collectTemplates: CollectTemplates): NextMiddleware;
 

package/dist/pages-router.d.ts

@@ -4,6 +4,7 @@ import 'react';
 import './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 type PagesRouterContext = {
     req?: {

package/dist/plugins/vercel-geo.d.ts

@@ -1,6 +1,7 @@
 import { NextlyticsPlugin } from '../types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 type VercelGeoPluginOptions = {
     /** Property name to store geo data under. Default: "geo" */

package/dist/server-component-context.d.ts

@@ -1,6 +1,7 @@
 import { NextResponse } from 'next/server';
 import { TemplatizedScriptInsertion } from './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
+import 'next';
 
 declare const headerNames: {
     readonly pathname: "x-nl-pathname";

package/dist/server.d.ts

@@ -1,6 +1,7 @@
 import { NextlyticsConfig, NextlyticsResult, RequestContext } from './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
 import 'next/server';
+import 'next';
 
 declare function createRequestContext(): Promise<RequestContext>;
 declare function Nextlytics(userConfig: NextlyticsConfig): NextlyticsResult;

package/dist/server.js

@@ -195,15 +195,14 @@ function Nextlytics(userConfig) {
     const templates = collectTemplates(config, requestCtx);
     return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_client.NextlyticsClient, { ctx: { requestId: ctx.pageRenderId, scripts: ctx.scripts, templates }, children });
   }
-  const analytics = async () => {
-    const headersList = await (0, import_headers.headers)();
-    const cookieStore = await (0, import_headers.cookies)();
-    const pageRenderId = headersList.get(import_server_component_context.headerNames.pageRenderId);
-    const serverContext = createServerContextFromHeaders(headersList);
+  const analytics = async (req) => {
+    const source = req ? normalizeRequest(req) : await normalizeFromNextHeaders();
+    const pageRenderId = source.headers.get(import_server_component_context.headerNames.pageRenderId) || source.cookies.get(import_server_component_context.LAST_PAGE_RENDER_ID_COOKIE)?.value || void 0;
+    const serverContext = buildServerContext(source);
     const ctx = {
-      headers: headersList,
-      cookies: cookieStore,
-      path: headersList.get(import_server_component_context.headerNames.pathname) || ""
+      headers: source.headers,
+      cookies: source.cookies,
+      path: source.path
     };
     const { anonId: anonymousUserId } = await (0, import_anonymous_user.resolveAnonymousUser)({ ctx, serverContext, config });
     let userContext;
@@ -216,14 +215,14 @@ function Nextlytics(userConfig) {
     const propsFromCallback = await (0, import_api_handler.getEventProps)(config, ctx, userContext);
     return {
       sendEvent: async (eventName, opts) => {
-        if (!pageRenderId) {
+        if (!pageRenderId && !req) {
           console.error("[Nextlytics] analytics() requires nextlyticsMiddleware");
           return { ok: false };
         }
         const event = {
           origin: "server",
           eventId: (0, import_uitils.generateId)(),
-          parentEventId: pageRenderId,
+          ...pageRenderId ? { parentEventId: pageRenderId } : {},
           type: eventName,
           collectedAt: (/* @__PURE__ */ new Date()).toISOString(),
           anonymousUserId,
@@ -244,32 +243,73 @@ function Nextlytics(userConfig) {
     NextlyticsServer: Server
   };
 }
-function createServerContextFromHeaders(headersList) {
+function searchToRecord(params) {
+  const out = {};
+  params.forEach((value, key) => {
+    (out[key] ?? (out[key] = [])).push(value);
+  });
+  return out;
+}
+function isNextApiRequest(req) {
+  return typeof req.headers?.get !== "function";
+}
+async function normalizeFromNextHeaders() {
+  const [_cookies, _headers] = await Promise.all([(0, import_headers.cookies)(), (0, import_headers.headers)()]);
+  return {
+    headers: _headers,
+    cookies: _cookies,
+    path: _headers.get(import_server_component_context.headerNames.pathname) || "",
+    search: searchToRecord(new URLSearchParams(_headers.get(import_server_component_context.headerNames.search) || "")),
+    method: "GET"
+  };
+}
+function normalizeRequest(req) {
+  if (!isNextApiRequest(req)) {
+    return {
+      headers: req.headers,
+      cookies: req.cookies,
+      path: req.nextUrl.pathname,
+      search: searchToRecord(req.nextUrl.searchParams),
+      method: req.method
+    };
+  }
+  const headersList = new Headers();
+  for (const [key, value] of Object.entries(req.headers)) {
+    if (value !== void 0) {
+      headersList.set(key, Array.isArray(value) ? value.join(", ") : value);
+    }
+  }
+  const cookieMap = req.cookies || {};
+  const cookieStore = {
+    get: (name) => {
+      const value = cookieMap[name];
+      return value === void 0 ? void 0 : { name, value };
+    },
+    getAll: () => Object.entries(cookieMap).map(([name, value]) => ({ name, value })),
+    has: (name) => name in cookieMap
+  };
+  const url = new URL(req.url || "/", `http://${headersList.get("host") || "localhost"}`);
+  return {
+    headers: headersList,
+    cookies: cookieStore,
+    path: url.pathname,
+    search: searchToRecord(url.searchParams),
+    method: req.method || "GET"
+  };
+}
+function buildServerContext(source) {
   const rawHeaders = {};
-  headersList.forEach((value, key) => {
+  source.headers.forEach((value, key) => {
     rawHeaders[key] = value;
   });
-  const requestHeaders = (0, import_headers2.removeSensitiveHeaders)(rawHeaders);
-  const pathname = headersList.get(import_server_component_context.headerNames.pathname) || "";
-  const search = headersList.get(import_server_component_context.headerNames.search) || "";
-  const searchParams = {};
-  if (search) {
-    const params = new URLSearchParams(search);
-    params.forEach((value, key) => {
-      if (!searchParams[key]) {
-        searchParams[key] = [];
-      }
-      searchParams[key].push(value);
-    });
-  }
   return {
     collectedAt: /* @__PURE__ */ new Date(),
-    host: headersList.get("host") || "",
-    method: "GET",
-    path: pathname,
-    search: searchParams,
-    ip: headersList.get("x-forwarded-for")?.split(",")[0]?.trim() || "",
-    requestHeaders,
+    host: source.headers.get("host") || "",
+    method: source.method,
+    path: source.path,
+    search: source.search,
+    ip: source.headers.get("x-forwarded-for")?.split(",")[0]?.trim() || "",
+    requestHeaders: (0, import_headers2.removeSensitiveHeaders)(rawHeaders),
     responseHeaders: {}
   };
 }

package/dist/types.d.ts

@@ -1,5 +1,6 @@
 import { RequestCookies } from 'next/dist/server/web/spec-extension/cookies';
-import { NextMiddleware } from 'next/server';
+import { NextRequest, NextMiddleware } from 'next/server';
+import { NextApiRequest } from 'next';
 
 /** Server-side request context collected in middleware */
 interface ServerEventContext {
@@ -227,7 +228,7 @@ type NextlyticsBackend = {
 type NextlyticsBackendFactory = (ctx: RequestContext) => NextlyticsBackend;
 /** Server-side analytics API */
 type NextlyticsServerSide = {
-    /** Send custom event from server component/action */
+    /** Send custom event from a server component, server action, or API route */
     sendEvent: (eventName: string, opts?: {
         props?: Record<string, unknown>;
     }) => Promise<{
@@ -272,8 +273,15 @@ type ClientRequestResult = {
 };
 /** Return value from Nextlytics() */
 type NextlyticsResult = {
-    /** Get server-side analytics API */
-    analytics: () => Promise<NextlyticsServerSide>;
+    /** Get server-side analytics API.
+     *
+     * App Router (server components, server actions, route handlers): call with no
+     * argument — context is read from `next/headers`.
+     *
+     * Pages Router API routes: `next/headers` is unavailable there, so pass the
+     * request (`analytics(req)`). A NextRequest (App Router route handler) is also
+     * accepted. */
+    analytics: (req?: NextRequest | NextApiRequest) => Promise<NextlyticsServerSide>;
     /** Middleware to intercept requests */
     middleware: NextMiddleware;
     /** Manually dispatch event (returns two-phase result) */

package/dist/uitils.d.ts

@@ -1,6 +1,7 @@
 import { NextRequest } from 'next/server';
 import { ServerEventContext } from './types.js';
 import 'next/dist/server/web/spec-extension/cookies';
+import 'next';
 
 /** Returns the full installed Next.js version string (e.g. "16.1.6"), or undefined. */
 declare function getNextVersion(): string | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextlytics/core",
-  "version": "0.4.2-canary.105",
+  "version": "0.4.2-canary.106",
   "description": "Analytics library for Next.js",
   "license": "MIT",
   "repository": {