Organize core imports

eslint.config.mjs

@@ -42,19 +42,19 @@ export default [
             },
             {
               target: ["./src/react/**/*"],
-              from: ["./src/!(core|react)/**/*"],
+              from: ["./src/!(core|react)/**/*", "./src/core/!(index.ts)"],
             },
             {
               target: ["./src/solid/**/*"],
-              from: ["./src/!(core|solid)/**/*"],
+              from: ["./src/!(core|solid)/**/*", "./src/core/!(index.ts)"],
             },
             {
               target: ["./src/svelte/**/*"],
-              from: ["./src/!(core|svelte)/**/*"],
+              from: ["./src/!(core|svelte)/**/*", "./src/core/!(index.ts)"],
             },
             {
               target: ["./src/vue/**/*"],
-              from: ["./src/!(core|vue)/**/*"],
+              from: ["./src/!(core|vue)/**/*", "./src/core/!(index.ts)"],
             },
           ],
         },

src/core/index.ts

@@ -0,0 +1,26 @@
+export {
+  ACTION_ITEMS_LENGTH_CHANGE,
+  ACTION_START_OFFSET_CHANGE,
+  UPDATE_VIRTUAL_STATE,
+  UPDATE_SCROLL_END_EVENT,
+  UPDATE_SCROLL_EVENT,
+  createVirtualStore,
+  type VirtualStore,
+  getScrollSize,
+  type StateVersion,
+} from "./store";
+export {
+  createScroller,
+  createWindowScroller,
+  createGridScroller,
+} from "./scroller";
+export {
+  createResizer,
+  createWindowResizer,
+  type ItemResizeObserver,
+  createGridResizer,
+  type GridResizer,
+} from "./resizer";
+export { isRTLDocument, isBrowser } from "./environment";
+export { microtask, sort } from "./utils";
+export type { CacheSnapshot, ScrollToIndexOpts, ItemsRange } from "./types";

src/core/utils.ts

@@ -6,8 +6,6 @@ export const { min, max, abs, floor } = Math;
 /** @internal */
 export const values = Object.values;
 /** @internal */
