pixel-data-js 0.21.0 → 0.23.0

package/src/PixelData/invertPixelData.ts

@@ -14,7 +14,6 @@ export function invertPixelData(
     w: width = pixelData.width,
     h: height = pixelData.height,
     mask,
-    mw,
     mx = 0,
     my = 0,
     invertMask = false,
@@ -33,7 +32,7 @@ export function invertPixelData(
 
   const dst32 = dst.data32
   const dw = dst.width
-  const mPitch = mw ?? width
+  const mPitch = mask?.w ?? width
 
   const dx = x - targetX
   const dy = y - targetY
@@ -46,9 +45,10 @@ export function invertPixelData(
 
   // Optimization: Split loops to avoid checking `if (mask)` for every pixel.
   if (mask) {
+    const maskData = mask.data
     for (let iy = 0; iy < actualH; iy++) {
       for (let ix = 0; ix < actualW; ix++) {
-        const mVal = mask[mIdx]
+        const mVal = maskData[mIdx]
         const isHit = invertMask
           ? mVal === 0
           : mVal === 1

package/src/PixelData/pixelDataToAlphaMask.ts

@@ -1,4 +1,5 @@
 import type { AlphaMask, IPixelData } from '../_types'
+import { makeAlphaMask } from '../Mask/AlphaMask'
 
 /**
  * Extracts the alpha channel from PixelData into a single-channel mask.
@@ -13,14 +14,15 @@ export function pixelDataToAlphaMask(
     height,
   } = pixelData
   const len = data32.length
-  const mask = new Uint8Array(width * height) as AlphaMask
+  const mask = makeAlphaMask(width, height)
+  const maskData = mask.data
 
   for (let i = 0; i < len; i++) {
     const val = data32[i]
 
     // Extract the Alpha byte (top 8 bits in ABGR / Little-Endian)
     // Shift right by 24 moves the 4th byte to the 1st position
-    mask[i] = (val >>> 24) & 0xff
+    maskData[i] = (val >>> 24) & 0xff
   }
 
   return mask

package/src/PixelData/writePixelDataBuffer.ts

@@ -1,14 +1,13 @@
 import { type IPixelData, type Rect } from '../_types'
 import { makeClippedBlit, resolveBlitClipping } from '../Internal/resolveClipping'
-import type { PixelData } from './PixelData'
 
 const SCRATCH_BLIT = makeClippedBlit()
 
 /**
- * Copies a pixel buffer into a specific region of a {@link PixelData} object.
+ * Copies a pixel buffer into a specific region of a {@link IPixelData} object.
  *
  * This function performs a direct memory copy from a {@link Uint32Array}
- * into the target {@link PixelData} buffer.
+ * into the target buffer.
  */
 export function writePixelDataBuffer(
   target: IPixelData,

package/src/Rect/getRectsBounds.ts

@@ -0,0 +1,22 @@
+import type { Rect } from '../_types'
+
+export function getRectsBounds<T extends Rect>(rects: T[]): T {
+  if (rects.length === 1) return { ...rects[0] }
+  let minX = Infinity, minY = Infinity
+  let maxX = -Infinity, maxY = -Infinity
+
+  for (let i = 0; i < rects.length; i++) {
+    const r = rects[i]
+    const x1 = r.x
+    const y1 = r.y
+    const x2 = x1 + r.w
+    const y2 = y1 + r.h
+
+    if (x1 < minX) minX = x1
+    if (y1 < minY) minY = y1
+    if (x2 > maxX) maxX = x2
+    if (y2 > maxY) maxY = y2
+  }
+
+  return { x: minX, y: minY, w: maxX - minX, h: maxY - minY } as T
+}

package/src/Rect/trimRectBounds.ts

@@ -1,11 +1,11 @@
-import type { Rect, SelectionRect } from '../_types'
-import { extractMask } from '../Mask/extractMask'
+import type { NullableMaskRect, Rect } from '../_types'
+import { extractMaskBuffer } from '../Mask/extractMaskBuffer'
 
 /**
  * Intersects a target rectangle with a boundary, trimming dimensions and masks in-place.
  * This utility calculates the axis-aligned intersection between the `target` and `bounds`.
- * If the `target` includes a `mask` (as in a {@link SelectionRect}), the mask is physically
- * cropped and re-aligned using `extractMask` to match the new dimensions.
+ * If the `target` includes a `mask` (as in a {@link NullableMaskRect}), the mask is physically
+ * cropped and re-aligned using `extractMaskBuffer` to match the new dimensions.
  * @param target - The rectangle or selection object to be trimmed. **Note:** This object is mutated in-place.
  * @param bounds - The boundary rectangle defining the maximum allowable area (e.g., canvas dimensions).
  * @example
@@ -15,7 +15,7 @@ import { extractMask } from '../Mask/extractMask'
  * // The mask is cropped by 10 px on the top and left.
  * trimRectBounds(selection, canvas);
  */
-export function trimRectBounds<T extends Rect | SelectionRect>(
+export function trimRectBounds<T extends NullableMaskRect>(
   target: T,
   bounds: Rect,
 ): void {
@@ -40,9 +40,8 @@ export function trimRectBounds<T extends Rect | SelectionRect>(
     target.w = 0
     target.h = 0
 
-    if ('mask' in target && target.mask) {
-      // This line is now hit by the 'empty intersection' test below
-      target.mask = new Uint8Array(0)
+    if ('data' in target && target.data) {
+      target.data = new Uint8Array(0)
     }
 
     return
@@ -58,9 +57,9 @@ export function trimRectBounds<T extends Rect | SelectionRect>(
   target.w = intersectedW
   target.h = intersectedH
 
-  if ('mask' in target && target.mask) {
-    const currentMask = extractMask(
-      target.mask,
+  if ('data' in target && target.data) {
+    const currentMaskBuffer = extractMaskBuffer(
+      target.data,
       originalW,
       offsetX,
       offsetY,
@@ -76,7 +75,7 @@ export function trimRectBounds<T extends Rect | SelectionRect>(
     // Scan for content
     for (let y = 0; y < intersectedH; y++) {
       for (let x = 0; x < intersectedW; x++) {
-        if (currentMask[y * intersectedW + x] !== 0) {
+        if (currentMaskBuffer[y * intersectedW + x] !== 0) {
           if (x < minX) minX = x
           if (x > maxX) maxX = x
           if (y < minY) minY = y
@@ -89,8 +88,8 @@ export function trimRectBounds<T extends Rect | SelectionRect>(
     if (maxX === -1) {
       target.w = 0
       target.h = 0
-      // This covers the specific line you mentioned
-      target.mask = new Uint8Array(0)
+      target.data = new Uint8Array(0)
+
       return
     }
 
@@ -99,20 +98,24 @@ export function trimRectBounds<T extends Rect | SelectionRect>(
 
     // Only shift and crop if the content is smaller than the intersection
     if (finalW !== intersectedW || finalH !== intersectedH) {
-      target.mask = extractMask(
-        currentMask,
+      const newMaskBuffer = extractMaskBuffer(
+        currentMaskBuffer,
         intersectedW,
         minX,
         minY,
         finalW,
         finalH,
       )
+
       target.x += minX
       target.y += minY
       target.w = finalW
       target.h = finalH
+      target.data = newMaskBuffer
     } else {
-      target.mask = currentMask
+      target.w = finalW
+      target.h = finalH
+      target.data = currentMaskBuffer
     }
   }
 }

package/src/_types.ts

@@ -47,14 +47,6 @@ export type Rect = {
   h: number
 }
 
-export type BinaryMaskRect = {
-  x: number
-  y: number
-  w: number
-  h: number
-  mask: BinaryMask
-}
-
 /**
  * Defines how mask values should be interpreted during a draw operation.
  */
@@ -71,12 +63,36 @@ export enum MaskType {
   BINARY
 }
 
+export interface Mask {
+  readonly type: MaskType
+  readonly data: Uint8Array
+  readonly w: number
+  readonly h: number
+}
+
 /** Strictly 0 or 1 */
-export type BinaryMask = Uint8Array & { readonly __brand: 'Binary' }
+export interface BinaryMask extends Mask {
+  readonly type: MaskType.BINARY
+}
+
 /** Strictly 0-255 */
-export type AlphaMask = Uint8Array & { readonly __brand: 'Alpha' }
+export interface AlphaMask extends Mask {
+  readonly type: MaskType.ALPHA
+}
 
-export type AnyMask = BinaryMask | AlphaMask
+interface CircleBrush {
+  readonly size: number
+  readonly radius: number
+  readonly minOffset: number
+}
+
+export interface CircleBrushAlphaMask extends CircleBrush, AlphaMask {
+}
+
+export interface CircleBrushBinaryMask extends CircleBrush, BinaryMask {
+}
+
+export type CircleBrushMask = CircleBrushAlphaMask | CircleBrushBinaryMask
 
 /**
  * Configuration for pixel manipulation operations.
@@ -122,14 +138,6 @@ export interface MaskOffset {
   my?: number
 }
 
-export interface MaskOffsetWidth {
-  /**
-   * Mask width.
-   * @default value of `w`
-   */
-  mw?: number
-}
-
 export interface InvertMask {
 
   /**
@@ -139,7 +147,7 @@ export interface InvertMask {
   invertMask?: boolean
 }
 
-export interface Alpha {
+interface Alpha {
   /**
    * Overall layer opacity 0-255.
    * @default 255
@@ -147,14 +155,14 @@ export interface Alpha {
   alpha?: number
 }
 
-export interface ApplyMaskToPixelDataOptions extends PixelRect, Alpha, MaskOffsetWidth, MaskOffset, InvertMask {
+export interface ApplyMaskToPixelDataOptions extends PixelRect, Alpha, MaskOffset, InvertMask {
 }
 
 export interface MergeAlphaMasksOptions extends PixelRect, Alpha, MaskOffset, InvertMask {
 
 }
 
-export interface PixelMutateOptions extends PixelRect, MaskOffset, MaskOffsetWidth, InvertMask {
+export interface PixelMutateOptions extends PixelRect, MaskOffset, InvertMask {
   /** An optional mask to restrict where pixels are mutated. */
   mask?: BinaryMask | null
 }
@@ -187,7 +195,7 @@ export interface PixelBlendOptions extends PixelRect, Alpha, BasePixelBlendOptio
 
 }
 
-export interface PixelBlendMaskOptions extends PixelRect, Alpha, MaskOffsetWidth, MaskOffset, InvertMask, BasePixelBlendOptions {
+export interface PixelBlendMaskOptions extends PixelRect, Alpha, MaskOffset, InvertMask, BasePixelBlendOptions {
 }
 
 /**
@@ -201,17 +209,35 @@ export interface ColorBlendOptions extends PixelRect, Alpha {
   blendFn?: BlendColor32
 }
 
-export interface ColorBlendMaskOptions extends ColorBlendOptions, MaskOffset, MaskOffsetWidth, InvertMask {
+export interface ColorBlendMaskOptions extends ColorBlendOptions, MaskOffset, InvertMask {
+}
+
+export type BinaryMaskRect = Rect & {
+  type: MaskType.BINARY
+  data: Uint8Array
 }
 
-export type SelectionRect = Rect & ({
-  mask: Uint8Array,
-  maskType: MaskType,
+export type NullableBinaryMaskRect = Rect & ({
+  type: MaskType.BINARY
+  data: Uint8Array
 } | {
-  mask?: null
-  maskType?: null,
+  type?: null
+  data?: null
 })
 
+
+export type NullableMaskRect = Rect & ({
+  type: MaskType
+  data: Uint8Array
+} | {
+  type?: null
+  data?: null
+})
+
+export type AlphaMaskRect = Rect & {
+  mask: AlphaMask
+}
+
 export type HistoryMutator<T extends {}, D extends {}> = (writer: PixelWriter<any>, deps?: Partial<D>) => T
 
 export interface IPixelData {

package/src/index.ts

@@ -43,14 +43,17 @@ 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'
 export * from './History/PixelMutator/mutatorInvert'
 
 export * from './ImageData/copyImageData'
 export * from './ImageData/extractImageDataBuffer'
 export * from './ImageData/ImageDataLike'
-export * from './ImageData/imageDataToAlphaMask'
+export * from './ImageData/imageDataToAlphaMaskBuffer'
 export * from './ImageData/imageDataToDataUrl'
 export * from './ImageData/imageDataToImgBlob'
 export * from './ImageData/imageDataToUInt32Array'
@@ -74,12 +77,24 @@ export * from './Input/fileInputChangeToImageData'
 export * from './Input/fileToImageData'
 export * from './Input/getSupportedRasterFormats'
 
+export * from './Mask/AlphaMask'
+export * from './Mask/BinaryMask'
+
+export * from './Mask/CircleBrushAlphaMask'
+export * from './Mask/CircleBrushBinaryMask'
+
 export * from './Mask/applyBinaryMaskToAlphaMask'
 export * from './Mask/copyMask'
 export * from './Mask/extractMask'
+export * from './Mask/extractMaskBuffer'
 export * from './Mask/invertMask'
 export * from './Mask/mergeAlphaMasks'
 export * from './Mask/mergeBinaryMasks'
+export * from './Mask/setMaskData'
+
+export { subtractBinaryMaskRects } from './MaskRect/subtractBinaryMaskRects'
+export * from './MaskRect/merge2BinaryMaskRects'
+export * from './MaskRect/mergeBinaryMaskRects'
 
 export * from './PixelData/applyAlphaMaskToPixelData'
 export * from './PixelData/applyBinaryMaskToPixelData'
@@ -98,6 +113,7 @@ export * from './PixelData/clearPixelData'
 export * from './PixelData/extractPixelData'
 export * from './PixelData/extractPixelDataBuffer'
 export * from './PixelData/fillPixelData'
+export * from './PixelData/fillPixelDataBinaryMask'
 export * from './PixelData/invertPixelData'
 export * from './PixelData/PixelBuffer32'
 export * from './PixelData/pixelDataToAlphaMask'
@@ -110,6 +126,7 @@ export * from './Rect/getCircleBrushOrPencilBounds'
 export * from './Rect/getCircleBrushOrPencilStrokeBounds'
 export * from './Rect/getRectBrushOrPencilBounds'
 export * from './Rect/getRectBrushOrPencilStrokeBounds'
+export * from './Rect/getRectsBounds'
 export * from './Rect/trimRectBounds'
 
 export * from './Algorithm/forEachLinePoint'