update types

demergent-labs · Dec 30, 2024 · b26f871 · b26f871
1 parent 01d4e04
commit b26f871
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 16 deletions.
diff --git a/examples/stable/test/end_to_end/candid_rpc/async_await/package-lock.json b/examples/stable/test/end_to_end/candid_rpc/async_await/package-lock.json
diff --git a/examples/stable/test/end_to_end/candid_rpc/heartbeat/package-lock.json b/examples/stable/test/end_to_end/candid_rpc/heartbeat/package-lock.json
diff --git a/src/lib/stable/canister_methods/heartbeat.ts b/src/lib/stable/canister_methods/heartbeat.ts
@@ -3,6 +3,6 @@ import { decoratorArgumentsHandler, MethodType } from '.';
 export function heartbeat<This, Args extends any[], Return>(
     originalMethod: MethodType<This, Args, Return>,
     context: ClassMethodDecoratorContext
-): MethodType<This, Args, Return> {
-    return decoratorArgumentsHandler('heartbeat', originalMethod, context);
+): void {
+    decoratorArgumentsHandler('heartbeat', originalMethod, context);
 }
diff --git a/src/lib/stable/canister_methods/index.ts b/src/lib/stable/canister_methods/index.ts
@@ -11,12 +11,17 @@ export type MethodType<This, Args extends any[], Return> = (
     ...args: Args
 ) => Return;
 
+export type DecoratorFunction<This, Args extends any[], Return> = (
+    originalMethod: MethodType<This, Args, Return>,
+    context: ClassMethodDecoratorContext
+) => MethodType<This, Args, Return>;
+
 export function decoratorArgumentsHandler<This, Args extends any[], Return>(
     canisterMethodMode: CanisterMethodMode,
     param1?: MethodType<This, Args, Return> | IDL.Type[],
     param2?: ClassMethodDecoratorContext | IDL.Type,
     param3?: { composite?: boolean; manual?: boolean }
-): any {
+): MethodType<This, Args, Return> | DecoratorFunction<This, Args, Return> {
     // First overload - decorator without params
     if (typeof param1 === 'function') {
         const originalMethod = param1;

diff --git a/src/lib/stable/canister_methods/init.ts b/src/lib/stable/canister_methods/init.ts
@@ -1,6 +1,6 @@
 import { IDL } from '@dfinity/candid';
 
-import { decoratorArgumentsHandler, MethodType } from '.';
+import { decoratorArgumentsHandler, DecoratorFunction, MethodType } from '.';
 
 export function init<This, Args extends any[], Return>(
     originalMethod: MethodType<This, Args, Return>,
@@ -17,6 +17,6 @@ export function init<This, Args extends any[], Return>(
 export function init<This, Args extends any[], Return>(
     param1?: MethodType<This, Args, Return> | IDL.Type[],
     param2?: ClassMethodDecoratorContext
-): any {
+): MethodType<This, Args, Return> | DecoratorFunction<This, Args, Return> {
     return decoratorArgumentsHandler('init', param1, param2);
 }
diff --git a/src/lib/stable/canister_methods/inspect_message.ts b/src/lib/stable/canister_methods/inspect_message.ts
@@ -4,6 +4,6 @@ import { decoratorArgumentsHandler, MethodType } from '.';
 export function inspectMessage<This, Args extends any[], Return>(
     originalMethod: MethodType<This, Args, Return>,
     context: ClassMethodDecoratorContext
-): MethodType<This, Args, Return> {
-    return decoratorArgumentsHandler('inspectMessage', originalMethod, context);
+): void {
+    decoratorArgumentsHandler('inspectMessage', originalMethod, context);
 }
diff --git a/src/lib/stable/canister_methods/post_upgrade.ts b/src/lib/stable/canister_methods/post_upgrade.ts
@@ -1,6 +1,6 @@
 import { IDL } from '@dfinity/candid';
 
-import { decoratorArgumentsHandler, MethodType } from '.';
+import { decoratorArgumentsHandler, DecoratorFunction, MethodType } from '.';
 
 export function postUpgrade<This, Args extends any[], Return>(
     originalMethod: MethodType<This, Args, Return>,
@@ -17,6 +17,6 @@ export function postUpgrade<This, Args extends any[], Return>(
 export function postUpgrade<This, Args extends any[], Return>(
     param1?: MethodType<This, Args, Return> | IDL.Type[],
     param2?: ClassMethodDecoratorContext
-): any {
+): MethodType<This, Args, Return> | DecoratorFunction<This, Args, Return> {
     return decoratorArgumentsHandler('postUpgrade', param1, param2);
 }
diff --git a/src/lib/stable/canister_methods/pre_upgrade.ts b/src/lib/stable/canister_methods/pre_upgrade.ts
@@ -3,6 +3,6 @@ import { decoratorArgumentsHandler, MethodType } from '.';
 export function preUpgrade<This, Args extends any[], Return>(
     originalMethod: MethodType<This, Args, Return>,
     context: ClassMethodDecoratorContext
-): MethodType<This, Args, Return> {
-    return decoratorArgumentsHandler('preUpgrade', originalMethod, context);
+): void {
+    decoratorArgumentsHandler('preUpgrade', originalMethod, context);
 }
diff --git a/src/lib/stable/canister_methods/query.ts b/src/lib/stable/canister_methods/query.ts
@@ -1,6 +1,6 @@
 import { IDL } from '@dfinity/candid';
 
-import { decoratorArgumentsHandler, MethodType } from '.';
+import { decoratorArgumentsHandler, DecoratorFunction, MethodType } from '.';
 
 export function query<This, Args extends any[], Return>(
     originalMethod: MethodType<This, Args, Return>,
@@ -23,6 +23,6 @@ export function query<This, Args extends any[], Return>(
     param1?: MethodType<This, Args, Return> | IDL.Type[],
     param2?: ClassMethodDecoratorContext | IDL.Type,
     param3?: { manual?: boolean }
-): any {
+): MethodType<This, Args, Return> | DecoratorFunction<This, Args, Return> {
     return decoratorArgumentsHandler('query', param1, param2, param3);
 }
diff --git a/src/lib/stable/canister_methods/update.ts b/src/lib/stable/canister_methods/update.ts
@@ -1,6 +1,6 @@
 import { IDL } from '@dfinity/candid';
 
-import { decoratorArgumentsHandler, MethodType } from '.';
+import { decoratorArgumentsHandler, DecoratorFunction, MethodType } from '.';
 
 export function update<This, Args extends any[], Return>(
     originalMethod: MethodType<This, Args, Return>,
@@ -18,11 +18,10 @@ export function update<This, Args extends any[], Return>(
     context: ClassMethodDecoratorContext
 ) => MethodType<This, Args, Return>;
 
-// TODO get rid of the any return type
 export function update<This, Args extends any[], Return>(
     param1?: MethodType<This, Args, Return> | IDL.Type[],
     param2?: ClassMethodDecoratorContext | IDL.Type,
     param3?: { manual?: boolean }
-): any {
+): MethodType<This, Args, Return> | DecoratorFunction<This, Args, Return> {
     return decoratorArgumentsHandler('update', param1, param2, param3);
 }