fix(mock): fix typings error on TS 3.5

ngneat · Sep 24, 2019 · 26fc6ba · 26fc6ba
1 parent fa1eff9
commit 26fc6ba
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 21 deletions.
diff --git a/projects/spectator/jest/src/lib/spectator-directive.ts b/projects/spectator/jest/src/lib/spectator-directive.ts
@@ -37,5 +37,5 @@ export function createDirectiveFactory<D, H = HostComponent>(
   return baseCreateDirectiveFactory({
     mockProvider,
     ...(isType(typeOrOptions) ? { directive: typeOrOptions } : typeOrOptions)
-  });
+  }) as SpectatorDirectiveFactory<D, H>;
 }
diff --git a/projects/spectator/jest/src/lib/spectator-host.ts b/projects/spectator/jest/src/lib/spectator-host.ts
@@ -49,5 +49,5 @@ export function createHostFactory<C, H = HostComponent>(typeOrOptions: Type<C> |
   return baseCreateHostFactory({
     mockProvider,
     ...(isType(typeOrOptions) ? { component: typeOrOptions } : typeOrOptions)
-  });
+  }) as SpectatorHostFactory<C, H>;
 }
diff --git a/projects/spectator/jest/src/lib/spectator-http.ts b/projects/spectator/jest/src/lib/spectator-http.ts
@@ -35,5 +35,5 @@ export function createHttpFactory<S>(typeOrOptions: SpectatorHttpOptions<S> | Ty
   return baseCreateHttpFactory({
     mockProvider,
     ...(isType(typeOrOptions) ? { dataService: typeOrOptions } : typeOrOptions)
-  });
+  }) as SpectatorHttpFactory<S>;
 }
diff --git a/projects/spectator/jest/src/lib/spectator-routing.ts b/projects/spectator/jest/src/lib/spectator-routing.ts
@@ -31,5 +31,5 @@ export function createRoutingFactory<C>(typeOrOptions: SpectatorRoutingOptions<C
   return baseCreateRoutingFactory({
     mockProvider,
     ...(isType(typeOrOptions) ? { component: typeOrOptions } : typeOrOptions)
-  });
+  }) as SpectatorRoutingFactory<C>;
 }
diff --git a/projects/spectator/jest/src/lib/spectator-service.ts b/projects/spectator/jest/src/lib/spectator-service.ts
@@ -30,7 +30,7 @@ export function createService<S>(typeOrOptions: SpectatorServiceOptions<S> | Typ
   return baseCreateService({
     mockProvider,
     ...(isType(typeOrOptions) ? { service: typeOrOptions } : typeOrOptions)
-  });
+  }) as SpectatorService<S>;
 }
 
 /**
@@ -40,5 +40,5 @@ export function createServiceFactory<S>(typeOrOptions: SpectatorServiceOptions<S
   return baseCreateServiceFactory({
     mockProvider,
     ...(isType(typeOrOptions) ? { service: typeOrOptions } : typeOrOptions)
-  });
+  }) as SpectatorServiceFactory<S>;
 }
diff --git a/projects/spectator/jest/src/lib/spectator.ts b/projects/spectator/jest/src/lib/spectator.ts
@@ -3,13 +3,18 @@ import {
   createComponentFactory as baseCreateComponentFactory,
   isType,
   Spectator as BaseSpectator,
-  SpectatorFactory,
   SpectatorOptions,
+  SpectatorOverrides,
   Token
 } from '@ngneat/spectator';
 
 import { mockProvider, SpyObject } from './mock';
 
+/**
+ * @publicApi
+ */
+export type SpectatorFactory<C> = (options?: SpectatorOverrides<C>) => Spectator<C>;
+
 /**
  * @deprecated Use createComponentFactory instead. To be removed in v5.
  */
@@ -21,7 +26,7 @@ export function createComponentFactory<C>(typeOrOptions: SpectatorOptions<C> | T
   return baseCreateComponentFactory({
     mockProvider,
     ...(isType(typeOrOptions) ? { component: typeOrOptions } : typeOrOptions)
-  });
+  }) as SpectatorFactory<C>;
 }
 
 export class Spectator<C> extends BaseSpectator<C> {

diff --git a/projects/spectator/jest/test/injection-and-mocking.spec.ts b/projects/spectator/jest/test/injection-and-mocking.spec.ts
@@ -1,4 +1,4 @@
-import { createHostFactory, createService, createComponentFactory, Spectator } from '@ngneat/spectator/jest';
+import { createHostFactory, createService, createComponentFactory, Spectator, SpectatorHost } from '@ngneat/spectator/jest';
 import { InjectionToken } from '@angular/core';
 
 import { ConsumerService } from '../../test/consumer.service';
@@ -78,7 +78,7 @@ describe('Injection tokens', () => {
       ]
     });
 
-    let host: Spectator<ZippyComponent>;
+    let host: SpectatorHost<ZippyComponent>;
 
     beforeEach(() => (host = createHost('<zippy></zippy>')));
 

diff --git a/projects/spectator/src/lib/mock.ts b/projects/spectator/src/lib/mock.ts
@@ -1,9 +1,16 @@
 /** Credit: Valentin Buryakov */
-import { FactoryProvider, Type } from '@angular/core';
+import { FactoryProvider } from '@angular/core';
 
 import { InjectableType } from './token';
 
-type Writable<T> = { -readonly [P in keyof T]: T[P] };
+type Writable<T> = { -readonly [P in keyof T]: T[P] } & {
+  /**
+   * Casts to type without readonly properties
+   *
+   * @deprecated Not needed anymore as since 4.3.1 all properties of SpyObject are already writable
+   */
+  castToWritable(): Writable<T>;
+};
 
 /**
  * @publicApi
@@ -30,15 +37,9 @@ export interface CompatibleSpy extends jasmine.Spy {
 /**
  * @publicApi
  */
-export type SpyObject<T> = Writable<T> &
-  { [P in keyof Writable<T>]: T[P] extends Function ? T[P] & CompatibleSpy : T[P] } & {
-    /**
-     * Casts to type without readonly properties
-     *
-     * @deprecated Not needed anymore as since 4.3.1 all properties of SpyObject are already writable
-     */
-    castToWritable(): Writable<T>;
-  };
+export type SpyObject<T> = {
+  [P in keyof Writable<T>]: Writable<T>[P] extends Function ? Writable<T>[P] & CompatibleSpy : Writable<T>[P];
+};
 
 /**
  * @internal