use .brand instead

ggazzo · ggazzo · commit b50354c81db1 · 2025-09-16T10:03:03.000-03:00
diff --git a/packages/room/src/types/_common.ts b/packages/room/src/types/_common.ts
@@ -1,14 +1,17 @@
+import z from 'zod';
 import type { Pdu, PduType } from './v3-11';
 
 export declare const __brand: unique symbol;
 
 export type Brand<B> = { [__brand]: B };
 export type Branded<T, B> = T & Brand<B>;
 
-export type EventID = Branded<string, 'EventID'>;
-
 export type StateKey = string;
 
+export const eventIdSchema = z.string().brand('EventID');
+
+export type EventID = z.infer<typeof eventIdSchema>;
+
 export type StateMapKey = `${PduType}:${StateKey}`;
 
 export type State = Map<StateMapKey, EventID>;
diff --git a/packages/room/src/types/v3-11.ts b/packages/room/src/types/v3-11.ts
@@ -1,7 +1,5 @@
 import { z } from 'zod';
-import { EventID, PduForType } from './_common';
-
-export const eventIdSchema = z.string().transform((val) => val as EventID);
+import { PduForType, eventIdSchema } from './_common';
 
 // Copied from: https://github.com/element-hq/synapse/blob/2277df2a1eb685f85040ef98fa21d41aa4cdd389/synapse/api/constants.py#L103-L141
 
@@ -536,8 +534,7 @@ export const PduNoContentTimelineEventSchema = {
 		.array(eventIdSchema)
 		.describe(
 			'A list of event IDs that are required in the room state before this event can be applied. The server will not send this event if it is not satisfied.',
-		)
-		.transform((val) => val as EventID[]),
+		),
 	depth: z
 		.number()
 		.describe(
