@pixerate/editor 0.132.0 → 0.133.0

package/dist/image-editor/index.js

@@ -75,6 +75,7 @@ import {
   applyDepthMask,
   applyImageProjectionToContext,
   applyLegacyAdjustments,
+  applyLegacyFloat,
   applyMatrix3,
   applyParams,
   applyProcess2Adjustments,
@@ -362,7 +363,7 @@ import {
   writePsd,
   xyToTempTint,
   xyToUv
-} from "../chunk-G5FX56KX.js";
+} from "../chunk-AOCFL7L7.js";
 import {
   parseCssColor
 } from "../chunk-CTTF4KYV.js";
@@ -426,7 +427,7 @@ import {
   validateLayerEffects,
   warpSurface,
   workingToSamples
-} from "../chunk-AHUYMDYW.js";
+} from "../chunk-2HC4DRF4.js";
 import {
   applyHomography,
   boxQuad,
@@ -447,6 +448,8 @@ import {
   applyRetouchToTile,
   applyToneToDeepTile,
   bestOffset,
+  boxBlurPixels,
+  contentAwareFill,
   dilateMask,
   dodgeBurn,
   dodgeBurnCurve,
@@ -457,6 +460,7 @@ import {
   normalizeRetouch,
   perDabStrength,
   readSourceRegion,
+  retouchFilter,
   rgbaViewOfGrey,
   saturationOf,
   seamlessClone,
@@ -467,7 +471,7 @@ import {
   spotHealPixels,
   spotHealWindow,
   toneOf
-} from "../chunk-YRZ6NVE3.js";
+} from "../chunk-6CTZAGZ2.js";
 import {
   BrushstrokeCache,
   brushstrokeDataUrl,
@@ -802,7 +806,7 @@ import {
   warpMeshParamAt,
   warpMeshRows,
   warpPresetMesh
-} from "../chunk-IEYXYMRQ.js";
+} from "../chunk-FOBB6AIO.js";
 import "../chunk-YGJIER2R.js";
 import "../chunk-KHNZ6MOU.js";
 import {
@@ -3685,7 +3689,7 @@ function convertSurfaceColors(surface, t) {
 
 // src/image-editor/controller.ts
 var IMAGE_EDITOR_SCHEMA_VERSION = LAYERED_SCHEMA_VERSION;
-var RETOUCH_TOOLS = ["clone", "heal", "spot-heal", "smudge", "dodge", "burn", "sponge"];
+var RETOUCH_TOOLS = ["clone", "heal", "spot-heal", "smudge", "dodge", "burn", "sponge", "blur", "sharpen", "history"];
 var isRetouchTool = (tool) => RETOUCH_TOOLS.includes(tool);
 var STROKE_TOOLS = ["brush", "eraser", "mixer", ...RETOUCH_TOOLS];
 function paintCoverageInto(base, coverage, apply, rects, depth = null) {
@@ -3959,6 +3963,18 @@ var PaintStrokeSession = class {
     this.controller._strokeCommit(this.before, this.target.id, this.target.channel, null);
   }
 };
+function workRegionOf(surface, rect, depth) {
+  if (!depth) return Float32Array.from(readRegion(surface, rect));
+  const d = readDeepRegion(surface, rect, depth);
+  const out = new Float32Array(d.length);
+  if (d instanceof Uint16Array) {
+    for (let i = 0; i < d.length; i++) out[i] = d[i] / 257;
+    return out;
+  }
+  const ch = surface.channels;
+  for (let i = 0; i < d.length; i++) out[i] = (ch === 4 && (i & 3) !== 3 ? srgbEncode(d[i]) : d[i]) * 255;
+  return out;
+}
 function workTileOf(tile) {
   if (!tile) return null;
   const d = tile.deep;
@@ -6158,7 +6174,7 @@ var ImageEditorController = class {
     if (tool === "smudge") return { kind: "dabs", create: (pixels) => new RetouchDabStroke(brush, pixels, smudgeEffect(brush, settings.strength)) };
     if (tool === "sponge") return { kind: "dabs", create: (pixels) => new RetouchDabStroke(brush, pixels, spongeEffect(brush, settings.spongeMode === "saturate", settings.vibrance)) };
     const retouchApply = {
-      opacity: tool === "clone" || tool === "heal" ? brush.opacity : 1,
+      opacity: tool === "clone" || tool === "heal" || tool === "history" ? brush.opacity : tool === "blur" || tool === "sharpen" ? brush.opacity * settings.strength : 1,
       blend: tool === "clone" && !mask ? brush.blend : "normal",
       lockTransparency: target.lockTransparency,
       selection: apply.selection,
@@ -6170,6 +6186,41 @@ var ImageEditorController = class {
       return { kind: "coverage", coverage, apply: retouchApply, start: () => {
       }, paint: () => paint2 };
     }
+    if (tool === "blur" || tool === "sharpen") {
+      const n = target.surface.channels;
+      const depth = !mask && this.bitDepth !== 8 ? this.bitDepth : null;
+      const m = 6;
+      const filtered = new TilePixelSource(
+        (tx, ty) => {
+          const r = { x: tx * TILE - m, y: ty * TILE - m, width: TILE + 2 * m, height: TILE + 2 * m };
+          const d = workRegionOf(target.surface, r, depth);
+          retouchFilter(d, r.width, r.height, n, tool, 2, 1.2);
+          const out = new Float32Array(TILE * TILE * n);
+          for (let y = 0; y < TILE; y++) out.set(d.subarray(((y + m) * r.width + m) * n, ((y + m) * r.width + m + TILE) * n), y * TILE * n);
+          return out;
+        },
+        n,
+        target.offset
+      );
+      const paint2 = { kind: "source", source: filtered, dx: 0, dy: 0 };
+      return { kind: "coverage", coverage, apply: retouchApply, start: () => {
+      }, paint: () => paint2 };
+    }
+    if (tool === "history") {
+      const steps = settings.historySteps;
+      const entry = steps > 0 ? this.undoStack[this.undoStack.length - steps] ?? this.undoStack[0] : this.undoStack[0];
+      if (!entry) throw new LayerOperationError("There is no earlier state to paint from yet: the History Brush paints a layer as it was some undo steps back. Make a change first.");
+      const then = findLayer(entry.layers, target.id)?.layer;
+      if (!then) throw new LayerOperationError(`Layer "${target.id}" did not exist ${steps > 0 ? `${steps} steps back` : "in the oldest state"}; choose fewer history steps (historySteps).`);
+      const surface = target.channel === "mask" ? then.mask?.surface : then.type === "pixel" ? then.surface : void 0;
+      if (!surface) throw new LayerOperationError(`Layer "${target.id}" had no ${target.channel === "mask" ? "mask" : "pixels"} in that state.`);
+      const offset2 = then.type === "pixel" ? then.offset : { x: 0, y: 0 };
+      const depth = !mask && this.bitDepth !== 8 ? this.bitDepth : null;
+      const source2 = depth ? new TilePixelSource((tx, ty) => workTileOf(surface.tiles.get(tileKey(tx, ty))), 4, offset2) : this.surfaceSource(surface, offset2);
+      const paint2 = { kind: "source", source: source2, dx: 0, dy: 0 };
+      return { kind: "coverage", coverage, apply: retouchApply, start: () => {
+      }, paint: () => paint2 };
+    }
     const sample = mask ? "current" : settings.sample;
     const deep = !mask && this.bitDepth !== 8 ? this.bitDepth : null;
     const own = deep ? new TilePixelSource((tx, ty) => workTileOf(target.surface.tiles.get(tileKey(tx, ty))), 4, target.offset) : this.surfaceSource(target.surface, target.offset);
@@ -10656,13 +10707,17 @@ var PAINT_TOOLS = [
   { id: "smudge", label: "Smudge", shortcut: "" },
   { id: "dodge", label: "Dodge", shortcut: "O" },
   { id: "burn", label: "Burn", shortcut: "Shift+O" },
-  { id: "sponge", label: "Sponge", shortcut: "Shift+O" }
+  { id: "sponge", label: "Sponge", shortcut: "Shift+O" },
+  { id: "blur", label: "Blur", shortcut: "" },
+  { id: "sharpen", label: "Sharpen", shortcut: "" },
+  { id: "history", label: "History", shortcut: "Y" }
 ];
 var isPaintTool = (tool) => PAINT_TOOLS.some((t) => t.id === tool);
-var isRetouchPaintTool = (tool) => tool === "clone" || tool === "heal" || tool === "spot-heal" || tool === "smudge" || tool === "dodge" || tool === "burn" || tool === "sponge";
+var isRetouchPaintTool = (tool) => tool === "clone" || tool === "heal" || tool === "spot-heal" || tool === "smudge" || tool === "dodge" || tool === "burn" || tool === "sponge" || tool === "blur" || tool === "sharpen" || tool === "history";
 var RETOUCH_OPTION_CONTROLS = [
   { id: "exposure", label: "Exposure", section: "layer", min: 0, max: 1, step: 0.01, default: 0.5, decimals: 0, track: plain2, displayScale: 100, unit: "%", tools: ["dodge", "burn"] },
-  { id: "strength", label: "Strength", section: "layer", min: 0, max: 1, step: 0.01, default: 0.5, decimals: 0, track: plain2, displayScale: 100, unit: "%", tools: ["smudge"] }
+  { id: "strength", label: "Strength", section: "layer", min: 0, max: 1, step: 0.01, default: 0.5, decimals: 0, track: plain2, displayScale: 100, unit: "%", tools: ["smudge", "blur", "sharpen"] },
+  { id: "historySteps", label: "Steps back", section: "layer", min: 0, max: 50, step: 1, default: 0, decimals: 0, track: plain2, unit: "", tools: ["history"] }
 ];
 var RETOUCH_CHOICES = [
   {
@@ -10681,6 +10736,7 @@ var RETOUCH_CHOICES = [
     tools: ["spot-heal"],
     options: [
       { id: "proximity-match", label: "Proximity Match", title: "Copy the best matching patch nearby" },
+      { id: "content-aware", label: "Content-Aware", title: "Synthesise texture and edges from patches around the spot" },
       { id: "smooth", label: "Smooth", title: "Fill smoothly from the edges" }
     ]
   },
@@ -10753,6 +10809,9 @@ function handlePaintShortcut(controller, e) {
       controller.setTool(next);
       return true;
     }
+    case "y":
+      controller.setTool("history");
+      return true;
     case "d":
       controller.resetPaintColors();
       return true;
@@ -11337,12 +11396,12 @@ function createImageRetouchTools(controller) {
   const spotHeal = {
     name: "spot_heal",
     title: "Spot Healing stroke",
-    description: "Removes what a stroke covers without a source point (Photoshop's Spot Healing Brush): proximity-match copies the best matching patch nearby and blends it in; smooth fills from the edges inwards (for spots on smooth areas). Paint just over the spot with a brush a little larger than it. One undo step. Returns the layerId, channel, changed bounds, dab count and spotHeal {offset} (the patch offset copied, or null for a smooth fill).",
+    description: "Removes what a stroke covers without a source point (Photoshop's Spot Healing Brush): proximity-match copies the best matching patch nearby and blends it in; content-aware synthesises texture and continues edges from patches all around (best across lines, on patterns and for larger spots, a little slower); smooth fills from the edges inwards (for spots on smooth areas). Paint just over the spot with a brush a little larger than it. One undo step. Returns the layerId, channel, changed bounds, dab count and spotHeal {offset} (the patch offset copied, or null for a smooth fill).",
     inputSchema: {
       type: "object",
       properties: {
         points: POINTS,
-        type: { type: "string", enum: [...SPOT_HEAL_TYPES], description: "proximity-match (default) or smooth." },
+        type: { type: "string", enum: [...SPOT_HEAL_TYPES], description: "proximity-match (default the current option), content-aware or smooth." },
         sample: SAMPLE,
         brush: BRUSH2,
         ...TARGET2
@@ -11419,10 +11478,55 @@ function createImageRetouchTools(controller) {
     annotations: { title: "Sponge stroke", ...WRITE5 },
     handler: (args) => stroke("sponge", { ...args, channel: "pixels" }, { ...pick(args, ["vibrance"]), ...args.mode !== void 0 ? { spongeMode: args.mode } : {} })
   };
+  const filterSchema = (verb) => ({
+    type: "object",
+    properties: {
+      points: POINTS,
+      strength: { type: "number", minimum: 0, maximum: 1, description: `How strongly to ${verb}, 0..1 (default the current option, 0.5); multiplies the brush opacity.` },
+      brush: BRUSH2,
+      ...TARGET2
+    },
+    required: ["points"],
+    additionalProperties: false
+  });
+  const blurTool = {
+    name: "blur_stroke",
+    title: "Blur stroke",
+    description: "Softens the pixels a stroke covers (Photoshop's Blur tool): a soft blur of the layer laid through the brush at `strength`. Overlapping dabs in one stroke do not compound; another stroke blurs further. Works on pixels and masks, at any bit depth. One undo step. Returns the layerId, channel, changed bounds and dab count.",
+    inputSchema: filterSchema("blur"),
+    annotations: { title: "Blur stroke", ...WRITE5 },
+    handler: (args) => stroke("blur", args, pick(args, ["strength"]))
+  };
+  const sharpenTool = {
+    name: "sharpen_stroke",
+    title: "Sharpen stroke",
+    description: "Crisps the pixels a stroke covers (Photoshop's Sharpen tool): an unsharp mask of the layer laid through the brush at `strength`. Keep strength low (0.2..0.5) and inspect with capture_view; strong sharpening shows halos and noise. One undo step. Returns the layerId, channel, changed bounds and dab count.",
+    inputSchema: filterSchema("sharpen"),
+    annotations: { title: "Sharpen stroke", ...WRITE5 },
+    handler: (args) => stroke("sharpen", args, pick(args, ["strength"]))
+  };
+  const historyBrush = {
+    name: "history_brush",
+    title: "History Brush stroke",
+    description: "Paints the layer back as it was earlier (Photoshop's History Brush): the same layer's pixels (or mask) from `historySteps` undo steps back, or from the oldest state history keeps (0, the default, usually the document as opened), laid through the brush. Use it to undo part of a filter, paint or retouch in one area. Fails if the layer did not exist then or there is no history yet. One undo step. Returns the layerId, channel, changed bounds and dab count.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        points: POINTS,
+        historySteps: { type: "integer", minimum: 0, maximum: 1e3, description: "Undo steps back to paint from; 0 (default the current option) is the oldest state history keeps." },
+        brush: BRUSH2,
+        ...TARGET2
+      },
+      required: ["points"],
+      additionalProperties: false
+    },
+    annotations: { title: "History Brush stroke", ...WRITE5 },
+    handler: (args) => stroke("history", args, pick(args, ["historySteps"]))
+  };
   const getOptions = {
     name: "get_retouch_options",
     title: "Get retouch options",
-    description: "Reads the retouching tools' options (aligned, sample, spotType, range, exposure, protectTones, spongeMode, vibrance, strength) and the clone source ({x, y, offset} or null; offset is the aligned offset the last clone or heal stroke fixed: an aligned stroke samples at the brush plus offset, which the editors show as a crosshair). Call it before clone_stamp or heal_brush without a source to see where they will sample.",
+    description: "Reads the retouching tools' options (aligned, sample, spotType, range, exposure, protectTones, spongeMode, vibrance, strength, historySteps) and the clone source ({x, y, offset} or null; offset is the aligned offset the last clone or heal stroke fixed: an aligned stroke samples at the brush plus offset, which the editors show as a crosshair). Call it before clone_stamp or heal_brush without a source to see where they will sample.",
     inputSchema: { type: "object", properties: {}, additionalProperties: false },
     annotations: { title: "Get retouch options", ...READ6 },
     handler: () => {
@@ -11439,13 +11543,14 @@ function createImageRetouchTools(controller) {
       properties: {
         aligned: { type: "boolean", description: "Clone / heal: keep the offset from stroke to stroke (default true)." },
         sample: SAMPLE,
-        spotType: { type: "string", enum: [...SPOT_HEAL_TYPES], description: "Spot heal: proximity-match (default) or smooth." },
+        spotType: { type: "string", enum: [...SPOT_HEAL_TYPES], description: "Spot heal: proximity-match (default), content-aware or smooth." },
         range: { type: "string", enum: [...TONE_RANGES], description: "Dodge / burn: shadows, midtones (default) or highlights." },
         exposure: { type: "number", minimum: 0, maximum: 1, description: "Dodge / burn strength 0..1 (default 0.5)." },
         protectTones: { type: "boolean", description: "Dodge / burn: keep hue and saturation (default true)." },
         spongeMode: { type: "string", enum: ["desaturate", "saturate"], description: "Sponge: desaturate (default) or saturate." },
         vibrance: { type: "boolean", description: "Sponge: damp clipping (default true)." },
-        strength: { type: "number", minimum: 0, maximum: 1, description: "Smudge strength 0..1 (default 0.5)." }
+        strength: { type: "number", minimum: 0, maximum: 1, description: "Smudge, blur and sharpen strength 0..1 (default 0.5)." },
+        historySteps: { type: "integer", minimum: 0, maximum: 1e3, description: "History Brush: undo steps back it paints from; 0 is the oldest state (default 0)." }
       },
       additionalProperties: false
     },
@@ -11475,7 +11580,7 @@ function createImageRetouchTools(controller) {
       return controller.setCloneSource(checkSource(controller, { x: args.x, y: args.y }));
     }
   };
-  return [cloneStamp, healBrush, spotHeal, smudge, dodge, burn, spongeTool, getOptions, setOptions, setSource];
+  return [cloneStamp, healBrush, spotHeal, smudge, dodge, burn, spongeTool, blurTool, sharpenTool, historyBrush, getOptions, setOptions, setSource];
 }
 function pick(args, keys) {
   const out = {};
@@ -15136,6 +15241,7 @@ export {
   applyHomography,
   applyImageProjectionToContext,
   applyLegacyAdjustments,
+  applyLegacyFloat,
   applyMatrix3,
   applyOutputStage,
   applyParams,
@@ -15164,6 +15270,7 @@ export {
   blenderDab,
   blurFilter,
   borderCoverage,
+  boxBlurPixels,
   boxMean,
   boxPointOf,
   boxQuad,
@@ -15204,6 +15311,7 @@ export {
   compositeSurfaceOver,
   computeHistogram,
   computeSelectionBounds,
+  contentAwareFill,
   contentBounds,
   contentsBox,
   contentsSurface,
@@ -15644,6 +15752,7 @@ export {
   resolvePaintGradient,
   resolveProfile,
   restyleRange,
+  retouchFilter,
   reversePaintGradient,
   rgbToGray,
   rgbToHsl,