Fixed retry type definition (#221)

CHANGELOG.md

@@ -11,6 +11,7 @@
 * Third party features are subject to a class's `invariant` when apply/call is used
 * A contracted feature can not be applied to objects of a different base class
 * Subcontract `extends` are now enforced
+* Updated `retry` type declaration to support accessors.
 
 ## v0.20.5
 

src/Contract.ts

@@ -20,7 +20,12 @@ type Properties<T extends AnyObject> = Pick<T, NonFunctionPropertyNames<T>>;
 export type Invariant<T extends AnyObject> = (self: T) => boolean;
 export type Demands<T extends AnyObject, F extends T[any]> = (self: T, ...args: Parameters<F>) => boolean;
 export type Ensures<T extends AnyObject, F extends T[any]> = (self: T, old: Properties<T>, ...args: Parameters<F>) => boolean;
-export type Rescue<T extends AnyObject, F extends T[any]> = (self: T, error: Error, args: Parameters<F>, retry: (...args: Parameters<F>) => void) => void;
+export type Rescue<T extends AnyObject, F extends T[any]> = (
+    self: T,
+    error: Error,
+    args: F extends AnyFunc ? Parameters<F> : [F],
+    retry: F extends AnyFunc ? (...args: Parameters<F>) => any : (value: F) => void
+) => void;
 
 export type ContractOptions<
     T extends AnyObject

src/tests/rescue.test.ts

@@ -119,7 +119,7 @@ describe('Any error thrown by a class feature must be captured by its @rescue',
             value: {
                 rescue(self, _error, _args, retry) {
                     self.value = 7;
-                    retry();
+                    retry(7);
                 }
             }
         });
@@ -183,7 +183,6 @@ describe('Any error thrown by a class feature must be captured by its @rescue',
         const baseContract = new Contract<Base>({
             value: {
                 rescue(_self, _error, _args, retry) {
-                    // @ts-ignore: typings not perfect with accessors
                     retry(0);
                 }
             }
@@ -354,7 +353,7 @@ describe('If a `rescue` is executed and the `retry` argument is not called then
         expect(base.throwRescue(true)).toBe(true);
     });
 
-    test('Unrescued error', () => {
+    test('Un-rescued error', () => {
         expect(() => base.throwFail()).toThrow('I am error');
     });
 });