Update rejections to functional runtime syntax

.github/workflows/test.yml

@@ -18,7 +18,6 @@
 # "examples/func_types",
 # "examples/generics",
 # "examples/motoko_examples/superheroes", # blocked by recursive
-# "examples/rejections",
 # "examples/robust_imports",
 # "examples/run_time_errors",
 # "examples/rust_type_conversions",
@@ -116,6 +115,7 @@ jobs:
                     "examples/principal",
                     "examples/query",
                     "examples/randomness",
+                    "examples/rejections",
                     "examples/service",
                     "examples/simple_erc20",
                     "examples/simple_user_accounts",

examples/rejections/canisters/rejections/index.ts

@@ -1,71 +1,71 @@
 import {
     ic,
+    init,
     Principal,
     RejectionCode,
     Service,
     text,
     update,
     Void
 } from 'azle';
-import { default as SomeService } from '../some_service';
+import SomeService from '../some_service';
 
-class Nonexistent extends Service {
-    @update([], Void)
-    method: () => Void;
-}
+const Nonexistent = Service({
+    method: update([], Void)
+});
 
-export default class extends Service {
-    nonexistentCanister = new Nonexistent(
-        Principal.fromText('rkp4c-7iaaa-aaaaa-aaaca-cai')
-    );
+let someService: typeof SomeService;
+let nonexistentCanister: typeof Nonexistent;
 
-    someService = new SomeService(
-        Principal.fromText(
-            process.env.SOME_SERVICE_PRINCIPAL ??
-                ic.trap('process.env.SOME_SERVICE_PRINCIPAL is undefined')
-        )
-    );
+export default Service({
+    init: init([], () => {
+        someService = SomeService(
+            Principal.fromText(
+                process.env.SOME_SERVICE_PRINCIPAL ??
+                    ic.trap('process.env.SOME_SERVICE_PRINCIPAL is undefined')
+            )
+        );
 
-    @update([], RejectionCode)
-    async getRejectionCodeNoError(): Promise<RejectionCode> {
-        await ic.call(this.someService.accept);
+        nonexistentCanister = Nonexistent(
+            Principal.fromText('rkp4c-7iaaa-aaaaa-aaaca-cai')
+        );
+    }),
+
+    getRejectionCodeNoError: update([], RejectionCode, async () => {
+        await ic.call(someService.accept);
 
         return ic.rejectCode();
-    }
+    }),
 
-    @update([], RejectionCode)
-    async getRejectionCodeDestinationInvalid(): Promise<RejectionCode> {
+    getRejectionCodeDestinationInvalid: update([], RejectionCode, async () => {
         try {
-            await ic.call(this.nonexistentCanister.method);
+            await ic.call(nonexistentCanister.method);
         } catch (error) {}
 
         return ic.rejectCode();
-    }
+    }),
 
-    @update([], RejectionCode)
-    async getRejectionCodeCanisterReject(): Promise<RejectionCode> {
+    getRejectionCodeCanisterReject: update([], RejectionCode, async () => {
         try {
-            await ic.call(this.someService.reject, { args: ['reject'] });
+            await ic.call(someService.reject, { args: ['reject'] });
         } catch (error) {}
 
         return ic.rejectCode();
-    }
+    }),
 
-    @update([], RejectionCode)
-    async getRejectionCodeCanisterError(): Promise<RejectionCode> {
+    getRejectionCodeCanisterError: update([], RejectionCode, async () => {
         try {
-            await ic.call(this.someService.error);
+            await ic.call(someService.error);
         } catch (error) {}
 
         return ic.rejectCode();
-    }
+    }),
 
-    @update([text], text)
-    async getRejectionMessage(message: text): Promise<text> {
+    getRejectionMessage: update([text], text, async (message: text) => {
         try {
-            await ic.call(this.someService.reject, { args: [message] });
+            await ic.call(someService.reject, { args: [message] });
         } catch (error) {}
 
         return ic.rejectMessage();
-    }
-}
+    })
+});

examples/rejections/canisters/some_service/index.ts

@@ -1,20 +1,25 @@
-import { bool, empty, ic, query, Service, text } from 'azle';
+import { bool, empty, ic, Manual, query, Service, text } from 'azle';
 
