Simplify getRailsContext

Author: alexeyr

node_package/src/CallbackRegistry.ts

@@ -47,7 +47,7 @@ export default class CallbackRegistry<T> {
     };
 
     onPageLoaded(() => {
-      const registryTimeout = getRailsContext().railsContext?.componentRegistryTimeout;
+      const registryTimeout = getRailsContext()?.componentRegistryTimeout;
       if (!registryTimeout) return;
 
       timeoutId = setTimeout(triggerTimeout, registryTimeout);

node_package/src/ClientSideRenderer.ts

@@ -61,7 +61,7 @@ class ComponentRenderer {
     const storeDependencies = el.getAttribute('data-store-dependencies');
     const storeDependenciesArray = storeDependencies ? (JSON.parse(storeDependencies) as string[]) : [];
 
-    const { railsContext } = getRailsContext();
+    const railsContext = getRailsContext();
     if (!railsContext) return;
 
     // Wait for all store dependencies to be loaded
@@ -181,7 +181,7 @@ class StoreRenderer {
 
   constructor(storeDataElement: Element) {
     this.state = 'hydrating';
-    const { railsContext } = getRailsContext();
+    const railsContext = getRailsContext();
     if (!railsContext) {
       return;
     }

node_package/src/context.ts

@@ -11,25 +11,24 @@ let currentRailsContext: RailsContext | null = null;
 
 // caches context and railsContext to avoid re-parsing rails-context each time a component is rendered
 // Cached values will be reset when resetRailsContext() is called
-export function getRailsContext(): { railsContext: RailsContext | null } {
+export function getRailsContext(): RailsContext | null {
   // Return cached values if already set
   if (currentRailsContext) {
-    return { railsContext: currentRailsContext };
+    return currentRailsContext;
   }
 
   const el = document.getElementById('js-react-on-rails-context');
   if (!el?.textContent) {
-    return { railsContext: null };
+    return null;
   }
 
   try {
     currentRailsContext = JSON.parse(el.textContent) as RailsContext;
+    return currentRailsContext;
   } catch (e) {
     console.error('Error parsing Rails context:', e);
-    return { railsContext: null };
+    return null;
   }
-
-  return { railsContext: currentRailsContext };
 }
 
 export function resetRailsContext(): void {

node_package/tests/ComponentRegistry.test.js

@@ -23,7 +23,7 @@ jest.mock('../src/pageLifecycle', () => ({
 }));
 
 jest.mock('../src/context', () => ({
-  getRailsContext: () => ({ railsContext: { componentRegistryTimeout: 100 } }),
+  getRailsContext: () => ({ componentRegistryTimeout: 100 }),
 }));
 
 describe('ComponentRegistry', () => {