From eda224bd559eb419ffd57658e210d1b72e695496 Mon Sep 17 00:00:00 2001
From: Martin Karkowski <m.karkowski@zema.de>
Date: Tue, 1 Feb 2022 08:20:16 +0100
Subject: [PATCH] Fixing Typings

---
 lib/dispatcher/InstanceManager/InstanceManager.ts | 12 ++++++------
 lib/types/nope/nopeInstanceManager.interface.ts   |  8 ++++----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/dispatcher/InstanceManager/InstanceManager.ts b/lib/dispatcher/InstanceManager/InstanceManager.ts
index 7148f77..96851ff 100644
--- a/lib/dispatcher/InstanceManager/InstanceManager.ts
+++ b/lib/dispatcher/InstanceManager/InstanceManager.ts
@@ -31,12 +31,12 @@ import {
   INopeRpcManager,
   INopeStatusInfo,
   TValidAsssignmentChecker,
-  ValidSelectorFunction,
+  ValidSelectorFunction
 } from "../../types/nope";
 import {
   INopeInstanceManager,
   TConstructorCallback,
-  TGenerateWrapperCallback,
+  TGenerateWrapperCallback
 } from "../../types/nope/nopeInstanceManager.interface";
 import { NopeConnectivityManager } from "../ConnectivityManager";
 import { NopeRpcManager } from "../RpcManager/NopeRpcManager";
@@ -665,13 +665,13 @@ export class NopeInstanceManager implements INopeInstanceManager {
   }
 
   // See interface description
-  public async createInstance<I extends INopeModule = IGenericNopeModule>(
+  public async createInstance<I = IGenericNopeModule>(
     description: Partial<IInstanceCreationMsg>,
     options: {
       selector?: ValidSelectorFunction;
       assignmentValid?: TValidAsssignmentChecker;
     } = {}
-  ): Promise<I> {
+  ): Promise<I & IGenericNopeModule> {
     // Define the Default Description
     // which will lead to an error.
     const _defDescription: IInstanceCreationMsg = {
@@ -785,7 +785,7 @@ export class NopeInstanceManager implements INopeInstanceManager {
         const wrapper = (await this._internalWrapperGenerators.get(_type)(
           this._core,
           definedInstance.description
-        )) as I;
+        )) as IGenericNopeModule;
 
         if (this._logger?.enabledFor(DEBUG)) {
           this._logger.debug(
@@ -799,7 +799,7 @@ export class NopeInstanceManager implements INopeInstanceManager {
           usedBy: [_description.dispatcherId],
         });
 
-        return wrapper;
+        return wrapper as I & IGenericNopeModule;
       }
 
       throw Error("No internal generator Available!");
diff --git a/lib/types/nope/nopeInstanceManager.interface.ts b/lib/types/nope/nopeInstanceManager.interface.ts
index e9c5a04..524ccff 100644
--- a/lib/types/nope/nopeInstanceManager.interface.ts
+++ b/lib/types/nope/nopeInstanceManager.interface.ts
@@ -9,13 +9,13 @@
 import { INopeCore, INopeModule } from ".";
 import {
   IAvailableInstancesMsg,
-  IInstanceCreationMsg,
+  IInstanceCreationMsg
 } from "./nopeCommunication.interface";
 import { INopeStatusInfo } from "./nopeConnectivityManager.interface";
 import { IMapBasedMergeData } from "./nopeHelpers.interface";
 import {
   IGenericNopeModule,
-  INopeModuleDescription,
+  INopeModuleDescription
 } from "./nopeModule.interface";
 import { INopeObservable } from "./nopeObservable.interface";
 import { ValidSelectorFunction } from "./nopeRpcManager.interface";
@@ -136,13 +136,13 @@ export interface INopeInstanceManager {
    * @return {Promise<I>}
    * @memberof INopeInstanceManager
    */
-  createInstance<I extends INopeModule = IGenericNopeModule>(
+  createInstance<I = IGenericNopeModule>(
     description: Partial<IInstanceCreationMsg>,
     options?: {
       selector?: ValidSelectorFunction;
       assignmentValid?: TValidAsssignmentChecker;
     }
-  ): Promise<I>;
+  ): Promise<I & IGenericNopeModule>;
 
   /**
    * Creates Wrappers for the Type of the given element.