feat: change MergeContract type name

yannbcf · Jun 15, 2023 · 518379c · 518379c
1 parent 7cce840
commit 518379c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/extendContract.ts b/src/extendContract.ts
@@ -1,6 +1,6 @@
 import type { RpcContract } from "./types.ts";
 
-type MergeContracts<Contract1 extends RpcContract, Contract2 extends RpcContract> = {
+type ExtendContract<Contract1 extends RpcContract, Contract2 extends RpcContract> = {
     [K in keyof Contract1]: K extends keyof Contract2 ? Contract2[K] : Contract1[K];
 } & Omit<Contract2, keyof Contract1>;
 
@@ -15,5 +15,5 @@ export function extend<
     const Contract1 extends RpcContract,
     const Contract2 extends RpcContract
 >(contract1: Contract1, contract2: Contract2) {
-    return { ...contract1, ...contract2 } as MergeContracts<Contract1, Contract2>;
+    return { ...contract1, ...contract2 } as ExtendContract<Contract1, Contract2>;
 }
diff --git a/src/server/alt.ts b/src/server/alt.ts
@@ -35,7 +35,7 @@ import { z } from "zod";
 // export const rgba = z.custom<alt.RGBA>((val) => val instanceof alt.RGBA);
 // export const file = z.custom<alt.File>((val) => val instanceof alt.File);
 
-export const connectionInfo = z.custom<alt.ConnectionInfo>((val) => val instanceof alt.ConnectionInfo);
+export const connectionInfo = z.custom<alt.ConnectionInfo>(() => true);
 export const baseObject = z.custom<alt.BaseObject>(() => true);
 export const worldObject = z.custom<alt.WorldObject>(() => true);
 export const virtualEntityGroup = z.custom<alt.VirtualEntityGroup>(() => true);