feat: better infer zod response type

src/types/icrc-responses.spec.ts

@@ -213,6 +213,7 @@ describe('icrc-responses', () => {
         ...validResponse,
         result: {
           supportedStandards: [
+            // @ts-expect-error: we are testing this on purpose
             {
               name: 'ICRC-25'
             }
@@ -242,6 +243,7 @@ describe('icrc-responses', () => {
         ...validResponse,
         result: {
           supportedStandards: [
+            // @ts-expect-error: we are testing this on purpose
             {
               url: 'https://github.com/dfinity/ICRC/blob/main/ICRCs/ICRC-25/ICRC-25.md'
             }
@@ -266,6 +268,7 @@ describe('icrc-responses', () => {
 
       const response: IcrcSupportedStandardsResponseType = {
         ...rest,
+        // @ts-expect-error: we are testing this on purpose
         result: {}
       };
 
@@ -311,6 +314,7 @@ describe('icrc-responses', () => {
     it('should throw if response has no valid result string', () => {
       const invalidResponse: IcrcReadyResponseType = {
         ...validResponse,
+        // @ts-expect-error: we are testing this on purpose
         result: 'test'
       };
       expect(() => IcrcReadyResponse.parse(invalidResponse)).toThrow();
@@ -319,6 +323,7 @@ describe('icrc-responses', () => {
     it('should throw if response has no valid result type', () => {
       const invalidResponse: IcrcReadyResponseType = {
         ...validResponse,
+        // @ts-expect-error: we are testing this on purpose
         result: {
           hello: 'world'
         }

src/types/rpc.ts

@@ -103,24 +103,50 @@ const RpcResponse = Rpc.extend({
 
 export type RpcResponseType = z.infer<typeof RpcResponse>;
 
-const RpcResponseContent = z
-  .object({
-    result: z.any(),
-    error: RpcResponseError
-  })
-  .partial();
+const RpcResponseContent = <T extends z.ZodTypeAny>(
+  result: T
+): z.ZodObject<{
+  result: z.ZodOptional<T>;
+  error: z.ZodOptional<typeof RpcResponseError>;
+}> =>
+  z
+    .object({
+      result,
+      error: RpcResponseError
+    })
+    .partial();
 
-type RpcResponseContentType = z.infer<typeof RpcResponseContent>;
+// TODO: Maybe we can use this type in inferRpcResponse?
+type _RpcResponseContentType<T extends z.ZodTypeAny> = z.infer<
+  ReturnType<typeof RpcResponseContent<T>>
+>;
 
 const RpcResponseWithError = RpcResponse.extend({
   error: RpcResponseError
 });
 
 export type RpcResponseWithErrorType = z.infer<typeof RpcResponseWithError>;
 
+// TODO: Simplify the return type to avoid redundancy with other types. Consider using a more concise or existing type definition.
 export const inferRpcResponse = <T extends z.ZodTypeAny>(
   result: T
-): z.ZodType<RpcResponseType & RpcResponseContentType> =>
+): z.ZodEffects<
+  z.ZodObject<
+    {
+      jsonrpc: z.ZodLiteral<'2.0'>;
+      id: z.ZodUnion<[z.ZodString, z.ZodNumber, z.ZodNull]>;
+      result: z.ZodOptional<T>;
+      error: z.ZodOptional<
+        z.ZodObject<{
+          code: z.ZodUnion<[z.ZodNumber, z.ZodNativeEnum<typeof RpcErrorCode>]>;
+          message: z.ZodString;
+          data: z.ZodOptional<z.ZodNever>;
+        }>
+      >;
+    },
+    'strict'
+  >
+> =>
   RpcResponseWithError.omit({error: true})
     .merge(
       z