-export const isArray = Array.isArray;
-/** @internal */
 export const timeout = setTimeout;
 
 /**

src/react/ListItem.tsx

@@ -7,11 +7,9 @@ import {
   ReactNode,
 } from "react";
 import { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect";
-import { ItemResizeObserver } from "../core/resizer";
+import { isRTLDocument, ItemResizeObserver } from "../core";
 import { refKey } from "./utils";
-import { isRTLDocument } from "../core/environment";
 import { CustomItemComponent } from "./types";
-import { NULL } from "../core/utils";
 
 interface ListItemProps {
   _children: ReactNode;
@@ -38,7 +36,7 @@ export const ListItem = memo(
     _isHorizontal: isHorizontal,
     _isSSR: isSSR,
   }: ListItemProps): ReactElement => {
-    const ref = useRef<HTMLDivElement>(NULL);
+    const ref = useRef<HTMLDivElement>(null);
 
     // The index may be changed if elements are inserted to or removed from the start of props.children
     useIsomorphicLayoutEffect(() => resizer(ref[refKey]!, index), [index]);

src/react/VGrid.tsx

@@ -14,17 +14,18 @@
   createVirtualStore,
   getScrollSize,
   UPDATE_VIRTUAL_STATE,
-} from "../core/store";
+  createGridScroller,
+  createGridResizer,
+  GridResizer,
+  isRTLDocument,
+} from "../core";
 import { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect";
-import { createGridScroller } from "../core/scroller";
 import { refKey } from "./utils";
 import { useStatic } from "./useStatic";
-import { createGridResizer, GridResizer } from "../core/resizer";
 import { ViewportComponentAttributes } from "./types";
 import { flushSync } from "react-dom";
-import { isRTLDocument } from "../core/environment";
 import { useRerender } from "./useRerender";
-import { NULL } from "../core/utils";
+
 const genKey = (i: number, j: number) => `${i}-${j}`;
 
 /**
@@ -65,7 +66,7 @@
     _hide: hide,
     _element: Element,
   }: CellProps): ReactElement => {
-    const ref = useRef<HTMLDivElement>(NULL);
+    const ref = useRef<HTMLDivElement>(null);
 
     // The index may be changed if elements are inserted to or removed from the start of props.children
     useIsomorphicLayoutEffect(
@@ -257,7 +258,7 @@
     const hJumpCount = hStore._getJumpCount();
     const height = getScrollSize(vStore);
     const width = getScrollSize(hStore);
-    const rootRef = useRef<HTMLDivElement>(NULL);
+    const rootRef = useRef<HTMLDivElement>(null);
 
     useIsomorphicLayoutEffect(() => {
       const root = rootRef[refKey]!;
@@ -320,7 +321,7 @@
         scrollTo: scroller._scrollTo,
         scrollBy: scroller._scrollBy,
       };
     }, []);
 
     const render = useMemo(() => {
       const cache = new Map<string, ReactNode>();

src/react/VList.tsx

@@ -5,7 +5,6 @@ import {
   VirtualizerHandle,
   VirtualizerProps,
 } from "./Virtualizer";
-import { NULL } from "../core/utils";
 
 /**
  * Methods of {@link VList}.
@@ -62,7 +61,7 @@ export const VList = forwardRef<VListHandle, VListProps>(
     },
     ref
   ): ReactElement => {
-    const scrollRef = useRef<HTMLDivElement>(NULL);
+    const scrollRef = useRef<HTMLDivElement>(null);
     const shouldReverse = reverse && !horizontal;
 
     let element = (

src/react/Virtualizer.tsx

@@ -15,20 +15,22 @@
   UPDATE_SCROLL_END_EVENT,
   getScrollSize,
   ACTION_START_OFFSET_CHANGE,
-} from "../core/store";
+  createScroller,
+  createResizer,
+  CacheSnapshot,
+  ScrollToIndexOpts,
+  microtask,
+  sort,
+} from "../core";
 import { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect";
-import { createScroller } from "../core/scroller";
 import { getKey, refKey } from "./utils";
 import { useStatic } from "./useStatic";
 import { useLatestRef } from "./useLatestRef";
-import { createResizer } from "../core/resizer";
 import { ListItem } from "./ListItem";
-import { CacheSnapshot, ScrollToIndexOpts } from "../core/types";
 import { flushSync } from "react-dom";
 import { useRerender } from "./useRerender";
 import { useChildren } from "./useChildren";
 import { CustomContainerComponent, CustomItemComponent } from "./types";
-import { microtask, NULL, sort } from "../core/utils";
 
 /**
  * Methods of {@link Virtualizer}.
@@ -191,7 +193,7 @@
 
     const [getElement, count] = useChildren(children, renderCountProp);
 
-    const containerRef = useRef<HTMLDivElement>(NULL);
+    const containerRef = useRef<HTMLDivElement>(null);
 
     const isSSR = useRef(!!ssrCount);
 
@@ -320,7 +322,7 @@
         scrollTo: scroller._scrollTo,
         scrollBy: scroller._scrollBy,
       };
     }, []);
 
     for (let i = startIndex, j = endIndex; i <= j; i++) {
       items.push(getListItem(i));

src/react/WindowVirtualizer.tsx

@@ -12,20 +12,20 @@
   createVirtualStore,
   UPDATE_SCROLL_END_EVENT,
   UPDATE_SCROLL_EVENT,
-} from "../core/store";
+  createWindowScroller,
+  createWindowResizer,
+  CacheSnapshot,
+  ScrollToIndexOpts,
+} from "../core";
 import { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect";
-import { createWindowScroller } from "../core/scroller";
 import { getKey, refKey } from "./utils";
 import { useStatic } from "./useStatic";
 import { useLatestRef } from "./useLatestRef";
-import { createWindowResizer } from "../core/resizer";
-import { CacheSnapshot, ScrollToIndexOpts } from "../core/types";
 import { CustomContainerComponent, CustomItemComponent } from "./types";
 import { ListItem } from "./ListItem";
 import { flushSync } from "react-dom";
 import { useRerender } from "./useRerender";
 import { useChildren } from "./useChildren";
-import { NULL } from "../core/utils";
 
 /**
  * Methods of {@link WindowVirtualizer}.
@@ -144,7 +144,7 @@
 
     const [getElement, count] = useChildren(children, renderCountProp);
 
-    const containerRef = useRef<HTMLDivElement>(NULL);
+    const containerRef = useRef<HTMLDivElement>(null);
 
     const onScroll = useLatestRef(onScrollProp);
     const onScrollEnd = useLatestRef(onScrollEndProp);
@@ -232,7 +232,7 @@
         findEndIndex: store._findEndIndex,
         scrollToIndex: scroller._scrollToIndex,
       };
     }, []);
 
     for (let i = startIndex, j = endIndex; i <= j; i++) {
       const e = getElement(i);

src/react/useIsomorphicLayoutEffect.ts

@@ -1,5 +1,5 @@
 import { useEffect, useLayoutEffect } from "react";
-import { isBrowser } from "../core/environment";
+import { isBrowser } from "../core";
 
 /**
  * https://gist.github.com/gaearon/e7d97cdf38a2907924ea12e4ebdf3c85

src/react/useRerender.ts

@@ -1,5 +1,5 @@
 import { useReducer } from "react";
-import { VirtualStore } from "../core/store";
+import { VirtualStore } from "../core";
 
 /**
  * @internal

src/react/utils.ts

@@ -1,5 +1,4 @@
 import { ReactNode } from "react";
-import { isArray, NULL } from "../core/utils";
 
 /**
  * @internal
@@ -12,11 +11,11 @@ export const refKey = "current";
 export type ItemElement = Exclude<ReactNode, null | boolean | Array<any>>;
 
 const forEach = (children: ReactNode, elements: ItemElement[]) => {
-  if (isArray(children)) {
+  if (Array.isArray(children)) {
     for (const c of children) {
       forEach(c, elements);
     }
-  } else if (children == NULL || typeof children === "boolean") {
+  } else if (children == null || typeof children === "boolean") {
     // filter out, that is the same as React.Children.toArray
   } else {
     elements.push(children);
@@ -49,5 +48,5 @@ type MayHaveKey = { key?: React.Key };
  */
 export const getKey = (e: ItemElement, i: number): React.Key => {
   const key = (e as MayHaveKey).key;
-  return key != NULL ? key : "_" + i;
+  return key != null ? key : "_" + i;
 };

