@codaco/analytics 6.0.0-alpha.1 → 6.0.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codaco/analytics",
-  "version": "6.0.0-alpha.1",
+  "version": "6.0.0-alpha.2",
   "packageManager": "pnpm@8.15.5+sha256.4b4efa12490e5055d59b9b9fc9438b7d581a6b7af3b5675eb5c5f447cee1a589",
   "type": "module",
   "main": "./dist/index.js",

package/src/index.ts

@@ -1,5 +1,5 @@
 import { NextResponse, type NextRequest } from 'next/server';
-import { ensureError, getBaseUrl } from './utils';
+import { ensureError, getBaseUrl, strictBooleanSchema } from './utils';
 import z from 'zod';
 
 // Todo: it would be great to work out a way to support arbitrary types here.
@@ -90,9 +90,13 @@ export const createRouteHandler = ({
     try {
       const incomingEvent = (await request.json()) as unknown;
 
+      const disableAnalytics = strictBooleanSchema.parse(
+        // eslint-disable-next-line no-process-env
+        process.env.DISABLE_ANALYTICS,
+      );
+
       // Check if analytics is disabled
-      // eslint-disable-next-line no-process-env, turbo/no-undeclared-env-vars
-      if (process.env.DISABLE_ANALYTICS) {
+      if (disableAnalytics) {
         // eslint-disable-next-line no-console
         console.info('🛑 Analytics disabled. Payload not sent.');
         try {
@@ -206,14 +210,15 @@ export const createRouteHandler = ({
 };
 
 export const makeEventTracker =
-  ({ endpoint = '/api/analytics' }: { endpoint?: string }) =>
+  (options?: { endpoint?: string }) =>
   async (
     event: RawEvent,
   ): Promise<{
     error: string | null;
     success: boolean;
   }> => {
-    const endpointWithHost = getBaseUrl() + endpoint;
+    const endpointWithHost =
+      getBaseUrl() + options?.endpoint ?? '/api/analytics';
 
     const eventWithTimeStamp: TrackableEvent = {
       ...event,

package/src/utils.ts

@@ -1,4 +1,7 @@
 /* eslint-disable no-process-env */
+
+import { z } from 'zod';
+
 // Helper function that ensures that a value is an Error
 export function ensureError(value: unknown): Error {
   if (!value) return new Error('No value was thrown');
@@ -24,18 +27,23 @@ export function ensureError(value: unknown): Error {
 }
 
 export function getBaseUrl() {
-  if (typeof window !== 'undefined')
-    // browser should use relative path
-    return '';
-
   if (process.env.VERCEL_URL)
     // reference for vercel.com
     return `https://${process.env.VERCEL_URL}`;
 
-  if (process.env.NEXT_PUBLIC_URL)
+  if (process.env.PUBLIC_URL)
     // Manually set deployment URL from env
-    return process.env.NEXT_PUBLIC_URL;
+    return process.env.PUBLIC_URL;
 
   // assume localhost
   return `http://127.0.0.1:3000`;
 }
+
+// this is a workaround for this issue:https://github.com/colinhacks/zod/issues/1630
+// z.coerce.boolean() doesn't work as expected
+export const strictBooleanSchema = z
+  .enum(['true', 'false', 'True', 'False', 'TRUE', 'FALSE'])
+  .default('false')
+  .transform(
+    (value) => value === 'true' || value === 'True' || value === 'TRUE',
+  );