fix: properties

Author: izadoesdev

apps/api/src/query/builders/custom-events.ts

@@ -11,17 +11,16 @@ export const CustomEventsBuilders: Record<string, SimpleQueryConfig> = {
 			'MAX(time) as last_occurrence',
 			'MIN(time) as first_occurrence',
 			'COUNT(DISTINCT path) as unique_pages',
-			"countIf(properties != '' AND isValidJSON(properties)) as events_with_properties",
+			"countIf(properties != '{}' AND isValidJSON(properties)) as events_with_properties",
 			'ROUND((COUNT(*) / SUM(COUNT(*)) OVER()) * 100, 2) as percentage',
-			"arrayDistinct(groupArray(CASE WHEN isValidJSON(properties) AND properties != '' THEN properties ELSE NULL END)) as all_properties",
 		],
 		where: [
 			"event_name NOT IN ('screen_view', 'page_exit', 'error', 'web_vitals', 'link_out')",
 			"event_name != ''",
 		],
 		groupBy: ['event_name'],
 		orderBy: 'total_events DESC',
-		limit: 100,
+		limit: 10_000,
 		timeField: 'time',
 		allowedFilters: ['event_name', 'path', 'device_type', 'browser_name'],
 		customizable: true,

apps/api/src/query/builders/sessions.ts

@@ -215,7 +215,7 @@ export const SessionsBuilders: Record<string, SimpleQueryConfig> = {
 			'path',
 			'error_message',
 			'error_type',
-			'properties_json',
+			'properties',
 			'device_type',
 			'browser_name',
 			'country',

bun.lock

@@ -3135,6 +3135,12 @@
 
     "admin/react-day-picker": ["[email protected]", "", { "peerDependencies": { "date-fns": "^2.28.0 || ^3.0.0", "react": "^16.8.0 || ^17.0.0 || ^18.0.0" } }, "sha512-TMx7fNbhLk15eqcMt+7Z7S2KF7mfTId/XJDjKE8f+IUcFn0l08/kI4FiYTL/0yuOLmEcbR4Fwe3GJf/NiiMnPA=="],
 
+    "basket/@databuddy/auth": ["@databuddy/auth@file:packages/auth", { "dependencies": { "@databuddy/db": "*", "@databuddy/email": "*", "better-auth": "^1.3.4", "resend": "^4.2.0" } }],
+
+    "basket/@databuddy/redis": ["@databuddy/redis@file:packages/redis", { "dependencies": { "ioredis": "^5.4.3", "superjson": "^2.0.2", "zod": "3.25.76" }, "devDependencies": { "@types/node": "^20.11.19", "typescript": "^5.3.3" } }],
+
+    "basket/@databuddy/validation": ["@databuddy/validation@file:packages/validation", { "dependencies": { "zod": "^4.0.10" }, "devDependencies": { "typescript": "^5.3.3" } }],
+
     "basket/autumn-js": ["[email protected]", "", { "dependencies": { "axios": "^1.10.0", "chalk": "^5.4.1", "commander": "^14.0.0", "ink": "^6.0.1", "jiti": "^2.4.2", "open": "^10.1.2", "rou3": "^0.6.1", "swr": "^2.3.3", "zod": "^3.24.1" }, "peerDependencies": { "better-auth": "^1.2.12", "better-call": "^1.0.12" }, "optionalPeers": ["better-auth", "better-call"] }, "sha512-Xmb6jvrr6EgN0UbHZZ0Er0OiLW/IbPPf02lbTNbTCuHePoSEaMQ3cxkvADpNRFf5NBo3Oos2rG2QVaDzkzIejg=="],
 
     "better-auth/zod": ["[email protected]", "", {}, "sha512-nGFJTnJN6cM2v9kXL+SOBq3AtjQby3Mv5ySGFof5UGRHrRioSJ5iG680cYNjE/yWk671nROcpPj4hAS8nyLhSw=="],
@@ -3441,6 +3447,10 @@
 
     "admin/next/postcss": ["[email protected]", "", { "dependencies": { "nanoid": "^3.3.6", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" } }, "sha512-PS08Iboia9mts/2ygV3eLpY5ghnUcfLV/EXTOW1E2qYxJKGGBUtNjN76FYHnMs36RmARn41bC0AZmn+rR0OVpQ=="],
 
+    "basket/@databuddy/redis/@types/node": ["@types/[email protected]", "", { "dependencies": { "undici-types": "~6.21.0" } }, "sha512-cuVNgarYWZqxRJDQHEB58GEONhOK79QVR/qYx4S7kcUObQvUwvFnYxJuuHUKm2aieN9X3yZB4LZsuYNU1Qphsw=="],
+
+    "basket/@databuddy/validation/zod": ["[email protected]", "", {}, "sha512-nGFJTnJN6cM2v9kXL+SOBq3AtjQby3Mv5ySGFof5UGRHrRioSJ5iG680cYNjE/yWk671nROcpPj4hAS8nyLhSw=="],
+
     "bun-types/@types/node/undici-types": ["[email protected]", "", {}, "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw=="],
 
     "cliui/string-width/emoji-regex": ["[email protected]", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],

packages/validation/src/schemas/analytics.ts

@@ -212,4 +212,8 @@ export const analyticsEventSchema = z.object({
 		.max(VALIDATION_LIMITS.VALUE_MAX_LENGTH)
 		.nullable()
 		.optional(),
+	properties: z
+		.record(z.union([z.string(), z.number(), z.boolean(), z.null()]))
+		.optional()
+		.nullable(),
 });