fix: Return same computed when injecting reactively many multiple tim…

…es for same injection token
ogre-works · Jun 15, 2022 · 75d8f51 · 75d8f51
1 parent a8fb83a
commit 75d8f51
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 10 deletions.
diff --git a/packages/injectable-extension-for-mobx/src/computedInjectMany.js b/packages/injectable-extension-for-mobx/src/computedInjectMany.js
@@ -62,22 +62,37 @@ const invalidateReactiveInstancesOnDeregisterDecorator = getInjectable({
 });
 
 export const computedInjectManyInjectable = getInjectable({
-  id: 'reactive-instances',
+  id: 'computed-inject-many',
 
   instantiate: di => {
-    const getMobxAtomForToken = injectionToken =>
-      di.inject(invalidabilityForReactiveInstances, injectionToken);
+    const getReactiveInstances = injectionToken =>
+      di.inject(reactiveInstancesInjectable, injectionToken);
 
     return injectionToken => {
-      const mobxAtomForToken = getMobxAtomForToken(injectionToken);
+      return getReactiveInstances(injectionToken);
+    };
+  },
+});
 
-      return computed(() => {
-        mobxAtomForToken.reportObserved();
+const reactiveInstancesInjectable = getInjectable({
+  id: 'reactive-instances',
 
-        return di.injectMany(injectionToken);
-      });
-    };
+  instantiate: (di, injectionToken) => {
+    const mobxAtomForToken = di.inject(
+      invalidabilityForReactiveInstances,
+      injectionToken,
+    );
+
+    return computed(() => {
+      mobxAtomForToken.reportObserved();
+
+      return di.injectMany(injectionToken);
+    });
   },
+
+  lifecycle: lifecycleEnum.keyedSingleton({
+    getInstanceKey: (di, injectionToken) => injectionToken,
+  }),
 });
 
 export const registerMobX = di => {
@@ -86,5 +101,6 @@ export const registerMobX = di => {
     invalidateReactiveInstancesOnDeregisterDecorator,
     computedInjectManyInjectable,
     invalidabilityForReactiveInstances,
+    reactiveInstancesInjectable,
   );
 };
diff --git a/packages/injectable-extension-for-mobx/src/computedInjectMany.test.js b/packages/injectable-extension-for-mobx/src/computedInjectMany.test.js
@@ -27,6 +27,7 @@ describe('registerMobx', () => {
     let someFirstInjectionToken;
     let someOtherInjectable;
     let reactionCountForFirstToken;
+    let computedInjectMany;
 
     beforeEach(() => {
       reactionCountForFirstToken = 0;
@@ -51,7 +52,7 @@ describe('registerMobx', () => {
 
       registerMobX(di);
 
-      const computedInjectMany = di.inject(computedInjectManyInjectable);
+      computedInjectMany = di.inject(computedInjectManyInjectable);
 
       actual = computedInjectMany(someFirstInjectionToken);
 
@@ -74,6 +75,13 @@ describe('registerMobx', () => {
       ]);
     });
 
+    it('when injected again, returns same instance of computed', () => {
+      const actual1 = computedInjectMany(someFirstInjectionToken);
+      const actual2 = computedInjectMany(someFirstInjectionToken);
+
+      expect(actual1).toBe(actual2);
+    });
+
     it('when a new implementation gets registered, the reactive instances react', () => {
       const someIrrelevantInjectable = getInjectable({
         id: 'some-irrelevant-injectable',