Fix type import paths

src/components/attribution-control.ts

@@ -3,7 +3,7 @@ import {useEffect, memo} from 'react';
 import {applyReactStyle} from '../utils/apply-react-style';
 import {useControl} from './use-control';
 
-import type {ControlPosition, AttributionControlOptions} from '../types';
+import type {ControlPosition, AttributionControlOptions} from '../types/lib';
 
 export type AttributionControlProps = AttributionControlOptions & {
   /** Placement of the control relative to the map. */

src/components/fullscreen-control.ts

@@ -4,7 +4,7 @@ import {useEffect, memo} from 'react';
 import {applyReactStyle} from '../utils/apply-react-style';
 import {useControl} from './use-control';
 
-import type {ControlPosition, FullscreenControlOptions} from '../types';
+import type {ControlPosition, FullscreenControlOptions} from '../types/lib';
 
 export type FullscreenControlProps = Omit<FullscreenControlOptions, 'container'> & {
   /** Id of the DOM element which should be made full screen. By default, the map container

src/components/geolocate-control.ts

@@ -6,11 +6,9 @@ import {useControl} from './use-control';
 import type {
   ControlPosition,
   GeolocateControlInstance,
-  GeolocateControlOptions,
-  GeolocateEvent,
-  GeolocateResultEvent,
-  GeolocateErrorEvent
-} from '../types';
+  GeolocateControlOptions
+} from '../types/lib';
+import type {GeolocateEvent, GeolocateResultEvent, GeolocateErrorEvent} from '../types/events';
 
 export type GeolocateControlProps = GeolocateControlOptions & {
   /** Placement of the control relative to the map. */

src/components/layer.ts

@@ -3,7 +3,8 @@ import {MapContext} from './map';
 import assert from '../utils/assert';
 import {deepEqual} from '../utils/deep-equal';
 
-import type {MapInstance, CustomLayerInterface, AnyLayer} from '../types';
+import type {MapInstance, CustomLayerInterface} from '../types/lib';
+import type {AnyLayer} from '../types/style-spec';
 
 // Omiting property from a union type, see
 // https://github.com/microsoft/TypeScript/issues/39556#issuecomment-656925230

src/components/logo-control.ts

@@ -3,7 +3,7 @@ import {useEffect, memo} from 'react';
 import {applyReactStyle} from '../utils/apply-react-style';
 import {useControl} from './use-control';
 
-import type {ControlPosition, LogoControlOptions} from '../types';
+import type {ControlPosition, LogoControlOptions} from '../types/lib';
 
 export type LogoControlProps = LogoControlOptions & {
   /** Placement of the control relative to the map. */

src/components/map.tsx

@@ -8,7 +8,7 @@ import createRef, {MapRef} from '../maplibre/create-ref';
 import type {CSSProperties} from 'react';
 import useIsomorphicLayoutEffect from '../utils/use-isomorphic-layout-effect';
 import setGlobals, {GlobalSettings} from '../utils/set-globals';
-import type {MapLib, MapOptions} from '../types';
+import type {MapLib, MapOptions} from '../types/lib';
 
 export type MapContextValue = {
   mapLib: MapLib;

src/components/marker.ts

@@ -4,13 +4,8 @@ import {createPortal} from 'react-dom';
 import {useImperativeHandle, useEffect, useMemo, useRef, useContext, forwardRef, memo} from 'react';
 import {applyReactStyle} from '../utils/apply-react-style';
 
-import type {
-  MarkerEvent,
-  MarkerDragEvent,
-  PopupInstance,
-  MarkerInstance,
-  MarkerOptions
-} from '../types';
+import type {PopupInstance, MarkerInstance, MarkerOptions} from '../types/lib';
+import type {MarkerEvent, MarkerDragEvent} from '../types/events';
 
 import {MapContext} from './map';
 import {arePointsEqual} from '../utils/deep-equal';

src/components/navigation-control.ts

@@ -3,7 +3,7 @@ import {useEffect, memo} from 'react';
 import {applyReactStyle} from '../utils/apply-react-style';
 import {useControl} from './use-control';
 
-import type {ControlPosition, NavigationControlOptions} from '../types';
+import type {ControlPosition, NavigationControlOptions} from '../types/lib';
 
 export type NavigationControlProps = NavigationControlOptions & {
   /** Placement of the control relative to the map. */

src/components/popup.ts

@@ -4,7 +4,8 @@ import {createPortal} from 'react-dom';
 import {useImperativeHandle, useEffect, useMemo, useRef, useContext, forwardRef, memo} from 'react';
 import {applyReactStyle} from '../utils/apply-react-style';
 
-import type {PopupEvent, PopupInstance, PopupOptions} from '../types';
+import type {PopupInstance, PopupOptions} from '../types/lib';
+import type {PopupEvent} from '../types/events';
 
 import {MapContext} from './map';
 import {deepEqual} from '../utils/deep-equal';

src/components/scale-control.ts

@@ -3,7 +3,7 @@ import {useEffect, useRef, memo} from 'react';
 import {applyReactStyle} from '../utils/apply-react-style';
 import {useControl} from './use-control';
 
-import type {ControlPosition, ScaleControlOptions} from '../types';
+import type {ControlPosition, ScaleControlOptions} from '../types/lib';
 
 export type ScaleControlProps = ScaleControlOptions & {
   // These props will be further constraint by OptionsT

src/components/source.ts

@@ -5,12 +5,12 @@ import assert from '../utils/assert';
 import {deepEqual} from '../utils/deep-equal';
 
 import type {
-  MapInstance,
   GeoJSONSourceImplementation,
   ImageSourceImplemtation,
-  AnySource,
   AnySourceImplementation
-} from '../types';
+} from '../types/internal';
+import type {AnySource} from '../types/style-spec';
+import type {MapInstance} from '../types/lib';
 
 export type SourceProps = AnySource & {
   id?: string;

src/components/terrain-control.ts

@@ -3,7 +3,8 @@ import {useEffect, memo} from 'react';
 import {applyReactStyle} from '../utils/apply-react-style';
 import {useControl} from './use-control';
 
-import type {ControlPosition, Terrain} from '../types';
+import type {ControlPosition} from '../types/lib';
+import type {Terrain} from '../types/style-spec';
 
 export type TerrainControlProps = Terrain & {
   /** Placement of the control relative to the map. */

src/components/use-control.ts

@@ -1,5 +1,5 @@
 import {useContext, useMemo, useEffect} from 'react';
-import type {IControl, ControlPosition} from '../types';
+import type {IControl, ControlPosition} from '../types/lib';
 import {MapContext} from './map';
 import type {MapContextValue} from './map';
 

src/maplibre/create-ref.ts

@@ -1,4 +1,4 @@
-import type {MapInstance} from '../types';
+import type {MapInstance} from '../types/lib';
 import type Maplibre from './maplibre';
 
 /** These methods may break the react binding if called directly */

src/maplibre/maplibre.ts

@@ -2,27 +2,25 @@ import {transformToViewState, applyViewStateToTransform} from '../utils/transfor
 import {normalizeStyle} from '../utils/style-utils';
 import {deepEqual} from '../utils/deep-equal';
 
+import type {TransformLike} from '../types/internal';
 import type {
-  TransformLike,
   ViewState,
-  ViewStateChangeEvent,
   Point,
   PointLike,
   PaddingOptions,
-  MapStyle,
   ImmutableLike,
   LngLatBoundsLike,
+  MapGeoJSONFeature
+} from '../types/common';
+import type {MapStyle, Sky, Light, Terrain, Projection} from '../types/style-spec';
+import type {MapInstance} from '../types/lib';
+import type {
   MapCallbacks,
-  Sky,
-  Light,
-  Terrain,
-  Projection,
+  ViewStateChangeEvent,
   MapEvent,
   ErrorEvent,
-  MapMouseEvent,
-  MapGeoJSONFeature,
-  MapInstance
-} from '../types';
+  MapMouseEvent
+} from '../types/events';
 
 export type MaplibreProps = Partial<ViewState> &
   MapCallbacks & {

src/types/index.ts → src/types/internal.ts

@@ -1,8 +1,3 @@
-export * from './common';
-export * from './lib';
-export * from './events';
-export * from './style-spec';
-
 // Internal types
 import type {
   LngLat,

src/utils/deep-equal.ts

@@ -1,4 +1,4 @@
-import type {PointLike} from '../types';
+import type {PointLike} from '../types/common';
 
 /**
  * Compare two points

src/utils/style-utils.ts

@@ -1,4 +1,5 @@
-import {ImmutableLike, MapStyle} from '../types';
+import type {MapStyle} from '../types/style-spec';
+import type {ImmutableLike} from '../types/common';
 
 const refProps = ['type', 'source', 'source-layer', 'minzoom', 'maxzoom', 'filter', 'layout'];
 

src/utils/transform.ts

@@ -1,5 +1,6 @@
 import type {MaplibreProps} from '../maplibre/maplibre';
-import type {TransformLike, ViewState} from '../types';
+import type {ViewState} from '../types/common';
+import type {TransformLike} from '../types/internal';
 import {deepEqual} from './deep-equal';
 
 /**