ts-jest 24.0.1 → 24.0.2

package/.ts-jest-digest

@@ -1 +1 @@
-a8aa81109806244e6aec89a7757a9d4d76a38fef
+0aceab77a1f613fedb22a0395a65327e834ef35c

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+<a name="24.0.2"></a>
+## [24.0.2](https://github.com/kulshekhar/ts-jest/compare/v24.0.1...v24.0.2) (2019-04-05)
+
+
+
 <a name="24.0.1"></a>
 ## [24.0.1](https://github.com/kulshekhar/ts-jest/compare/v24.0.0...v24.0.1) (2019-03-30)
 

package/dist/util/testing.d.ts

@@ -1,35 +1,34 @@
 /// <reference types="jest" />
-interface MockWithArgs<T> extends Function, jest.MockInstance<T> {
-    new (...args: ArgumentsOf<T>): T;
-    (...args: ArgumentsOf<T>): any;
-}
+declare type MockableFunction = (...args: any[]) => any;
 declare type MethodKeysOf<T> = {
-    [K in keyof T]: T[K] extends Function ? K : never;
+    [K in keyof T]: T[K] extends MockableFunction ? K : never;
 }[keyof T];
 declare type PropertyKeysOf<T> = {
-    [K in keyof T]: T[K] extends Function ? never : K;
+    [K in keyof T]: T[K] extends MockableFunction ? never : K;
 }[keyof T];
 declare type ArgumentsOf<T> = T extends (...args: infer A) => any ? A : never;
-interface MockWithArgs<T> extends Function, jest.MockInstance<T> {
-    new (...args: ArgumentsOf<T>): T;
-    (...args: ArgumentsOf<T>): any;
+declare type ConstructorArgumentsOf<T> = T extends new (...args: infer A) => any ? A : never;
+interface MockWithArgs<T extends MockableFunction> extends jest.MockInstance<ReturnType<T>, ArgumentsOf<T>> {
+    new (...args: ConstructorArgumentsOf<T>): T;
+    (...args: ArgumentsOf<T>): ReturnType<T>;
 }
-declare type MockedFunction<T> = MockWithArgs<T> & {
+declare type MaybeMockedConstructor<T> = T extends new (...args: any[]) => infer R ? jest.MockInstance<R, ConstructorArgumentsOf<T>> : {};
+declare type MockedFunction<T extends MockableFunction> = MockWithArgs<T> & {
     [K in keyof T]: T[K];
 };
-declare type MockedFunctionDeep<T> = MockWithArgs<T> & MockedObjectDeep<T>;
-declare type MockedObject<T> = {
-    [K in MethodKeysOf<T>]: MockedFunction<T[K]>;
+declare type MockedFunctionDeep<T extends MockableFunction> = MockWithArgs<T> & MockedObjectDeep<T>;
+declare type MockedObject<T> = MaybeMockedConstructor<T> & {
+    [K in MethodKeysOf<T>]: T[K] extends MockableFunction ? MockedFunction<T[K]> : T[K];
 } & {
     [K in PropertyKeysOf<T>]: T[K];
 };
-declare type MockedObjectDeep<T> = {
-    [K in MethodKeysOf<T>]: MockedFunctionDeep<T[K]>;
+declare type MockedObjectDeep<T> = MaybeMockedConstructor<T> & {
+    [K in MethodKeysOf<T>]: T[K] extends MockableFunction ? MockedFunctionDeep<T[K]> : T[K];
 } & {
     [K in PropertyKeysOf<T>]: MaybeMockedDeep<T[K]>;
 };
-export declare type MaybeMockedDeep<T> = T extends Function ? MockedFunctionDeep<T> : T extends object ? MockedObjectDeep<T> : T;
-export declare type MaybeMocked<T> = T extends Function ? MockedFunction<T> : T extends object ? MockedObject<T> : T;
+export declare type MaybeMockedDeep<T> = T extends MockableFunction ? MockedFunctionDeep<T> : T extends object ? MockedObjectDeep<T> : T;
+export declare type MaybeMocked<T> = T extends MockableFunction ? MockedFunction<T> : T extends object ? MockedObject<T> : T;
 export declare function mocked<T>(item: T, deep?: false): MaybeMocked<T>;
 export declare function mocked<T>(item: T, deep: true): MaybeMockedDeep<T>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-jest",
-  "version": "24.0.1",
+  "version": "24.0.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "bin": "cli.js",