@pixerate/editor 0.218.1 → 0.219.1

package/dist/{chunk-YF3YZZ6G.cjs → chunk-2ONK3ERD.cjs}

@@ -5,7 +5,7 @@
 
 
 
-var _chunkMQDIP4CFcjs = require('./chunk-MQDIP4CF.cjs');
+var _chunkBB6TR422cjs = require('./chunk-BB6TR422.cjs');
 
 
 
@@ -465,7 +465,7 @@ function toneOf(tool, settings) {
 }
 function healPixels(w, h, src, dst, mask) {
   const out = new Float32Array(dst);
-  const bb = _chunkMQDIP4CFcjs.maskBounds.call(void 0, w, h, mask);
+  const bb = _chunkBB6TR422cjs.maskBounds.call(void 0, w, h, mask);
   if (!bb) return out;
   const x0 = Math.max(0, bb[0] - 1);
   const y0 = Math.max(0, bb[1] - 1);
@@ -487,7 +487,7 @@ function healPixels(w, h, src, dst, mask) {
       }
     }
   }
-  const healed = _chunkMQDIP4CFcjs.seamlessClone.call(void 0, rw, rh, 4, s, d, m);
+  const healed = _chunkBB6TR422cjs.seamlessClone.call(void 0, rw, rh, 4, s, d, m);
   for (let y = 0; y < rh; y++) {
     for (let x = 0; x < rw; x++) {
       const gi = ((y + y0) * w + x + x0) * 4;
@@ -498,13 +498,13 @@ function healPixels(w, h, src, dst, mask) {
   return out;
 }
 function spotHealPixels(w, h, img, hole, size, type, onOffset) {
-  const domain = _chunkMQDIP4CFcjs.dilateMask.call(void 0, w, h, hole, 2);
-  const healMask = _chunkMQDIP4CFcjs.dilateMask.call(void 0, w, h, hole, 1);
+  const domain = _chunkBB6TR422cjs.dilateMask.call(void 0, w, h, hole, 2);
+  const healMask = _chunkBB6TR422cjs.dilateMask.call(void 0, w, h, hole, 1);
   let filled = null;
   let bestFound = null;
   if (type === "proximity-match") {
     const ring = Math.min(16, Math.max(3, Math.floor(size / 8)));
-    const off = _chunkMQDIP4CFcjs.bestOffset.call(void 0, w, h, 4, img, domain, ring, Math.floor(Math.max(w, h) / 2));
+    const off = _chunkBB6TR422cjs.bestOffset.call(void 0, w, h, 4, img, domain, ring, Math.floor(Math.max(w, h) / 2));
     if (off) {
       bestFound = off;
       filled = new Float32Array(img);
@@ -519,8 +519,8 @@ function spotHealPixels(w, h, img, hole, size, type, onOffset) {
     }
   }
   _optionalChain([onOffset, 'optionalCall', _ => _(filled ? bestFound : null)]);
-  if (!filled && type === "content-aware") filled = _chunkMQDIP4CFcjs.contentAwareFill.call(void 0, w, h, 4, img, domain);
-  if (!filled) filled = _chunkMQDIP4CFcjs.membraneFill.call(void 0, w, h, 4, img, domain);
+  if (!filled && type === "content-aware") filled = _chunkBB6TR422cjs.contentAwareFill.call(void 0, w, h, 4, img, domain);
+  if (!filled) filled = _chunkBB6TR422cjs.membraneFill.call(void 0, w, h, 4, img, domain);
   return healPixels(w, h, filled, img, healMask);
 }
 function spotHealWindow(bounds, canvas) {

package/dist/{chunk-U7C655AM.js → chunk-3X244IZ5.js}

@@ -10,7 +10,7 @@ import {
 } from "./chunk-ZNA3IQZF.js";
 import {
   contentAwareFill
-} from "./chunk-XI2NV5U7.js";
+} from "./chunk-VWEWY4FY.js";
 
 // src/image-editor/selection/shapes.ts
 function polygonCoverage(points, width, height, antiAlias = true) {
@@ -808,12 +808,15 @@ function selectObjectIn(pixels, target, options = {}) {
   const px = Math.min(w - 1, Math.max(0, Math.floor(target.point.x * scale)));
   const py = Math.min(h - 1, Math.max(0, Math.floor(target.point.y * scale)));
   let half = Math.max(24, Math.round(0.3 * Math.max(w, h)));
+  let seed = null;
+  let reseeds = 0;
   for (; ; ) {
     const rx = Math.max(0, px - half);
     const ry = Math.max(0, py - half);
     const roi = { x: rx, y: ry, width: Math.min(w, px + half + 1) - rx, height: Math.min(h, py + half + 1) - ry };
     const whole = roi.width === w && roi.height === h;
     const band = Math.max(4, Math.round(0.15 * half));
+    const radius = seed ?? 0.3 * half;
     const n = roi.width * roi.height;
     const initial = new Uint8Array(n);
     const hardBg = new Uint8Array(n);
@@ -822,9 +825,10 @@ function selectObjectIn(pixels, target, options = {}) {
     for (let y = 0; y < roi.height; y++) {
       for (let x = 0; x < roi.width; x++) {
         const p = y * roi.width + x;
+        const d = Math.hypot(rx + x - px, ry + y - py);
         if (inBand(x, y)) hardBg[p] = 1;
-        else initial[p] = 1;
-        if (Math.hypot(rx + x - px, ry + y - py) <= 1.5) hardFg[p] = 1;
+        else if (d <= radius) initial[p] = 1;
+        if (d <= 1.5) hardFg[p] = 1;
       }
     }
     const label = grabCutLabels(work, { roi, initial, hardBg, hardFg }, iterations, round);
@@ -838,6 +842,19 @@ function selectObjectIn(pixels, target, options = {}) {
         }
       }
     }
+    if (!touches && reseeds < 2) {
+      let found = 0;
+      let seeded = 0;
+      for (let p = 0; p < n; p++) {
+        found += label[p];
+        seeded += initial[p];
+      }
+      if (found * 2 < seeded) {
+        reseeds++;
+        seed = Math.max(2, 0.7 * Math.sqrt(found / Math.PI));
+        continue;
+      }
+    }
     if (!touches || whole) {
       report?.(0.9, "Scaling up");
       const out = upscaleRegion(work, pixels, roi, label, enhance);
@@ -845,6 +862,7 @@ function selectObjectIn(pixels, target, options = {}) {
       return out;
     }
     half = Math.round(half * 1.6);
+    seed = null;
   }
 }
 
@@ -1574,7 +1592,11 @@ function runSelectionJob(job, pixels, onProgress) {
       };
     case "fill": {
       onProgress?.(0, "Filling");
-      const filled = contentAwareFill(pixels.width, pixels.height, 4, pixels.data, job.hole, { seed: job.seed, exclude: job.exclude });
+      const filled = contentAwareFill(pixels.width, pixels.height, 4, pixels.data, job.hole, {
+        seed: job.seed,
+        exclude: job.exclude,
+        onProgress: (f) => onProgress?.(f * 0.99, "Filling")
+      });
       onProgress?.(1, "Done");
       return { mask: createSelectionMask(1, 1), pixels: Uint8ClampedArray.from(filled) };
     }

package/dist/{chunk-ZGJGSCUW.js → chunk-4P6H35HU.js}

@@ -5,7 +5,7 @@ import {
   maskBounds,
   membraneFill,
   seamlessClone
-} from "./chunk-XI2NV5U7.js";
+} from "./chunk-VWEWY4FY.js";
 import {
   DabWalker,
   SmudgeTip,

package/dist/{chunk-MQDIP4CF.cjs → chunk-BB6TR422.cjs}

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } }// src/paint/heal.ts
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }// src/paint/heal.ts
 var TOL = 2e-3;
 var FINE_ITERS = 30;
 var FINE_OMEGA = 1.7;
@@ -311,6 +311,8 @@ function contentAwareFill(w, h, ch, img, hole, options = {}) {
     levels.push(downsample(top, ch));
   }
   const random = rng(_nullishCoalesce(options.seed, () => ( w * 73856093 + h * 19349663)));
+  const totalWork = levels.reduce((n, l) => n + l.w * l.h, 0) * iters || 1;
+  let doneWork = 0;
   let prevFill = null;
   let prevNnf = null;
   let prevW = 0;
@@ -441,6 +443,8 @@ function contentAwareFill(w, h, ch, img, hole, options = {}) {
         }
       }
       for (let q = 0; q < W * H; q++) if (holeL[q] && wsum[q] > 0) for (let c = 0; c < ch; c++) cur[q * ch + c] = acc[q * ch + c] / wsum[q];
