allow recursive types to be any by default

demergent-labs · Oct 1, 2023 · d8a8a5e · d8a8a5e
1 parent b4cdbcb
commit d8a8a5e
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/examples/recursion/src/recursion/index.ts b/examples/recursion/src/recursion/index.ts
@@ -20,7 +20,7 @@ import MyFullCanister from '../recursive_canister';
 // These are the types that can be recursive
 // Record
 //     Record can't be recursive by itself. It needs something to be able to terminate it. It needs to work with Variants, Opts, and Vec
-const varRecord = Recursive(() => Record({ myVar: myVar }));
+const varRecord = Recursive(() => Record({ myVar }));
 const vecRecord = Recursive(() => Record({ myVecRecords: Vec(vecRecord) }));
 const optRecord = Recursive(() => Record({ myOpt: Opt(optRecord) }));
 const myVar = Variant({ num: int8, varRec: varRecord });
@@ -33,7 +33,7 @@ const recVariant = Recursive(() =>
 const optTuple = Recursive(() => Tuple(Opt(optTuple), Opt(optTuple)));
 const vecTuple = Recursive(() => Tuple(Vec(vecTuple), Vec(vecTuple)));
 const varTuple = Recursive(() => Tuple(myTupleVar, myTupleVar));
-const myTupleVar = Variant({ num: int8, varTuple: varTuple });
+const myTupleVar = Variant({ num: int8, varTuple });
 // Vec
 //      Vec can't be recursive by itself. At the end of it all it needs to have a concrete type.
 // Opt

diff --git a/src/lib_functional/candid/index.ts b/src/lib_functional/candid/index.ts
@@ -77,7 +77,7 @@ export type TypeMapping<T> = T extends () => any
     : T extends AzleVoid
     ? void
     : T extends AzleTuple<infer U>
-    ? { [K in keyof U]: TypeMapping<U[K]> }
+    ? { [K in keyof U]: U[K] extends any ? any : TypeMapping<U[K]> }
     : T extends AzleVec<infer U>
     ? TypeMapping<U>[]
     : T extends AzleOpt<infer U>

diff --git a/src/lib_functional/candid/reference/recursive.ts b/src/lib_functional/candid/reference/recursive.ts
@@ -2,7 +2,7 @@ import { v4 } from 'uuid';
 import { IDL } from '@dfinity/candid';
 import { Parent } from '../../../lib_new/utils';
 
-export function Recursive<T extends () => any>(idlCallback: T): T {
+export function Recursive(idlCallback: any): any {
     const name = v4();
 
     let result = (...args: any[]) => {

diff --git a/src/lib_functional/canister_methods/index.ts b/src/lib_functional/canister_methods/index.ts
@@ -1,6 +1,6 @@
 import { IDL } from '../../lib_new/index';
 import { ic } from '../../lib_new/ic';
-import { TypeMapping } from '..';
+import { CandidType, TypeMapping } from '..';
 import {
     DecodeVisitor,
     EncodeVisitor
@@ -33,7 +33,10 @@ export type CanisterMethodInfo<T extends ReadonlyArray<any>, K> = {
     guard: (() => any) | undefined;
 };
 
-export type Callback<Params extends ReadonlyArray<any>, Return> = (
+export type Callback<
+    Params extends ReadonlyArray<CandidType>,
+    Return extends CandidType
+> = (
     ...args: { [K in keyof Params]: TypeMapping<Params[K]> }
 ) => TypeMapping<Return> | Promise<TypeMapping<Return>>;
 

diff --git a/src/lib_functional/canister_methods/query.ts b/src/lib_functional/canister_methods/query.ts
@@ -6,7 +6,7 @@ import {
     createParents,
     executeMethod
 } from '.';
-import { CandidType, RecursiveType, TypeMapping } from '../candid';
+import { CandidType, TypeMapping } from '../candid';
 import { toParamIDLTypes, toReturnIDLType } from '../../lib_new/utils';
 
 export function query<