pr fixes

src/build/experimental/commands/compile/javascript.ts

@@ -84,7 +84,7 @@ export function getPrelude(main: string): string {
                 const candid = idlToString(canister.getIdlType([]), {
                     ...getDefaultVisitorData(),
                     isFirstService: true,
-                    initAndPostUpgradeParams: canister.getInitAndPostUpgradeParamIdlTypes()
+                    initAndPostUpgradeParamIdlTypes: canister.getInitAndPostUpgradeParamIdlTypes()
                 });
 
                 globalThis._azleCallbacks = canister.callbacks;

src/build/stable/commands/compile/javascript.ts

@@ -31,7 +31,7 @@ export function handleClassApiCanister(): string {
         const candid = idlToString(canisterIdlType, {
             ...getDefaultVisitorData(),
             isFirstService: true,
-            initAndPostUpgradeParams: exportedCanisterClassInstance._azleInitAndPostUpgradeIdlTypes
+            initAndPostUpgradeParamIdlTypes: exportedCanisterClassInstance._azleInitAndPostUpgradeIdlTypes
         });
 
         globalThis._azleGetCandidAndMethodMeta = () => {

src/lib/experimental/candid/types/reference/service/canister_function/index.ts

@@ -6,6 +6,7 @@ import {
     Method,
     MethodMeta
 } from '../../../../../../../build/stable/utils/types';
+import { CanisterMethodMode } from '../../../../../../stable/execute_with_candid_serde';
 import { CanisterMethodInfo } from '../../../../../canister_methods/types/canister_method_info';
 import { Callbacks } from '../../../../../globals';
 import { ic } from '../../../../../ic';
@@ -30,17 +31,8 @@ type _AzleFunctionReturnType = {
 type CallRawFunction = typeof ic.callRaw;
 type NotifyRawFunction = typeof ic.notifyRaw;
 
-type Mode =
-    | 'query'
-    | 'update'
-    | 'init'
-    | 'postUpgrade'
-    | 'preUpgrade'
-    | 'inspectMessage'
-    | 'heartbeat';
-
 type FunctionInfo = {
-    mode: Mode;
+    mode: CanisterMethodMode;
     paramCandidTypes: CandidType[];
     returnCandidType: CandidType;
 };
@@ -106,7 +98,7 @@ function createGetIdlTypeFunction(
     };
 }
 
-function createAnnotation(mode: Mode): string[] {
+function createAnnotation(mode: CanisterMethodMode): string[] {
     if (mode === 'query') {
         return ['query'];
     }

src/lib/experimental/candid/types/reference/service/canister_function/system_methods.ts

@@ -12,60 +12,49 @@ export function createGetInitAndPostUpgradeParamIdlTypes(
 ) {
     return (parents: Parent[]): IDL.Type[] => {
         const serviceFunctionInfo = canisterOptions as ServiceFunctionInfo;
-        let foundInit = false;
-        let foundPostUpgrade = false;
 
-        return Object.entries(serviceFunctionInfo).reduce(
-            (accumulator, [_methodName, functionInfo]) => {
-                const mode = functionInfo.mode;
-                const isInitOrPostUpgradeMethod =
-                    mode === 'init' || mode === 'postUpgrade';
-                if (!isInitOrPostUpgradeMethod) {
-                    return accumulator;
-                }
-
-                if (mode === 'init') {
-                    if (foundInit === true) {
-                        throw new Error(
-                            'Init method already found in canister options'
-                        );
-                    }
-                    foundInit = true;
-                } else if (mode === 'postUpgrade') {
-                    if (foundPostUpgrade === true) {
-                        throw new Error(
-                            'PostUpgrade method already found in canister options'
-                        );
-                    }
-                    foundPostUpgrade = true;
-                }
+        const initMethod = Object.entries(serviceFunctionInfo).find(
+            ([_, info]) => info.mode === 'init'
+        );
+        const postUpgradeMethod = Object.entries(serviceFunctionInfo).find(
+            ([_, info]) => info.mode === 'postUpgrade'
+        );
 
-                const paramIdlTypes = toIdlTypeArray(
-                    functionInfo.paramCandidTypes,
-                    parents
+        if (initMethod !== undefined && postUpgradeMethod !== undefined) {
+            const initParams = toIdlTypeArray(
+                initMethod[1].paramCandidTypes,
+                parents
+            );
+            const postUpgradeParams = toIdlTypeArray(
+                postUpgradeMethod[1].paramCandidTypes,
+                parents
+            );
+
+            const initSignature = idlToString(IDL.Func(initParams, []));
+            const postUpgradeSignature = idlToString(
+                IDL.Func(postUpgradeParams, [])
+            );
+
+            if (initSignature !== postUpgradeSignature) {
+                throw new Error(
+                    `'init' and 'postUpgrade' methods must have the same parameters.\nFound:\n${initSignature}\n${postUpgradeSignature}`
                 );
-                if (
-                    (mode === 'init' && foundPostUpgrade) ||
-                    (mode === 'postUpgrade' && foundInit)
-                ) {
-                    const functionSignature = idlToString(
-                        IDL.Func(paramIdlTypes, [])
-                    );
+            }
 
-                    const accumulatorSignature = idlToString(
-                        IDL.Func(accumulator, [])
-                    );
+            return initParams;
+        }
 
-                    if (functionSignature !== accumulatorSignature) {
-                        throw new Error(
-                            'Init and postUpgrade methods must have the same function signature'
-                        );
-                    }
-                }
+        if (initMethod !== undefined) {
+            return toIdlTypeArray(initMethod[1].paramCandidTypes, parents);
+        }
 
-                return paramIdlTypes;
-            },
-            [] as IDL.Type[]
-        );
+        if (postUpgradeMethod !== undefined) {
+            return toIdlTypeArray(
+                postUpgradeMethod[1].paramCandidTypes,
+                parents
+            );
+        }
+
+        return [];
     };
 }

src/lib/stable/canister_methods/index.ts

@@ -26,8 +26,8 @@ type DefinedSystemMethods = {
     init: boolean;
     postUpgrade: boolean;
     preUpgrade: boolean;
-    heartbeat: boolean;
     inspectMessage: boolean;
+    heartbeat: boolean;
 };
 
 export type MethodType<This, Args extends unknown[], Return> = (
@@ -262,31 +262,31 @@ function decoratorImplementation<This, Args extends unknown[], Return>(
             };
         }
 
-        if (canisterMethodMode === 'heartbeat') {
+        if (canisterMethodMode === 'inspectMessage') {
             throwIfMethodAlreadyDefined(
-                'heartbeat',
+                'inspectMessage',
                 exportedCanisterClassInstance._azleDefinedSystemMethods
-                    .heartbeat
+                    .inspectMessage
             );
 
-            exportedCanisterClassInstance._azleDefinedSystemMethods.heartbeat =
+            exportedCanisterClassInstance._azleDefinedSystemMethods.inspectMessage =
                 true;
-            exportedCanisterClassInstance._azleMethodMeta.heartbeat = {
+            exportedCanisterClassInstance._azleMethodMeta.inspect_message = {
                 name,
                 index
             };
         }
 
-        if (canisterMethodMode === 'inspectMessage') {
+        if (canisterMethodMode === 'heartbeat') {
             throwIfMethodAlreadyDefined(
-                'inspectMessage',
+                'heartbeat',
                 exportedCanisterClassInstance._azleDefinedSystemMethods
-                    .inspectMessage
+                    .heartbeat
             );
 
-            exportedCanisterClassInstance._azleDefinedSystemMethods.inspectMessage =
+            exportedCanisterClassInstance._azleDefinedSystemMethods.heartbeat =
                 true;
-            exportedCanisterClassInstance._azleMethodMeta.inspect_message = {
+            exportedCanisterClassInstance._azleMethodMeta.heartbeat = {
                 name,
                 index
             };
@@ -348,7 +348,7 @@ function isDecoratorOverloadedWithoutParams<
 /**
  * @internal
  *
- * Uses the candid string of the init and post-upgrade methods to verify that
+ * Uses the candid string of the `init` and `postUpgrade` methods to verify that
  * they have matching parameter signatures.
  *
  * @param idlTypes - Array of IDL function types representing canister methods
@@ -378,12 +378,12 @@ function verifyInitAndPostUpgradeHaveTheSameParams(
  * @throws {Error} If the method is already defined
  */
 function throwIfMethodAlreadyDefined(
-    methodName: string,
+    methodName: keyof DefinedSystemMethods,
     isDefined: boolean
 ): void {
     if (isDefined === true) {
         throw new Error(
-            `'${methodName}' method has multiple definitions in the class`
+            `'${methodName}' method can only have one definition in the exported canister class`
         );
     }
 }

src/lib/stable/did_file/idl_to_string.ts

@@ -16,7 +16,7 @@ import {
  * @returns The Candid string representation of the type
  *
  * @example
- * const recordType = IDL.Record({ 'name': IDL.Text, 'age': IDL.Nat8 });
+ * const recordType = IDL.Record({ name: IDL.Text, age: IDL.Nat8 });
  * const candidStr = idlToString(recordType);
  * // Result: "record { name : text; age : nat8 }"
  */

src/lib/stable/did_file/visitor/did_visitor.ts

@@ -22,7 +22,7 @@ export type VisitorData = {
     /** Indicates if this is the first/primary service being processed */
     isFirstService: boolean;
     /** Collection of system functions (init, postUpgrade) to process */
-    initAndPostUpgradeParams: IDL.FuncClass[];
+    initAndPostUpgradeParamIdlTypes: IDL.FuncClass[];
 };
 
 /**
@@ -60,7 +60,7 @@ export function getDefaultVisitorData(): VisitorData {
         usedRecClasses: [],
         isOnService: false,
         isFirstService: false,
-        initAndPostUpgradeParams: []
+        initAndPostUpgradeParamIdlTypes: []
     };
 }
 

src/lib/stable/did_file/visitor/visit/service.ts

@@ -41,7 +41,7 @@ export function visitService(
 function serviceToCandidString(
     t: IDL.ServiceClass,
     canisterMethodCandidStrings: string[],
-    initOrPostUpgradeMethodCandidString: string[],
+    initAndPostUpgradeMethodCandidString: string[],
     candidTypes: CandidTypesDefs,
     isFirstService: boolean
 ): [CandidDef, CandidTypesDefs] {
@@ -57,7 +57,7 @@ function serviceToCandidString(
         .join(func_separator);
 
     const canisterParamsString = createCanisterParamsString(
-        initOrPostUpgradeMethodCandidString
+        initAndPostUpgradeMethodCandidString
     );
 
     if (isFirstService === true) {
@@ -73,7 +73,7 @@ function getInitAndPostUpgradeMethodCandid(
     didVisitor: DidVisitor,
     data: VisitorData
 ): [CandidDef[], CandidTypesDefs] {
-    const result = IDL.Func(data.initAndPostUpgradeParams, []).accept(
+    const result = IDL.Func(data.initAndPostUpgradeParamIdlTypes, []).accept(
         didVisitor,
         {
             ...data,