Separate options file

Author: alexeyr

node_package/src/ReactOnRails.client.ts

@@ -13,9 +13,9 @@ import type {
   AuthenticityHeaders,
   Store,
   StoreGenerator,
-  ReactOnRailsOptions,
 } from './types/index.ts';
 import reactHydrateOrRenderInternal from './reactHydrateOrRender.ts';
+import { resetOptions } from './options.ts';
 
 export { default as buildConsoleReplay } from './buildConsoleReplay.ts';
 
@@ -25,22 +25,17 @@ declare global {
   /* eslint-enable no-var,vars-on-top,no-underscore-dangle */
 }
 
+// eslint-disable-next-line no-underscore-dangle
 if (globalThis.__REACT_ON_RAILS_LOADED__) {
   throw new Error(`\
 The ReactOnRails value exists in the ${globalThis} scope, it may not be safe to overwrite it.
 This could be caused by setting Webpack's optimization.runtimeChunk to "true" or "multiple," rather than "single."
 Check your Webpack configuration. Read more at https://github.com/shakacode/react_on_rails/issues/1558.`);
 }
 
+// eslint-disable-next-line no-underscore-dangle
 globalThis.__REACT_ON_RAILS_LOADED__ = true;
 
-const DEFAULT_OPTIONS = {
-  traceTurbolinks: false,
-  turbo: false,
-};
-
-let options: ReactOnRailsOptions = {};
-
 // TODO: convert to re-exports if everything works fine
 export function register(components: Record<string, ReactComponentOrRenderFunction>): void {
   ComponentRegistry.register(components);
@@ -83,26 +78,6 @@ export function reactHydrateOrRender(
   return reactHydrateOrRenderInternal(domNode, reactElement, hydrate);
 }
 
-export function setOptions(newOptions: Partial<ReactOnRailsOptions>): void {
-  if (typeof newOptions.traceTurbolinks !== 'undefined') {
-    options.traceTurbolinks = newOptions.traceTurbolinks;
-
-    // eslint-disable-next-line no-param-reassign
-    delete newOptions.traceTurbolinks;
-  }
-
-  if (typeof newOptions.turbo !== 'undefined') {
-    options.turbo = newOptions.turbo;
-
-    // eslint-disable-next-line no-param-reassign
-    delete newOptions.turbo;
-  }
-
-  if (Object.keys(newOptions).length > 0) {
-    throw new Error(`Invalid options passed to ReactOnRails.options: ${JSON.stringify(newOptions)}`);
-  }
-}
-
 export function reactOnRailsPageLoaded() {
   return ClientStartup.reactOnRailsPageLoaded();
 }
@@ -127,10 +102,6 @@ export function authenticityHeaders(otherHeaders: Record<string, string> = {}):
 // INTERNALLY USED APIs
 // /////////////////////////////////////////////////////////////////////////////
 
-export function option<K extends keyof ReactOnRailsOptions>(key: K): ReactOnRailsOptions[K] | undefined {
-  return options[key];
-}
-
 export function getStoreGenerator(name: string): StoreGenerator {
   return StoreRegistry.getStoreGenerator(name);
 }
@@ -201,12 +172,9 @@ export function stores(): Map<string, Store> {
   return StoreRegistry.stores();
 }
 
-export function resetOptions(): void {
-  options = { ...DEFAULT_OPTIONS };
-}
-
 resetOptions();
 
 ClientStartup.clientStartup();
 
 export * from './types/index.ts';
+export * from './options.ts';

node_package/src/options.ts

@@ -0,0 +1,36 @@
+import type { ReactOnRailsOptions } from './types/index.ts';
+
+const DEFAULT_OPTIONS = {
+  traceTurbolinks: false,
+  turbo: false,
+};
+
+let options: ReactOnRailsOptions = {};
+
+export function setOptions(newOptions: Partial<ReactOnRailsOptions>): void {
+  if (typeof newOptions.traceTurbolinks !== 'undefined') {
+    options.traceTurbolinks = newOptions.traceTurbolinks;
+
+    // eslint-disable-next-line no-param-reassign
+    delete newOptions.traceTurbolinks;
+  }
+
+  if (typeof newOptions.turbo !== 'undefined') {
+    options.turbo = newOptions.turbo;
+
+    // eslint-disable-next-line no-param-reassign
+    delete newOptions.turbo;
+  }
+
+  if (Object.keys(newOptions).length > 0) {
+    throw new Error(`Invalid options passed to ReactOnRails.options: ${JSON.stringify(newOptions)}`);
+  }
+}
+
+export function option<K extends keyof ReactOnRailsOptions>(key: K): ReactOnRailsOptions[K] | undefined {
+  return options[key];
+}
+
+export function resetOptions(): void {
+  options = { ...DEFAULT_OPTIONS };
+}

node_package/src/turbolinksUtils.ts

@@ -1,5 +1,4 @@
-// TODO: move option to a separate file to avoid circular dependencies
-import { option } from './ReactOnRails.client';
+import { option } from './options.ts';
 
 declare global {
   namespace Turbolinks {