Factorize input matrix type

Author: wcandillon

package/src/dom/types/Common.ts

@@ -3,10 +3,8 @@ import type { ReactNode } from "react";
 import type {
   BlendMode,
   Color,
-  Matrix3,
-  Matrix4,
+  InputMatrix,
   PaintStyle,
-  SkMatrix,
   SkPaint,
   SkPath,
   SkRect,
@@ -68,7 +66,7 @@ export type CircleDef = PointCircleDef | ScalarCircleDef;
 export interface TransformProps {
   transform?: Transforms3d;
   origin?: Vector;
-  matrix?: SkMatrix | Matrix4 | Matrix3 | number[];
+  matrix?: InputMatrix;
 }
 
 export interface PaintProps extends ChildrenProps {

package/src/skia/types/Canvas.ts

@@ -8,12 +8,11 @@ import type { SkColor } from "./Color";
 import type { SkRRect } from "./RRect";
 import type { BlendMode } from "./Paint/BlendMode";
 import type { SkPoint, PointMode } from "./Point";
-import type { SkMatrix } from "./Matrix";
+import type { InputMatrix } from "./Matrix";
 import type { SkImageFilter } from "./ImageFilter";
 import type { SkVertices } from "./Vertices";
 import type { SkTextBlob } from "./TextBlob";
 import type { SkPicture } from "./Picture";
-import type { Matrix4, Matrix3 } from "./Matrix4";
 
 export enum ClipOp {
   Difference,
@@ -486,7 +485,7 @@ export interface SkCanvas {
    * Replaces current matrix with m premultiplied with the existing matrix.
    * @param m
    */
-  concat(m: SkMatrix | number[] | Matrix4 | Matrix3): void;
+  concat(m: InputMatrix): void;
 
   /**
    * Draws the given picture using the current clip, current matrix, and the provided paint.

package/src/skia/types/Matrix.ts

@@ -7,7 +7,7 @@ export const isMatrix = (obj: unknown): obj is SkMatrix =>
   obj !== null && (obj as SkJSIInstance<string>).__typename__ === "Matrix";
 
 export interface SkMatrix extends SkJSIInstance<"Matrix"> {
-  concat: (matrix: SkMatrix | Matrix4 | Matrix3 | number[]) => SkMatrix;
+  concat: (matrix: InputMatrix) => SkMatrix;
   translate: (x: number, y: number) => SkMatrix;
   scale: (x: number, y?: number) => SkMatrix;
   skew: (x: number, y: number) => SkMatrix;
@@ -20,6 +20,8 @@ export interface SkMatrix extends SkJSIInstance<"Matrix"> {
   get: () => number[];
 }
 
+export type InputMatrix = SkMatrix | Matrix3 | Matrix4 | number[];
+
 export interface TransformProp {
   transform?: Transforms3d;
 }

package/src/skia/types/Path/Path.ts

@@ -2,9 +2,8 @@ import type { SkRect } from "../Rect";
 import type { SkPoint } from "../Point";
 import type { SkRRect } from "../RRect";
 import type { StrokeJoin, StrokeCap } from "../Paint";
-import type { SkMatrix } from "../Matrix";
+import type { InputMatrix, SkMatrix } from "../Matrix";
 import type { SkJSIInstance } from "../JsiInstance";
-import { Matrix3, Matrix4 } from "../Matrix4";
 
 /**
  * Options used for Path.stroke(). If an option is omitted, a sensible default will be used.
@@ -541,7 +540,7 @@ export interface SkPath extends SkJSIInstance<"Path"> {
   /**
    * Transforms the path by the specified matrix.
    */
-  transform(m3: SkMatrix | number[] | Matrix3 | Matrix4): SkPath;
+  transform(m3: InputMatrix): SkPath;
 
   /**
    * Interpolates between Path with point array of equal size.

package/src/skia/web/JsiSkMatrix.ts

@@ -1,12 +1,12 @@
 import type { CanvasKit, Matrix3x3 } from "canvaskit-wasm";
 
-import { toMatrix3, type Matrix3, type Matrix4, type SkMatrix } from "../types";
+import { toMatrix3 } from "../types";
+import type { SkMatrix, InputMatrix, Matrix4 } from "../types";
 
 import { HostObject } from "./Host";
 
-const isMatrixHostObject = (
-  obj: SkMatrix | number[] | Matrix4 | Matrix3
-): obj is SkMatrix => !Array.isArray(obj);
+const isMatrixHostObject = (obj: InputMatrix): obj is SkMatrix =>
+  !Array.isArray(obj);
 
 export class JsiSkMatrix
   extends HostObject<Matrix3x3, "Matrix">
@@ -28,7 +28,7 @@ export class JsiSkMatrix
     // Do nothing - the matrix is represenetd by a Float32Array
   };
 
-  concat(matrix: SkMatrix | number[] | Matrix4 | Matrix3) {
+  concat(matrix: InputMatrix) {
     this.preMultiply(
       // eslint-disable-next-line no-nested-ternary
       isMatrixHostObject(matrix)