Refactor / cleanup owner usage in Modifier manager APIs.

Author: Robert Jackson

addon/-private/class/modifier-manager.ts

@@ -10,18 +10,18 @@ function destroyModifier(modifier: ClassBasedModifier): void {
   modifier.willDestroy();
 }
 
-class ClassBasedModifierManager {
+export default class ClassBasedModifierManager {
   capabilities = capabilities('3.13');
 
+  constructor(private owner: unknown) {}
+
   createModifier(
     factory: { owner: unknown; class: typeof ClassBasedModifier },
     args: ModifierArgs
   ): ClassBasedModifier {
-    // TODO: stop getting the owner off the factory like this; it is *not* per
-    // the spec. See https://github.com/ember-modifier/ember-modifier/issues/25
-    const { owner, class: Modifier } = factory;
+    const Modifier = factory.class;
 
-    const modifier = new Modifier(owner, args);
+    const modifier = new Modifier(this.owner, args);
 
     registerDestructor(modifier, destroyModifier);
 
@@ -45,5 +45,3 @@ class ClassBasedModifierManager {
     destroy(instance);
   }
 }
-
-export default new ClassBasedModifierManager();

addon/-private/class/modifier.ts

@@ -97,4 +97,4 @@ export default class ClassBasedModifier<
   }
 }
 
-setModifierManager(() => Manager, ClassBasedModifier);
+setModifierManager((owner) => new Manager(owner), ClassBasedModifier);

addon/-private/functional/modifier-manager.ts

@@ -28,15 +28,9 @@ function setup(
   MODIFIER_TEARDOWNS.set(modifier, teardown);
 }
 
-export default class FunctionalModifierManager {
+class FunctionalModifierManager {
   capabilities = capabilities('3.13');
 
-  // TODO: remove this entirely as part of #25
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  constructor(_owner: unknown) {
-    /* no-op */
-  }
-
   createModifier(factory: Factory): FunctionalModifier {
     // This looks superfluous, but this is creating a new instance
     // of a function -- this is important so that each instance of the
@@ -65,3 +59,5 @@ export default class FunctionalModifierManager {
     teardown(modifier);
   }
 }
+
+export default new FunctionalModifierManager();

addon/-private/functional/modifier.ts

@@ -7,20 +7,6 @@ export type FunctionalModifier<
   N extends ModifierArgs['named'] = ModifierArgs['named']
 > = (element: Element, positional: P, named: N) => unknown;
 
-const MANAGERS: WeakMap<object, FunctionalModifierManager> = new WeakMap();
-
-function managerFor(owner: object): FunctionalModifierManager {
-  let manager = MANAGERS.get(owner);
-
-  if (manager === undefined) {
-    manager = new FunctionalModifierManager(owner);
-  }
-
-  return manager;
-}
-
-// TODO: simplify this -- it doesn't (and shouldn't) use the owner at all.
-// See https://github.com/ember-modifier/ember-modifier/issues/26
 /**
  * An API for writing simple modifiers.
  *
@@ -37,5 +23,5 @@ function managerFor(owner: object): FunctionalModifierManager {
  * @param fn The function which defines the modifier.
  */
 export default function modifier(fn: FunctionalModifier): unknown {
-  return setModifierManager(managerFor, fn);
+  return setModifierManager(() => FunctionalModifierManager, fn);
 }