feat: Make auto-register support same injectable being exported multi…

…ple times
ogre-works · Sep 6, 2023 · a1527e3 · a1527e3
1 parent 33990e7
commit a1527e3
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 5 deletions.
diff --git a/packages/injectable/extension-for-auto-registration/src/autoRegister.js b/packages/injectable/extension-for-auto-registration/src/autoRegister.js
@@ -1,17 +1,30 @@
-import { flatMap, forEach, tap } from 'lodash/fp';
+import {
+  flatMap,
+  forEach,
+  tap,
+  uniq,
+  values,
+  filter,
+  overSome,
+} from 'lodash/fp';
+
 import { pipeline } from '@ogre-tools/fp';
+
 import {
   isInjectable,
   isInjectableBunch,
   toFlatInjectables,
 } from '@ogre-tools/injectable';
+
 import requireContextFake from './requireContextFake';
 
 const toInjectables = module =>
-  toFlatInjectables(
-    Object.values(module).filter(
-      exported => isInjectable(exported) || isInjectableBunch(exported),
-    ),
+  pipeline(
+    module,
+    values,
+    filter(overSome([isInjectable, isInjectableBunch])),
+    toFlatInjectables,
+    uniq,
   );
 
 const getFileNameAndModule = requireContext =>

diff --git a/packages/injectable/extension-for-auto-registration/src/autoRegister.test.js b/packages/injectable/extension-for-auto-registration/src/autoRegister.test.js
@@ -63,6 +63,40 @@ describe('autoRegister', () => {
     expect(actual).toBe('some-injected-instance');
   });
 
+  it('given file with same injectable exported multiple times, and auto-registered, when the injectable is injected, does so', () => {
+    const injectableStub = getInjectable({
+      id: 'irrelevant',
+      instantiate: () => 'some-injected-instance',
+    });
+
+    const requireStub = {
+      context: getSafeFrom({
+        'some-directory/': getRequireContextStub({
+          default: injectableStub,
+          someNamedExport: injectableStub,
+        }),
+      }),
+    };
+
+    const di = createContainer('some-container');
+
+    autoRegister({
+      di,
+
+      targetModule: {
+        require: requireStub,
+      },
+
+      getRequireContexts: () => [
+        requireStub.context('some-directory/', true, /\.injectable\.js$/),
+      ],
+    });
+
+    const actual = di.inject(injectableStub);
+
+    expect(actual).toBe('some-injected-instance');
+  });
+
   it('given file with injectable bunch as export and auto-registered, when an injectable in bunch is injected, does so', () => {
     const someInjectableBunch = getInjectableBunch({
       someInjectable: {