+      doneWork += W * H;
+      _optionalChain([options, 'access', _ => _.onProgress, 'optionalCall', _2 => _2(Math.min(1, doneWork / totalWork))]);
     }
     prevFill = cur;
     prevNnf = nnf;

package/dist/{chunk-UC3PWFM3.cjs → chunk-SRMDF2VN.cjs}

@@ -10,7 +10,7 @@
 var _chunkSS53NNZOcjs = require('./chunk-SS53NNZO.cjs');
 
 
-var _chunkMQDIP4CFcjs = require('./chunk-MQDIP4CF.cjs');
+var _chunkBB6TR422cjs = require('./chunk-BB6TR422.cjs');
 
 // src/image-editor/selection/shapes.ts
 function polygonCoverage(points, width, height, antiAlias = true) {
@@ -808,12 +808,15 @@ function selectObjectIn(pixels, target, options = {}) {
   const px = Math.min(w - 1, Math.max(0, Math.floor(target.point.x * scale)));
   const py = Math.min(h - 1, Math.max(0, Math.floor(target.point.y * scale)));
   let half = Math.max(24, Math.round(0.3 * Math.max(w, h)));
+  let seed = null;
+  let reseeds = 0;
   for (; ; ) {
     const rx = Math.max(0, px - half);
     const ry = Math.max(0, py - half);
     const roi = { x: rx, y: ry, width: Math.min(w, px + half + 1) - rx, height: Math.min(h, py + half + 1) - ry };
     const whole = roi.width === w && roi.height === h;
     const band = Math.max(4, Math.round(0.15 * half));
+    const radius = _nullishCoalesce(seed, () => ( 0.3 * half));
     const n = roi.width * roi.height;
     const initial = new Uint8Array(n);
     const hardBg = new Uint8Array(n);
@@ -822,9 +825,10 @@ function selectObjectIn(pixels, target, options = {}) {
     for (let y = 0; y < roi.height; y++) {
       for (let x = 0; x < roi.width; x++) {
         const p = y * roi.width + x;
+        const d = Math.hypot(rx + x - px, ry + y - py);
         if (inBand(x, y)) hardBg[p] = 1;
-        else initial[p] = 1;
-        if (Math.hypot(rx + x - px, ry + y - py) <= 1.5) hardFg[p] = 1;
+        else if (d <= radius) initial[p] = 1;
+        if (d <= 1.5) hardFg[p] = 1;
       }
     }
     const label = grabCutLabels(work, { roi, initial, hardBg, hardFg }, iterations, round);
@@ -838,6 +842,19 @@ function selectObjectIn(pixels, target, options = {}) {
         }
       }
     }
+    if (!touches && reseeds < 2) {
+      let found = 0;
+      let seeded = 0;
+      for (let p = 0; p < n; p++) {
+        found += label[p];
+        seeded += initial[p];
+      }
+      if (found * 2 < seeded) {
+        reseeds++;
+        seed = Math.max(2, 0.7 * Math.sqrt(found / Math.PI));
+        continue;
+      }
+    }
     if (!touches || whole) {
       _optionalChain([report, 'optionalCall', _10 => _10(0.9, "Scaling up")]);
       const out = upscaleRegion(work, pixels, roi, label, enhance);
@@ -845,6 +862,7 @@ function selectObjectIn(pixels, target, options = {}) {
       return out;
     }
     half = Math.round(half * 1.6);
+    seed = null;
   }
 }
 
@@ -1574,16 +1592,20 @@ function runSelectionJob(job, pixels, onProgress) {
       };
     case "fill": {
       _optionalChain([onProgress, 'optionalCall', _32 => _32(0, "Filling")]);
-      const filled = _chunkMQDIP4CFcjs.contentAwareFill.call(void 0, pixels.width, pixels.height, 4, pixels.data, job.hole, { seed: job.seed, exclude: job.exclude });
-      _optionalChain([onProgress, 'optionalCall', _33 => _33(1, "Done")]);
+      const filled = _chunkBB6TR422cjs.contentAwareFill.call(void 0, pixels.width, pixels.height, 4, pixels.data, job.hole, {
+        seed: job.seed,
+        exclude: job.exclude,
+        onProgress: (f) => _optionalChain([onProgress, 'optionalCall', _33 => _33(f * 0.99, "Filling")])
+      });
+      _optionalChain([onProgress, 'optionalCall', _34 => _34(1, "Done")]);
       return { mask: _chunkSS53NNZOcjs.createSelectionMask.call(void 0, 1, 1), pixels: Uint8ClampedArray.from(filled) };
     }
     case "refine-preview": {
-      _optionalChain([onProgress, 'optionalCall', _34 => _34(0, "Refining")]);
+      _optionalChain([onProgress, 'optionalCall', _35 => _35(0, "Refining")]);
       const base = job.base ? deserializeMask(job.base) : null;
       const { selection, refineBrush } = applyRefineEdits(pixels, base, job.edits, pixels.width, pixels.height);
-      const mask = _optionalChain([selection, 'optionalAccess', _35 => _35.bounds]) ? _chunkSS53NNZOcjs.refineSelection.call(void 0, pixels, selection, job.params, refineBrush) : _chunkSS53NNZOcjs.createSelectionMask.call(void 0, pixels.width, pixels.height);
-      _optionalChain([onProgress, 'optionalCall', _36 => _36(1, "Done")]);
+      const mask = _optionalChain([selection, 'optionalAccess', _36 => _36.bounds]) ? _chunkSS53NNZOcjs.refineSelection.call(void 0, pixels, selection, job.params, refineBrush) : _chunkSS53NNZOcjs.createSelectionMask.call(void 0, pixels.width, pixels.height);
+      _optionalChain([onProgress, 'optionalCall', _37 => _37(1, "Done")]);
       return { mask };
     }
   }
