fix manual and void

demergent-labs · Sep 29, 2023 · 54629d0 · 54629d0
1 parent dbb334d
commit 54629d0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/src/lib_functional/candid/index.ts b/src/lib_functional/candid/index.ts
@@ -40,7 +40,8 @@ import {
     AzleResult,
     Result,
     AzleTuple,
-    AzleText
+    AzleText,
+    AzleVoid
 } from '../../lib_new';
 
 export type TypeMapping<T> = T extends () => any
@@ -73,7 +74,7 @@ export type TypeMapping<T> = T extends () => any
     ? float64
     : T extends AzleFloat32
     ? float32
-    : T extends never[]
+    : T extends AzleVoid
     ? void
     : T extends AzleTuple<infer U>
     ? { [K in keyof U]: TypeMapping<U[K]> }

diff --git a/src/lib_new/primitives.ts b/src/lib_new/primitives.ts
@@ -225,7 +225,7 @@ export class Principal extends DfinityPrincipal {
  * a value, or `None` and does not.
  */
 export type Opt<Value> = [Value] | [];
-export const Void: [] = [];
+export const Void: AzleVoid = AzleVoid as any;
 export type Void = void;
 
 /**
@@ -302,6 +302,6 @@ export function Tuple<T extends any[]>(...types: T): AzleTuple<T> {
     return new AzleTuple(types);
 }
 
-export function Manual(t: any): void {
+export function Manual(t: any): AzleVoid {
     return t;
 }
diff --git a/src/lib_new/utils.ts b/src/lib_new/utils.ts
@@ -182,15 +182,13 @@ export function toParamIDLTypes(idl: CandidClass[]): IDL.Type<any>[] {
 }
 
 export function toReturnIDLType(returnIdl: ReturnCandidClass): IDL.Type<any>[] {
-    if (Array.isArray(returnIdl)) {
-        // If Void
-        if (returnIdl.length === 0) {
-            return [];
-        }
-        // Should be unreachable
-        return [];
+    const idlType = toIDLType(returnIdl, []);
+
+    if (Array.isArray(idlType)) {
+        return [...idlType];
     }
-    return [toIDLType(returnIdl, [])];
+
+    return [idlType];
 }
 
 type CandidMap = { [key: string]: any };