fix: improve branded utility type

defi-wonderland · Sep 20, 2024 · f11a12e · f11a12e
1 parent 0076e2c
commit f11a12e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/automated-dispute/src/types/prophet.ts b/packages/automated-dispute/src/types/prophet.ts
@@ -1,10 +1,10 @@
 import { Caip2ChainId } from "@ebo-agent/blocknumber";
-import { Brand, NormalizedAddress } from "@ebo-agent/shared";
+import { Branded, NormalizedAddress } from "@ebo-agent/shared";
 import { Address, Hex } from "viem";
 
-export type RequestId = Brand<NormalizedAddress, "RequestId">;
-export type ResponseId = Brand<NormalizedAddress, "ResponseId">;
-export type DisputeId = Brand<NormalizedAddress, "DisputeId">;
+export type RequestId = Branded<NormalizedAddress, "RequestId">;
+export type ResponseId = Branded<NormalizedAddress, "ResponseId">;
+export type DisputeId = Branded<NormalizedAddress, "DisputeId">;
 
 export type RequestStatus = "Active" | "Finalized";
 

diff --git a/packages/shared/src/types/brand.ts b/packages/shared/src/types/brand.ts
@@ -1 +1,5 @@
-export type Brand<K, T> = K & { __brand: T };
+declare const __brand: unique symbol;
+
+type Brand<B> = { [__brand]: B };
+
+export type Branded<T, B> = T & Brand<B>;