pixel-data-js 0.34.0 → 0.36.0

package/dist/index.prod.cjs

@@ -71,6 +71,7 @@ __export(src_exports, {
   copyImageDataLike: () => copyImageDataLike,
   copyMask: () => copyMask,
   copyPixelData: () => copyPixelData,
+  cropPixelData: () => cropPixelData,
   darkenFast: () => darkenFast,
   darkenPerfect: () => darkenPerfect,
   darkerFast: () => darkerFast,
@@ -109,6 +110,7 @@ __export(src_exports, {
   getImageDataFromClipboard: () => getImageDataFromClipboard,
   getIndexedImageColor: () => getIndexedImageColor,
   getIndexedImageColorCounts: () => getIndexedImageColorCounts,
+  getPixelDataTransparentTrimmedBounds: () => getPixelDataTransparentTrimmedBounds,
   getRectsBounds: () => getRectsBounds,
   getSupportedPixelFormats: () => getSupportedPixelFormats,
   hardLightFast: () => hardLightFast,
@@ -204,7 +206,6 @@ __export(src_exports, {
   mutatorClear: () => mutatorClear,
   mutatorFill: () => mutatorFill,
   mutatorFillBinaryMask: () => mutatorFillBinaryMask,
-  mutatorFillRect: () => mutatorFillRect,
   mutatorInvert: () => mutatorInvert,
   overlayFast: () => overlayFast,
   overlayPerfect: () => overlayPerfect,
@@ -248,6 +249,8 @@ __export(src_exports, {
   toBlendModeIndexAndName: () => toBlendModeIndexAndName,
   trimMaskRectBounds: () => trimMaskRectBounds,
   trimRectBounds: () => trimRectBounds,
+  trimTransparentPixelData: () => trimTransparentPixelData,
+  trimTransparentPixelDataInPlace: () => trimTransparentPixelDataInPlace,
   uInt32ArrayToImageData: () => uInt32ArrayToImageData,
   uInt32ArrayToImageDataLike: () => uInt32ArrayToImageDataLike,
   uInt32ArrayToPixelData: () => uInt32ArrayToPixelData,
@@ -2416,6 +2419,11 @@ var PixelAccumulator = class {
   storePixelBeforeState(x, y) {
     const shift = this.config.tileShift;
     const columns = this.config.targetColumns;
+    const targetWidth = this.config.target.w;
+    const targetHeight = this.config.target.h;
+    if (x < 0 || x >= targetWidth || y < 0 || y >= targetHeight) {
+      return null;
+    }
     const tx = x >> shift;
     const ty = y >> shift;
     const id = ty * columns + tx;
@@ -2446,10 +2454,19 @@ var PixelAccumulator = class {
   storeRegionBeforeState(x, y, w, h) {
     const shift = this.config.tileShift;
     const columns = this.config.targetColumns;
-    const startX = x >> shift;
-    const startY = y >> shift;
-    const endX = x + w - 1 >> shift;
-    const endY = y + h - 1 >> shift;
+    const targetWidth = this.config.target.w;
+    const targetHeight = this.config.target.h;
+    const clipX1 = Math.max(0, x);
+    const clipY1 = Math.max(0, y);
+    const clipX2 = Math.min(targetWidth - 1, x + w - 1);
+    const clipY2 = Math.min(targetHeight - 1, y + h - 1);
+    if (clipX2 < clipX1 || clipY2 < clipY1) {
+      return null;
+    }
+    const startX = clipX1 >> shift;
+    const startY = clipY1 >> shift;
+    const endX = clipX2 >> shift;
+    const endY = clipY2 >> shift;
     const startIndex = this.beforeTiles.length;
     for (let ty = startY; ty <= endY; ty++) {
       for (let tx = startX; tx <= endX; tx++) {
@@ -2920,6 +2937,7 @@ var mutatorApplyAlphaMask = ((writer, deps = defaults) => {
       const w = opts?.w ?? target.w;
       const h = opts?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(applyAlphaMaskToPixelData2(target, mask, opts));
     }
   };
@@ -3022,7 +3040,12 @@ var mutatorApplyBinaryMask = ((writer, deps = defaults2) => {
       const w = opts?.w ?? target.w;
       const h = opts?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
-      return didChange(applyBinaryMaskToPixelData2(target, mask, opts));
+      if (!didChange) return false;
+      const b = applyBinaryMaskToPixelData2(target, mask, opts);
+      console.log({
+        b
+      });
+      return didChange(b);
     }
   };
 });
@@ -3045,6 +3068,7 @@ var mutatorApplyMask = ((writer, deps = defaults3) => {
       const w = opts?.w ?? target.w;
       const h = opts?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       if (mask.type === 1 /* BINARY */) {
         return didChange(applyBinaryMaskToPixelData2(target, mask, opts));
       } else {
@@ -3189,6 +3213,7 @@ var mutatorBlendAlphaMask = ((writer, deps = defaults4) => {
       const w = opts?.w ?? src.w;
       const h = opts?.h ?? src.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(blendPixelDataAlphaMask2(writer.config.target, src, mask, opts));
     }
   };
@@ -3316,6 +3341,7 @@ var mutatorBlendBinaryMask = ((writer, deps = defaults5) => {
       const w = opts?.w ?? src.w;
       const h = opts?.h ?? src.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(blendPixelDataBinaryMask2(writer.config.target, src, mask, opts));
     }
   };
@@ -3390,6 +3416,7 @@ var mutatorBlendColor = ((writer, deps = defaults6) => {
       const w = opts?.w ?? target.w;
       const h = opts?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(blendColorPixelData2(target, color, opts));
     }
   };
@@ -3502,6 +3529,7 @@ var mutatorBlendColorPaintAlphaMask = ((writer, deps = defaults7) => {
       const tx = x + mask.centerOffsetX;
       const ty = y + mask.centerOffsetY;
       const didChange = writer.accumulator.storeRegionBeforeState(tx, ty, mask.w, mask.h);
+      if (!didChange) return false;
       OPTS.x = tx;
       OPTS.y = ty;
       OPTS.alpha = alpha;
@@ -3598,6 +3626,7 @@ var mutatorBlendColorPaintBinaryMask = ((writer, deps = defaults8) => {
       const tx = x + mask.centerOffsetX;
       const ty = y + mask.centerOffsetY;
       const didChange = writer.accumulator.storeRegionBeforeState(tx, ty, mask.w, mask.h);
+      if (!didChange) return false;
       OPTS.x = tx;
       OPTS.y = ty;
       OPTS.alpha = alpha;
@@ -3628,6 +3657,7 @@ var mutatorBlendColorPaintMask = ((writer, deps = defaults9) => {
       const tx = x + mask.centerOffsetX;
       const ty = y + mask.centerOffsetY;
       const didChange = writer.accumulator.storeRegionBeforeState(tx, ty, mask.w, mask.h);
+      if (!didChange) return false;
       OPTS.x = tx;
       OPTS.y = ty;
       OPTS.alpha = alpha;
@@ -3669,6 +3699,7 @@ var mutatorBlendColorPaintRect = ((writer, deps = defaults10) => {
       OPTS.blendFn = blendFn;
       OPTS.alpha = alpha;
       const didChange = writer.accumulator.storeRegionBeforeState(topLeftX, topLeftY, brushWidth, brushHeight);
+      if (!didChange) return false;
       return didChange(blendColorPixelData2(target, color, OPTS));
     }
   };
@@ -3691,6 +3722,7 @@ var mutatorBlendMask = ((writer, deps = defaults11) => {
       const w = opts?.w ?? src.w;
       const h = opts?.h ?? src.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       if (mask.type === 1 /* BINARY */) {
         return didChange(blendPixelDataBinaryMask2(writer.config.target, src, mask, opts));
       } else {
@@ -3737,6 +3769,7 @@ var mutatorBlendPixel = ((writer, deps = defaults12) => {
   return {
     blendPixel(x, y, color, alpha, blendFn) {
       const didChange = writer.accumulator.storePixelBeforeState(x, y);
+      if (!didChange) return false;
       return didChange(blendPixel2(writer.config.target, x, y, color, alpha, blendFn));
     }
   };
@@ -3844,6 +3877,7 @@ var mutatorBlendPixelData = ((writer, deps = defaults13) => {
       const w = opts?.w ?? src.w;
       const h = opts?.h ?? src.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(blendPixelData2(writer.config.target, src, opts));
     }
   };
@@ -3857,16 +3891,16 @@ function fillPixelData(dst, color, _x, _y, _w, _h) {
   let y;
   let w;
   let h;
-  if (typeof _x === "object") {
-    x = _x.x ?? 0;
-    y = _x.y ?? 0;
-    w = _x.w ?? dstW;
-    h = _x.h ?? dstH;
-  } else if (typeof _x === "number") {
+  if (typeof _x === "number") {
     x = _x;
     y = _y;
     w = _w;
     h = _h;
+  } else if (typeof _x === "object") {
+    x = _x.x ?? 0;
+    y = _x.y ?? 0;
+    w = _x.w ?? dstW;
+    h = _x.h ?? dstH;
   } else {
     x = 0;
     y = 0;
@@ -3931,6 +3965,7 @@ var mutatorClear = ((writer, deps = defaults14) => {
       const w = rect?.w ?? target.w;
       const h = rect?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+      if (!didChange) return false;
       return didChange(fillPixelData2(target, 0, x, y, w, h));
     }
   };
@@ -3944,24 +3979,37 @@ var mutatorFill = ((writer, deps = defaults15) => {
   const {
     fillPixelData: fillPixelData2 = defaults15.fillPixelData
   } = deps;
-  return {
-    fill(color, x = 0, y = 0, w = writer.config.target.w, h = writer.config.target.h) {
-      const target = writer.config.target;
-      const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
-      return didChange(fillPixelData2(target, color, x, y, w, h));
+  const config = writer.config;
+  function fill(color, _x, _y, _w, _h) {
+    const target = config.target;
+    const dstW = target.w;
+    const dstH = target.h;
+    let x;
+    let y;
+    let w;
+    let h;
+    if (typeof _x === "number") {
+      x = _x;
+      y = _y;
+      w = _w;
+      h = _h;
+    } else if (typeof _x === "object") {
+      x = _x.x ?? 0;
+      y = _x.y ?? 0;
+      w = _x.w ?? dstW;
+      h = _x.h ?? dstH;
+    } else {
+      x = 0;
+      y = 0;
+      w = dstW;
+      h = dstH;
     }
-  };
-});
-var mutatorFillRect = ((writer, deps = defaults15) => {
-  const {
-    fillPixelData: fillPixelData2 = defaults15.fillPixelData
-  } = deps;
+    const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
+    if (!didChange) return false;
+    return didChange(fillPixelData2(target, color, x, y, w, h));
+  }
   return {
-    fillRect(color, rect) {
-      const target = writer.config.target;
-      const didChange = writer.accumulator.storeRegionBeforeState(rect.x, rect.y, rect.w, rect.h);
-      return didChange(fillPixelData2(target, color, rect.x, rect.y, rect.w, rect.h));
-    }
+    fill
   };
 });
 
@@ -4023,6 +4071,7 @@ var mutatorFillBinaryMask = ((writer, deps = defaults16) => {
   return {
     fillBinaryMask(color, mask, x = 0, y = 0) {
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, mask.w, mask.h);
+      if (!didChange) return false;
       return didChange(fillPixelDataBinaryMask2(writer.config.target, color, mask, x, y));
     }
   };
@@ -4107,7 +4156,8 @@ var mutatorInvert = ((writer, deps = defaults17) => {
       const w = opts?.w ?? target.w;
       const h = opts?.h ?? target.h;
       const didChange = writer.accumulator.storeRegionBeforeState(x, y, w, h);
-      return didChange(invertPixelData2(target, opts));
+      if (!didChange) return false;
+      return didChange?.(invertPixelData2(target, opts));
     }
   };
 });
@@ -4132,7 +4182,6 @@ function makeFullPixelMutator(writer) {
     ...mutatorClear(writer),
     ...mutatorFill(writer),
     ...mutatorFillBinaryMask(writer),
-    ...mutatorFillRect(writer),
     ...mutatorInvert(writer)
   };
 }
@@ -6163,6 +6212,9 @@ function makeRectFalloffPaintAlphaMask(width, height, fallOff = (d) => d) {
 // src/Paint/PaintRect.ts
 function makePaintRect(w, h) {
   return {
+    type: null,
+    outlineType: 2 /* RECT */,
+    data: null,
     w,
     h,
     centerOffsetX: -(w - 1 >> 1),
@@ -6199,31 +6251,34 @@ function makePaintCursorRenderer(reusableCanvasFactory) {
   const getPixelData = makeReusablePixelData();
   let _color = packColor(0, 255, 255, 255);
   let _scale = 1;
-  let currentMask = {
-    type: 1 /* BINARY */,
+  let currentBrush = {
+    type: null,
     outlineType: 2 /* RECT */,
     w: 1,
     h: 1,
     centerOffsetX: -(10 - 1 >> 1),
-    centerOffsetY: -(10 - 1 >> 1)
+    centerOffsetY: -(10 - 1 >> 1),
+    data: null
   };
   let outline;
   function update(paintMask, scale, color, alphaThreshold = 127) {
-    currentMask = paintMask ?? currentMask;
+    currentBrush = paintMask ?? currentBrush;
     _scale = scale ?? _scale;
     _color = color ?? _color;
-    updateBuffer(currentMask.w * _scale + 2 * _scale, currentMask.h * _scale + 2 * _scale);
-    if (currentMask.type === 1 /* BINARY */) {
-      if (currentMask.outlineType === 1 /* CIRCLE */) {
-        outline = makeCircleBinaryMaskOutline(currentMask.w, _scale);
-      } else if (currentMask.outlineType === 2 /* RECT */) {
-        outline = makeRectBinaryMaskOutline(currentMask.w, currentMask.h, _scale);
-      } else if (currentMask.outlineType === 0 /* MASKED */) {
-        outline = makeBinaryMaskOutline(currentMask, _scale);
+    updateBuffer(currentBrush.w * _scale + 2 * _scale, currentBrush.h * _scale + 2 * _scale);
+    if (currentBrush.type === 1 /* BINARY */) {
+      if (currentBrush.outlineType === 1 /* CIRCLE */) {
+        outline = makeCircleBinaryMaskOutline(currentBrush.w, _scale);
+      } else if (currentBrush.outlineType === 2 /* RECT */) {
+        outline = makeRectBinaryMaskOutline(currentBrush.w, currentBrush.h, _scale);
+      } else if (currentBrush.outlineType === 0 /* MASKED */) {
+        outline = makeBinaryMaskOutline(currentBrush, _scale);
       }
-    } else if (currentMask.type === 0 /* ALPHA */) {
-      const mask = makeBinaryMaskFromAlphaMask(currentMask, alphaThreshold);
+    } else if (currentBrush.type === 0 /* ALPHA */) {
+      const mask = makeBinaryMaskFromAlphaMask(currentBrush, alphaThreshold);
       outline = makeBinaryMaskOutline(mask, _scale);
+    } else {
+      outline = makeRectBinaryMaskOutline(currentBrush.w, currentBrush.h, _scale);
     }
     const pixelData = getPixelData(outline.w, outline.h);
     fillPixelDataBinaryMask(pixelData, _color, outline);
@@ -6236,10 +6291,10 @@ function makePaintCursorRenderer(reusableCanvasFactory) {
     h: 0
   };
   function getBounds(centerX, centerY) {
-    boundsScratch.x = centerX + currentMask.centerOffsetX;
-    boundsScratch.y = centerY + currentMask.centerOffsetY;
-    boundsScratch.w = currentMask.w;
-    boundsScratch.h = currentMask.h;
+    boundsScratch.x = centerX + currentBrush.centerOffsetX;
+    boundsScratch.y = centerY + currentBrush.centerOffsetY;
+    boundsScratch.w = currentBrush.w;
+    boundsScratch.h = currentBrush.h;
     return boundsScratch;
   }
   const boundsScaledScratch = {
@@ -6249,22 +6304,25 @@ function makePaintCursorRenderer(reusableCanvasFactory) {
     h: 0
   };
   function getOutlineBoundsScaled(centerX, centerY) {
-    boundsScaledScratch.x = centerX * _scale + currentMask.centerOffsetX * _scale - 1;
-    boundsScaledScratch.y = centerY * _scale + currentMask.centerOffsetY * _scale - 1;
-    boundsScaledScratch.w = currentMask.w * _scale;
-    boundsScaledScratch.h = currentMask.h * _scale;
+    boundsScaledScratch.x = centerX * _scale + currentBrush.centerOffsetX * _scale - 1;
+    boundsScaledScratch.y = centerY * _scale + currentBrush.centerOffsetY * _scale - 1;
+    boundsScaledScratch.w = currentBrush.w * _scale;
+    boundsScaledScratch.h = currentBrush.h * _scale;
     return boundsScaledScratch;
   }
   function draw(drawCtx, centerX, centerY) {
-    const dx = centerX * _scale + currentMask.centerOffsetX * _scale - 1;
-    const dy = centerY * _scale + currentMask.centerOffsetY * _scale - 1;
+    const dx = centerX * _scale + currentBrush.centerOffsetX * _scale - 1;
+    const dy = centerY * _scale + currentBrush.centerOffsetY * _scale - 1;
     drawCtx.drawImage(canvas, Math.floor(dx), Math.floor(dy));
   }
+  function drawRaw(drawCtx, x, y) {
+    drawCtx.drawImage(canvas, Math.floor(x * _scale), Math.floor(y * _scale));
+  }
   function getSettings() {
     return {
       color: _color,
       scale: _scale,
-      currentMask
+      currentBrush
     };
   }
   return {
@@ -6272,6 +6330,7 @@ function makePaintCursorRenderer(reusableCanvasFactory) {
     getBounds,
     getBoundsScaled: getOutlineBoundsScaled,
     draw,
+    drawRaw,
     getSettings
   };
 }
@@ -6446,6 +6505,36 @@ function copyPixelData(target) {
   return makePixelData(new ImageData(buffer, target.w, target.h));
 }
 
+// src/PixelData/cropPixelData.ts
+function cropPixelData(src, x, y, w, h, out) {
+  const cx = Math.max(x, 0);
+  const cy = Math.max(y, 0);
+  const cw = Math.min(x + w, src.w) - cx;
+  const ch = Math.min(y + h, src.h) - cy;
+  if (cw <= 0 || ch <= 0) {
+    throw new Error(`Crop [${x},${y} ${w}x${h}] does not overlap PixelData [${src.w}x${src.h}]`);
+  }
+  const cropped = new ImageData(cw, ch);
+  let dst32;
+  if (out) {
+    setPixelData(out, cropped);
+    dst32 = out.data;
+  } else {
+    dst32 = new Uint32Array(cropped.data.buffer);
+  }
+  for (let row = 0; row < ch; row++) {
+    const srcOffset = (cy + row) * src.w + cx;
+    const dstOffset = row * cw;
+    dst32.set(src.data.subarray(srcOffset, srcOffset + cw), dstOffset);
+  }
+  return out ?? {
+    data: dst32,
+    imageData: cropped,
+    w: cw,
+    h: ch
+  };
+}
+
 // src/PixelData/extractPixelDataBuffer.ts
 function extractPixelDataBuffer(source, _x, _y, _w, _h) {
   let x;
@@ -6661,6 +6750,46 @@ function rotateSquareInPlace(pixelData) {
   }
 }
 
+// src/PixelData/trimPixelData.ts
+function getPixelDataTransparentTrimmedBounds(target) {
+  let minX = target.w;
+  let minY = target.h;
+  let maxX = -1;
+  let maxY = -1;
+  for (let y = 0; y < target.h; y++) {
+    for (let x = 0; x < target.w; x++) {
+      const alpha = target.data[y * target.w + x] >>> 24;
+      if (alpha !== 0) {
+        if (x < minX) minX = x;
+        if (x > maxX) maxX = x;
+        if (y < minY) minY = y;
+        if (y > maxY) maxY = y;
+      }
+    }
+  }
+  if (maxX === -1) return null;
+  return {
+    x: minX,
+    y: minY,
+    w: maxX - minX + 1,
+    h: maxY - minY + 1
+  };
+}
+function trimTransparentPixelData(target) {
+  const r = getPixelDataTransparentTrimmedBounds(target);
+  if (!r) {
+    throw new Error("PixelData is fully transparent \u2014 no crop bounds found");
+  }
+  return cropPixelData(target, r.x, r.y, r.w, r.h);
+}
+function trimTransparentPixelDataInPlace(target) {
+  const r = getPixelDataTransparentTrimmedBounds(target);
+  if (!r) {
+    throw new Error("PixelData is fully transparent \u2014 no crop bounds found");
+  }
+  cropPixelData(target, r.x, r.y, r.w, r.h, target);
+}
+
 // src/PixelData/uInt32ArrayToPixelData.ts
 function uInt32ArrayToPixelData(data, width, height) {
   const buffer = data.buffer;
@@ -6820,6 +6949,7 @@ function writePixelData(target, source, x = 0, y = 0) {
   copyImageDataLike,
   copyMask,
   copyPixelData,
+  cropPixelData,
   darkenFast,
   darkenPerfect,
   darkerFast,
@@ -6858,6 +6988,7 @@ function writePixelData(target, source, x = 0, y = 0) {
   getImageDataFromClipboard,
   getIndexedImageColor,
   getIndexedImageColorCounts,
+  getPixelDataTransparentTrimmedBounds,
   getRectsBounds,
   getSupportedPixelFormats,
   hardLightFast,
@@ -6953,7 +7084,6 @@ function writePixelData(target, source, x = 0, y = 0) {
   mutatorClear,
   mutatorFill,
   mutatorFillBinaryMask,
-  mutatorFillRect,
   mutatorInvert,
   overlayFast,
   overlayPerfect,
@@ -6997,6 +7127,8 @@ function writePixelData(target, source, x = 0, y = 0) {
   toBlendModeIndexAndName,
   trimMaskRectBounds,
   trimRectBounds,
+  trimTransparentPixelData,
+  trimTransparentPixelDataInPlace,
   uInt32ArrayToImageData,
   uInt32ArrayToImageDataLike,
   uInt32ArrayToPixelData,