improve vec typing

demergent-labs · Oct 27, 2023 · 24d87dd · 24d87dd
1 parent e7d3890
commit 24d87dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/property_tests/arbitraries/candid/constructed/vec_arb.ts b/property_tests/arbitraries/candid/constructed/vec_arb.ts
@@ -18,9 +18,9 @@ import { Float64Arb } from '../primitive/floats/float64_arb';
 import { NullArb } from '../primitive/null';
 import { TextArb } from '../primitive/text';
 
-const VecInnerArb = (arb: fc.Arbitrary<Candid<any>>) => {
+const VecInnerArb = <T>(arb: fc.Arbitrary<Candid<T>>) => {
     return fc.tuple(fc.array(arb), arb).map(
-        ([sample, src]): Candid<any[]> => ({
+        ([sample, src]): Candid<T[]> => ({
             value: sample.map((sample) => sample.value),
             src: {
                 candidType: `Vec(${src.src.candidType})`,

diff --git a/property_tests/tests/vec/test/test.ts b/property_tests/tests/vec/test/test.ts
@@ -10,7 +10,7 @@ const VecTestArb = fc
     .tuple(createUniquePrimitiveArb(JsFunctionNameArb), fc.array(VecArb))
     .map(([functionName, vecs]): TestSample => {
         const paramCandidTypes = vecs.map((vec) => vec.src.candidType);
-        const returnCandidType = vecs[0]?.src?.candidType ?? 'Vec(int8)';
+        const returnCandidType = vecs[0]?.src?.candidType ?? 'Vec(nat8)';
         const paramNames = vecs.map((_, index) => `param${index}`);
 
         // TODO these checks should be much more precise probably, imagine checking the elements inside of the arrays
@@ -29,7 +29,7 @@ const VecTestArb = fc
             })
             .join('\n');
 
-        const returnStatement = paramNames[0] ?? `[]`;
+        const returnStatement = paramNames[0] ?? `new Uint8Array()`;
 
         const expectedResult = vecs[0]?.value ?? [];
 
@@ -59,14 +59,8 @@ const VecTestArb = fc
                 test: async () => {
                     const actor = getActor('./tests/vec/test');
 
-                    console.log('Expected Result');
-                    console.log(JSON.stringify(expectedResult, replacer));
                     const params = vecs.map((vec) => vec.value);
-                    console.log('Params');
-                    console.log(JSON.stringify(params, replacer));
                     const result = await actor[functionName](...params);
-                    console.log('Actual Result');
-                    console.log(JSON.stringify(result, replacer));
 
                     return {
                         Ok: primitiveArraysAreEqual(

diff --git a/src/lib/candid/type_mapping.ts b/src/lib/candid/type_mapping.ts
@@ -82,7 +82,7 @@ export type TypeMapping<T, RecursionLevel = 0> = RecursionLevel extends 10
                   : 10
           >;
       }
-    : T extends AzleVec<AzleNat8>
+    : T extends AzleVec<AzleNat8> // TODO this isn't correct. It's capturing everything that's an AzleVec not just AzleVec<AzleNat8>
     ? Uint8Array
     : T extends AzleVec<infer U>
     ? TypeMapping<U>[]