Merge branch 'main' into missing_apis

.github/workflows/build_templates.yml

@@ -48,10 +48,10 @@ jobs:
                   AZLE_VERBOSE=true npx azle install-global-dependencies --rust --wasi2ic
 
             - name: Build stable template
-              run: AZLE_VERBOSE=true npx azle template
+              run: npx azle template
 
             - name: Build experimental template
-              run: AZLE_VERBOSE=true npx azle template --experimental
+              run: npx azle template --experimental
 
             - uses: ./.github/actions/commit_and_push
               with:

.github/workflows/release.yml

@@ -57,10 +57,10 @@ jobs:
                   npm install
 
             - name: Build stable template
-              run: AZLE_VERBOSE=true npx azle template
+              run: npx azle template
 
             - name: Build experimental template
-              run: AZLE_VERBOSE=true npx azle template --experimental
+              run: npx azle template --experimental
 
             - uses: ./.github/actions/commit_and_push
               with:

examples/experimental/test/end_to_end/candid_rpc/ic_api/src/index.ts

@@ -97,12 +97,6 @@ export default Canister({
     performanceCounter: query([], nat64, () => {
         return ic.performanceCounter(0);
     }),
-    // prints a message through the local replica's output
-    print: query([text], bool, (message) => {
-        ic.print(message);
-
-        return true;
-    }),
     reject: query(
         [text],
         Manual(empty),

examples/experimental/test/end_to_end/candid_rpc/ic_api/test/tests.ts

@@ -16,43 +16,6 @@ export function getTests(icApiCanister: ActorSubclass<_SERVICE>): Test {
             );
         });
 
-        // it('calls argData on the ic object with zero params', async () => {
-        //     const result = await icApiCanister.argDataZeroParams();
-
-        //     expect(Array.isArray(result)).toBe(true);
-        //     expect(result.length).toBe(0);
-        // });
-
-        // it('calls argData on the ic object with a single param', async () => {
-        //     const result = await icApiCanister.argDataOneParam(true);
-
-        //     expect(result).toBe(true);
-        // });
-
-        // it('calls argData on the ic object with multiple params', async () => {
-        //     const blobString = 'Surprise!';
-        //     const blob = blobString.split('').map((char) => char.charCodeAt(0));
-        //     const int = 127;
-        //     const bool = true;
-        //     const string = 'test';
-
-        //     const result = await icApiCanister.argDataMultipleParams(
-        //         blob,
-        //         int,
-        //         bool,
-        //         string
-        //     );
-
-        //     const expected = {
-        //         blob,
-        //         int,
-        //         boolean: bool,
-        //         string
-        //     };
-
-        //     expect(result).toStrictEqual(expected);
-        // });
-
         it('calls argDataRaw on the ic object', async () => {
             const blobString = 'Surprise!';
             const blob = Uint8Array.from(
@@ -138,12 +101,6 @@ export function getTests(icApiCanister: ActorSubclass<_SERVICE>): Test {
             expect(result).toBeGreaterThan(0n);
         });
 
-        it('calls print on the ic object', async () => {
-            const result = await icApiCanister.print('Hello World!');
-
-            expect(result).toBe(true);
-        });
-
         it('calls reject on the ic object', async () => {
             const rejectionMessage = 'Rejected!';
 

examples/experimental/test/end_to_end/candid_rpc/null_example/src/index.ts

@@ -1,6 +1,5 @@
 import {
     Canister,
-    ic,
     int,
     Null,
     query,
@@ -31,7 +30,7 @@ export default Canister({
         return param;
     }),
     voidIsNotNull: query([], Void, () => {
-        ic.print(
+        console.info(
             'Even though they are both None in Python, for Candid null and void are different.'
         );
     }),

examples/stable/test/end_to_end/candid_rpc/ic_api/src/index.ts

@@ -10,7 +10,6 @@ import {
     isController,
     performanceCounter,
     Principal,
-    print,
     query,
     reject,
     setCertifiedData,
@@ -138,14 +137,6 @@ export default class {
         return performanceCounter(0);
     }
 
-    // prints a message through the local replica's output
-    @query([IDL.Text], IDL.Bool)
-    print(message: string): boolean {
-        print(message);
-
-        return true;
-    }
-
     @query([IDL.Text], IDL.Empty, { manual: true })
     reject(message: string): void {
         reject(message);

examples/stable/test/end_to_end/candid_rpc/null_example/src/index.ts

@@ -1,4 +1,4 @@
-import { IDL, print, query, update } from 'azle';
+import { IDL, query, update } from 'azle';
 
 const PartiallyNullRecord = IDL.Record({
     firstItem: IDL.Int,
@@ -39,7 +39,7 @@ export default class {
 
     @query
     voidIsNotNull(): void {
-        print(
+        console.info(
             'Even though they are both None in Python, for Candid null and void are different.'
         );
     }

package.json

@@ -73,7 +73,7 @@
         "fast-check": "^3.23.2",
         "husky": "9.1.7",
         "jest": "^29.7.0",
-        "lint-staged": "15.3.0",
+        "lint-staged": "15.4.1",
         "prettier": "^3.4.2",
         "puppeteer": "^24.1.0",
         "semver": "^7.6.3",

src/build/experimental/commands/compile/wasm_binary/rust/experimental_canister_template/src/ic/mod.rs

@@ -10,6 +10,7 @@ mod canister_version;
 mod clear_timer;
 mod cycles_burn;
 mod data_certificate;
+mod debug_print;
 mod id;
 mod in_replicated_execution;
 mod is_controller;
@@ -19,7 +20,6 @@ mod msg_cycles_available;
 mod msg_cycles_refunded;
 mod notify_raw;
 mod performance_counter;
-mod print;
 mod reject;
 mod reject_code;
 mod reject_message;
@@ -126,6 +126,13 @@ pub fn register(context: &mut wasmedge_quickjs::Context) {
             .into(),
     );
 
+    ic.set(
+        "debugPrint",
+        context
+            .new_function::<debug_print::NativeFunction>("")
+            .into(),
+    );
+
     ic.set("id", context.new_function::<id::NativeFunction>("").into());
 
     ic.set(
@@ -184,11 +191,6 @@ pub fn register(context: &mut wasmedge_quickjs::Context) {
             .into(),
     );
 
-    ic.set(
-        "print",
-        context.new_function::<print::NativeFunction>("").into(),
-    );
-
     ic.set(
         "reject",
         context.new_function::<reject::NativeFunction>("").into(),

src/build/index.ts

@@ -86,7 +86,7 @@ async function build(): Promise<void> {
     }
 
     if (command === 'template') {
-        await handleTemplateCommand(ioType);
+        await handleTemplateCommand('inherit');
 
         return;
     }
@@ -159,14 +159,21 @@ async function handleCompileCommand(ioType: IOType): Promise<void> {
 }
 
 async function handleTemplateCommand(ioType: IOType): Promise<void> {
-    const experimental =
-        process.argv.includes('--experimental') ||
-        process.env.AZLE_EXPERIMENTAL === 'true';
+    const all = process.argv.includes('--all');
 
-    if (experimental === false) {
+    if (all === true) {
         await runStableTemplateCommand(ioType);
-    } else {
         await runExperimentalTemplateCommand(ioType);
+    } else {
+        const experimental =
+            process.argv.includes('--experimental') ||
+            process.env.AZLE_EXPERIMENTAL === 'true';
+
+        if (experimental === false) {
+            await runStableTemplateCommand(ioType);
+        } else {
+            await runExperimentalTemplateCommand(ioType);
+        }
     }
 }
 

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/accept_message.rs

@@ -2,5 +2,5 @@ use ic_cdk::api::call::accept_message;
 use rquickjs::{Ctx, Function, Result};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx, || accept_message())
+    Function::new(ctx, || -> () { accept_message() })
 }

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/arg_data_raw.rs

@@ -2,7 +2,7 @@ use ic_cdk::api::call::arg_data_raw;
 use rquickjs::{Ctx, Function, Result, TypedArray};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx.clone(), move || {
+    Function::new(ctx.clone(), move || -> Result<TypedArray<u8>> {
         TypedArray::<u8>::new(ctx.clone(), arg_data_raw())
     })
 }

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/caller.rs

@@ -2,7 +2,7 @@ use ic_cdk::api::caller;
 use rquickjs::{Ctx, Function, Result, TypedArray};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx.clone(), move || {
+    Function::new(ctx.clone(), move || -> Result<TypedArray<u8>> {
         TypedArray::<u8>::new(ctx.clone(), caller().as_slice())
     })
 }

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/canister_balance.rs

@@ -2,5 +2,5 @@ use ic_cdk::api::canister_balance128;
 use rquickjs::{Ctx, Function, Result};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx, || canister_balance128().to_string())
+    Function::new(ctx, || -> String { canister_balance128().to_string() })
 }

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/canister_version.rs

@@ -2,7 +2,7 @@ use ic_cdk::api::canister_version;
 use rquickjs::{BigInt, Ctx, Function, Result};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx.clone(), move || {
+    Function::new(ctx.clone(), move || -> Result<BigInt> {
         BigInt::from_u64(ctx.clone(), canister_version())
     })
 }

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/print.rs → src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/debug_print.rs

@@ -2,7 +2,7 @@ use ic_cdk::print;
 use rquickjs::{Ctx, Function, Result};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx, |message: String| {
+    Function::new(ctx, |message: String| -> () {
         print(message);
     })
 }

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/is_controller.rs

@@ -3,7 +3,7 @@ use ic_cdk::api::is_controller;
 use rquickjs::{Ctx, Function, Result, TypedArray};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx, |principal_bytes: TypedArray<u8>| {
+    Function::new(ctx, |principal_bytes: TypedArray<u8>| -> bool {
         let principal = Principal::from_slice(principal_bytes.as_ref());
 
         is_controller(&principal)

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/method_name.rs

@@ -2,5 +2,5 @@ use ic_cdk::api::call::method_name;
 use rquickjs::{Ctx, Function, Result};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx, || method_name())
+    Function::new(ctx, || -> String { method_name() })
 }

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/mod.rs

@@ -13,6 +13,7 @@ mod canister_version;
 mod clear_timer;
 mod cycles_burn;
 mod data_certificate;
+mod debug_print;
 mod id;
 mod in_replicated_execution;
 mod is_controller;
@@ -22,7 +23,6 @@ mod msg_cycles_available;
 mod msg_cycles_refunded;
 mod notify_raw;
 mod performance_counter;
-mod print;
 mod reject;
 mod reject_code;
 mod reject_message;
@@ -78,6 +78,8 @@ pub fn register(ctx: Ctx) -> Result<()> {
         data_certificate::get_function(ctx.clone()),
     )?;
 
+    ic.set("debugPrint", debug_print::get_function(ctx.clone()))?;
+
     ic.set("id", id::get_function(ctx.clone()))?;
 
     ic.set(
@@ -111,8 +113,6 @@ pub fn register(ctx: Ctx) -> Result<()> {
         performance_counter::get_function(ctx.clone()),
     )?;
 
-    ic.set("print", print::get_function(ctx.clone()))?;
-
     ic.set("reject", reject::get_function(ctx.clone()))?;
 
     ic.set("rejectCode", reject_code::get_function(ctx.clone()))?;

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/msg_cycles_available.rs

@@ -2,5 +2,5 @@ use ic_cdk::api::call::msg_cycles_available128;
 use rquickjs::{Ctx, Function, Result};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx, || msg_cycles_available128().to_string())
+    Function::new(ctx, || -> String { msg_cycles_available128().to_string() })
 }

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/msg_cycles_refunded.rs

@@ -2,5 +2,5 @@ use ic_cdk::api::call::msg_cycles_refunded128;
 use rquickjs::{Ctx, Function, Result};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx, || msg_cycles_refunded128().to_string())
+    Function::new(ctx, || -> String { msg_cycles_refunded128().to_string() })
 }

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/reject.rs

@@ -2,5 +2,5 @@ use ic_cdk::api::call::reject;
 use rquickjs::{Ctx, Function, Result};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx, |message: String| reject(&message))
+    Function::new(ctx, |message: String| -> () { reject(&message) })
 }

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/reject_code.rs

@@ -2,7 +2,7 @@ use ic_cdk::api::call::{reject_code, RejectionCode};
 use rquickjs::{Ctx, Function, Result};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx, || {
+    Function::new(ctx, || -> u32 {
         let reject_code = reject_code();
 
         match reject_code {

src/build/stable/commands/compile/wasm_binary/rust/stable_canister_template/src/ic/reject_message.rs

@@ -2,5 +2,5 @@ use ic_cdk::api::call::reject_message;
 use rquickjs::{Ctx, Function, Result};
 
 pub fn get_function(ctx: Ctx) -> Result<Function> {
-    Function::new(ctx, || reject_message())
+    Function::new(ctx, || -> String { reject_message() })
 }