From d9e6e605c55d7444cc599a6b2129a9885678b0ee Mon Sep 17 00:00:00 2001
From: Chris Garrett <cgarrett@linkedin.com>
Date: Fri, 3 Apr 2020 19:25:06 -0700
Subject: [PATCH] [BUGFIX] Fixes the types of manager return values

Currently `setManager` APIs return object as a type, when they _should_
return the value they were passed. This updates the types to make that
happen using generics.
---
 packages/@glimmer/core/src/managers/index.ts | 33 +++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/packages/@glimmer/core/src/managers/index.ts b/packages/@glimmer/core/src/managers/index.ts
index b2f859664..c09ae7fc1 100644
--- a/packages/@glimmer/core/src/managers/index.ts
+++ b/packages/@glimmer/core/src/managers/index.ts
@@ -46,10 +46,10 @@ const MANAGER_INSTANCES: WeakMap<
 
 const getPrototypeOf = Object.getPrototypeOf;
 
-export function setManager<Owner extends object, StateBucket = unknown>(
+export function setManager<Def extends object, Owner extends object, StateBucket = unknown>(
   wrapper: ManagerWrapper<Owner, StateBucket>,
-  obj: {}
-): {} {
+  obj: Def
+): Def {
   MANAGERS.set(obj, wrapper);
   return obj;
 }
@@ -95,10 +95,11 @@ function getManagerInstanceForOwner<D extends ManagerDelegate>(
 
 ///////////
 
-export function setModifierManager<StateBucket, Owner extends object = object>(
-  factory: ManagerFactory<Owner, ModifierManager<StateBucket>>,
-  definition: ModifierDefinition<StateBucket>
-): {} {
+export function setModifierManager<
+  StateBucket,
+  Def extends ModifierDefinition<StateBucket>,
+  Owner extends object = object
+>(factory: ManagerFactory<Owner, ModifierManager<StateBucket>>, definition: Def): Def {
   return setManager({ factory, type: 'modifier' }, definition);
 }
 
@@ -113,10 +114,11 @@ export function getModifierManager<StateBucket = unknown>(
   }
 }
 
-export function setHelperManager<StateBucket, Owner extends object = object>(
-  factory: ManagerFactory<Owner, HelperManager<StateBucket>>,
-  definition: HelperDefinition<StateBucket>
-): {} {
+export function setHelperManager<
+  StateBucket,
+  Def extends HelperDefinition<StateBucket>,
+  Owner extends object = object
+>(factory: ManagerFactory<Owner, HelperManager<StateBucket>>, definition: Def): Def {
   return setManager({ factory, type: 'helper' }, definition);
 }
 
@@ -131,10 +133,11 @@ export function getHelperManager<StateBucket = unknown>(
   }
 }
 
-export function setComponentManager<StateBucket, Owner extends object = object>(
-  factory: ManagerFactory<Owner, ComponentManager<StateBucket>>,
-  definition: ComponentDefinition<StateBucket>
-): {} {
+export function setComponentManager<
+  StateBucket,
+  Def extends ComponentDefinition<StateBucket>,
+  Owner extends object = object
+>(factory: ManagerFactory<Owner, ComponentManager<StateBucket>>, definition: Def): Def {
   return setManager({ factory, type: 'component' }, definition);
 }