src/solid/ListItem.tsx

@@ -1,8 +1,7 @@
 /**
  * @jsxImportSource solid-js
  */
-import { ItemResizeObserver } from "../core/resizer";
-import { isRTLDocument } from "../core/environment";
+import { ItemResizeObserver, isRTLDocument } from "../core";
 import {
   Component,
   JSX,
@@ -29,7 +28,7 @@
  */
 export const ListItem: Component<ListItemProps> = (props) => {
   let elementRef: HTMLDivElement | undefined;
   props = mergeProps<[Partial<ListItemProps>, ListItemProps]>(
     { _as: "div" },
     props
   );

src/solid/RangedFor.tsx

@@ -10,7 +10,7 @@
   Signal,
   Accessor,
 } from "solid-js";
-import { ItemsRange } from "../core/types";
+import { ItemsRange } from "../core";
 
 interface RenderedNode<T> {
   _data: Signal<T>;
@@ -37,7 +37,7 @@
     }
   });
 
   return createMemo(() => {
     const list = props._each;
     const [start, end] = props._range;
     const current = new Map<number, RenderedNode<T>>();
@@ -50,7 +50,7 @@
         lookup
           ? lookup._element
           : createRoot((dispose) => {
               const data = createSignal(newData);
               const result = props._render(data[0], i);
               current.set(i, {
                 _data: data,

src/solid/Virtualizer.tsx

@@ -22,10 +22,11 @@ import {
   ACTION_ITEMS_LENGTH_CHANGE,
   getScrollSize,
   ACTION_START_OFFSET_CHANGE,
-} from "../core/store";
-import { createResizer } from "../core/resizer";
-import { createScroller } from "../core/scroller";
-import { ItemsRange, ScrollToIndexOpts } from "../core/types";
+  createResizer,
+  createScroller,
+  ItemsRange,
+  ScrollToIndexOpts,
+} from "../core";
 import { ListItem } from "./ListItem";
 import { RangedFor } from "./RangedFor";
 import { isSameRange } from "./utils";

src/solid/WindowVirtualizer.tsx

@@ -17,13 +17,14 @@ import {
   createVirtualStore,
   ACTION_ITEMS_LENGTH_CHANGE,
   UPDATE_SCROLL_EVENT,
-} from "../core/store";
-import { createWindowResizer } from "../core/resizer";
-import { createWindowScroller } from "../core/scroller";
+  createWindowResizer,
+  createWindowScroller,
+  ItemsRange,
+  ScrollToIndexOpts,
+} from "../core";
 import { ListItem } from "./ListItem";
 import { RangedFor } from "./RangedFor";
 import { isSameRange } from "./utils";
-import { ItemsRange, ScrollToIndexOpts } from "../core/types";
 
 /**
  * Methods of {@link WindowVirtualizer}.

src/solid/utils.ts

@@ -1,4 +1,4 @@
-import { ItemsRange } from "../core/types";
+import { ItemsRange } from "../core";
 
 /**
  * @internal

src/svelte/Virtualizer.type.ts

@@ -1,6 +1,6 @@
 import { type Snippet } from "svelte";
 import type { SvelteHTMLElements } from "svelte/elements";
-import { type ScrollToIndexOpts } from "../core/types";
+import { type ScrollToIndexOpts } from "../core";
 
 /**
  * Props of {@link Virtualizer}.

src/svelte/WindowVirtualizer.type.ts

@@ -1,5 +1,5 @@
 import { type Snippet } from "svelte";
-import { type ScrollToIndexOpts } from "../core/types";
+import { type ScrollToIndexOpts } from "../core";
 
 /**
  * Props of {@link WindowVirtualizer}.

src/svelte/core.ts

@@ -8,13 +8,17 @@ import {
   type StateVersion,
   getScrollSize,
   ACTION_START_OFFSET_CHANGE,
-} from "../core/store";
-import { createResizer, createWindowResizer } from "../core/resizer";
-import { createScroller, createWindowScroller } from "../core/scroller";
+  createResizer,
+  createWindowResizer,
+  createScroller,
+  createWindowScroller,
+} from "../core";
 
-export { type StateVersion } from "../core/store";
-export { isRTLDocument } from "../core/environment";
-export type { ItemResizeObserver } from "../core/resizer";
+export {
+  type StateVersion,
+  type ItemResizeObserver,
+  isRTLDocument,
+} from "../core";
 
 export const ON_MOUNT = 0;
 export const ON_UN_MOUNT = 1;

src/svelte/utils.ts

@@ -1,4 +1,4 @@
-import type { ItemsRange } from "../core/types";
+import type { ItemsRange } from "../core";
 
 export const styleToString = (
   obj: Record<string, string | undefined>

src/vue/ListItem.tsx

@@ -10,9 +10,12 @@ import {
   computed,
   Ref,
 } from "vue";
-import { ItemResizeObserver } from "../core/resizer";
-import { isRTLDocument } from "../core/environment";
-import { StateVersion, VirtualStore } from "../core/store";
+import {
+  ItemResizeObserver,
+  isRTLDocument,
+  StateVersion,
+  VirtualStore,
+} from "../core";
 
 /**
  * @internal

src/vue/Virtualizer.tsx

@@ -22,13 +22,14 @@ import {
   ACTION_ITEMS_LENGTH_CHANGE,
   getScrollSize,
   ACTION_START_OFFSET_CHANGE,
-} from "../core/store";
-import { createResizer } from "../core/resizer";
-import { createScroller } from "../core/scroller";
-import { ItemsRange, ScrollToIndexOpts } from "../core/types";
+  createResizer,
+  createScroller,
+  ItemsRange,
+  ScrollToIndexOpts,
+  microtask,
+} from "../core";
 import { ListItem } from "./ListItem";
 import { getKey, isSameRange } from "./utils";
-import { microtask } from "../core/utils";
 
 export interface VirtualizerHandle {
   /**