fix RouterContext export and test root warnings

Export RouterContext from the main entrypoint and run warning-producing test setup inside reactive roots so the suite stays clean.

Made-with: Cursor

Author: ryansolid

src/components.tsx

@@ -2,7 +2,6 @@
 import type { JSX } from "solid-js";
 import { createMemo, mergeProps, splitProps } from "solid-js";
 import {
-  RouterContextObj,
   useHref,
   useLocation,
   useNavigate,
@@ -14,8 +13,6 @@ import type {
 } from "./types.js";
 import { normalizePath } from "./utils.js";
 
-export { RouterContextObj as RouterContext };
-
 declare module "solid-js" {
   namespace JSX {
     interface AnchorHTMLAttributes<T> {

src/data/events.spec.ts

@@ -447,6 +447,7 @@ describe("form submit handling", () => {
   let mockRouter: RouterContext;
   let submitHandler: Function;
   let originalDocument: any;
+  let disposeEvents: (() => void) | undefined;
 
   beforeEach(() => {
     mockRouter = createMockRouter();
@@ -470,10 +471,14 @@ describe("form submit handling", () => {
       }
     } as any;
 
-    setupNativeEvents()(mockRouter);
+    disposeEvents = createRoot(dispose => {
+      setupNativeEvents()(mockRouter);
+      return dispose;
+    });
   });
 
   afterEach(() => {
+    disposeEvents?.();
     global.document = originalDocument;
   });
 

src/index.tsx

@@ -12,7 +12,8 @@ export {
   useResolvedPath,
   useSearchParams,
   useBeforeLeave,
-  usePreloadRoute
+  usePreloadRoute,
+  RouterContextObj as RouterContext
 } from "./routing.js";
 export { mergeSearchString as _mergeSearchString } from "./utils.js";
 export * from "./data/index.js";

src/routing.ts

@@ -51,6 +51,7 @@ import {
 
 const MAX_REDIRECTS = 100;
 
+/** Consider this API opaque and internal. It is likely to change in the future. */
 export const RouterContextObj = createContext<RouterContext>();
 export const RouteContextObj = createContext<RouteContext>();
 

test/utils.spec.ts

@@ -7,6 +7,7 @@ import {
   mergeSearchString,
   extractSearchParams
 } from "../src/utils.js";
+import { createRoot } from "solid-js";
 
 describe("resolvePath should", () => {
   test("normalize the base arg", () => {
@@ -355,38 +356,44 @@ describe("joinPaths should", () => {
 
 describe("createMemoObject should", () => {
   test("allow listing its own keys", () => {
-    const actual = createMemoObject(() => ({
-      hello: "world",
-      get throws() {
-        throw new Error("throws");
-      }
-    }));
-    expect(Object.getOwnPropertyNames(actual)).toEqual(["hello", "throws"]);
+    createRoot(() => {
+      const actual = createMemoObject(() => ({
+        hello: "world",
+        get throws() {
+          throw new Error("throws");
+        }
+      }));
+      expect(Object.getOwnPropertyNames(actual)).toEqual(["hello", "throws"]);
+    });
   });
 
   test("allow listing its keys", () => {
-    const actual = createMemoObject(() => ({
-      hello: "world",
-      get throws() {
-        throw new Error("throws");
-      }
-    }));
-    expect(Object.keys(actual)).toEqual(["hello", "throws"]);
+    createRoot(() => {
+      const actual = createMemoObject(() => ({
+        hello: "world",
+        get throws() {
+          throw new Error("throws");
+        }
+      }));
+      expect(Object.keys(actual)).toEqual(["hello", "throws"]);
+    });
   });
 
   test("stringify into JSON", () => {
-    const actual = createMemoObject(() => ({
-      hello: "world",
-      get getter() {
-        return "works too";
-      }
-    }));
-    expect(JSON.stringify(actual)).toEqual(
-      JSON.stringify({
+    createRoot(() => {
+      const actual = createMemoObject(() => ({
         hello: "world",
-        getter: "works too"
-      })
-    );
+        get getter() {
+          return "works too";
+        }
+      }));
+      expect(JSON.stringify(actual)).toEqual(
+        JSON.stringify({
+          hello: "world",
+          getter: "works too"
+        })
+      );
+    });
   });
 });