-type Manual<T> = void;
+export default Service({
+    reject: query(
+        [text],
+        Manual(empty),
+        (message) => {
+            ic.reject(message);
+        },
+        { manual: true }
+    ),
 
-export default class extends Service {
-    @query([text], empty, { manual: true })
-    reject(message: text): Manual<empty> {
-        ic.reject(message);
-    }
-
-    @query([], bool)
-    accept(): bool {
+    accept: query([], bool, () => {
         return true;
-    }
+    }),
 
-    @query([], empty, { manual: true })
-    error(): Manual<empty> {
-        // This errors because neither ic.reject nor ic.reply were called
-    }
-}
+    error: query(
+        [],
+        Manual(empty),
+        () => {
+            // This errors because neither ic.reject nor ic.reply were called
+        },
+        { manual: true }
+    )
+});

examples/rejections/dfx.json

@@ -6,7 +6,8 @@
             "root": "canisters/rejections",
             "ts": "canisters/rejections/index.ts",
             "candid": "canisters/rejections/index.did",
-            "wasm": ".azle/rejections/rejections.wasm.gz",
+            "wasm": ".azle/rejections/rejections.wasm",
+            "gzip": true,
             "declarations": {
                 "output": "test/dfx_generated/rejections",
                 "node_compatibility": true
@@ -19,7 +20,8 @@
             "root": "canisters/some_service",
             "ts": "canisters/some_service/index.ts",
             "candid": "canisters/some_service/index.did",
-            "wasm": ".azle/some_service/some_service.wasm.gz",
+            "wasm": ".azle/some_service/some_service.wasm",
+            "gzip": true,
             "declarations": {
                 "output": "test/dfx_generated/some_service",
                 "node_compatibility": true

src/lib_functional/candid/reference/variant.ts

@@ -2,6 +2,7 @@ import { TypeMapping } from '..';
 import { IDL } from '@dfinity/candid';
 import { processMap } from '../../../lib_new/utils';
 import { v4 } from 'uuid';
+import { Null } from '../../../lib_new/primitives';
 
 export function Variant<T>(obj: T): RequireExactlyOne<{
     [K in keyof T]: TypeMapping<T[K]>;
@@ -36,3 +37,16 @@ type RequireExactlyOne<
         Partial<Record<Exclude<KeysType, Key>, never>>;
 }[KeysType] &
     Omit<ObjectType, KeysType>;
+
+/**
+ * Indicates an error was encountered during a canister method.
+ */
+export const RejectionCode = Variant({
+    NoError: Null,
+    SysFatal: Null,
+    SysTransient: Null,
+    DestinationInvalid: Null,
+    CanisterReject: Null,
+    CanisterError: Null,
+    Unknown: Null
+});

src/lib_new/ic.ts

@@ -2,7 +2,7 @@ import '@dfinity/candid/lib/esm/idl'; // This must remain or the build fails
 import { Principal } from '@dfinity/principal';
 import { IDL } from './index';
 import { blob, nat, nat32, nat64, AzleNat64, Void, Opt } from './primitives';
-import { RejectionCode } from './system_types';
+import { RejectionCode } from '../lib_functional';
 import { v4 } from 'uuid';
 import { CandidClass, toIDLType } from './utils';
 import { EncodeVisitor } from './visitors/encode_decode';
@@ -258,7 +258,7 @@ type Ic = {
      * call
      * @returns the rejection code
      */
-    rejectCode: () => RejectionCode;
+    rejectCode: () => typeof RejectionCode;
 
     /**
      * Returns the rejection message from the most recently executed

src/lib_new/system_types.ts

@@ -1,32 +1,17 @@
-import { candid } from './index';
-import { Null } from './primitives';
-import { Variant } from './variant';
+import { RequireExactlyOne } from './variant';
 
 /**
  * Indicates an error was encountered during a canister method.
  */
-export class RejectionCode extends Variant {
-    @candid(Null)
-    NoError?: null;
-
-    @candid(Null)
-    SysFatal?: null;
-
-    @candid(Null)
-    SysTransient?: null;
-
-    @candid(Null)
-    DestinationInvalid?: null;
-
-    @candid(Null)
-    CanisterReject?: null;
-
-    @candid(Null)
-    CanisterError?: null;
-
-    @candid(Null)
-    Unknown?: null;
-}
+export type RejectionCode = RequireExactlyOne<{
+    NoError: null;
+    SysFatal: null;
+    SysTransient: null;
+    DestinationInvalid: null;
+    CanisterReject: null;
+    CanisterError: null;
+    Unknown: null;
+}>;
 
 // TODO we have decided to not use callresult or notifyresult
 // TODO remove once we are more mature in the project