pixel-data-js 0.25.0 → 0.26.0

package/src/History/PixelMutator/mutatorBlendMask.ts

@@ -0,0 +1,43 @@
+import { type IPixelData32, type Mask, MaskType, type PixelBlendMaskOptions } from '../../_types'
+import { blendPixelDataAlphaMask } from '../../PixelData/blendPixelDataAlphaMask'
+import { blendPixelDataBinaryMask } from '../../PixelData/blendPixelDataBinaryMask'
+import { type HistoryMutator, PixelWriter } from '../PixelWriter'
+
+const defaults = { blendPixelDataAlphaMask, blendPixelDataBinaryMask }
+type Deps = Partial<typeof defaults>
+
+/**
+ * @param deps - @hidden
+ */
+export const mutatorBlendMask = ((writer: PixelWriter<any>, deps: Partial<Deps> = defaults) => {
+  const {
+    blendPixelDataAlphaMask = defaults.blendPixelDataAlphaMask,
+    blendPixelDataBinaryMask = defaults.blendPixelDataBinaryMask,
+  } = deps
+
+  return {
+    blendMask(
+      src: IPixelData32,
+      mask: Mask,
+      opts?: PixelBlendMaskOptions,
+    ): boolean {
+      const x = opts?.x ?? 0
+      const y = opts?.y ?? 0
+      const w = opts?.w ?? src.width
+      const h = opts?.h ?? src.height
+
+      const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
+
+      if (mask.type === MaskType.BINARY) {
+        return didChange(
+          blendPixelDataBinaryMask(writer.config.target, src, mask, opts),
+        )
+      } else {
+        return didChange(
+          blendPixelDataAlphaMask(writer.config.target, src, mask, opts),
+        )
+      }
+    },
+  }
+}) satisfies HistoryMutator<any, Deps>
+

package/src/History/PixelMutator/mutatorBlendPaintRect.ts

@@ -0,0 +1,55 @@
+import type { BlendColor32, Color32 } from '../../_types'
+import { sourceOverPerfect } from '../../BlendModes/blend-modes-perfect'
+import { _macro_paintRectCenterOffset } from '../../Internal/helpers'
+import { blendColorPixelData } from '../../PixelData/blendColorPixelData'
+import { type HistoryMutator, PixelWriter } from '../PixelWriter'
+
+const defaults = {
+  blendColorPixelData,
+}
+
+type Deps = Partial<typeof defaults>
+
+/**
+ * @param deps - @hidden
+ */
+export const mutatorBlendPaintRect = ((writer: PixelWriter<any>, deps: Deps = defaults) => {
+  const {
+    blendColorPixelData = defaults.blendColorPixelData,
+  } = deps
+
+  const OPTS = { x: 0, y: 0, w: 0, h: 0, blendFn: sourceOverPerfect, alpha: 255 }
+
+  return {
+    blendPaintRect(
+      color: Color32,
+      centerX: number,
+      centerY: number,
+      brushWidth: number,
+      brushHeight: number,
+      alpha = 255,
+      blendFn: BlendColor32 = sourceOverPerfect,
+    ): boolean {
+      const target = writer.config.target
+
+      const topLeftX = centerX + -_macro_paintRectCenterOffset(brushWidth)
+      const topLeftY = centerY + -_macro_paintRectCenterOffset(brushHeight)
+
+      OPTS.x = topLeftX
+      OPTS.y = topLeftY
+      OPTS.w = brushWidth
+      OPTS.h = brushHeight
+      OPTS.blendFn = blendFn
+      OPTS.alpha = alpha
+
+      const didChange = writer.accumulator.storeRegionBeforeState(topLeftX, topLeftY, brushWidth, brushHeight)
+      return didChange(
+        blendColorPixelData(
+          target,
+          color,
+          OPTS,
+        ),
+      )
+    },
+  }
+}) satisfies HistoryMutator<any, Deps>

