Filter out non-controllers from ComposableController input

Author: MajorLift

app/core/Engine.ts

@@ -462,22 +462,6 @@ type Controllers = {
   SwapsController: SwapsController;
 };
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-type NonControllers = {
-  AssetsContractController: AssetsContractController;
-  NftDetectionController: NftDetectionController;
-  TokenDetectionController: TokenDetectionController;
-};
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-type NonControllerNames = keyof NonControllers;
-
-const NONCONTROLLER_NAMES = [
-  'AssetsContractController',
-  'NftDetectionController',
-  'TokenDetectionController',
-] as const;
-
 /**
  * Controllers that area always instantiated
  */
@@ -488,6 +472,24 @@ type RequiredControllers = Omit<Controllers, 'PPOMController'>;
  */
 type OptionalControllers = Pick<Controllers, 'PPOMController'>;
 
+/**
+ * Messageable modules that are part of the Engine's context, but are not defined with state.
+ * TODO: Replace with type guard once consistent inheritance for non-controllers is implemented. See: https://github.com/MetaMask/decisions/pull/41
+ */
+const STATELESS_NON_CONTROLLER_NAMES = [
+  'AssetsContractController',
+  'NftDetectionController',
+  'TokenDetectionController',
+] as const;
+
+/**
+ * Controllers that are defined with state.
+ */
+type StatefulControllers = Omit<
+  Controllers,
+  (typeof STATELESS_NON_CONTROLLER_NAMES)[number]
+>;
+
 /**
  * Combines required and optional controllers for the Engine context type.
  */
@@ -530,7 +532,7 @@ export class Engine {
    */
   datamodel: ComposableController<
     EngineState,
-    Exclude<Controllers[keyof Controllers], NonControllers[NonControllerNames]>
+    StatefulControllers[keyof StatefulControllers]
   >;
 
   /**
@@ -1780,18 +1782,15 @@ export class Engine {
 
     this.datamodel = new ComposableController<
       EngineState,
-      Exclude<
-        Controllers[keyof Controllers],
-        NonControllers[keyof NonControllers]
-      >
+      StatefulControllers[keyof StatefulControllers]
     >({
       controllers: controllers.filter(
         (
           controller,
-        ): controller is Exclude<
-          Controllers[keyof Controllers],
-          NonControllers[keyof NonControllers]
-        > => !NONCONTROLLER_NAMES.find((name) => name === controller.name),
+        ): controller is StatefulControllers[keyof StatefulControllers] =>
+          !STATELESS_NON_CONTROLLER_NAMES.find(
+            (name) => name === controller.name,
+          ),
       ),
       messenger: this.controllerMessenger.getRestricted({
         name: 'ComposableController',