From 8f363363b8df1af0e2a0fede5217435537ff6425 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Thu, 7 Apr 2022 17:07:41 +0200
Subject: [PATCH] core-app-api: refactor v2 routing collector a lil bit

Co-authored-by: blam <ben@blam.sh>
Co-authored-by: Johan Haals <johan.haals@gmail.com>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../core-app-api/src/routing/collectors.tsx   | 48 ++++++++-----------
 1 file changed, 21 insertions(+), 27 deletions(-)

diff --git a/packages/core-app-api/src/routing/collectors.tsx b/packages/core-app-api/src/routing/collectors.tsx
index c5d8072fc8..e036a6ef3b 100644
--- a/packages/core-app-api/src/routing/collectors.tsx
+++ b/packages/core-app-api/src/routing/collectors.tsx
@@ -77,15 +77,13 @@ export const routingV2Collector = createCollector(
     objects: new Array<BackstageRouteObject>(),
   }),
   (acc, node, parent, ctx?: RoutingV2CollectorContext) => {
-    const path: string | undefined = node.props?.path;
+    const path: unknown = node.props?.path;
 
     const mountPoint = getComponentData<RouteRef>(node, 'core.mountPoint');
-    if (mountPoint) {
-      if (path) {
-        throw new Error(
-          'Path property may not be set directly on a routable extension',
-        );
-      }
+    if (mountPoint && path) {
+      throw new Error(
+        'Path property may not be set directly on a routable extension',
+      );
     }
 
     // If we're in an element prop, ignore everything
@@ -97,10 +95,13 @@ export const routingV2Collector = createCollector(
       return { ...ctx, isElementAncestor: true };
     }
 
-    let currentObj = ctx?.obj;
-    const parentChildren = currentObj?.children ?? acc.objects;
+    const parentChildren = ctx?.obj?.children ?? acc.objects;
 
     if (path) {
+      if (typeof path !== 'string') {
+        throw new Error('Element path must be a string');
+      }
+
       const elementProp = node.props.element;
 
       if (getComponentData<boolean>(node, 'core.gatherMountPoints')) {
@@ -108,18 +109,18 @@ export const routingV2Collector = createCollector(
           throw new Error('Mount point gatherers may not have an element prop');
         }
 
-        currentObj = {
+        const newObj = {
           path,
           element: 'gathered',
-          routeRefs: new Set(),
+          routeRefs: new Set<RouteRef>(),
           caseSensitive: Boolean(node.props?.caseSensitive),
           children: [MATCH_ALL_ROUTE],
           plugin: undefined,
         };
-        parentChildren.push(currentObj);
+        parentChildren.push(newObj);
 
         return {
-          obj: currentObj,
+          obj: newObj,
           gatherPath: path,
           routeRef: ctx?.routeRef,
           gatherRouteRef: ctx?.routeRef,
@@ -134,7 +135,7 @@ export const routingV2Collector = createCollector(
           );
         }
 
-        currentObj = {
+        const newObj = {
           path,
           element: 'mounted',
           routeRefs: new Set([routeRef]),
@@ -142,12 +143,12 @@ export const routingV2Collector = createCollector(
           children: [MATCH_ALL_ROUTE],
           plugin,
         };
-        parentChildren.push(currentObj);
-        acc.parents.set(routeRef, ctx?.routeRef);
+        parentChildren.push(newObj);
         acc.paths.set(routeRef, path);
+        acc.parents.set(routeRef, ctx?.routeRef);
 
         return {
-          obj: currentObj,
+          obj: newObj,
           routeRef: routeRef ?? ctx?.routeRef,
           gatherPath: path,
           gatherRouteRef: ctx?.gatherRouteRef,
@@ -161,23 +162,16 @@ export const routingV2Collector = createCollector(
       }
 
       ctx?.obj?.routeRefs.add(mountPoint);
-      acc.parents.set(mountPoint, ctx?.gatherRouteRef);
       acc.paths.set(mountPoint, ctx.gatherPath);
+      acc.parents.set(mountPoint, ctx?.gatherRouteRef);
 
       return {
-        obj: currentObj,
+        ...ctx,
         routeRef: mountPoint,
-        gatherPath: ctx?.gatherPath,
-        gatherRouteRef: ctx?.gatherRouteRef,
       };
     }
 
-    return {
-      obj: currentObj,
-      routeRef: ctx?.routeRef,
-      gatherPath: ctx?.gatherPath,
-      gatherRouteRef: ctx?.gatherRouteRef,
-    };
+    return ctx;
   },
 );