fix: Typings fix and improvements. (#1364)

feathersjs · May 31, 2019 · 515b916 · 515b916
1 parent adb2543
commit 515b916
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/packages/authentication-client/src/index.ts b/packages/authentication-client/src/index.ts
@@ -5,7 +5,7 @@ import { AuthenticationResult, AuthenticationRequest } from '@feathersjs/authent
 import { Storage, MemoryStorage, StorageWrapper } from './storage';
 
 declare module '@feathersjs/feathers' {
-  interface Application<ServiceTypes = any> {
+  interface Application<ServiceTypes = {}> {
     io?: any;
     rest?: any;
     primus?: any;

diff --git a/packages/authentication/test/jwt.test.ts b/packages/authentication/test/jwt.test.ts
@@ -14,7 +14,8 @@ const { authenticate } = hooks;
 describe('authentication/jwt', () => {
   let app: Application<{
     authentication: AuthenticationService & Service<AuthenticationResult>,
-    users: Service<any>
+    users: Service<any>,
+    protected: Service<any>
   }>;
   let user: any;
   let accessToken: string;

diff --git a/packages/feathers/index.d.ts b/packages/feathers/index.d.ts
@@ -178,10 +178,10 @@ declare namespace createApplication {
 
     type ServiceMixin = (service: Service<any>, path: string) => void;
 
-    interface Application<ServiceTypes = any> extends EventEmitter {
+    interface Application<ServiceTypes = {}> extends EventEmitter {
         version: string;
 
-        services: ServiceTypes;
+        services: keyof ServiceTypes extends never ? any : ServiceTypes;
 
         mixins: ServiceMixin[];
 
@@ -207,7 +207,7 @@ declare namespace createApplication {
 
         service<L extends keyof ServiceTypes> (location: L): ServiceTypes[L];
 
-        service (location: string): Service<any>;
+        service (location: string): keyof ServiceTypes extends never ? any : never;
 
         use (path: string, service: Partial<ServiceMethods<any> & SetupMethod> | Application, options?: any): this;