@@ -1624,7 +1646,7 @@ var SelectionWorkerClient = (_class2 = class {
   __init9() {this.pending = /* @__PURE__ */ new Map()}
   /** Runs `job` on `pixels` in the worker. Aborting `signal` terminates the worker and rejects with an `AbortError`. */
   run(job, pixels, options = {}) {
-    if (_optionalChain([options, 'access', _37 => _37.signal, 'optionalAccess', _38 => _38.aborted])) return Promise.reject(abortError());
+    if (_optionalChain([options, 'access', _38 => _38.signal, 'optionalAccess', _39 => _39.aborted])) return Promise.reject(abortError());
     const worker = this.ensure();
     let key = this.sent.get(pixels.data);
     if (key === void 0) {
@@ -1635,7 +1657,7 @@ var SelectionWorkerClient = (_class2 = class {
     const id = this.nextId++;
     return new Promise((resolve, reject) => {
       this.pending.set(id, { resolve, reject, onProgress: options.onProgress });
-      _optionalChain([options, 'access', _39 => _39.signal, 'optionalAccess', _40 => _40.addEventListener, 'call', _41 => _41(
+      _optionalChain([options, 'access', _40 => _40.signal, 'optionalAccess', _41 => _41.addEventListener, 'call', _42 => _42(
         "abort",
         () => {
           if (this.pending.has(id)) this.terminate(abortError());
@@ -1647,7 +1669,7 @@ var SelectionWorkerClient = (_class2 = class {
   }
   /** Stops the worker; jobs still running reject with `reason` (default an `AbortError`). */
   terminate(reason = abortError()) {
-    _optionalChain([this, 'access', _42 => _42.worker, 'optionalAccess', _43 => _43.terminate, 'optionalCall', _44 => _44()]);
+    _optionalChain([this, 'access', _43 => _43.worker, 'optionalAccess', _44 => _44.terminate, 'optionalCall', _45 => _45()]);
     this.worker = null;
     this.sent = /* @__PURE__ */ new WeakMap();
     const pending = [...this.pending.values()];
@@ -1661,14 +1683,14 @@ var SelectionWorkerClient = (_class2 = class {
       const msg = event.data;
       const p = this.pending.get(msg.id);
       if (!p) return;
-      if (msg.type === "progress") _optionalChain([p, 'access', _45 => _45.onProgress, 'optionalCall', _46 => _46(msg.fraction, msg.stage)]);
+      if (msg.type === "progress") _optionalChain([p, 'access', _46 => _46.onProgress, 'optionalCall', _47 => _47(msg.fraction, msg.stage)]);
       else {
         this.pending.delete(msg.id);
         if (msg.type === "error") p.reject(new Error(msg.message));
         else p.resolve({ mask: deserializeMask(msg.mask), reason: msg.reason, noiseLevel: msg.noiseLevel, pixels: msg.pixels });
       }
     };
-    worker.onerror = (event) => this.terminate(new Error(_optionalChain([event, 'optionalAccess', _47 => _47.message]) || "The selection worker failed."));
+    worker.onerror = (event) => this.terminate(new Error(_optionalChain([event, 'optionalAccess', _48 => _48.message]) || "The selection worker failed."));
     this.worker = worker;
     return worker;
   }

package/dist/{chunk-XI2NV5U7.js → chunk-VWEWY4FY.js}

@@ -311,6 +311,8 @@ function contentAwareFill(w, h, ch, img, hole, options = {}) {
     levels.push(downsample(top, ch));
   }
   const random = rng(options.seed ?? w * 73856093 + h * 19349663);
+  const totalWork = levels.reduce((n, l) => n + l.w * l.h, 0) * iters || 1;
+  let doneWork = 0;
   let prevFill = null;
   let prevNnf = null;
   let prevW = 0;
@@ -441,6 +443,8 @@ function contentAwareFill(w, h, ch, img, hole, options = {}) {
         }
       }
       for (let q = 0; q < W * H; q++) if (holeL[q] && wsum[q] > 0) for (let c = 0; c < ch; c++) cur[q * ch + c] = acc[q * ch + c] / wsum[q];
+      doneWork += W * H;
+      options.onProgress?.(Math.min(1, doneWork / totalWork));
     }
     prevFill = cur;
     prevNnf = nnf;

package/dist/image-editor/controller.d.cts

@@ -285,6 +285,20 @@ export interface CloneSource {
 /** A vector mask's path: several `components`, or one `shape` / `subpaths` (with `op`). */
 /** What `inspectMaskEdge` reads: the selection, a layer's painted mask or its vector mask. */
 export type MaskEdgeTarget = 'selection' | 'layer-mask' | 'vector-mask';
+/** What `separateSubject` made. */
+export interface SeparateSubjectResult {
+    /** The subject: a copy of the layer masked by the selection, on top. */
+    foregroundLayerId: string;
+    /** The background plate: a copy with the subject's area filled. */
+    plateLayerId: string;
+    /** The layer it came from (now hidden). */
+    sourceLayerId: string;
+    /** An alpha channel of the filled area, to select and fill again where the fill is wrong. */
+    fillChannelId: string;
+    filledBounds: CropBox;
+    dilate: number;
+    fill: 'content-aware' | 'none';
+}
 /** A selection `compareSelections` reads (see `selectionFrom`). */
 export type SelectionSource = {
     kind: 'selection';
@@ -1617,6 +1631,23 @@ export declare class ImageEditorController {
         bounds: CropBox;
         output: ContentAwareFillOutput;
     }>;
+    /**
+     * Separate Subject: splits the selected subject from its background in one undo step. The
+     * subject goes to a copy of the layer masked by the selection (on top, made active); a second
+     * copy becomes the background plate with the subject's area, grown by `dilate` px (default 8),
+     * Content-Aware Filled (`fill: 'none'` leaves it transparent); an alpha channel marks the filled
+     * area so a bad patch can be selected and filled again; the source layer is hidden. The fill is
+     * computed first, so `signal` cancels it with nothing changed. 8-bit pixel layers only. Returns
+     * the new layers, the channel and the filled bounds.
+     */
+    separateSubject(options?: {
+        layerId?: string;
+        dilate?: number;
+        fill?: 'content-aware' | 'none';
+        seed?: number;
+        signal?: AbortSignal;
+        onProgress?: SelectionProgress;
+    }): Promise<SeparateSubjectResult>;
     /**
      * The fill without changing anything: the window, its pixels before and after (RGBA, the fill
      * blended by the selection's coverage) and the sampling area used, for a preview.

package/dist/image-editor/controller.d.ts

@@ -285,6 +285,20 @@ export interface CloneSource {
 /** A vector mask's path: several `components`, or one `shape` / `subpaths` (with `op`). */
 /** What `inspectMaskEdge` reads: the selection, a layer's painted mask or its vector mask. */
 export type MaskEdgeTarget = 'selection' | 'layer-mask' | 'vector-mask';
+/** What `separateSubject` made. */
+export interface SeparateSubjectResult {
+    /** The subject: a copy of the layer masked by the selection, on top. */
+    foregroundLayerId: string;
+    /** The background plate: a copy with the subject's area filled. */
+    plateLayerId: string;
+    /** The layer it came from (now hidden). */
+    sourceLayerId: string;
+    /** An alpha channel of the filled area, to select and fill again where the fill is wrong. */
+    fillChannelId: string;
+    filledBounds: CropBox;
+    dilate: number;
+    fill: 'content-aware' | 'none';
+}
 /** A selection `compareSelections` reads (see `selectionFrom`). */
 export type SelectionSource = {
     kind: 'selection';
@@ -1617,6 +1631,23 @@ export declare class ImageEditorController {
         bounds: CropBox;
         output: ContentAwareFillOutput;
     }>;
+    /**
+     * Separate Subject: splits the selected subject from its background in one undo step. The
+     * subject goes to a copy of the layer masked by the selection (on top, made active); a second
+     * copy becomes the background plate with the subject's area, grown by `dilate` px (default 8),
+     * Content-Aware Filled (`fill: 'none'` leaves it transparent); an alpha channel marks the filled
+     * area so a bad patch can be selected and filled again; the source layer is hidden. The fill is
+     * computed first, so `signal` cancels it with nothing changed. 8-bit pixel layers only. Returns
+     * the new layers, the channel and the filled bounds.
+     */
+    separateSubject(options?: {
+        layerId?: string;
+        dilate?: number;
+        fill?: 'content-aware' | 'none';
+        seed?: number;
+        signal?: AbortSignal;
+        onProgress?: SelectionProgress;
+    }): Promise<SeparateSubjectResult>;
     /**
      * The fill without changing anything: the window, its pixels before and after (RGBA, the fill
      * blended by the selection's coverage) and the sampling area used, for a preview.