From 57ce2b2dc5adc04fb5d507e1bef683a7d58fc3fd Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 27 Nov 2020 15:49:33 +0100
Subject: [PATCH] core-api: fix accidental global singletons in collectors

Co-authored-by: blam <ben@blam.sh>
---
 .../src/extensions/traversal.test.tsx         | 26 ++++++++++++-------
 packages/core-api/src/extensions/traversal.ts |  4 +--
 packages/core-api/src/plugin/collectors.ts    |  2 +-
 packages/core-api/src/routing/collectors.tsx  |  4 +--
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/packages/core-api/src/extensions/traversal.test.tsx b/packages/core-api/src/extensions/traversal.test.tsx
index a69ee9de77..38571fdcc7 100644
--- a/packages/core-api/src/extensions/traversal.test.tsx
+++ b/packages/core-api/src/extensions/traversal.test.tsx
@@ -41,11 +41,14 @@ describe('discovery', () => {
       root,
       discoverers: [childDiscoverer],
       collectors: {
-        names: createCollector(Array<string>(), (acc, el) => {
-          if (typeof el.type === 'string') {
-            acc.push(el.type);
-          }
-        }),
+        names: createCollector(
+          () => Array<string>(),
+          (acc, el) => {
+            if (typeof el.type === 'string') {
+              acc.push(el.type);
+            }
+          },
+        ),
       },
     });
 
@@ -85,11 +88,14 @@ describe('discovery', () => {
           ),
       ],
       collectors: {
-        names: createCollector(Array<string>(), (acc, el) => {
-          if (typeof el.type === 'string') {
-            acc.push(el.type);
-          }
-        }),
+        names: createCollector(
+          () => Array<string>(),
+          (acc, el) => {
+            if (typeof el.type === 'string') {
+              acc.push(el.type);
+            }
+          },
+        ),
       },
     });
 
diff --git a/packages/core-api/src/extensions/traversal.ts b/packages/core-api/src/extensions/traversal.ts
index a1fbdab25a..054f23daca 100644
--- a/packages/core-api/src/extensions/traversal.ts
+++ b/packages/core-api/src/extensions/traversal.ts
@@ -120,10 +120,10 @@ export function traverseElementTree<Results>(options: {
 }
 
 export function createCollector<Result, Context>(
-  initialResult: Result,
+  accumulatorFactory: () => Result,
   visit: ReturnType<Collector<Result, Context>>['visit'],
 ): Collector<Result, Context> {
-  return () => ({ accumulator: initialResult, visit });
+  return () => ({ accumulator: accumulatorFactory(), visit });
 }
 
 export function childDiscoverer(element: ReactElement): ReactNode {
diff --git a/packages/core-api/src/plugin/collectors.ts b/packages/core-api/src/plugin/collectors.ts
index a222746f9e..3eadfc0185 100644
--- a/packages/core-api/src/plugin/collectors.ts
+++ b/packages/core-api/src/plugin/collectors.ts
@@ -34,7 +34,7 @@ import { getComponentData } from '../extensions';
 import { createCollector } from '../extensions/traversal';
 
 export const pluginCollector = createCollector(
-  new Set<BackstagePlugin>(),
+  () => new Set<BackstagePlugin>(),
   (acc, node) => {
     const plugin = getComponentData<BackstagePlugin>(node, 'core.plugin');
     if (plugin) {
diff --git a/packages/core-api/src/routing/collectors.tsx b/packages/core-api/src/routing/collectors.tsx
index fab0cbe112..34edd8a0d5 100644
--- a/packages/core-api/src/routing/collectors.tsx
+++ b/packages/core-api/src/routing/collectors.tsx
@@ -20,7 +20,7 @@ import { getComponentData } from '../extensions';
 import { createCollector } from '../extensions/traversal';
 
 export const routeCollector = createCollector(
-  new Map<RouteRef, string>(),
+  () => new Map<RouteRef, string>(),
   (acc, node, parent) => {
     if (parent.props.element === node) {
       return;
@@ -51,7 +51,7 @@ export const routeCollector = createCollector(
 );
 
 export const routeParentCollector = createCollector(
-  new Map<RouteRef, RouteRef | undefined>(),
+  () => new Map<RouteRef, RouteRef | undefined>(),
   (acc, node, parent, parentRouteRef?: RouteRef) => {
     if (parent.props.element === node) {
       return parentRouteRef;