Shorten types import

alexeyr · alexeyr · commit 5770e00feda5 · 2025-04-03T09:03:34.000Z
diff --git a/eslint.config.ts b/eslint.config.ts
@@ -144,7 +144,7 @@ const config = tsEslint.config([
     },
   },
   {
-    files: ['**/*.ts', '**/*.tsx'],
+    files: ['**/*.ts', '**/*.[cm]ts', '**/*.tsx'],
 
     extends: tsEslint.configs.strictTypeChecked,
 
diff --git a/node_package/src/Authenticity.ts b/node_package/src/Authenticity.ts
@@ -1,4 +1,4 @@
-import type { AuthenticityHeaders } from './types/index.ts';
+import type { AuthenticityHeaders } from './_types.ts';
 
 export default {
   authenticityToken(): string | null {
diff --git a/node_package/src/CallbackRegistry.ts b/node_package/src/CallbackRegistry.ts
@@ -1,4 +1,4 @@
-import { ItemRegistrationCallback } from './types/index.ts';
+import { ItemRegistrationCallback } from './_types.ts';
 import { onPageLoaded, onPageUnloaded } from './pageLifecycle.ts';
 import { getContextAndRailsContext } from './context.ts';
 
diff --git a/node_package/src/ClientSideRenderer.ts b/node_package/src/ClientSideRenderer.ts
@@ -3,7 +3,7 @@
 
 import * as ReactDOM from 'react-dom';
 import type { ReactElement } from 'react';
-import type { RailsContext, RegisteredComponent, RenderFunction, Root } from './types/index.ts';
+import type { RailsContext, RegisteredComponent, RenderFunction, Root } from './_types.ts';
 
 import { getContextAndRailsContext, resetContextAndRailsContext, type Context } from './context.ts';
 import createReactOutput from './createReactOutput.ts';
diff --git a/node_package/src/ComponentRegistry.ts b/node_package/src/ComponentRegistry.ts
@@ -1,4 +1,4 @@
-import { type RegisteredComponent, type ReactComponentOrRenderFunction } from './types/index.ts';
+import { type RegisteredComponent, type ReactComponentOrRenderFunction } from './_types.ts';
 import isRenderFunction from './isRenderFunction.ts';
 import CallbackRegistry from './CallbackRegistry.ts';
 
diff --git a/node_package/src/RSCClientRoot.ts b/node_package/src/RSCClientRoot.ts
@@ -5,7 +5,7 @@ import * as ReactDOMClient from 'react-dom/client';
 import { createFromReadableStream } from 'react-on-rails-rsc/client';
 import { fetch } from './utils.ts';
 import transformRSCStreamAndReplayConsoleLogs from './transformRSCStreamAndReplayConsoleLogs.ts';
-import { RailsContext, RenderFunction } from './types/index.ts';
+import { RailsContext, RenderFunction } from './_types.ts';
 
 const { use } = React;
 
diff --git a/node_package/src/ReactOnRails.client.ts b/node_package/src/ReactOnRails.client.ts
@@ -16,7 +16,7 @@ import type {
   Store,
   StoreGenerator,
   ReactOnRailsOptions,
-} from './types/index.ts';
+} from './_types.ts';
 import reactHydrateOrRender from './reactHydrateOrRender.ts';
 
 const ctx = context();
@@ -203,5 +203,5 @@ ctx.ReactOnRails.resetOptions();
 
 ClientStartup.clientStartup(ctx);
 
-export * from './types/index.ts';
+export * from './_types.ts';
 export default ctx.ReactOnRails;
diff --git a/node_package/src/ReactOnRails.full.ts b/node_package/src/ReactOnRails.full.ts
@@ -1,6 +1,6 @@
 import handleError from './handleError.ts';
 import serverRenderReactComponent from './serverRenderReactComponent.ts';
-import type { RenderParams, RenderResult, ErrorOptions } from './types/index.ts';
+import type { RenderParams, RenderResult, ErrorOptions } from './_types.ts';
 
 import Client from './ReactOnRails.client.ts';
 
@@ -15,5 +15,5 @@ Client.handleError = (options: ErrorOptions): string | undefined => handleError(
 Client.serverRenderReactComponent = (options: RenderParams): null | string | Promise<RenderResult> =>
   serverRenderReactComponent(options);
 
-export * from './types/index.ts';
+export * from './_types.ts';
 export default Client;
diff --git a/node_package/src/ReactOnRailsRSC.ts b/node_package/src/ReactOnRailsRSC.ts
@@ -2,7 +2,7 @@ import { renderToPipeableStream } from 'react-on-rails-rsc/server.node';
 import { PassThrough, Readable } from 'stream';
 import type { ReactElement } from 'react';
 
-import { RSCRenderParams, StreamRenderState } from './types/index.ts';
+import { RSCRenderParams, StreamRenderState } from './_types.ts';
 import ReactOnRails from './ReactOnRails.full.ts';
 import buildConsoleReplay from './buildConsoleReplay.ts';
 import handleError from './handleError.ts';
@@ -65,5 +65,5 @@ ReactOnRails.serverRenderRSCReactComponent = (options: RSCRenderParams) => {
   }
 };
 
-export * from './types/index.ts';
+export * from './_types.ts';
 export default ReactOnRails;
diff --git a/node_package/src/StoreRegistry.ts b/node_package/src/StoreRegistry.ts
@@ -1,5 +1,5 @@
-import CallbackRegistry from './CallbackRegistry';
-import type { Store, StoreGenerator } from './types/index.ts';
+import CallbackRegistry from './CallbackRegistry.ts';
+import type { Store, StoreGenerator } from './_types.ts';
 
 const storeGeneratorRegistry = new CallbackRegistry<StoreGenerator>('store generator');
 const hydratedStoreRegistry = new CallbackRegistry<Store>('hydrated store');
diff --git a/node_package/src/_types.ts b/node_package/src/_types.ts
diff --git a/node_package/src/context.ts b/node_package/src/context.ts
@@ -1,4 +1,4 @@
-import type { ReactOnRailsInternal as ReactOnRailsType, RailsContext } from './types/index.ts';
+import type { ReactOnRailsInternal as ReactOnRailsType, RailsContext } from './_types.ts';
 
 declare global {
   interface Window {
diff --git a/node_package/src/createReactOutput.ts b/node_package/src/createReactOutput.ts
@@ -5,7 +5,7 @@ import type {
   ReactComponent,
   RenderFunction,
   CreateReactOutputResult,
-} from './types/index.ts';
+} from './_types.ts';
 import { isServerRenderHash, isPromise } from './isServerRenderResult.ts';
 
 /**
diff --git a/node_package/src/handleError.ts b/node_package/src/handleError.ts
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import * as ReactDOMServer from 'react-dom/server';
-import type { ErrorOptions } from './types/index.ts';
+import type { ErrorOptions } from './_types.ts';
 
 function handleRenderFunctionIssue(options: ErrorOptions): string {
   const { e, name } = options;
diff --git a/node_package/src/isRenderFunction.ts b/node_package/src/isRenderFunction.ts
@@ -1,6 +1,6 @@
 // See discussion:
 // https://discuss.reactjs.org/t/how-to-determine-if-js-object-is-react-component/2825/2
-import { ReactComponentOrRenderFunction, RenderFunction } from './types/index.ts';
+import { ReactComponentOrRenderFunction, RenderFunction } from './_types.ts';
 
 /**
  * Used to determine we'll call be calling React.createElement on the component of if this is a
diff --git a/node_package/src/isServerRenderResult.ts b/node_package/src/isServerRenderResult.ts
@@ -1,4 +1,4 @@
-import type { CreateReactOutputResult, ServerRenderResult } from './types/index.ts';
+import type { CreateReactOutputResult, ServerRenderResult } from './_types.ts';
 
 export function isServerRenderHash(testValue: CreateReactOutputResult): testValue is ServerRenderResult {
   return !!(
diff --git a/node_package/src/reactHydrateOrRender.ts b/node_package/src/reactHydrateOrRender.ts
@@ -1,6 +1,6 @@
 import type { ReactElement } from 'react';
 import * as ReactDOM from 'react-dom';
-import type { RenderReturnType } from './types/index.ts';
+import type { RenderReturnType } from './_types.ts';
 import { supportsRootApi } from './reactApis.ts';
 
 type HydrateOrRenderType = (domNode: Element, reactElement: ReactElement) => RenderReturnType;
diff --git a/node_package/src/registerServerComponent/client.ts b/node_package/src/registerServerComponent/client.ts
@@ -1,6 +1,6 @@
 import ReactOnRails from '../ReactOnRails.client.ts';
 import RSCClientRoot from '../RSCClientRoot.ts';
-import { RegisterServerComponentOptions, RailsContext, ReactComponentOrRenderFunction } from '../types/index.ts';
+import { RegisterServerComponentOptions, RailsContext, ReactComponentOrRenderFunction } from '../_types.ts';
 
 /**
  * Registers React Server Components (RSC) with React on Rails.
diff --git a/node_package/src/registerServerComponent/server.ts b/node_package/src/registerServerComponent/server.ts
@@ -1,5 +1,5 @@
 import ReactOnRails from '../ReactOnRails.client.ts';
-import { ReactComponent } from '../types/index.ts';
+import { ReactComponent } from '../_types.ts';
 
 /**
  * Registers React Server Components (RSC) with React on Rails for both server and RSC bundles.
diff --git a/node_package/src/serverRenderReactComponent.ts b/node_package/src/serverRenderReactComponent.ts
@@ -14,7 +14,7 @@ import type {
   RenderState,
   RenderOptions,
   ServerRenderResult,
-} from './types/index.ts';
+} from './_types.ts';
 
 function processServerRenderHash(result: ServerRenderResult, options: RenderOptions): RenderState {
   const { redirectLocation, routeError } = result;
diff --git a/node_package/src/serverRenderUtils.ts b/node_package/src/serverRenderUtils.ts
@@ -1,4 +1,4 @@
-import type { RegisteredComponent, RenderResult, RenderState, StreamRenderState } from './types/index.ts';
+import type { RegisteredComponent, RenderResult, RenderState, StreamRenderState } from './_types.ts';
 
 export function createResultObject(
   html: string | null,
diff --git a/node_package/src/streamServerRenderedReactComponent.ts b/node_package/src/streamServerRenderedReactComponent.ts
@@ -8,7 +8,7 @@ import { isPromise, isServerRenderHash } from './isServerRenderResult.ts';
 import buildConsoleReplay from './buildConsoleReplay.ts';
 import handleError from './handleError.ts';
 import { createResultObject, convertToError, validateComponent } from './serverRenderUtils.ts';
-import type { RenderParams, StreamRenderState } from './types/index.ts';
+import type { RenderParams, StreamRenderState } from './_types.ts';
 
 const stringToStream = (str: string): Readable => {
   const stream = new PassThrough();
diff --git a/node_package/src/transformRSCStreamAndReplayConsoleLogs.ts b/node_package/src/transformRSCStreamAndReplayConsoleLogs.ts
@@ -1,4 +1,4 @@
-import { RenderResult } from './types/index.ts';
+import { RenderResult } from './_types.ts';
 
 export default function transformRSCStreamAndReplayConsoleLogs(stream: ReadableStream<Uint8Array>) {
   return new ReadableStream({

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ const config = tsEslint.config([`
`144`	`144`	`},`
`145`	`145`	`},`
`146`	`146`	`{`
`147`		`- files: ['*/.ts', '*/.tsx'],`
	`147`	`+ files: ['*/.ts', '*/.[cm]ts', '*/.tsx'],`
`148`	`148`
`149`	`149`	`extends: tsEslint.configs.strictTypeChecked,`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { AuthenticityHeaders } from './types/index.ts';`
	`1`	`+import type { AuthenticityHeaders } from './_types.ts';`
`2`	`2`
`3`	`3`	`export default {`
`4`	`4`	`authenticityToken(): string \| null {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { ItemRegistrationCallback } from './types/index.ts';`
	`1`	`+import { ItemRegistrationCallback } from './_types.ts';`
`2`	`2`	`import { onPageLoaded, onPageUnloaded } from './pageLifecycle.ts';`
`3`	`3`	`import { getContextAndRailsContext } from './context.ts';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { type RegisteredComponent, type ReactComponentOrRenderFunction } from './types/index.ts';`
	`1`	`+import { type RegisteredComponent, type ReactComponentOrRenderFunction } from './_types.ts';`
`2`	`2`	`import isRenderFunction from './isRenderFunction.ts';`
`3`	`3`	`import CallbackRegistry from './CallbackRegistry.ts';`
`4`	`4`