catalyst-core 1.0.2 → 1.0.3-canary.1

package/dist/web-router/context.d.ts

@@ -1,3 +1,4 @@
+import type React from "react";
 import type { Location, NavigateFunction, Params, RouteMatch, RouteObject } from "react-router";
 /**
  * Internal context shared among the router components. `matchedRoutes` is the
@@ -26,4 +27,4 @@ export interface OneMgRouterContextValue {
 /**
  * @description This is internal context made for sharing data among router components
  */
-export declare const OneMgRouterContext: import("react").Context<OneMgRouterContextValue>;
+export declare const OneMgRouterContext: React.Context<OneMgRouterContextValue>;

package/dist/web-router/context.jsx

@@ -17,7 +17,16 @@ import { createContext } from "react";
  * internal context a subpath's own hook calls can't see.
  */
 
+// One context per JS realm, not per module record. A production build can load
+// this file twice: the app's server bundle inlines catalyst-core's main entry
+// while `catalyst-core/webmcp` is loaded by Node at runtime (or the reverse),
+// and each copy's own `createContext()` would be a different context. Provider
+// and consumer then never meet and `useRouterState()` throws on every page.
+// Keying the context on the global symbol registry makes every copy share it.
+const CONTEXT_KEY = Symbol.for("catalyst-core.OneMgRouterContext");
+const globalScope = globalThis;
+
 /**
  * @description This is internal context made for sharing data among router components
  */
-export const OneMgRouterContext = createContext({});
+export const OneMgRouterContext = globalScope[CONTEXT_KEY] ??= createContext({});

package/dist/web-router/context.test.jsx

@@ -1,4 +1,4 @@
-import { describe, expect, it } from "vitest"
+import { describe, expect, it, vi } from "vitest"
 import { OneMgRouterContext } from "./context.jsx"
 
 describe("OneMgRouterContext", () => {
@@ -7,4 +7,15 @@ describe("OneMgRouterContext", () => {
         expect(OneMgRouterContext.Consumer).toBeDefined()
         expect(OneMgRouterContext._currentValue).toEqual({})
     })
+
+    // Regression for #550: a production build can load this module twice (the
+    // app's server bundle inlines it, catalyst-core/webmcp loads it from
+    // disk). A per-module createContext() gave each copy its own context, so
+    // useRouterState() threw on every page under `catalyst serve`.
+    it("is the same context object across separate module instances", async () => {
+        const first = (await import("./context.jsx")).OneMgRouterContext
+        vi.resetModules()
+        const second = (await import("./context.jsx")).OneMgRouterContext
+        expect(second).toBe(first)
+    })
 })

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "catalyst-core",
-    "version": "1.0.2",
+    "version": "1.0.3-canary.1",
     "type": "module",
     "main": "./dist/index.jsx",
     "description": "Web framework that provides great performance out of the box",