pixel-data-js 0.22.2 → 0.23.0

package/dist/index.dev.js

@@ -2426,19 +2426,50 @@ var mutatorApplyCircleBrushStroke = ((writer, deps = defaults4) => {
   };
 });
 
-// src/History/PixelMutator/mutatorApplyCirclePencilStroke.ts
+// src/History/PixelMutator/mutatorApplyCirclePencil.ts
 var defaults5 = {
+  applyCircleBrushToPixelData,
+  getCircleBrushOrPencilBounds
+};
+var mutatorApplyCirclePencil = ((writer, deps = defaults5) => {
+  const {
+    applyCircleBrushToPixelData: applyCircleBrushToPixelData2 = defaults5.applyCircleBrushToPixelData,
+    getCircleBrushOrPencilBounds: getCircleBrushOrPencilBounds2 = defaults5.getCircleBrushOrPencilBounds
+  } = deps;
+  const boundsOut = {
+    x: 0,
+    y: 0,
+    w: 0,
+    h: 0
+  };
+  return {
+    applyCirclePencil(color, centerX, centerY, brush, alpha = 255, blendFn) {
+      const bounds = getCircleBrushOrPencilBounds2(centerX, centerY, brush.size, writer.target.width, writer.target.height, boundsOut);
+      const {
+        x,
+        y,
+        w,
+        h
+      } = bounds;
+      writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      applyCircleBrushToPixelData2(writer.target, color, centerX, centerY, brush, alpha, blendFn, bounds);
+    }
+  };
+});
+
+// src/History/PixelMutator/mutatorApplyCirclePencilStroke.ts
+var defaults6 = {
   forEachLinePoint,
   blendColorPixelDataBinaryMask,
   getCircleBrushOrPencilBounds,
   getCircleBrushOrPencilStrokeBounds
 };
