chore(TS): export util types

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## [next]
 
+- chore(TS): export util types [#8915](https://github.com/fabricjs/fabric.js/pull/8915)
 - chore(TS): export gradient types
 - chore(lint) export filter colors and brushes types [#8913](https://github.com/fabricjs/fabric.js/pull/8913)
 - chore(lint) Add a rule for import type [#8907](https://github.com/fabricjs/fabric.js/pull/8907)

fabric.ts

@@ -5,13 +5,17 @@ export { config } from './src/config';
 export { classRegistry } from './src/ClassRegistry';
 export { runningAnimations } from './src/util/animation/AnimationRegistry';
 
+export * from './src/typedefs';
+
+export * from './src/EventTypeDefs';
 export { Observable } from './src/Observable';
 
 export { StaticCanvas } from './src/canvas/StaticCanvas';
 export { Canvas } from './src/canvas/Canvas';
 
 export type { XY } from './src/Point';
 export { Point } from './src/Point';
+export type { IntersectionType } from './src/Intersection';
 export { Intersection } from './src/Intersection';
 export { Color } from './src/color/Color';
 export * from './src/color/typedefs';

src/canvas/Canvas.ts

@@ -19,7 +19,7 @@ import { sendPointToPlane } from '../util/misc/planeChange';
 import {
   isFabricObjectWithDragSupport,
   isInteractiveTextObject,
-} from '../util/types';
+} from '../util/typeAssertions';
 import { SelectableCanvas } from './SelectableCanvas';
 import { TextEditingManager } from './TextEditingManager';
 

src/canvas/SelectableCanvas.ts

@@ -16,7 +16,7 @@ import {
   saveObjectTransform,
 } from '../util/misc/objectTransforms';
 import { StaticCanvas } from './StaticCanvas';
-import { isCollection } from '../util/types';
+import { isCollection } from '../util/typeAssertions';
 import { invertTransform, transformPoint } from '../util/misc/matrix';
 import { isTransparent } from '../util/misc/isTransparent';
 import type {

src/canvas/StaticCanvas.ts

@@ -39,7 +39,12 @@ import {
 import { pick } from '../util/misc/pick';
 import { matrixToSVG } from '../util/misc/svgParsing';
 import { toFixed } from '../util/misc/toFixed';
-import { isCollection, isFiller, isPattern, isTextObject } from '../util/types';
+import {
+  isCollection,
+  isFiller,
+  isPattern,
+  isTextObject,
+} from '../util/typeAssertions';
 
 type TDestroyed<T, K extends keyof any> = {
   // @ts-expect-error TS doesn't recognize protected/private fields using the `keyof` directive so we use `keyof any`

src/canvas/canvas_gestures.mixin.ts

@@ -1,7 +1,7 @@
 //@ts-nocheck
 
 import { scalingEqually } from '../controls/scale';
-import { fireEvent } from '../util/fireEvent';
+import { fireEvent } from '../controls/fireEvent';
 import {
   degreesToRadians,
   radiansToDegrees,

src/controls/drag.ts

@@ -1,5 +1,5 @@
 import type { TransformActionHandler } from '../EventTypeDefs';
-import { fireEvent } from '../util/fireEvent';
+import { fireEvent } from './fireEvent';
 import { commonEventInfo, isLocked } from './util';
 
 /**

src/controls/wrapWithFireEvent.ts

@@ -3,7 +3,7 @@ import type {
   Transform,
   TransformActionHandler,
 } from '../EventTypeDefs';
-import { fireEvent } from '../util/fireEvent';
+import { fireEvent } from './fireEvent';
 import { commonEventInfo } from './util';
 
 /**

src/shapes/Line.ts

@@ -4,7 +4,7 @@ import type { TClassProperties } from '../typedefs';
 import { classRegistry } from '../ClassRegistry';
 import { FabricObject, cacheProperties } from './Object/FabricObject';
 import { Point } from '../Point';
-import { isFiller } from '../util/types';
+import { isFiller } from '../util/typeAssertions';
 import type {
   FabricObjectProps,
   SerializedObjectProps,

src/shapes/Object/Object.ts

@@ -28,7 +28,11 @@ import { pick, pickBy } from '../../util/misc/pick';
 import { toFixed } from '../../util/misc/toFixed';
 import type { Group } from '../Group';
 import { StaticCanvas } from '../../canvas/StaticCanvas';
-import { isFiller, isSerializableFiller, isTextObject } from '../../util/types';
+import {
+  isFiller,
+  isSerializableFiller,
+  isTextObject,
+} from '../../util/typeAssertions';
 import type { Image } from '../Image';
 import {
   cacheProperties,

src/shapes/Object/StackedObject.ts

@@ -3,7 +3,7 @@ import type { Group } from '../Group';
 import type { Canvas } from '../../canvas/Canvas';
 import type { StaticCanvas } from '../../canvas/StaticCanvas';
 import { ObjectGeometry } from './ObjectGeometry';
-import { isActiveSelection } from '../../util/types';
+import { isActiveSelection } from '../../util/typeAssertions';
 
 type TAncestor = StackedObject | Canvas | StaticCanvas;
 type TCollection = Group | Canvas | StaticCanvas;

src/util/animation/index.ts

@@ -0,0 +1,2 @@
+export * from './animate';
+export * from './types';

src/util/index.ts

@@ -12,7 +12,7 @@ export {
   radiansToDegrees,
 } from './misc/radiansDegreesConversion';
 export { rotatePoint } from './misc/rotatePoint';
-export { projectStrokeOnPoints } from './misc/projectStroke';
+export * from './misc/projectStroke';
 export {
   transformPoint,
   invertTransform,
@@ -28,6 +28,7 @@ export {
   multiplyTransformMatrixArray,
   isIdentityMatrix,
 } from './misc/matrix';
+export type { TextStyleArray } from './misc/textStyles';
 export {
   stylesFromArray,
   stylesToArray,
@@ -65,12 +66,17 @@ export {
   sendObjectToPlane,
 } from './misc/planeChange';
 export * as string from './lang_string';
+export type {
+  EnlivenObjectOptions,
+  LoadImageOptions,
+} from './misc/objectEnlive';
 export {
   loadImage,
   enlivenObjects,
   enlivenObjectEnlivables,
 } from './misc/objectEnlive';
 export { pick } from './misc/pick';
+export * from './path/typedefs';
 export {
   joinPath,
   parsePath,
@@ -92,7 +98,7 @@ export {
 } from './dom_misc';
 export { isTransparent } from './misc/isTransparent';
 export { mergeClipPaths } from './misc/mergeClipPaths';
-export { animate, animateColor } from './animation/animate';
+export * from './animation';
 export * as ease from './animation/easing';
 export {
   requestAnimFrame,

src/util/misc/findScaleTo.ts

@@ -1,26 +1,14 @@
-export interface IWithDimensions {
-  /**
-   * natural unscaled width of the object
-   */
-  width: number;
-  /**
-   * natural unscaled height of the object
-   */
-  height: number;
-}
+import type { TSize } from '../../typedefs';
 
 /**
  * Finds the scale for the object source to fit inside the object destination,
  * keeping aspect ratio intact.
  * respect the total allowed area for the cache.
- * @param {IWithDimensions} source
- * @param {IWithDimensions} destination
+ * @param {TSize} source natural unscaled size of the object
+ * @param {TSize} destination natural unscaled size of the object
  * @return {Number} scale factor to apply to source to fit into destination
  */
-export const findScaleToFit = (
-  source: IWithDimensions,
-  destination: IWithDimensions
-) =>
+export const findScaleToFit = (source: TSize, destination: TSize) =>
   Math.min(
     destination.width / source.width,
     destination.height / source.height
@@ -30,14 +18,11 @@ export const findScaleToFit = (
  * Finds the scale for the object source to cover entirely the object destination,
  * keeping aspect ratio intact.
  * respect the total allowed area for the cache.
- * @param {IWithDimensions} source
- * @param {IWithDimensions} destination
+ * @param {TSize} source natural unscaled size of the object
+ * @param {TSize} destination natural unscaled size of the object
  * @return {Number} scale factor to apply to source to cover destination
  */
-export const findScaleToCover = (
-  source: IWithDimensions,
-  destination: IWithDimensions
-) =>
+export const findScaleToCover = (source: TSize, destination: TSize) =>
   Math.max(
     destination.width / source.width,
     destination.height / source.height

src/util/misc/objectEnlive.ts

@@ -84,7 +84,6 @@ export const enlivenObjects = (
       objects.map((obj) =>
         classRegistry
           .getClass(obj.type)
-          // @ts-ignore
           .fromObject(obj, {
             signal,
             reviver,

src/util/misc/projectStroke/index.ts

@@ -3,6 +3,8 @@ import { StrokeLineCapProjections } from './StrokeLineCapProjections';
 import { StrokeLineJoinProjections } from './StrokeLineJoinProjections';
 import type { TProjection, TProjectStrokeOnPointsOptions } from './types';
 
+export * from './types';
+
 /**
  *
  * Used to calculate object's bounding box