pixel-data-js 0.22.2 → 0.23.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pixel-data-js",
   "type": "module",
-  "version": "0.22.2",
+  "version": "0.23.1",
   "packageManager": "pnpm@10.30.0",
   "description": "JS Pixel and ImageData operations",
   "author": {

package/src/History/PixelMutator/mutatorBlendPixelData.ts

@@ -16,7 +16,7 @@ export const mutatorBlendPixelData = ((writer: PixelWriter<any>, deps: Partial<D
   return {
     blendPixelData(
       src: IPixelData,
-      opts: PixelBlendOptions,
+      opts: PixelBlendOptions = {},
     ) {
       const {
         x = 0,

package/src/History/PixelMutator/mutatorBlendPixelDataAlphaMask.ts

@@ -0,0 +1,33 @@
+import type { AlphaMask, HistoryMutator, IPixelData, PixelBlendMaskOptions } from '../../_types'
+import { blendPixelDataAlphaMask } from '../../PixelData/blendPixelDataAlphaMask'
+import { PixelWriter } from '../PixelWriter'
+
+const defaults = { blendPixelDataAlphaMask }
+type Deps = Partial<typeof defaults>
+
+/**
+ * @param deps - @hidden
+ */
+export const mutatorBlendPixelDataAlphaMask = ((writer: PixelWriter<any>, deps: Partial<Deps> = defaults) => {
+  const {
+    blendPixelDataAlphaMask = defaults.blendPixelDataAlphaMask,
+  } = deps
+
+  return {
+    blendPixelDataAlphaMask(
+      src: IPixelData,
+      mask: AlphaMask,
+      opts: PixelBlendMaskOptions = {},
+    ) {
+      const x = opts.x ?? 0
+      const y = opts.y ?? 0
+      const w = opts.w ?? src.width
+      const h = opts.h ?? src.height
+
+      writer.accumulator.storeRegionBeforeState(x, y, w, h)
+
+      blendPixelDataAlphaMask(writer.target, src, mask, opts)
+    },
+  }
+}) satisfies HistoryMutator<any, Deps>
+

package/src/History/PixelMutator/mutatorBlendPixelDataBinaryMask.ts

@@ -0,0 +1,33 @@
+import type { BinaryMask, HistoryMutator, IPixelData, PixelBlendMaskOptions } from '../../_types'
+import { blendPixelDataBinaryMask } from '../../PixelData/blendPixelDataBinaryMask'
+import { PixelWriter } from '../PixelWriter'
+
+const defaults = { blendPixelDataBinaryMask }
+type Deps = Partial<typeof defaults>
+
+/**
+ * @param deps - @hidden
+ */
+export const mutatorBlendPixelDataBinaryMask = ((writer: PixelWriter<any>, deps: Partial<Deps> = defaults) => {
+  const {
+    blendPixelDataBinaryMask = defaults.blendPixelDataBinaryMask,
+  } = deps
+
+  return {
+    blendPixelDataBinaryMask(
+      src: IPixelData,
+      mask: BinaryMask,
+      opts: PixelBlendMaskOptions = {},
+    ) {
+      const x = opts.x ?? 0
+      const y = opts.y ?? 0
+      const w = opts.w ?? src.width
+      const h = opts.h ?? src.height
+
+      writer.accumulator.storeRegionBeforeState(x, y, w, h)
+
+      blendPixelDataBinaryMask(writer.target, src, mask, opts)
+    },
+  }
+}) satisfies HistoryMutator<any, Deps>
+

package/src/History/PixelMutator/mutatorClear.ts

@@ -1,4 +1,4 @@
-import type { BinaryMaskRect, Color32, HistoryMutator } from '../../_types'
+import type { Color32, HistoryMutator, Rect } from '../../_types'
 import { fillPixelData } from '../../PixelData/fillPixelData'
 import { PixelWriter } from '../PixelWriter'
 
@@ -16,7 +16,7 @@ export const mutatorClear = ((writer: PixelWriter<any>, deps: Deps = defaults) =
 
   return {
     clear(
-      rect: Partial<BinaryMaskRect> = {},
+      rect: Partial<Rect> = {},
     ) {
       const x = rect.x ?? 0
       const y = rect.y ?? 0

package/src/History/PixelMutator.ts

@@ -2,6 +2,7 @@ import { mutatorApplyAlphaMask } from './PixelMutator/mutatorApplyAlphaMask'
 import { mutatorApplyBinaryMask } from './PixelMutator/mutatorApplyBinaryMask'
 import { mutatorApplyCircleBrush } from './PixelMutator/mutatorApplyCircleBrush'
 import { mutatorApplyCircleBrushStroke } from './PixelMutator/mutatorApplyCircleBrushStroke'
+import { mutatorApplyCirclePencil } from './PixelMutator/mutatorApplyCirclePencil'
 import { mutatorApplyCirclePencilStroke } from './PixelMutator/mutatorApplyCirclePencilStroke'
 import { mutatorApplyRectBrush } from './PixelMutator/mutatorApplyRectBrush'
 import { mutatorApplyRectBrushStroke } from './PixelMutator/mutatorApplyRectBrushStroke'
@@ -10,33 +11,35 @@ import { mutatorApplyRectPencilStroke } from './PixelMutator/mutatorApplyRectPen
 import { mutatorBlendColor } from './PixelMutator/mutatorBlendColor'
 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 } from './PixelMutator/mutatorFill'
+import { mutatorFillBinaryMask } from './PixelMutator/mutatorFillBinaryMask'
 import { mutatorInvert } from './PixelMutator/mutatorInvert'
 import type { PixelWriter } from './PixelWriter'
 
 export function makeFullPixelMutator(writer: PixelWriter<any>) {
   return {
+    // @sort
     ...mutatorApplyAlphaMask(writer),
     ...mutatorApplyBinaryMask(writer),
-
-    ...mutatorBlendPixelData(writer),
-    ...mutatorBlendColor(writer),
-    ...mutatorBlendPixel(writer),
-    ...mutatorFill(writer),
-    ...mutatorInvert(writer),
-
     ...mutatorApplyCircleBrush(writer),
     ...mutatorApplyCircleBrushStroke(writer),
-
+    ...mutatorApplyCirclePencil(writer),
     ...mutatorApplyCirclePencilStroke(writer),
-
     ...mutatorApplyRectBrush(writer),
     ...mutatorApplyRectBrushStroke(writer),
-
     ...mutatorApplyRectPencil(writer),
     ...mutatorApplyRectPencilStroke(writer),
-
+    ...mutatorBlendColor(writer),
+    ...mutatorBlendPixel(writer),
+    ...mutatorBlendPixelData(writer),
+    ...mutatorBlendPixelDataAlphaMask(writer),
+    ...mutatorBlendPixelDataBinaryMask(writer),
     ...mutatorClear(writer),
+    ...mutatorFill(writer),
+    ...mutatorFillBinaryMask(writer),
+    ...mutatorInvert(writer),
   }
 }

package/src/PixelData/blendPixelData.ts

@@ -18,7 +18,7 @@ import { sourceOverPerfect } from '../BlendModes/blend-modes-perfect'
 export function blendPixelData(
   dst: IPixelData,
   src: IPixelData,
-  opts: PixelBlendOptions,
+  opts: PixelBlendOptions = {},
 ) {
   const {
     x: targetX = 0,

package/src/PixelData/blendPixelDataBinaryMask.ts

@@ -5,7 +5,7 @@ export function blendPixelDataBinaryMask(
   dst: IPixelData,
   src: IPixelData,
   binaryMask: BinaryMask,
-  opts: PixelBlendMaskOptions,
+  opts: PixelBlendMaskOptions = {},
 ) {
   const {
     x: targetX = 0,

package/src/index.ts

@@ -43,6 +43,8 @@ export * from './History/PixelMutator/mutatorApplyRectBrushStroke'
 export * from './History/PixelMutator/mutatorBlendColor'
 export * from './History/PixelMutator/mutatorBlendPixel'
 export * from './History/PixelMutator/mutatorBlendPixelData'
+export * from './History/PixelMutator/mutatorBlendPixelDataAlphaMask'
+export * from './History/PixelMutator/mutatorBlendPixelDataBinaryMask'
 export * from './History/PixelMutator/mutatorClear'
 export * from './History/PixelMutator/mutatorFill'
 export * from './History/PixelMutator/mutatorFillBinaryMask'