From 3a7fe9c4784178f91ab924e7b49a7d777b53f719 Mon Sep 17 00:00:00 2001
From: Taylor Lodge <taylor.lodge@koordinates.com>
Date: Fri, 16 Aug 2024 11:36:25 +1200
Subject: [PATCH] fix(builders): buildRoutingMachine not working with routing
 events containing dots

---
 src/builders.spec.tsx | 52 +++++++++++++++++++++++++++++++++++--------
 src/builders.tsx      | 13 +++++++++--
 2 files changed, 54 insertions(+), 11 deletions(-)

diff --git a/src/builders.spec.tsx b/src/builders.spec.tsx
index 44f16be..16bba29 100644
--- a/src/builders.spec.tsx
+++ b/src/builders.spec.tsx
@@ -107,16 +107,15 @@ describe("xstate-tree builders", () => {
     const hist: XstateTreeHistory = createMemoryHistory();
     const createRoute = buildCreateRoute(() => hist, "/");
 
-    const fooRoute = createRoute.simpleRoute()({
-      url: "/foo/",
-      event: "GO_TO_FOO",
-    });
-    const barRoute = createRoute.simpleRoute()({
-      url: "/bar/",
-      event: "GO_TO_BAR",
-    });
-
     it("takes a mapping of routes to machines and returns a machine that invokes those machines when those routes events are broadcast", async () => {
+      const fooRoute = createRoute.simpleRoute()({
+        url: "/foo/",
+        event: "GO_TO_FOO",
+      });
+      const barRoute = createRoute.simpleRoute()({
+        url: "/bar/",
+        event: "GO_TO_BAR",
+      });
       const FooMachine = viewToMachine(() => <div>foo</div>);
       const BarMachine = viewToMachine(() => <div>bar</div>);
 
@@ -142,5 +141,40 @@ describe("xstate-tree builders", () => {
       act(() => barRoute.navigate());
       await waitFor(() => getByText("bar"));
     });
+
+    it("handles routing events that contain . in them", async () => {
+      const fooRoute = createRoute.simpleRoute()({
+        url: "/foo/",
+        event: "routing.foo",
+      });
+      const barRoute = createRoute.simpleRoute()({
+        url: "/bar/",
+        event: "routing.bar",
+      });
+      const FooMachine = viewToMachine(() => <div>foo</div>);
+      const BarMachine = viewToMachine(() => <div>bar</div>);
+
+      const routingMachine = buildRoutingMachine([fooRoute, barRoute], {
+        "routing.foo": FooMachine,
+        "routing.bar": BarMachine,
+      });
+
+      const Root = buildRootComponent({
+        machine: routingMachine,
+        routing: {
+          history: hist,
+          basePath: "/",
+          routes: [fooRoute, barRoute],
+        },
+      });
+
+      const { getByText } = render(<Root />);
+
+      act(() => fooRoute.navigate());
+      await waitFor(() => getByText("foo"));
+
+      act(() => barRoute.navigate());
+      await waitFor(() => getByText("bar"));
+    });
   });
 });
diff --git a/src/builders.tsx b/src/builders.tsx
index 5865e5c..fa34a1b 100644
--- a/src/builders.tsx
+++ b/src/builders.tsx
@@ -111,13 +111,22 @@ export function buildRoutingMachine<TRoutes extends AnyRoute[]>(
   _routes: TRoutes,
   mappings: Record<TRoutes[number]["event"], AnyXstateTreeMachine>
 ): AnyXstateTreeMachine {
+  /**
+   * States in xstate can't contain dots, since the states are named after the routing events
+   * if the routing event contains a dot that will make a state with a dot in it
+   * this function sanitizes the event name to remove dots and is used for the state names and targets
+   */
+  function sanitizeEventName(event: string) {
+    return event.replace(/\.([a-zA-Z])/g, (_, letter) => letter.toUpperCase());
+  }
+
   const contentSlot = singleSlot("Content");
   const mappingsToStates = Object.entries<AnyXstateTreeMachine>(
     mappings
   ).reduce((acc, [event, _machine]) => {
     return {
       ...acc,
-      [event]: {
+      [sanitizeEventName(event)]: {
         invoke: {
           src: event,
           id: contentSlot.getId(),
@@ -130,7 +139,7 @@ export function buildRoutingMachine<TRoutes extends AnyRoute[]>(
     (acc, event) => ({
       ...acc,
       [event]: {
-        target: `.${event}`,
+        target: `.${sanitizeEventName(event)}`,
       },
     }),
     {}