pixel-data-js 0.26.0 → 0.28.0

package/src/Canvas/PixelCanvas.ts

@@ -1,10 +1,5 @@
-import { CANVAS_CTX_FAILED } from '../../support/error-strings'
-
-export type PixelCanvas = {
-  readonly canvas: HTMLCanvasElement,
-  readonly ctx: CanvasRenderingContext2D,
-  readonly resize: (w: number, h: number) => void
-}
+import { CANVAS_CTX_FAILED } from '../Internal/_errors'
+import type { PixelCanvas } from './_canvas-types'
 
 /**
  * Ensures the canvas ctx is always set to imageSmoothingEnabled = false.

package/src/Canvas/ReusableCanvas.ts

@@ -1,13 +1,5 @@
-import { CANVAS_CTX_FAILED } from '../../support/error-strings'
-
-export type CanvasContext<T> = T extends HTMLCanvasElement
-  ? CanvasRenderingContext2D
-  : OffscreenCanvasRenderingContext2D
-
-export type ReusableCanvas<T extends HTMLCanvasElement | OffscreenCanvas> = {
-  readonly canvas: T
-  readonly ctx: CanvasContext<T>
-}
+import { CANVAS_CTX_FAILED } from '../Internal/_errors'
+import type { CanvasContext, CanvasObjectFactory, ReusableCanvas, ReusableCanvasFactory } from './_canvas-types'
 
 /**
  * Creates a reusable HTMLCanvasElement and context that are not part of the DOM.
@@ -37,8 +29,8 @@ export function makeReusableOffscreenCanvas() {
 }
 
 function makeReusableCanvasMeta<T extends HTMLCanvasElement | OffscreenCanvas>(
-  factory: (w: number, h: number) => T,
-) {
+  factory: CanvasObjectFactory<T>,
+): ReusableCanvasFactory<T> {
   let canvas: T | null = null
   let ctx: CanvasContext<T> | null = null
 

package/src/Canvas/_canvas-types.ts

@@ -0,0 +1,26 @@
+export type CanvasContext<T> = T extends HTMLCanvasElement
+  ? CanvasRenderingContext2D
+  : OffscreenCanvasRenderingContext2D
+
+export interface ReusableCanvas<T extends HTMLCanvasElement | OffscreenCanvas> {
+  readonly canvas: T
+  readonly ctx: CanvasContext<T>
+}
+
+export type ReusableCanvasFactory<T extends HTMLCanvasElement | OffscreenCanvas> = {
+  (w: number, h: number): ReusableCanvas<T>,
+  reset(): void
+}
+
+export type DrawPixelLayer<T extends HTMLCanvasElement | OffscreenCanvas> =
+  (ctx: CanvasContext<T>) => void
+
+export type DrawScreenLayer = (ctx: CanvasRenderingContext2D, scale: number) => void
+
+export interface PixelCanvas {
+  readonly canvas: HTMLCanvasElement,
+  readonly ctx: CanvasRenderingContext2D,
+  readonly resize: (w: number, h: number) => void
+}
+
+export type CanvasObjectFactory<T extends HTMLCanvasElement | OffscreenCanvas> = (w: number, h: number) => T

package/src/History/PixelAccumulator.ts

@@ -1,5 +1,5 @@
-import { PixelTile } from '../PixelTile/PixelTile'
-import type { PixelTilePool } from '../PixelTile/PixelTilePool'
+import type { PixelTile } from '../Tile/_tile-types'
+import type { TilePool } from '../Tile/TilePool'
 import type { PixelEngineConfig } from './PixelEngineConfig'
 import { applyPatchTiles, type PixelPatchTiles } from './PixelPatchTiles'
 
@@ -11,15 +11,15 @@ export class PixelAccumulator {
 
   constructor(
     readonly config: PixelEngineConfig,
-    readonly tilePool: PixelTilePool,
+    readonly pixelTilePool: TilePool<PixelTile>,
   ) {
     this.lookup = []
     this.beforeTiles = []
   }
 
   recyclePatch(patch: PixelPatchTiles) {
-    this.tilePool.releaseTiles(patch.beforeTiles)
-    this.tilePool.releaseTiles(patch.afterTiles)
+    this.pixelTilePool.releaseTiles(patch.beforeTiles)
+    this.pixelTilePool.releaseTiles(patch.afterTiles)
   }
 
   /**
@@ -37,7 +37,7 @@ export class PixelAccumulator {
     let added = false
 
     if (!tile) {
-      tile = this.tilePool.getTile(id, tx, ty)
+      tile = this.pixelTilePool.getTile(id, tx, ty)
 
       this.extractState(tile)
       this.lookup[id] = tile
@@ -49,7 +49,7 @@ export class PixelAccumulator {
       if (!didChange && added) {
         this.beforeTiles.pop()
         this.lookup[id] = undefined
-        this.tilePool.releaseTile(tile!)
+        this.pixelTilePool.releaseTile(tile!)
       }
       return didChange
     }
@@ -83,7 +83,7 @@ export class PixelAccumulator {
         let tile = this.lookup[id]
 
         if (!tile) {
-          tile = this.tilePool.getTile(id, tx, ty)
+          tile = this.pixelTilePool.getTile(id, tx, ty)
 
           this.extractState(tile)
           this.lookup[id] = tile
@@ -101,7 +101,7 @@ export class PixelAccumulator {
 
           if (t) {
             this.lookup[t.id] = undefined
-            this.tilePool.releaseTile(t)
+            this.pixelTilePool.releaseTile(t)
           }
         }
 
@@ -116,7 +116,7 @@ export class PixelAccumulator {
     let added = false
 
     if (!tile) {
-      tile = this.tilePool.getTile(id, tx, ty)
+      tile = this.pixelTilePool.getTile(id, tx, ty)
 
       this.extractState(tile)
       this.lookup[id] = tile
@@ -128,7 +128,7 @@ export class PixelAccumulator {
       if (!didChange && added) {
         this.beforeTiles.pop()
         this.lookup[id] = undefined
-        this.tilePool.releaseTile(tile!)
+        this.pixelTilePool.releaseTile(tile!)
       }
       return didChange
     }
@@ -137,12 +137,12 @@ export class PixelAccumulator {
   extractState(tile: PixelTile) {
     const target = this.config.target
     const TILE_SIZE = this.config.tileSize
-    const dst = tile.data32
-    const src = target.data32
+    const dst = tile.data
+    const src = target.data
     const startX = tile.tx * TILE_SIZE
     const startY = tile.ty * TILE_SIZE
-    const targetWidth = target.width
-    const targetHeight = target.height
+    const targetWidth = target.w
+    const targetHeight = target.h
 
     // If the tile is completely outside the canvas, zero it out.
     if (startX >= targetWidth || startX + TILE_SIZE <= 0 || startY >= targetHeight || startY + TILE_SIZE <= 0) {
@@ -190,7 +190,7 @@ export class PixelAccumulator {
       let beforeTile = this.beforeTiles[i]
 
       if (beforeTile) {
-        let afterTile = this.tilePool.getTile(beforeTile.id, beforeTile.tx, beforeTile.ty)
+        let afterTile = this.pixelTilePool.getTile(beforeTile.id, beforeTile.tx, beforeTile.ty)
 
         this.extractState(afterTile)
         afterTiles.push(afterTile)
@@ -219,7 +219,7 @@ export class PixelAccumulator {
 
       if (tile) {
         this.lookup[tile.id] = undefined
-        this.tilePool.releaseTile(tile)
+        this.pixelTilePool.releaseTile(tile)
       }
     }
 

package/src/History/PixelEngineConfig.ts

@@ -1,4 +1,4 @@
-import type { PixelData } from '../PixelData/PixelData'
+import type { PixelData } from '../PixelData/_pixelData-types'
 
 export class PixelEngineConfig {
   readonly tileSize: number
@@ -22,7 +22,7 @@ export class PixelEngineConfig {
     this.tileMask = tileSize - 1
     this.tileArea = tileSize * tileSize
     this.target = target
-    this.targetColumns = (target.width + this.tileMask) >> this.tileShift
-    this.targetRows = (target.height + this.tileMask) >> this.tileShift
+    this.targetColumns = (target.w + this.tileMask) >> this.tileShift
+    this.targetRows = (target.h + this.tileMask) >> this.tileShift
   }
 }

package/src/History/PixelMutator/mutatorApplyAlphaMask.ts

@@ -1,4 +1,5 @@
-import { type AlphaMask, type ApplyMaskToPixelDataOptions } from '../../_types'
+import { type ApplyMaskToPixelDataOptions } from '../../_types'
+import type { AlphaMask } from '../../Mask/_mask-types'
 import { applyAlphaMaskToPixelData } from '../../PixelData/applyAlphaMaskToPixelData'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
@@ -21,8 +22,8 @@ export const mutatorApplyAlphaMask = ((writer: PixelWriter<any>, deps: Deps = de
       const target = writer.config.target
       const x = opts?.x ?? 0
       const y = opts?.y ?? 0
-      const w = opts?.w ?? target.width
-      const h = opts?.h ?? target.height
+      const w = opts?.w ?? target.w
+      const h = opts?.h ?? target.h
 
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
       return didChange(applyAlphaMaskToPixelData(target, mask, opts))

package/src/History/PixelMutator/mutatorApplyBinaryMask.ts

@@ -1,4 +1,5 @@
-import { type ApplyMaskToPixelDataOptions, type BinaryMask } from '../../_types'
+import { type ApplyMaskToPixelDataOptions } from '../../_types'
+import type { BinaryMask } from '../../Mask/_mask-types'
 import { applyBinaryMaskToPixelData } from '../../PixelData/applyBinaryMaskToPixelData'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
@@ -21,8 +22,8 @@ export const mutatorApplyBinaryMask = ((writer: PixelWriter<any>, deps: Deps = d
       const target = writer.config.target
       const x = opts?.x ?? 0
       const y = opts?.y ?? 0
-      const w = opts?.w ?? target.width
-      const h = opts?.h ?? target.height
+      const w = opts?.w ?? target.w
+      const h = opts?.h ?? target.h
 
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
       return didChange(applyBinaryMaskToPixelData(target, mask, opts))

package/src/History/PixelMutator/mutatorApplyMask.ts

@@ -1,4 +1,5 @@
-import { type ApplyMaskToPixelDataOptions, type Mask, MaskType } from '../../_types'
+import { type ApplyMaskToPixelDataOptions } from '../../_types'
+import { type Mask, MaskType } from '../../Mask/_mask-types'
 import { applyAlphaMaskToPixelData } from '../../PixelData/applyAlphaMaskToPixelData'
 import { applyBinaryMaskToPixelData } from '../../PixelData/applyBinaryMaskToPixelData'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'
@@ -24,8 +25,8 @@ export const mutatorApplyMask = ((writer: PixelWriter<any>, deps: Deps = default
       const target = writer.config.target
       const x = opts?.x ?? 0
       const y = opts?.y ?? 0
-      const w = opts?.w ?? target.width
-      const h = opts?.h ?? target.height
+      const w = opts?.w ?? target.w
+      const h = opts?.h ?? target.h
 
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
 

package/src/History/PixelMutator/mutatorBlendAlphaMask.ts

@@ -1,4 +1,6 @@
-import type { AlphaMask, IPixelData32, PixelBlendMaskOptions } from '../../_types'
+import type { PixelBlendMaskOptions } from '../../_types'
+import type { AlphaMask } from '../../Mask/_mask-types'
+import type { PixelData32 } from '../../PixelData/_pixelData-types'
 import { blendPixelDataAlphaMask } from '../../PixelData/blendPixelDataAlphaMask'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
@@ -15,14 +17,14 @@ export const mutatorBlendAlphaMask = ((writer: PixelWriter<any>, deps: Partial<D
 
   return {
     blendAlphaMask(
-      src: IPixelData32,
+      src: PixelData32,
       mask: AlphaMask,
       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 w = opts?.w ?? src.w
+      const h = opts?.h ?? src.h
 
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
 

package/src/History/PixelMutator/mutatorBlendBinaryMask.ts

@@ -1,4 +1,6 @@
-import type { BinaryMask, IPixelData32, PixelBlendMaskOptions } from '../../_types'
+import type { PixelBlendMaskOptions } from '../../_types'
+import type { BinaryMask } from '../../Mask/_mask-types'
+import type { PixelData32 } from '../../PixelData/_pixelData-types'
 import { blendPixelDataBinaryMask } from '../../PixelData/blendPixelDataBinaryMask'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
@@ -15,14 +17,14 @@ export const mutatorBlendBinaryMask = ((writer: PixelWriter<any>, deps: Partial<
 
   return {
     blendBinaryMask(
-      src: IPixelData32,
+      src: PixelData32,
       mask: BinaryMask,
       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 w = opts?.w ?? src.w
+      const h = opts?.h ?? src.h
 
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
 

package/src/History/PixelMutator/mutatorBlendColor.ts

@@ -21,8 +21,8 @@ export const mutatorBlendColor = ((writer: PixelWriter<any>, deps: Deps = defaul
       const target = writer.config.target
       const x = opts?.x ?? 0
       const y = opts?.y ?? 0
-      const w = opts?.w ?? target.width
-      const h = opts?.h ?? target.height
+      const w = opts?.w ?? target.w
+      const h = opts?.h ?? target.h
 
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
       return didChange(

package/src/History/PixelMutator/mutatorBlendColorPaintAlphaMask.ts

@@ -1,5 +1,6 @@
-import { type Color32, type PaintAlphaMask } from '../../_types'
+import { type Color32 } from '../../_types'
 import { sourceOverPerfect } from '../../BlendModes/blend-modes-perfect'
+import type { PaintAlphaMask } from '../../Paint/_paint-types'
 import { blendColorPixelDataAlphaMask } from '../../PixelData/blendColorPixelDataAlphaMask'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 

package/src/History/PixelMutator/mutatorBlendColorPaintBinaryMask.ts

@@ -1,5 +1,6 @@
-import { type Color32, type PaintBinaryMask } from '../../_types'
+import { type Color32 } from '../../_types'
 import { sourceOverPerfect } from '../../BlendModes/blend-modes-perfect'
+import type { PaintBinaryMask } from '../../Paint/_paint-types'
 import { blendColorPixelDataBinaryMask } from '../../PixelData/blendColorPixelDataBinaryMask'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 

package/src/History/PixelMutator/mutatorBlendColorPaintMask.ts

@@ -1,5 +1,7 @@
-import { type Color32, MaskType, type PaintMask } from '../../_types'
+import { type Color32 } from '../../_types'
 import { sourceOverPerfect } from '../../BlendModes/blend-modes-perfect'
+import { MaskType } from '../../Mask/_mask-types'
+import type { PaintMask } from '../../Paint/_paint-types'
 import { blendColorPixelDataAlphaMask } from '../../PixelData/blendColorPixelDataAlphaMask'
 import { blendColorPixelDataBinaryMask } from '../../PixelData/blendColorPixelDataBinaryMask'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'

package/src/History/PixelMutator/{mutatorBlendPaintRect.ts → mutatorBlendColorPaintRect.ts}

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

package/src/History/PixelMutator/mutatorBlendMask.ts

@@ -1,4 +1,6 @@
-import { type IPixelData32, type Mask, MaskType, type PixelBlendMaskOptions } from '../../_types'
+import { type PixelBlendMaskOptions } from '../../_types'
+import { type Mask, MaskType } from '../../Mask/_mask-types'
+import type { PixelData32 } from '../../PixelData/_pixelData-types'
 import { blendPixelDataAlphaMask } from '../../PixelData/blendPixelDataAlphaMask'
 import { blendPixelDataBinaryMask } from '../../PixelData/blendPixelDataBinaryMask'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'
@@ -17,14 +19,14 @@ export const mutatorBlendMask = ((writer: PixelWriter<any>, deps: Partial<Deps>
 
   return {
     blendMask(
-      src: IPixelData32,
+      src: PixelData32,
       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 w = opts?.w ?? src.w
+      const h = opts?.h ?? src.h
 
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
 

package/src/History/PixelMutator/mutatorBlendPixelData.ts

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

package/src/History/PixelMutator/mutatorClear.ts

@@ -1,5 +1,6 @@
-import type { Color32, Rect } from '../../_types'
+import type { Color32 } from '../../_types'
 import { fillPixelData } from '../../PixelData/fillPixelData'
+import type { Rect } from '../../Rect/_rect-types'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
 const defaults = { fillPixelData }
@@ -21,8 +22,8 @@ export const mutatorClear = ((writer: PixelWriter<any>, deps: Deps = defaults) =
       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 w = rect?.w ?? target.w
+      const h = rect?.h ?? target.h
 
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
       return didChange(

package/src/History/PixelMutator/mutatorFill.ts

@@ -1,5 +1,6 @@
-import type { Color32, Rect } from '../../_types'
+import type { Color32 } from '../../_types'
 import { fillPixelData } from '../../PixelData/fillPixelData'
+import type { Rect } from '../../Rect/_rect-types'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 
 const defaults = { fillPixelData }
@@ -18,8 +19,8 @@ export const mutatorFill = ((writer: PixelWriter<any>, deps: Deps = defaults) =>
       color: Color32,
       x = 0,
       y = 0,
-      w = writer.config.target.width,
-      h = writer.config.target.height,
+      w = writer.config.target.w,
+      h = writer.config.target.h,
     ) {
       const target = writer.config.target
 
@@ -48,7 +49,7 @@ export const mutatorFillRect = ((writer: PixelWriter<any>, deps: Deps = defaults
 
       const didChange = writer.accumulator.storeRegionBeforeState(rect.x, rect.y, rect.w, rect.h)
       return didChange(
-        fillPixelData(target, color, rect.x, rect.y, rect.w, rect.h)
+        fillPixelData(target, color, rect.x, rect.y, rect.w, rect.h),
       )
     },
   }

package/src/History/PixelMutator/mutatorFillBinaryMask.ts

@@ -1,4 +1,5 @@
-import type { BinaryMask, Color32 } from '../../_types'
+import type { Color32 } from '../../_types'
+import type { BinaryMask } from '../../Mask/_mask-types'
 import { fillPixelDataBinaryMask } from '../../PixelData/fillPixelDataBinaryMask'
 import { type HistoryMutator, PixelWriter } from '../PixelWriter'
 

package/src/History/PixelMutator/mutatorInvert.ts

@@ -18,8 +18,8 @@ export const mutatorInvert = ((writer: PixelWriter<any>, deps: Deps = defaults)
       const target = writer.config.target
       const x = opts?.x ?? 0
       const y = opts?.y ?? 0
-      const w = opts?.w ?? target.width
-      const h = opts?.h ?? target.height
+      const w = opts?.w ?? target.w
+      const h = opts?.h ?? target.h
 
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h)
 

package/src/History/PixelMutator.ts

@@ -7,8 +7,8 @@ import { mutatorBlendColor } from './PixelMutator/mutatorBlendColor'
 import { mutatorBlendColorPaintAlphaMask } from './PixelMutator/mutatorBlendColorPaintAlphaMask'
 import { mutatorBlendColorPaintBinaryMask } from './PixelMutator/mutatorBlendColorPaintBinaryMask'
 import { mutatorBlendColorPaintMask } from './PixelMutator/mutatorBlendColorPaintMask'
+import { mutatorBlendColorPaintRect } from './PixelMutator/mutatorBlendColorPaintRect'
 import { mutatorBlendMask } from './PixelMutator/mutatorBlendMask'
-import { mutatorBlendPaintRect } from './PixelMutator/mutatorBlendPaintRect'
 import { mutatorBlendPixel } from './PixelMutator/mutatorBlendPixel'
 import { mutatorBlendPixelData } from './PixelMutator/mutatorBlendPixelData'
 import { mutatorClear } from './PixelMutator/mutatorClear'
@@ -29,8 +29,8 @@ export function makeFullPixelMutator(writer: PixelWriter<any>) {
     ...mutatorBlendColorPaintAlphaMask(writer),
     ...mutatorBlendColorPaintBinaryMask(writer),
     ...mutatorBlendColorPaintMask(writer),
+    ...mutatorBlendColorPaintRect(writer),
     ...mutatorBlendMask(writer),
-    ...mutatorBlendPaintRect(writer),
     ...mutatorBlendPixel(writer),
     ...mutatorBlendPixelData(writer),
     ...mutatorClear(writer),

package/src/History/PixelPatchTiles.ts

@@ -1,21 +1,21 @@
-import type { IPixelData32 } from '../_types'
-import { PixelTile } from '../PixelTile/PixelTile'
+import type { PixelData32 } from '../PixelData/_pixelData-types'
+import type { PixelTile } from '../Tile/_tile-types'
 
 export type PixelPatchTiles = {
   beforeTiles: PixelTile[]
   afterTiles: PixelTile[]
 }
 
-export function applyPatchTiles(target: IPixelData32, tiles: PixelTile[], tileSize: number) {
+export function applyPatchTiles(target: PixelData32, tiles: PixelTile[], tileSize: number) {
   for (let i = 0; i < tiles.length; i++) {
     const tile = tiles[i]
 
     if (!tile) continue
 
-    const dst = target.data32
-    const src = tile.data32
-    const dstWidth = target.width
-    const dstHeight = target.height
+    const dst = target.data
+    const src = tile.data
+    const dstWidth = target.w
+    const dstHeight = target.h
     const startX = tile.tx * tileSize
     const startY = tile.ty * tileSize