DO NOT MERGE

src/lib/candid/index.ts

@@ -23,6 +23,7 @@ import { AzleNat32, nat32 } from './types/primitive/nats/nat32';
 import { AzleNat64, nat64 } from './types/primitive/nats/nat64';
 import { AzleResult, Result } from '../system_types';
 import { Principal } from './types/reference';
+import { Serializable } from '../stable_b_tree_map';
 
 export * from './types/constructed';
 export * from './types/primitive';
@@ -108,7 +109,7 @@ export type TypeMapping<T, RecursionLevel = 0> = RecursionLevel extends 10
 
 export type CandidType = {
     _azleCandidType?: '_azleCandidType';
-};
+} & Serializable;
 
 export type Parent = {
     idl: IDL.RecClass;

src/lib/candid/types/primitive/nats/nat64.ts

@@ -1,4 +1,5 @@
 import { IDL } from '@dfinity/candid';
+import { decode, encode } from '../../../serde';
 
 export class AzleNat64 {
     _kind: 'AzleNat64' = 'AzleNat64';
@@ -7,6 +8,15 @@ export class AzleNat64 {
     static getIDL() {
         return IDL.Nat64;
     }
+
+    toBytes(data: number): Uint8Array {
+        return encode(nat64, data);
+    }
+
+    fromBytes(bytes: Uint8Array): number {
+        return decode(nat64, bytes);
+    }
 }
+
 export const nat64: AzleNat64 = AzleNat64 as any;
 export type nat64 = bigint;

src/lib/candid/types/primitive/nats/nat8.ts

@@ -1,4 +1,5 @@
 import { IDL } from '@dfinity/candid';
+import { decode, encode } from '../../../serde';
 
 export class AzleNat8 {
     _kind: 'AzleNat8' = 'AzleNat8';
@@ -7,6 +8,14 @@ export class AzleNat8 {
     static getIDL() {
         return IDL.Nat8;
     }
+
+    toBytes(data: number): Uint8Array {
+        return encode(nat8, data);
+    }
+
+    fromBytes(bytes: Uint8Array): number {
+        return decode(nat8, bytes);
+    }
 }
 
 export const nat8: AzleNat8 = AzleNat8 as any;

src/lib/stable_b_tree_map.ts

@@ -1,12 +1,29 @@
-import { CandidType, TypeMapping } from './candid';
+import { TypeMapping } from './candid';
 import { None, Opt, Some } from './candid/types/constructed/opt';
 import { nat64 } from './candid/types/primitive/nats/nat64';
 import { nat8 } from './candid/types/primitive/nats/nat8';
 import { encode, decode } from './candid/serde';
 
+// TODO we should probably try to make it work with bigint, Principal, etc
+// TODO out of the box
+export class StableJson {
+    static toBytes(data: any): Uint8Array {
+        return Uint8Array.from(Buffer.from(JSON.stringify(data)));
+    }
+
+    static fromBytes(bytes: Uint8Array): any {
+        return JSON.parse(Buffer.from(bytes).toString());
+    }
+}
+
+export type Serializable = {
+    toBytes: (data: any) => Uint8Array;
+    fromBytes: (bytes: Uint8Array) => any;
+};
+
 export function StableBTreeMap<
-    Key extends CandidType,
-    Value extends CandidType
+    Key extends Serializable,
+    Value extends Serializable
 >(keyType: Key, valueType: Value, memoryId: nat8) {
     const candidEncodedMemoryId = encode(nat8, memoryId).buffer;
 
@@ -62,8 +79,12 @@ export function StableBTreeMap<
             value: TypeMapping<Value>
         ): Opt<TypeMapping<Value>> {
             const candidEncodedMemoryId = encode(nat8, memoryId).buffer;
-            const candidEncodedKey = encode(keyType, key).buffer;
-            const candidEncodedValue = encode(valueType, value).buffer;
+
+            // const candidEncodedKey = encode(keyType, key).buffer;
+            const candidEncodedKey = keyType.toBytes(key).buffer;
+
+            // const candidEncodedValue = encode(valueType, value).buffer;
+            const candidEncodedValue = valueType.toBytes(value).buffer;
 
             const candidEncodedResultValue = (
                 globalThis as any
@@ -73,11 +94,13 @@ export function StableBTreeMap<
                 candidEncodedValue
             );
 
-            if (candidEncodedResultValue === undefined) {
-                return None;
-            } else {
-                return Some(decode(valueType, candidEncodedResultValue));
-            }
+            return None;
+
+            // if (candidEncodedResultValue === undefined) {
+            //     return None;
+            // } else {
+            //     return Some(decode(valueType, candidEncodedResultValue));
+            // }
         },
         /**
          * Checks if the map is empty.
@@ -173,7 +196,8 @@ export function StableBTreeMap<
 
             // TODO too much copying
             return candidEncodedValues.map((candidEncodedValue: any) => {
-                return decode(valueType, candidEncodedValue);
+                // return decode(valueType, candidEncodedValue);
+                return valueType.fromBytes(candidEncodedValue);
             });
         }
     };