package/src/History/PixelMutator/mutatorBlendPixel.ts

@@ -1,6 +1,6 @@
-import type { BlendColor32, Color32, HistoryMutator } from '../../_types'
+import type { BlendColor32, Color32 } from '../../_types'
 import { blendPixel } from '../../PixelData/blendPixel'
-import { PixelWriter } from '../PixelWriter'
+import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
 const defaults = { blendPixel }
 type Deps = Partial<typeof defaults>

package/src/History/PixelMutator/mutatorBlendPixelData.ts

@@ -1,6 +1,6 @@
-import type { HistoryMutator, IPixelData32, PixelBlendOptions } from '../../_types'
+import type { IPixelData32, PixelBlendOptions } from '../../_types'
 import { blendPixelData } from '../../PixelData/blendPixelData'
-import { PixelWriter } from '../PixelWriter'
+import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
 const defaults = { blendPixelData }
 type Deps = Partial<typeof defaults>
@@ -16,14 +16,13 @@ export const mutatorBlendPixelData = ((writer: PixelWriter<any>, deps: Partial<D
   return {
     blendPixelData(
       src: IPixelData32,
-      opts: PixelBlendOptions = {},
+      opts?: PixelBlendOptions,
     ): boolean {
-      const {
-        x = 0,
-        y = 0,
-        w = src.width,
-        h = src.height,
-      } = opts
+      const x = opts?.x ?? 0
+      const y = opts?.y ?? 0
+      const w = opts?.w ?? src.width
+      const h = opts?.h ?? src.height
+
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
 
       return didChange(

package/src/History/PixelMutator/mutatorClear.ts

@@ -1,8 +1,8 @@
-import type { Color32, HistoryMutator, Rect } from '../../_types'
-import { fillPixelDataFast } from '../../PixelData/fillPixelDataFast'
-import { PixelWriter } from '../PixelWriter'
+import type { Color32, Rect } from '../../_types'
+import { fillPixelData } from '../../PixelData/fillPixelData'
+import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
-const defaults = { fillPixelData: fillPixelDataFast }
+const defaults = { fillPixelData }
 
 type Deps = Partial<typeof defaults>
 
@@ -16,16 +16,18 @@ export const mutatorClear = ((writer: PixelWriter<any>, deps: Deps = defaults) =
 
   return {
     clear(
-      rect: Partial<Rect> = {},
+      rect?: Partial<Rect>,
     ) {
       const target = writer.config.target
-      const x = rect.x ?? 0
-      const y = rect.y ?? 0
-      const w = rect.w ?? target.width
-      const h = rect.h ?? target.height
+      const x = rect?.x ?? 0
+      const y = rect?.y ?? 0
+      const w = rect?.w ?? target.width
+      const h = rect?.h ?? target.height
 
-      writer.accumulator.storeRegionBeforeState(x, y, w, h)
-      fillPixelData(target, 0 as Color32, x, y, w, h)
+      const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
+      return didChange(
+        fillPixelData(target, 0 as Color32, x, y, w, h),
+      )
     },
   }
 }) satisfies HistoryMutator<any, Deps>

package/src/History/PixelMutator/mutatorFill.ts

@@ -1,6 +1,6 @@
-import type { Color32, HistoryMutator, Rect } from '../../_types'
+import type { Color32, Rect } from '../../_types'
 import { fillPixelData } from '../../PixelData/fillPixelData'
-import { PixelWriter } from '../PixelWriter'
+import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
 const defaults = { fillPixelData }
 type Deps = Partial<typeof defaults>

package/src/History/PixelMutator/mutatorFillBinaryMask.ts

@@ -1,6 +1,6 @@
-import type { BinaryMask, Color32, HistoryMutator } from '../../_types'
+import type { BinaryMask, Color32 } from '../../_types'
 import { fillPixelDataBinaryMask } from '../../PixelData/fillPixelDataBinaryMask'
-import { PixelWriter } from '../PixelWriter'
+import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
 const defaults = { fillPixelDataBinaryMask }
 type Deps = Partial<typeof defaults>
@@ -17,13 +17,12 @@ export const mutatorFillBinaryMask = ((writer: PixelWriter<any>, deps: Deps = de
     fillBinaryMask(
       color: Color32,
       mask: BinaryMask,
-      alpha = 255,
       x = 0,
       y = 0,
     ) {
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, mask.w, mask.h)
       return didChange(
-        fillPixelDataBinaryMask(writer.config.target, color, mask, alpha, x, y),
+        fillPixelDataBinaryMask(writer.config.target, color, mask, x, y),
       )
     },
   }

package/src/History/PixelMutator/mutatorInvert.ts

@@ -1,6 +1,6 @@
-import type { HistoryMutator, PixelMutateOptions } from '../../_types'
+import type { PixelMutateOptions } from '../../_types'
 import { invertPixelData } from '../../PixelData/invertPixelData'
-import { PixelWriter } from '../PixelWriter'
+import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
 const defaults = { invertPixelData }
 type Deps = Partial<typeof defaults>
@@ -14,14 +14,13 @@ export const mutatorInvert = ((writer: PixelWriter<any>, deps: Deps = defaults)
   } = deps
 
   return {
-    invert(opts: PixelMutateOptions = {}) {
+    invert(opts?: PixelMutateOptions) {
       const target = writer.config.target
-      const {
-        x = 0,
-        y = 0,
-        w = target.width,
-        h = target.height,
-      } = opts
+      const x = opts?.x ?? 0
+      const y = opts?.y ?? 0
+      const w = opts?.w ?? target.width
+      const h = opts?.h ?? target.height
+
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
 
       return didChange(

package/src/History/PixelMutator.ts

@@ -1,8 +1,16 @@
+import { mutatorApplyAlphaMask } from './PixelMutator/mutatorApplyAlphaMask'
+import { mutatorApplyBinaryMask } from './PixelMutator/mutatorApplyBinaryMask'
+import { mutatorApplyMask } from './PixelMutator/mutatorApplyMask'
+import { mutatorBlendAlphaMask } from './PixelMutator/mutatorBlendAlphaMask'
+import { mutatorBlendBinaryMask } from './PixelMutator/mutatorBlendBinaryMask'
 import { mutatorBlendColor } from './PixelMutator/mutatorBlendColor'
+import { mutatorBlendColorPaintAlphaMask } from './PixelMutator/mutatorBlendColorPaintAlphaMask'
+import { mutatorBlendColorPaintBinaryMask } from './PixelMutator/mutatorBlendColorPaintBinaryMask'
+import { mutatorBlendColorPaintMask } from './PixelMutator/mutatorBlendColorPaintMask'
+import { mutatorBlendMask } from './PixelMutator/mutatorBlendMask'
+import { mutatorBlendPaintRect } from './PixelMutator/mutatorBlendPaintRect'
 import { mutatorBlendPixel } from './PixelMutator/mutatorBlendPixel'
 import { mutatorBlendPixelData } from './PixelMutator/mutatorBlendPixelData'
-import { mutatorBlendPixelDataAlphaMask } from './PixelMutator/mutatorBlendPixelDataAlphaMask'
-import { mutatorBlendPixelDataBinaryMask } from './PixelMutator/mutatorBlendPixelDataBinaryMask'
 import { mutatorClear } from './PixelMutator/mutatorClear'
 import { mutatorFill, mutatorFillRect } from './PixelMutator/mutatorFill'
 import { mutatorFillBinaryMask } from './PixelMutator/mutatorFillBinaryMask'
@@ -12,11 +20,19 @@ import type { PixelWriter } from './PixelWriter'
 export function makeFullPixelMutator(writer: PixelWriter<any>) {
   return {
     // @sort
+    ...mutatorApplyAlphaMask(writer),
+    ...mutatorApplyBinaryMask(writer),
+    ...mutatorApplyMask(writer),
+    ...mutatorBlendAlphaMask(writer),
+    ...mutatorBlendBinaryMask(writer),
     ...mutatorBlendColor(writer),
+    ...mutatorBlendColorPaintAlphaMask(writer),
+    ...mutatorBlendColorPaintBinaryMask(writer),
+    ...mutatorBlendColorPaintMask(writer),
+    ...mutatorBlendMask(writer),
+    ...mutatorBlendPaintRect(writer),
     ...mutatorBlendPixel(writer),
     ...mutatorBlendPixelData(writer),
-    ...mutatorBlendPixelDataAlphaMask(writer),
-    ...mutatorBlendPixelDataBinaryMask(writer),
     ...mutatorClear(writer),
     ...mutatorFill(writer),
     ...mutatorFillBinaryMask(writer),

package/src/History/PixelWriter.ts

@@ -59,19 +59,15 @@ export class PixelWriter<M> {
 
   private _inProgress = false
 
-  constructor(target: PixelData, mutatorFactory: (writer: PixelWriter<any>) => M, {
-    tileSize = 256,
-    maxHistorySteps = 50,
-    historyManager = new HistoryManager(maxHistorySteps),
-    historyActionFactory = makeHistoryAction,
-    pixelTilePool,
-    accumulator,
-  }: PixelWriterOptions = {}) {
+  constructor(target: PixelData, mutatorFactory: (writer: PixelWriter<any>) => M, options?: PixelWriterOptions) {
+    const tileSize = options?.tileSize ?? 256
+    const maxHistorySteps = options?.maxHistorySteps ?? 50
+
     this.config = new PixelEngineConfig(tileSize, target)
-    this.historyManager = historyManager
-    this.pixelTilePool = pixelTilePool ?? new PixelTilePool(this.config)
-    this.accumulator = accumulator ?? new PixelAccumulator(this.config, this.pixelTilePool)
-    this.historyActionFactory = historyActionFactory
+    this.historyManager = options?.historyManager ?? new HistoryManager(maxHistorySteps)
+    this.historyActionFactory = options?.historyActionFactory ?? makeHistoryAction
+    this.pixelTilePool = options?.pixelTilePool ?? new PixelTilePool(this.config)
+    this.accumulator = options?.accumulator ?? new PixelAccumulator(this.config, this.pixelTilePool)
     this.mutator = mutatorFactory(this)
     this.paintBuffer = new PaintBuffer(this.config, this.pixelTilePool)
   }
@@ -115,7 +111,7 @@ export class PixelWriter<M> {
     if (this.accumulator.beforeTiles.length === 0) return
 
     const patch = this.accumulator.extractPatch()
-    const action = this.historyActionFactory(this, patch, after, afterUndo, afterRedo)
+    const action = this.historyActionFactory(this.config, this.accumulator, patch, after, afterUndo, afterRedo)
 
     this.historyManager.commit(action)
   }
@@ -200,3 +196,5 @@ export class PixelWriter<M> {
     paintBuffer.clear()
   }
 }
+
+export type HistoryMutator<T extends {}, D extends {}> = (writer: PixelWriter<any>, deps?: Partial<D>) => T

package/src/Input/fileToImageData.ts

@@ -1,4 +1,4 @@
-import { OFFSCREEN_CANVAS_CTX_FAILED } from '../Canvas/_constants'
+import { OFFSCREEN_CANVAS_CTX_FAILED } from '../../support/error-strings'
 
 /**
  * Thrown when the user provides a file that isn't an image.

package/src/Internal/helpers.ts

@@ -1,2 +1,5 @@
 // @__INLINE_MACRO__
-export const macro_halfAndFloor = (value: number) => value >> 1
+export const _macro_halfAndFloor = (value: number) => value >> 1
+
+// @__INLINE_MACRO__
+export const _macro_paintRectCenterOffset = (size: number) => (size - 1) >> 1

package/src/Mask/applyBinaryMaskToAlphaMask.ts

@@ -3,17 +3,15 @@ import type { AlphaMask, ApplyMaskToPixelDataOptions, BinaryMask } from '../_typ
 export function applyBinaryMaskToAlphaMask(
   alphaMaskDst: AlphaMask,
   binaryMaskSrc: BinaryMask,
-  opts: ApplyMaskToPixelDataOptions = {},
+  opts?: ApplyMaskToPixelDataOptions,
 ): void {
-  const {
-    x: targetX = 0,
-    y: targetY = 0,
-    w: reqWidth = 0,
-    h: reqHeight = 0,
-    mx = 0,
-    my = 0,
-    invertMask = false,
-  } = opts
+  const targetX = opts?.x ?? 0
+  const targetY = opts?.y ?? 0
+  const reqWidth = opts?.w ?? 0
+  const reqHeight = opts?.h ?? 0
+  const mx = opts?.mx ?? 0
+  const my = opts?.my ?? 0
+  const invertMask = opts?.invertMask ?? false
 
   const dstWidth = alphaMaskDst.w
   if (dstWidth <= 0) return

package/src/Paint/PaintBuffer.ts

@@ -1,7 +1,7 @@
 import type { Color32, PaintAlphaMask, PaintBinaryMask, Rect } from '../_types'
 import { forEachLinePoint } from '../Algorithm/forEachLinePoint'
 import type { PixelEngineConfig } from '../History/PixelEngineConfig'
-import { macro_halfAndFloor } from '../Internal/helpers'
+import { _macro_paintRectCenterOffset } from '../Internal/helpers'
 import type { PixelTile } from '../PixelTile/PixelTile'
 import type { PixelTilePool } from '../PixelTile/PixelTilePool'
 import { trimRectBounds } from '../Rect/trimRectBounds'
@@ -205,8 +205,8 @@ export class PaintBuffer {
     const target = config.target
     const scratch = this.scratchBounds
 
-    const centerOffsetX = macro_halfAndFloor(brushWidth - 1)
-    const centerOffsetY = macro_halfAndFloor(brushHeight - 1)
+    const centerOffsetX = -_macro_paintRectCenterOffset(brushWidth)
+    const centerOffsetY = -_macro_paintRectCenterOffset(brushHeight)
 
     let changed = false
 

package/src/Paint/PaintBufferCanvasRenderer.ts

@@ -1,4 +1,4 @@
-import { CANVAS_CTX_FAILED } from '../Canvas/_constants'
+import { CANVAS_CTX_FAILED } from '../../support/error-strings'
 import type { PaintBuffer } from './PaintBuffer'
 
 export type PaintBufferCanvasRenderer = ReturnType<typeof makePaintBufferCanvasRenderer>

package/src/Paint/makePaintMask.ts

@@ -1,5 +1,5 @@
 import { type AlphaMask, type BinaryMask, MaskType, type PaintAlphaMask, type PaintBinaryMask } from '../_types'
-import { macro_halfAndFloor } from '../Internal/helpers'
+import { _macro_halfAndFloor } from '../Internal/helpers'
 
 export function makePaintBinaryMask(
   mask: BinaryMask,
@@ -9,8 +9,8 @@ export function makePaintBinaryMask(
     data: mask.data,
     w: mask.w,
     h: mask.h,
-    centerOffsetX: -macro_halfAndFloor(mask.w),
-    centerOffsetY: -macro_halfAndFloor(mask.h),
+    centerOffsetX: -_macro_halfAndFloor(mask.w),
+    centerOffsetY: -_macro_halfAndFloor(mask.h),
   }
 }
 
@@ -22,7 +22,7 @@ export function makePaintAlphaMask(
     data: mask.data,
     w: mask.w,
     h: mask.h,
-    centerOffsetX: -macro_halfAndFloor(mask.w),
-    centerOffsetY: -macro_halfAndFloor(mask.h),
+    centerOffsetX: -_macro_halfAndFloor(mask.w),
+    centerOffsetY: -_macro_halfAndFloor(mask.h),
   }
 }

package/src/Paint/makeRectFalloffPaintAlphaMask.ts

@@ -1,5 +1,5 @@
 import { MaskType, type PaintAlphaMask } from '../_types'
-import { macro_halfAndFloor } from '../Internal/helpers'
+import { _macro_halfAndFloor } from '../Internal/helpers'
 
 export function makeRectFalloffPaintAlphaMask(
   width: number,
@@ -41,7 +41,7 @@ export function makeRectFalloffPaintAlphaMask(
     data: data,
     w: width,
     h: height,
-    centerOffsetX: -macro_halfAndFloor(width),
-    centerOffsetY: -macro_halfAndFloor(height),
+    centerOffsetX: -_macro_halfAndFloor(width),
+    centerOffsetY: -_macro_halfAndFloor(height),
   }
 }

package/src/PixelData/applyAlphaMaskToPixelData.ts

@@ -6,20 +6,18 @@ import { type AlphaMask, type ApplyMaskToPixelDataOptions, type Color32, type IP
  * @returns true if any pixels were actually modified.
  */
 export function applyAlphaMaskToPixelData(
-  dst: IPixelData32,
+  target: IPixelData32,
   mask: AlphaMask,
-  opts: ApplyMaskToPixelDataOptions = {},
+  opts?: ApplyMaskToPixelDataOptions,
 ): boolean {
-  const {
-    x: targetX = 0,
-    y: targetY = 0,
-    w: width = dst.width,
-    h: height = dst.height,
-    alpha: globalAlpha = 255,
-    mx = 0,
-    my = 0,
-    invertMask = false,
-  } = opts
+  const targetX = opts?.x ?? 0
+  const targetY = opts?.y ?? 0
+  const width = opts?.w ?? target.width
+  const height = opts?.h ?? target.height
+  const globalAlpha = opts?.alpha ?? 255
+  const mx = opts?.mx ?? 0
+  const my = opts?.my ?? 0
+  const invertMask = opts?.invertMask ?? false
 
   if (globalAlpha === 0) return false
 
@@ -39,8 +37,8 @@ export function applyAlphaMaskToPixelData(
     y = 0
   }
 
-  w = Math.min(w, dst.width - x)
-  h = Math.min(h, dst.height - y)
+  w = Math.min(w, target.width - x)
+  h = Math.min(h, target.height - y)
 
   if (w <= 0) return false
   if (h <= 0) return false
@@ -72,8 +70,8 @@ export function applyAlphaMaskToPixelData(
   const xShift = sX0 - startX
   const yShift = sY0 - startY
 
-  const dst32 = dst.data32
-  const dw = dst.width
+  const dst32 = target.data32
+  const dw = target.width
   const dStride = dw - finalW
   const mStride = mPitch - finalW
   const maskData = mask.data

package/src/PixelData/applyBinaryMaskToPixelData.ts

@@ -6,20 +6,18 @@ import { type ApplyMaskToPixelDataOptions, type BinaryMask, type IPixelData32 }
  * @returns true if any pixels were actually modified.
  */
 export function applyBinaryMaskToPixelData(
-  dst: IPixelData32,
+  target: IPixelData32,
   mask: BinaryMask,
-  opts: ApplyMaskToPixelDataOptions = {},
+  opts?: ApplyMaskToPixelDataOptions,
 ): boolean {
-  const {
-    x: targetX = 0,
-    y: targetY = 0,
-    w: width = dst.width,
-    h: height = dst.height,
-    alpha: globalAlpha = 255,
-    mx = 0,
-    my = 0,
-    invertMask = false,
-  } = opts
+  const targetX = opts?.x ?? 0
+  const targetY = opts?.y ?? 0
+  const width = opts?.w ?? target.width
+  const height = opts?.h ?? target.height
+  const globalAlpha = opts?.alpha ?? 255
+  const mx = opts?.mx ?? 0
+  const my = opts?.my ?? 0
+  const invertMask = opts?.invertMask ?? false
 
   if (globalAlpha === 0) return false
 
@@ -38,8 +36,8 @@ export function applyBinaryMaskToPixelData(
     y = 0
   }
 
-  w = Math.min(w, dst.width - x)
-  h = Math.min(h, dst.height - y)
+  w = Math.min(w, target.width - x)
+  h = Math.min(h, target.height - y)
 
   if (w <= 0 || h <= 0) return false
 
@@ -69,8 +67,8 @@ export function applyBinaryMaskToPixelData(
   const xShift = sX0 - startX
   const yShift = sY0 - startY
 
-  const dst32 = dst.data32
-  const dw = dst.width
+  const dst32 = target.data32
+  const dw = target.width
   const dStride = dw - finalW
   const mStride = mPitch - finalW
   const maskData = mask.data

package/src/PixelData/applyMaskToPixelData.ts

@@ -0,0 +1,22 @@
+import {
+  type AlphaMask,
+  type ApplyMaskToPixelDataOptions,
+  type BinaryMask,
+  type IPixelData32,
+  type Mask,
+  MaskType,
+} from '../_types'
+import { applyAlphaMaskToPixelData } from './applyAlphaMaskToPixelData'
+import { applyBinaryMaskToPixelData } from './applyBinaryMaskToPixelData'
+
+export function applyMaskToPixelData(
+  dst: IPixelData32,
+  mask: Mask,
+  opts?: ApplyMaskToPixelDataOptions,
+): boolean {
+  if (mask.type === MaskType.BINARY) {
+    return applyBinaryMaskToPixelData(dst, mask as BinaryMask, opts)
+  } else {
+    return applyAlphaMaskToPixelData(dst, mask as AlphaMask, opts)
+  }
+}

package/src/PixelData/blendColorPixelData.ts

@@ -6,19 +6,16 @@ import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
  * @returns true if any pixels were actually modified.
  */
 export function blendColorPixelData(
-  dst: IPixelData32,
+  target: IPixelData32,
   color: Color32,
-  opts: ColorBlendOptions = {},
+  opts?: ColorBlendOptions,
 ): boolean {
-  const {
-    x: targetX = 0,
-    y: targetY = 0,
-    w: width = dst.width,
-    h: height = dst.height,
-    alpha: globalAlpha = 255,
-    blendFn = sourceOverPerfect,
-  } = opts
-
+  const targetX = opts?.x ?? 0
+  const targetY = opts?.y ?? 0
+  const width = opts?.w ?? target.width
+  const height = opts?.h ?? target.height
+  const globalAlpha = opts?.alpha ?? 255
+  const blendFn = opts?.blendFn ?? sourceOverPerfect
   if (globalAlpha === 0) return false
 
   const baseSrcAlpha = (color >>> 24)
@@ -42,8 +39,8 @@ export function blendColorPixelData(
     y = 0
   }
 
-  const actualW = Math.min(w, dst.width - x)
-  const actualH = Math.min(h, dst.height - y)
+  const actualW = Math.min(w, target.width - x)
+  const actualH = Math.min(h, target.height - y)
 
   if (actualW <= 0 || actualH <= 0) return false
 
@@ -56,8 +53,8 @@ export function blendColorPixelData(
     finalSrcColor = ((color & 0x00ffffff) | (a << 24)) >>> 0 as Color32
   }
 
-  const dst32 = dst.data32
-  const dw = dst.width
+  const dst32 = target.data32
+  const dw = target.width
   let dIdx = (y * dw + x) | 0
   const dStride = (dw - actualW) | 0
   let didChange = false