-var mutatorApplyCirclePencilStroke = ((writer, deps = defaults5) => {
+var mutatorApplyCirclePencilStroke = ((writer, deps = defaults6) => {
   const {
-    forEachLinePoint: forEachLinePoint2 = defaults5.forEachLinePoint,
-    blendColorPixelDataBinaryMask: blendColorPixelDataBinaryMask2 = defaults5.blendColorPixelDataBinaryMask,
-    getCircleBrushOrPencilStrokeBounds: getCircleBrushOrPencilStrokeBounds2 = defaults5.getCircleBrushOrPencilStrokeBounds,
-    getCircleBrushOrPencilBounds: getCircleBrushOrPencilBounds2 = defaults5.getCircleBrushOrPencilBounds
+    forEachLinePoint: forEachLinePoint2 = defaults6.forEachLinePoint,
+    blendColorPixelDataBinaryMask: blendColorPixelDataBinaryMask2 = defaults6.blendColorPixelDataBinaryMask,
+    getCircleBrushOrPencilStrokeBounds: getCircleBrushOrPencilStrokeBounds2 = defaults6.getCircleBrushOrPencilStrokeBounds,
+    getCircleBrushOrPencilBounds: getCircleBrushOrPencilBounds2 = defaults6.getCircleBrushOrPencilBounds
   } = deps;
   const strokeBoundsOut = {
     x: 0,
@@ -2592,14 +2623,14 @@ function applyRectBrushToPixelData(target, color, centerX, centerY, brushWidth,
 }
 
 // src/History/PixelMutator/mutatorApplyRectBrush.ts
-var defaults6 = {
+var defaults7 = {
   applyRectBrushToPixelData,
   getRectBrushOrPencilBounds
 };
-var mutatorApplyRectBrush = ((writer, deps = defaults6) => {
+var mutatorApplyRectBrush = ((writer, deps = defaults7) => {
   const {
-    applyRectBrushToPixelData: applyRectBrushToPixelData2 = defaults6.applyRectBrushToPixelData,
-    getRectBrushOrPencilBounds: getRectBrushOrPencilBounds2 = defaults6.getRectBrushOrPencilBounds
+    applyRectBrushToPixelData: applyRectBrushToPixelData2 = defaults7.applyRectBrushToPixelData,
+    getRectBrushOrPencilBounds: getRectBrushOrPencilBounds2 = defaults7.getRectBrushOrPencilBounds
   } = deps;
   const boundsOut = {
     x: 0,
@@ -2638,18 +2669,18 @@ function getRectBrushOrPencilStrokeBounds(x0, y0, x1, y1, brushWidth, brushHeigh
 }
 
 // src/History/PixelMutator/mutatorApplyRectBrushStroke.ts
-var defaults7 = {
+var defaults8 = {
   forEachLinePoint,
   blendColorPixelDataAlphaMask,
   getRectBrushOrPencilBounds,
   getRectBrushOrPencilStrokeBounds
 };
-var mutatorApplyRectBrushStroke = ((writer, deps = defaults7) => {
+var mutatorApplyRectBrushStroke = ((writer, deps = defaults8) => {
   const {
-    forEachLinePoint: forEachLinePoint2 = defaults7.forEachLinePoint,
-    blendColorPixelDataAlphaMask: blendColorPixelDataAlphaMask2 = defaults7.blendColorPixelDataAlphaMask,
-    getRectBrushOrPencilBounds: getRectBrushOrPencilBounds2 = defaults7.getRectBrushOrPencilBounds,
-    getRectBrushOrPencilStrokeBounds: getRectBrushOrPencilStrokeBounds2 = defaults7.getRectBrushOrPencilStrokeBounds
+    forEachLinePoint: forEachLinePoint2 = defaults8.forEachLinePoint,
+    blendColorPixelDataAlphaMask: blendColorPixelDataAlphaMask2 = defaults8.blendColorPixelDataAlphaMask,
+    getRectBrushOrPencilBounds: getRectBrushOrPencilBounds2 = defaults8.getRectBrushOrPencilBounds,
+    getRectBrushOrPencilStrokeBounds: getRectBrushOrPencilStrokeBounds2 = defaults8.getRectBrushOrPencilStrokeBounds
   } = deps;
   const strokeBoundsOut = {
     x: 0,
@@ -2741,16 +2772,16 @@ var mutatorApplyRectBrushStroke = ((writer, deps = defaults7) => {
 });
 
 // src/History/PixelMutator/mutatorApplyRectPencil.ts
-var defaults8 = {
+var defaults9 = {
   applyRectBrushToPixelData,
   getRectBrushOrPencilBounds,
   fallOff: () => 1
 };
-var mutatorApplyRectPencil = ((writer, deps = defaults8) => {
+var mutatorApplyRectPencil = ((writer, deps = defaults9) => {
   const {
-    applyRectBrushToPixelData: applyRectBrushToPixelData2 = defaults8.applyRectBrushToPixelData,
-    getRectBrushOrPencilBounds: getRectBrushOrPencilBounds2 = defaults8.getRectBrushOrPencilBounds,
-    fallOff = defaults8.fallOff
+    applyRectBrushToPixelData: applyRectBrushToPixelData2 = defaults9.applyRectBrushToPixelData,
+    getRectBrushOrPencilBounds: getRectBrushOrPencilBounds2 = defaults9.getRectBrushOrPencilBounds,
+    fallOff = defaults9.fallOff
   } = deps;
   const boundsOut = {
     x: 0,
@@ -2774,18 +2805,18 @@ var mutatorApplyRectPencil = ((writer, deps = defaults8) => {
 });
 
 // src/History/PixelMutator/mutatorApplyRectPencilStroke.ts
-var defaults9 = {
+var defaults10 = {
   forEachLinePoint,
   getRectBrushOrPencilBounds,
   getRectBrushOrPencilStrokeBounds,
   blendColorPixelDataBinaryMask
 };
-var mutatorApplyRectPencilStroke = ((writer, deps = defaults9) => {
+var mutatorApplyRectPencilStroke = ((writer, deps = defaults10) => {
   const {
-    forEachLinePoint: forEachLinePoint2 = defaults9.forEachLinePoint,
-    blendColorPixelDataBinaryMask: blendColorPixelDataBinaryMask2 = defaults9.blendColorPixelDataBinaryMask,
-    getRectBrushOrPencilBounds: getRectBrushOrPencilBounds2 = defaults9.getRectBrushOrPencilBounds,
-    getRectBrushOrPencilStrokeBounds: getRectBrushOrPencilStrokeBounds2 = defaults9.getRectBrushOrPencilStrokeBounds
+    forEachLinePoint: forEachLinePoint2 = defaults10.forEachLinePoint,
+    blendColorPixelDataBinaryMask: blendColorPixelDataBinaryMask2 = defaults10.blendColorPixelDataBinaryMask,
+    getRectBrushOrPencilBounds: getRectBrushOrPencilBounds2 = defaults10.getRectBrushOrPencilBounds,
+    getRectBrushOrPencilStrokeBounds: getRectBrushOrPencilStrokeBounds2 = defaults10.getRectBrushOrPencilStrokeBounds
   } = deps;
   const strokeBoundsOut = {
     x: 0,
@@ -2914,12 +2945,12 @@ function blendColorPixelData(dst, color, opts = {}) {
 }
 
 // src/History/PixelMutator/mutatorBlendColor.ts
-var defaults10 = {
+var defaults11 = {
   blendColorPixelData
 };
-var mutatorBlendColor = ((writer, deps = defaults10) => {
+var mutatorBlendColor = ((writer, deps = defaults11) => {
   const {
-    blendColorPixelData: blendColorPixelData2 = defaults10.blendColorPixelData
+    blendColorPixelData: blendColorPixelData2 = defaults11.blendColorPixelData
   } = deps;
   return {
     blendColor(color, opts = {}) {
@@ -2958,7 +2989,7 @@ function mutatorBlendPixel(writer) {
 }
 
 // src/PixelData/blendPixelData.ts
-function blendPixelData(dst, src, opts) {
+function blendPixelData(dst, src, opts = {}) {
   const {
     x: targetX = 0,
     y: targetY = 0,
@@ -3040,15 +3071,15 @@ function blendPixelData(dst, src, opts) {
 }
 
 // src/History/PixelMutator/mutatorBlendPixelData.ts
-var defaults11 = {
+var defaults12 = {
   blendPixelData
 };
-var mutatorBlendPixelData = ((writer, deps = defaults11) => {
+var mutatorBlendPixelData = ((writer, deps = defaults12) => {
   const {
-    blendPixelData: blendPixelData2 = defaults11.blendPixelData
+    blendPixelData: blendPixelData2 = defaults12.blendPixelData
   } = deps;
   return {
-    blendPixelData(src, opts) {
+    blendPixelData(src, opts = {}) {
       const {
         x = 0,
         y = 0,
@@ -3061,6 +3092,263 @@ var mutatorBlendPixelData = ((writer, deps = defaults11) => {
   };
 });
 
+// src/PixelData/blendPixelDataAlphaMask.ts
+function blendPixelDataAlphaMask(dst, src, alphaMask, opts = {}) {
+  const {
+    x: targetX = 0,
+    y: targetY = 0,
+    sx: sourceX = 0,
+    sy: sourceY = 0,
+    w: width = src.width,
+    h: height = src.height,
+    alpha: globalAlpha = 255,
+    blendFn = sourceOverPerfect,
+    mx = 0,
+    my = 0,
+    invertMask = false
+  } = opts;
+  if (globalAlpha === 0) return;
+  let x = targetX;
+  let y = targetY;
+  let sx = sourceX;
+  let sy = sourceY;
+  let w = width;
+  let h = height;
+  if (sx < 0) {
+    x -= sx;
+    w += sx;
+    sx = 0;
+  }
+  if (sy < 0) {
+    y -= sy;
+    h += sy;
+    sy = 0;
+  }
+  w = Math.min(w, src.width - sx);
+  h = Math.min(h, src.height - sy);
+  if (x < 0) {
+    sx -= x;
+    w += x;
+    x = 0;
+  }
+  if (y < 0) {
+    sy -= y;
+    h += y;
+    y = 0;
+  }
+  const actualW = Math.min(w, dst.width - x);
+  const actualH = Math.min(h, dst.height - y);
+  if (actualW <= 0 || actualH <= 0) return;
+  const dw = dst.width;
+  const sw = src.width;
+  const mPitch = alphaMask.w;
+  const maskData = alphaMask.data;
+  const dx = x - targetX | 0;
+  const dy = y - targetY | 0;
+  const dst32 = dst.data32;
+  const src32 = src.data32;
+  let dIdx = y * dw + x | 0;
+  let sIdx = sy * sw + sx | 0;
+  let mIdx = (my + dy) * mPitch + (mx + dx) | 0;
+  const dStride = dw - actualW | 0;
+  const sStride = sw - actualW | 0;
+  const mStride = mPitch - actualW | 0;
+  const isOpaque = globalAlpha === 255;
+  const isOverwrite = blendFn.isOverwrite || false;
+  for (let iy = 0; iy < actualH; iy++) {
+    for (let ix = 0; ix < actualW; ix++) {
+      const mVal = maskData[mIdx];
+      const effM = invertMask ? 255 - mVal : mVal;
+      if (effM === 0) {
+        dIdx++;
+        sIdx++;
+        mIdx++;
+        continue;
+      }
+      const srcCol = src32[sIdx];
+      const srcAlpha = srcCol >>> 24;
+      if (srcAlpha === 0 && !isOverwrite) {
+        dIdx++;
+        sIdx++;
+        mIdx++;
+        continue;
+      }
+      let weight = globalAlpha;
+      if (isOpaque) {
+        weight = effM;
+      } else if (effM !== 255) {
+        weight = effM * globalAlpha + 128 >> 8;
+      }
+      if (weight === 0) {
+        dIdx++;
+        sIdx++;
+        mIdx++;
+        continue;
+      }
+      let finalCol = srcCol;
+      if (weight < 255) {
+        const a = srcAlpha * weight + 128 >> 8;
+        if (a === 0 && !isOverwrite) {
+          dIdx++;
+          sIdx++;
+          mIdx++;
+          continue;
+        }
+        finalCol = (srcCol & 16777215 | a << 24) >>> 0;
+      }
+      dst32[dIdx] = blendFn(finalCol, dst32[dIdx]);
+      dIdx++;
+      sIdx++;
+      mIdx++;
+    }
+    dIdx += dStride;
+    sIdx += sStride;
+    mIdx += mStride;
+  }
+}
+
+// src/History/PixelMutator/mutatorBlendPixelDataAlphaMask.ts
+var defaults13 = {
+  blendPixelDataAlphaMask
+};
+var mutatorBlendPixelDataAlphaMask = ((writer, deps = defaults13) => {
+  const {
+    blendPixelDataAlphaMask: blendPixelDataAlphaMask2 = defaults13.blendPixelDataAlphaMask
+  } = deps;
+  return {
+    blendPixelDataAlphaMask(src, mask, opts = {}) {
+      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);
+      blendPixelDataAlphaMask2(writer.target, src, mask, opts);
+    }
+  };
+});
+
+// src/PixelData/blendPixelDataBinaryMask.ts
+function blendPixelDataBinaryMask(dst, src, binaryMask, opts = {}) {
+  const {
+    x: targetX = 0,
+    y: targetY = 0,
+    sx: sourceX = 0,
+    sy: sourceY = 0,
+    w: width = src.width,
+    h: height = src.height,
+    alpha: globalAlpha = 255,
+    blendFn = sourceOverPerfect,
+    mx = 0,
+    my = 0,
+    invertMask = false
+  } = opts;
+  if (globalAlpha === 0) return;
+  let x = targetX;
+  let y = targetY;
+  let sx = sourceX;
+  let sy = sourceY;
+  let w = width;
+  let h = height;
+  if (sx < 0) {
+    x -= sx;
+    w += sx;
+    sx = 0;
+  }
+  if (sy < 0) {
+    y -= sy;
+    h += sy;
+    sy = 0;
+  }
+  w = Math.min(w, src.width - sx);
+  h = Math.min(h, src.height - sy);
+  if (x < 0) {
+    sx -= x;
+    w += x;
+    x = 0;
+  }
+  if (y < 0) {
+    sy -= y;
+    h += y;
+    y = 0;
+  }
+  const actualW = Math.min(w, dst.width - x);
+  const actualH = Math.min(h, dst.height - y);
+  if (actualW <= 0 || actualH <= 0) return;
+  const dx = x - targetX | 0;
+  const dy = y - targetY | 0;
+  const dst32 = dst.data32;
+  const src32 = src.data32;
+  const dw = dst.width;
+  const sw = src.width;
+  const mPitch = binaryMask.w;
+  const maskData = binaryMask.data;
+  let dIdx = y * dw + x | 0;
+  let sIdx = sy * sw + sx | 0;
+  let mIdx = (my + dy) * mPitch + (mx + dx) | 0;
+  const dStride = dw - actualW | 0;
+  const sStride = sw - actualW | 0;
+  const mStride = mPitch - actualW | 0;
+  const skipVal = invertMask ? 1 : 0;
+  const isOpaque = globalAlpha === 255;
+  const isOverwrite = blendFn.isOverwrite || false;
+  for (let iy = 0; iy < actualH; iy++) {
+    for (let ix = 0; ix < actualW; ix++) {
+      if (maskData[mIdx] === skipVal) {
+        dIdx++;
+        sIdx++;
+        mIdx++;
+        continue;
+      }
+      const srcCol = src32[sIdx];
+      const srcAlpha = srcCol >>> 24;
+      if (srcAlpha === 0 && !isOverwrite) {
+        dIdx++;
+        sIdx++;
+        mIdx++;
+        continue;
+      }
+      let finalCol = srcCol;
+      if (!isOpaque) {
+        const a = srcAlpha * globalAlpha + 128 >> 8;
+        if (a === 0 && !isOverwrite) {
+          dIdx++;
+          sIdx++;
+          mIdx++;
+          continue;
+        }
+        finalCol = (srcCol & 16777215 | a << 24) >>> 0;
+      }
+      dst32[dIdx] = blendFn(finalCol, dst32[dIdx]);
+      dIdx++;
+      sIdx++;
+      mIdx++;
+    }
+    dIdx += dStride;
+    sIdx += sStride;
+    mIdx += mStride;
+  }
+}
+
+// src/History/PixelMutator/mutatorBlendPixelDataBinaryMask.ts
+var defaults14 = {
+  blendPixelDataBinaryMask
+};
+var mutatorBlendPixelDataBinaryMask = ((writer, deps = defaults14) => {
+  const {
+    blendPixelDataBinaryMask: blendPixelDataBinaryMask2 = defaults14.blendPixelDataBinaryMask
+  } = deps;
+  return {
+    blendPixelDataBinaryMask(src, mask, opts = {}) {
+      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);
+      blendPixelDataBinaryMask2(writer.target, src, mask, opts);
+    }
+  };
+});
+
 // src/PixelData/fillPixelData.ts
 var SCRATCH_RECT = makeClippedRect();
 function fillPixelData(dst, color, _x, _y, _w, _h) {
@@ -3106,12 +3394,12 @@ function fillPixelData(dst, color, _x, _y, _w, _h) {
 }
 
 // src/History/PixelMutator/mutatorClear.ts
-var defaults12 = {
+var defaults15 = {
   fillPixelData
 };
-var mutatorClear = ((writer, deps = defaults12) => {
+var mutatorClear = ((writer, deps = defaults15) => {
   const {
-    fillPixelData: fillPixelData2 = defaults12.fillPixelData
+    fillPixelData: fillPixelData2 = defaults15.fillPixelData
   } = deps;
   return {
     clear(rect = {}) {
@@ -3126,12 +3414,12 @@ var mutatorClear = ((writer, deps = defaults12) => {
 });
 
 // src/History/PixelMutator/mutatorFill.ts
-var defaults13 = {
+var defaults16 = {
   fillPixelData
 };
-var mutatorFill = ((writer, deps = defaults13) => {
+var mutatorFill = ((writer, deps = defaults16) => {
   const {
-    fillPixelData: fillPixelData2 = defaults13.fillPixelData
+    fillPixelData: fillPixelData2 = defaults16.fillPixelData
   } = deps;
   return {
     fill(color, rect = {}) {
@@ -3147,8 +3435,64 @@ var mutatorFill = ((writer, deps = defaults13) => {
   };
 });
 
-// src/PixelData/invertPixelData.ts
+// src/PixelData/fillPixelDataBinaryMask.ts
 var SCRATCH_RECT2 = makeClippedRect();
+function fillPixelDataBinaryMask(dst, color, mask, alpha = 255, x = 0, y = 0) {
+  if (alpha === 0) return;
+  const maskW = mask.w;
+  const maskH = mask.h;
+  const clip = resolveRectClipping(x, y, maskW, maskH, dst.width, dst.height, SCRATCH_RECT2);
+  if (!clip.inBounds) return;
+  const {
+    x: finalX,
+    y: finalY,
+    w: actualW,
+    h: actualH
+  } = clip;
+  const maskData = mask.data;
+  const dst32 = dst.data32;
+  const dw = dst.width;
+  let finalCol = color;
+  if (alpha < 255) {
+    const baseSrcAlpha = color >>> 24;
+    const colorRGB = color & 16777215;
+    const a = baseSrcAlpha * alpha + 128 >> 8;
+    finalCol = (colorRGB | a << 24) >>> 0;
+  }
+  for (let iy = 0; iy < actualH; iy++) {
+    const currentY = finalY + iy;
+    const maskY = currentY - y;
+    const maskOffset = maskY * maskW;
+    const dstRowOffset = currentY * dw;
+    for (let ix = 0; ix < actualW; ix++) {
+      const currentX = finalX + ix;
+      const maskX = currentX - x;
+      const maskIndex = maskOffset + maskX;
+      if (maskData[maskIndex]) {
+        dst32[dstRowOffset + currentX] = finalCol;
+      }
+    }
+  }
+}
+
+// src/History/PixelMutator/mutatorFillBinaryMask.ts
+var defaults17 = {
+  fillPixelDataBinaryMask
+};
+var mutatorFillBinaryMask = ((writer, deps = defaults17) => {
+  const {
+    fillPixelDataBinaryMask: fillPixelDataBinaryMask2 = defaults17.fillPixelDataBinaryMask
+  } = deps;
+  return {
+    fillBinaryMask(color, mask, alpha = 255, x = 0, y = 0) {
+      writer.accumulator.storeRegionBeforeState(x, y, mask.w, mask.h);
+      fillPixelDataBinaryMask2(writer.target, color, mask, alpha, x, y);
+    }
+  };
+});
+
+// src/PixelData/invertPixelData.ts
+var SCRATCH_RECT3 = makeClippedRect();
 function invertPixelData(pixelData, opts = {}) {
   const dst = pixelData;
   const {
@@ -3161,7 +3505,7 @@ function invertPixelData(pixelData, opts = {}) {
     my = 0,
     invertMask = false
   } = opts;
-  const clip = resolveRectClipping(targetX, targetY, width, height, dst.width, dst.height, SCRATCH_RECT2);
+  const clip = resolveRectClipping(targetX, targetY, width, height, dst.width, dst.height, SCRATCH_RECT3);
   if (!clip.inBounds) return;
   const {
     x,
@@ -3205,12 +3549,12 @@ function invertPixelData(pixelData, opts = {}) {
 }
 
 // src/History/PixelMutator/mutatorInvert.ts
-var defaults14 = {
+var defaults18 = {
   invertPixelData
 };
-var mutatorInvert = ((writer, deps = defaults14) => {
+var mutatorInvert = ((writer, deps = defaults18) => {
   const {
-    invertPixelData: invertPixelData2 = defaults14.invertPixelData
+    invertPixelData: invertPixelData2 = defaults18.invertPixelData
   } = deps;
   return {
     invert(opts = {}) {
@@ -3229,21 +3573,26 @@ var mutatorInvert = ((writer, deps = defaults14) => {
 // src/History/PixelMutator.ts
 function makeFullPixelMutator(writer) {
   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),
-    ...mutatorClear(writer)
+    ...mutatorBlendColor(writer),
+    ...mutatorBlendPixel(writer),
+    ...mutatorBlendPixelData(writer),
+    ...mutatorBlendPixelDataAlphaMask(writer),
+    ...mutatorBlendPixelDataBinaryMask(writer),
+    ...mutatorClear(writer),
+    ...mutatorFill(writer),
+    ...mutatorFillBinaryMask(writer),
+    ...mutatorInvert(writer)
   };
 }
 
@@ -3261,121 +3610,34 @@ var PixelWriter = class {
   } = {}) {
     this.target = target;
     this.config = new PixelEngineConfig(tileSize);
-    this.historyManager = historyManager;
-    this.accumulator = new PixelAccumulator(target, this.config);
-    this.mutator = mutatorFactory(this);
-  }
-  withHistory(cb) {
-    cb(this.mutator);
-    this.captureHistory();
-  }
-  captureHistory() {
-    const beforeTiles = this.accumulator.beforeTiles;
-    if (beforeTiles.length === 0) return;
-    const afterTiles = this.accumulator.extractAfterTiles();
-    const patch = {
-      beforeTiles,
-      afterTiles
-    };
-    const target = this.target;
-    const tileSize = this.config.tileSize;
-    const accumulator = this.accumulator;
-    const action = {
-      undo: () => applyPatchTiles(target, patch.beforeTiles, tileSize),
-      redo: () => applyPatchTiles(target, patch.afterTiles, tileSize),
-      dispose: () => accumulator.recyclePatch(patch)
-    };
-    this.historyManager.commit(action);
-    this.accumulator.reset();
-  }
-};
-
-// src/History/PixelMutator/mutatorApplyCirclePencil.ts
-var defaults15 = {
-  applyCircleBrushToPixelData,
-  getCircleBrushOrPencilBounds
-};
-var mutatorApplyCirclePencil = ((writer, deps = defaults15) => {
-  const {
-    applyCircleBrushToPixelData: applyCircleBrushToPixelData2 = defaults15.applyCircleBrushToPixelData,
-    getCircleBrushOrPencilBounds: getCircleBrushOrPencilBounds2 = defaults15.getCircleBrushOrPencilBounds
-  } = deps;
-  const boundsOut = {
-    x: 0,
-    y: 0,
-    w: 0,
-    h: 0
-  };
-  return {
-    applyCirclePencil(color, centerX, centerY, brush, alpha = 255, blendFn) {
-      const bounds = getCircleBrushOrPencilBounds2(centerX, centerY, brush.size, writer.target.width, writer.target.height, boundsOut);
-      const {
-        x,
-        y,
-        w,
-        h
-      } = bounds;
-      writer.accumulator.storeRegionBeforeState(x, y, w, h);
-      applyCircleBrushToPixelData2(writer.target, color, centerX, centerY, brush, alpha, blendFn, bounds);
-    }
-  };
-});
-
-// src/PixelData/fillPixelDataBinaryMask.ts
-var SCRATCH_RECT3 = makeClippedRect();
-function fillPixelDataBinaryMask(dst, color, mask, alpha = 255, x = 0, y = 0) {
-  if (alpha === 0) return;
-  const maskW = mask.w;
-  const maskH = mask.h;
-  const clip = resolveRectClipping(x, y, maskW, maskH, dst.width, dst.height, SCRATCH_RECT3);
-  if (!clip.inBounds) return;
-  const {
-    x: finalX,
-    y: finalY,
-    w: actualW,
-    h: actualH
-  } = clip;
-  const maskData = mask.data;
-  const dst32 = dst.data32;
-  const dw = dst.width;
-  let finalCol = color;
-  if (alpha < 255) {
-    const baseSrcAlpha = color >>> 24;
-    const colorRGB = color & 16777215;
-    const a = baseSrcAlpha * alpha + 128 >> 8;
-    finalCol = (colorRGB | a << 24) >>> 0;
-  }
-  for (let iy = 0; iy < actualH; iy++) {
-    const currentY = finalY + iy;
-    const maskY = currentY - y;
-    const maskOffset = maskY * maskW;
-    const dstRowOffset = currentY * dw;
-    for (let ix = 0; ix < actualW; ix++) {
-      const currentX = finalX + ix;
-      const maskX = currentX - x;
-      const maskIndex = maskOffset + maskX;
-      if (maskData[maskIndex]) {
-        dst32[dstRowOffset + currentX] = finalCol;
-      }
-    }
+    this.historyManager = historyManager;
+    this.accumulator = new PixelAccumulator(target, this.config);
+    this.mutator = mutatorFactory(this);
+  }
+  withHistory(cb) {
+    cb(this.mutator);
+    this.captureHistory();
+  }
+  captureHistory() {
+    const beforeTiles = this.accumulator.beforeTiles;
+    if (beforeTiles.length === 0) return;
+    const afterTiles = this.accumulator.extractAfterTiles();
+    const patch = {
+      beforeTiles,
+      afterTiles
+    };
+    const target = this.target;
+    const tileSize = this.config.tileSize;
+    const accumulator = this.accumulator;
+    const action = {
+      undo: () => applyPatchTiles(target, patch.beforeTiles, tileSize),
+      redo: () => applyPatchTiles(target, patch.afterTiles, tileSize),
+      dispose: () => accumulator.recyclePatch(patch)
+    };
+    this.historyManager.commit(action);
+    this.accumulator.reset();
   }
-}
-
-// src/History/PixelMutator/mutatorFillBinaryMask.ts
-var defaults16 = {
-  fillPixelDataBinaryMask
 };
-var mutatorFillBinaryMask = ((writer, deps = defaults16) => {
-  const {
-    fillPixelDataBinaryMask: fillPixelDataBinaryMask2 = defaults16.fillPixelDataBinaryMask
-  } = deps;
-  return {
-    fillBinaryMask(color, mask, alpha = 255, x = 0, y = 0) {
-      writer.accumulator.storeRegionBeforeState(x, y, mask.w, mask.h);
-      fillPixelDataBinaryMask2(writer.target, color, mask, alpha, x, y);
-    }
-  };
-});
 
 // src/ImageData/copyImageData.ts
 function copyImageData({
@@ -4471,223 +4733,6 @@ var PixelData = class _PixelData {
   }
 };
 
-// src/PixelData/blendPixelDataAlphaMask.ts
-function blendPixelDataAlphaMask(dst, src, alphaMask, opts = {}) {
-  const {
-    x: targetX = 0,
-    y: targetY = 0,
-    sx: sourceX = 0,
-    sy: sourceY = 0,
-    w: width = src.width,
-    h: height = src.height,
-    alpha: globalAlpha = 255,
-    blendFn = sourceOverPerfect,
-    mx = 0,
-    my = 0,
-    invertMask = false
-  } = opts;
-  if (globalAlpha === 0) return;
-  let x = targetX;
-  let y = targetY;
-  let sx = sourceX;
-  let sy = sourceY;
-  let w = width;
-  let h = height;
-  if (sx < 0) {
-    x -= sx;
-    w += sx;
-    sx = 0;
-  }
-  if (sy < 0) {
-    y -= sy;
-    h += sy;
-    sy = 0;
-  }
-  w = Math.min(w, src.width - sx);
-  h = Math.min(h, src.height - sy);
-  if (x < 0) {
-    sx -= x;
-    w += x;
-    x = 0;
-  }
-  if (y < 0) {
-    sy -= y;
-    h += y;
-    y = 0;
-  }
-  const actualW = Math.min(w, dst.width - x);
-  const actualH = Math.min(h, dst.height - y);
-  if (actualW <= 0 || actualH <= 0) return;
-  const dw = dst.width;
-  const sw = src.width;
-  const mPitch = alphaMask.w;
-  const maskData = alphaMask.data;
-  const dx = x - targetX | 0;
-  const dy = y - targetY | 0;
-  const dst32 = dst.data32;
-  const src32 = src.data32;
-  let dIdx = y * dw + x | 0;
-  let sIdx = sy * sw + sx | 0;
-  let mIdx = (my + dy) * mPitch + (mx + dx) | 0;
-  const dStride = dw - actualW | 0;
-  const sStride = sw - actualW | 0;
-  const mStride = mPitch - actualW | 0;
-  const isOpaque = globalAlpha === 255;
-  const isOverwrite = blendFn.isOverwrite || false;
-  for (let iy = 0; iy < actualH; iy++) {
-    for (let ix = 0; ix < actualW; ix++) {
-      const mVal = maskData[mIdx];
-      const effM = invertMask ? 255 - mVal : mVal;
-      if (effM === 0) {
-        dIdx++;
-        sIdx++;
-        mIdx++;
-        continue;
-      }
-      const srcCol = src32[sIdx];
-      const srcAlpha = srcCol >>> 24;
-      if (srcAlpha === 0 && !isOverwrite) {
-        dIdx++;
-        sIdx++;
-        mIdx++;
-        continue;
-      }
-      let weight = globalAlpha;
-      if (isOpaque) {
-        weight = effM;
-      } else if (effM !== 255) {
-        weight = effM * globalAlpha + 128 >> 8;
-      }
-      if (weight === 0) {
-        dIdx++;
-        sIdx++;
-        mIdx++;
-        continue;
-      }
-      let finalCol = srcCol;
-      if (weight < 255) {
-        const a = srcAlpha * weight + 128 >> 8;
-        if (a === 0 && !isOverwrite) {
-          dIdx++;
-          sIdx++;
-          mIdx++;
-          continue;
-        }
-        finalCol = (srcCol & 16777215 | a << 24) >>> 0;
-      }
-      dst32[dIdx] = blendFn(finalCol, dst32[dIdx]);
-      dIdx++;
-      sIdx++;
-      mIdx++;
-    }
-    dIdx += dStride;
-    sIdx += sStride;
-    mIdx += mStride;
-  }
-}
-
-// src/PixelData/blendPixelDataBinaryMask.ts
-function blendPixelDataBinaryMask(dst, src, binaryMask, opts) {
-  const {
-    x: targetX = 0,
-    y: targetY = 0,
-    sx: sourceX = 0,
-    sy: sourceY = 0,
-    w: width = src.width,
-    h: height = src.height,
-    alpha: globalAlpha = 255,
-    blendFn = sourceOverPerfect,
-    mx = 0,
-    my = 0,
-    invertMask = false
-  } = opts;
-  if (globalAlpha === 0) return;
-  let x = targetX;
-  let y = targetY;
-  let sx = sourceX;
-  let sy = sourceY;
-  let w = width;
-  let h = height;
-  if (sx < 0) {
-    x -= sx;
-    w += sx;
-    sx = 0;
-  }
-  if (sy < 0) {
-    y -= sy;
-    h += sy;
-    sy = 0;
-  }
-  w = Math.min(w, src.width - sx);
-  h = Math.min(h, src.height - sy);
-  if (x < 0) {
-    sx -= x;
-    w += x;
-    x = 0;
-  }
-  if (y < 0) {
-    sy -= y;
-    h += y;
-    y = 0;
-  }
-  const actualW = Math.min(w, dst.width - x);
-  const actualH = Math.min(h, dst.height - y);
-  if (actualW <= 0 || actualH <= 0) return;
-  const dx = x - targetX | 0;
-  const dy = y - targetY | 0;
-  const dst32 = dst.data32;
-  const src32 = src.data32;
-  const dw = dst.width;
-  const sw = src.width;
-  const mPitch = binaryMask.w;
-  const maskData = binaryMask.data;
-  let dIdx = y * dw + x | 0;
-  let sIdx = sy * sw + sx | 0;
-  let mIdx = (my + dy) * mPitch + (mx + dx) | 0;
-  const dStride = dw - actualW | 0;
-  const sStride = sw - actualW | 0;
-  const mStride = mPitch - actualW | 0;
-  const skipVal = invertMask ? 1 : 0;
-  const isOpaque = globalAlpha === 255;
-  const isOverwrite = blendFn.isOverwrite || false;
-  for (let iy = 0; iy < actualH; iy++) {
-    for (let ix = 0; ix < actualW; ix++) {
-      if (maskData[mIdx] === skipVal) {
-        dIdx++;
-        sIdx++;
-        mIdx++;
-        continue;
-      }
-      const srcCol = src32[sIdx];
-      const srcAlpha = srcCol >>> 24;
-      if (srcAlpha === 0 && !isOverwrite) {
-        dIdx++;
-        sIdx++;
-        mIdx++;
-        continue;
-      }
-      let finalCol = srcCol;
-      if (!isOpaque) {
-        const a = srcAlpha * globalAlpha + 128 >> 8;
-        if (a === 0 && !isOverwrite) {
-          dIdx++;
-          sIdx++;
-          mIdx++;
-          continue;
-        }
-        finalCol = (srcCol & 16777215 | a << 24) >>> 0;
-      }
-      dst32[dIdx] = blendFn(finalCol, dst32[dIdx]);
-      dIdx++;
-      sIdx++;
-      mIdx++;
-    }
-    dIdx += dStride;
-    sIdx += sStride;
-    mIdx += mStride;
-  }
-}
-
 // src/PixelData/clearPixelData.ts
 function clearPixelData(dst, rect) {
   fillPixelData(dst, 0, rect);
@@ -5040,6 +5085,8 @@ export {
   mutatorBlendColor,
   mutatorBlendPixel,
   mutatorBlendPixelData,
+  mutatorBlendPixelDataAlphaMask,
+  mutatorBlendPixelDataBinaryMask,
   mutatorClear,
   mutatorFill,
   mutatorFillBinaryMask,