@bensitu/image-editor 2.1.0 → 2.3.0

package/dist/types/core/state-serializer.d.ts

@@ -43,10 +43,9 @@
  * @module
  */
 import type * as FabricNS from 'fabric';
-import type { ImageMimeType } from './public-types.js';
+import type { AnnotationObject, BaseImageObject, ImageMimeType, MaskObject } from './public-types.js';
 /**
- * Per-object payload inside a {@link CanvasJson} snapshot. Mirrors the
- * Pretty_Printer wire format used by the canvas serializer.
+ * Per-object payload inside a {@link CanvasJson} snapshot.
  *
  * The `isCropRect` and `maskLabel` markers are filtered out by
  * {@link saveState}, so a snapshot pushed to history will never contain
@@ -57,6 +56,10 @@ import type { ImageMimeType } from './public-types.js';
 export interface CanvasJsonObject {
     /** Fabric shape type discriminator (`'rect'`, `'circle'`, `'image'`, etc.). */
     type?: string;
+    /** Editor-owned object discriminator. */
+    editorObjectKind?: string;
+    /** Session object subtype discriminator. */
+    sessionObjectType?: string;
     /** Left-edge pixel coordinate (Fabric serializes `originX: 'left'` masks here). */
     left?: number;
     /** Top-edge pixel coordinate. */
@@ -89,12 +92,26 @@ export interface CanvasJsonObject {
     cornerColor?: string;
     /** Fabric corner control size. */
     cornerSize?: number;
+    /** Fabric horizontal flip flag. */
+    flipX?: boolean;
+    /** Fabric vertical flip flag. */
+    flipY?: boolean;
     /** Marks the transient crop rectangle; filtered before history push. */
     isCropRect?: boolean;
     /** Marks a mask label text object; filtered before history push. */
     maskLabel?: boolean;
     /** Marks Mosaic preview objects; filtered before history push. */
     isMosaicPreview?: boolean;
+    /** Annotation identifier. */
+    annotationId?: number;
+    /** Annotation subtype. */
+    annotationType?: string;
+    /** Annotation display name. */
+    annotationName?: string;
+    /** Business-level annotation visibility. */
+    annotationHidden?: boolean;
+    /** Business-level annotation lock state. */
+    annotationLocked?: boolean;
     /** Pass-through for every other Fabric-serialized shape property. */
     [key: string]: unknown;
 }
@@ -112,8 +129,12 @@ export interface EditorStateMeta {
     baseImageScale: number;
     /** MIME type of the currently committed image, when known. */
     currentImageMimeType?: ImageMimeType | null;
+    /** Active editor-owned object kind when the snapshot was captured, if any. */
+    activeObjectKind?: 'mask' | 'annotation' | null;
     /** Mask selected when the snapshot was captured, if any. */
     activeMaskId?: number;
+    /** Annotation selected when the snapshot was captured, if any. */
+    activeAnnotationId?: number;
 }
 /**
  * Full snapshot envelope. Standard Fabric `toJSON` keys plus the editor
@@ -141,7 +162,7 @@ export interface CanvasJson {
  * cannot mutate the shared array.
  *
  */
-export declare const SNAPSHOT_CUSTOM_KEYS: readonly ["maskId", "maskUid", "maskName", "isCropRect", "maskLabel", "originalAlpha", "originalStroke", "originalStrokeWidth", "hasControls", "selectable", "strokeUniform", "lockRotation", "transparentCorners", "borderColor", "cornerColor", "cornerSize", "isMosaicPreview"];
+export declare const SNAPSHOT_CUSTOM_KEYS: readonly ["editorObjectKind", "sessionObjectType", "maskId", "maskUid", "maskName", "isCropRect", "maskLabel", "originalAlpha", "originalStroke", "originalStrokeWidth", "hasControls", "selectable", "strokeUniform", "lockRotation", "transparentCorners", "borderColor", "cornerColor", "cornerSize", "flipX", "flipY", "isMosaicPreview", "annotationId", "annotationType", "annotationName", "annotationHidden", "annotationLocked"];
 /**
  * Inputs to {@link saveState}. The editor facade passes the live canvas
  * plus the three transform fields that make up `_editorState`.
@@ -151,6 +172,8 @@ export interface SaveStateInput {
     canvas: FabricNS.Canvas;
     /** Active mask id supplied by the facade when Fabric active state is unavailable. */
     activeMaskId?: number | null;
+    /** Active annotation id supplied by the facade when Fabric active state is unavailable. */
+    activeAnnotationId?: number | null;
     /** Current image zoom factor (mirrored into `_editorState.currentScale`). */
     currentScale: number;
     /** Current image rotation in degrees (mirrored into `_editorState.currentRotation`). */
@@ -239,19 +262,25 @@ export interface LoadFromStateResult {
      * `createMask` calls do not collide with restored IDs.
      */
     maxMaskId: number;
+    /** Highest `annotationId` observed on restored annotation objects. */
+    maxAnnotationId: number;
     /**
      * The first `'image'` object that is NOT a mask, or `null`. Used by the
      * facade to set `selectable: false`, `evented: false`, and to send the
      * image to the back of the stacking order. The serializer does not
      * mutate the object itself.
      */
-    originalImage: FabricNS.FabricImage | null;
+    originalImage: BaseImageObject | null;
     /**
      * All canvas objects after restore, in `getObjects` order. The facade
      * uses this list to re-attach mask hover handlers and to drive the
      * `isImageLoadedToCanvas` flag.
      */
     objects: FabricNS.FabricObject[];
+    /** Restored mask objects. */
+    masks: MaskObject[];
+    /** Restored annotation objects. */
+    annotations: AnnotationObject[];
     /**
      * The canonical JSON string for the snapshot — equal to the input string
      * if a string was passed, or `JSON.stringify(input)` if a `CanvasJson`

package/dist/types/core/state-serializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"state-serializer.d.ts","sourceRoot":"","sources":["../../../src/core/state-serializer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"state-serializer.d.ts","sourceRoot":"","sources":["../../../src/core/state-serializer.ts"],"names":[],"mappings":"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"}

package/dist/types/crop/crop-controller.d.ts

@@ -2,7 +2,7 @@
  * Crop session lifecycle owner. Implements the
  * `enterCropMode → applyCrop` and
  * `enterCropMode → cancelCrop` transitions atop the
- * legacy crop pipeline, plus the dedicated crop rectangle
+ * crop export/load pipeline, plus the dedicated crop rectangle
  * shape, its drag/scale clamps, and the per-object
  * `evented`/`selectable` freeze that keeps only the crop
  * rectangle interactive while a session is open.
@@ -66,10 +66,9 @@
  *   `left` and `top` shifted by `-cropRegion.left, -cropRegion.top`.
  *   Per-mask `angle`, `scaleX`, and `scaleY` are restored verbatim so
  *   the visible mask shape does not change size or orientation. The
- *   cropRegion-relative shift matches legacy's
+ *   cropRegion-relative shift preserves the historical
  *   `_translateObjectByCanvasOffset(mask, -cropRegion.sourceX,
- *   -cropRegion.sourceY)` and is the documented legacy behavior to
- *   preserve. Because shifting `left` / `top` by a constant translates
+ *   -cropRegion.sourceY)` behavior. Because shifting `left` / `top` by a constant translates
  *   the entire object (including its rotated visual) by the same
  *   constant in canvas pixels, the post-crop position relative to the
  *   new image bounding box matches the pre-crop position relative to
@@ -87,7 +86,7 @@
  * before export and re-adds the masks shifted by
  * `-cropRegion.left, -cropRegion.top` after
  * `context.loadImage(croppedBase64)` commits. The intersection filter
- * drops masks that do not overlap the crop region, matching legacy
+ * drops masks that do not overlap the crop region, matching the documented
  * observable behavior: masks fully outside the cropped region are
  * removed, while intersecting masks are preserved.
  *
@@ -97,21 +96,21 @@
  *   {@link CropControllerContext}. The `ImageEditor` facade keeps
  *   ownership of the canonical session pointer (`getCropSession` /
  *   `setCropSession`) so multiple editors on the same page do not share
- *   crop state and a sub-agent unit test can exercise the controller
+ *   crop state and unit tests can exercise the controller
  *   without instantiating the full facade.
  * - The crop rectangle's drag/scale handlers clamp `scaleX` / `scaleY`
  *   so the rect cannot grow past the available image bounding box and
  *   cannot shrink below the configured `crop.minWidth` / `crop.minHeight`.
  *   This matches legacy's `handleCropRectModified`.
- * - In Fabric v7 the rotation handle (`mtr`) is hidden via
- *   `setControlVisible('mtr', false)` because `hasRotatingPoint` is
- *   silently ignored. `lockRotation: true` is also set as runtime
- *   defence so the rotation transform itself cannot fire even if the
- *   handle were somehow shown.
+ * - In Fabric v7 crop rectangle controls are configured via
+ *   `setControlsVisibility(...)` because `hasRotatingPoint` is silently
+ *   ignored. `lockRotation: true` is also set as runtime defence so the
+ *   rotation transform itself cannot fire even if the handle were somehow
+ *   shown.
  * - The pre-crop snapshot is captured once, in `enterCropMode`, and
  *   reused by `applyCrop`'s history command and rollback path. This
  *   avoids a re-serialization right before the crop, and — more
- *   importantly — avoids the legacy fragility of filtering `isCropRect`
+ *   importantly — avoids the historical fragility of filtering `isCropRect`
  *   objects out of a post-rect snapshot when Fabric's custom-key
  *   serializer occasionally drops the marker.
  *
@@ -122,7 +121,7 @@
  * @module
  */
 import type * as FabricNS from 'fabric';
-import type { CropHandler, CropPrevEvented, FabricModule, ImageMimeType, LoadImageOptions, MaskBackup, ResolvedOptions } from '../core/public-types.js';
+import type { CropAspectRatio, CropHandler, CropModeOptions, CropPrevEvented, FabricModule, ImageMimeType, LoadImageOptions, MaskBackup, ResolvedOptions } from '../core/public-types.js';
 import { type HistoryManager } from '../history/history-manager.js';
 /**
  * Internal state of an open crop session. Built by {@link enterCropMode},
@@ -153,6 +152,7 @@ import { type HistoryManager } from '../history/history-manager.js';
  * - `cropRect` — the active crop rectangle, or `null` after the rect has
  *   been removed (so subsequent calls to {@link removeCropRect} are
  *   idempotent on the success and rollback paths).
+ * - `aspectRatio` — current crop aspect-ratio lock. `null` means free crop.
  * - `handlers` — bound `modified` / `moving` / `scaling` handler records
  *   on the crop rectangle. Detached when the session ends.
  *
@@ -164,6 +164,7 @@ export interface CropSession {
     /** Per-mask style backups captured when masks are hidden during crop mode. */
     maskBackups: MaskBackup[];
     cropRect: FabricNS.Rect | null;
+    aspectRatio: NormalizedCropAspectRatio;
     handlers: CropHandler[];
 }
 /**
@@ -256,6 +257,8 @@ export interface CropControllerContext {
      */
     updateMaskList?(): void;
 }
+export type NormalizedCropAspectRatio = number | null;
+export declare function normalizeCropAspectRatio(input: CropAspectRatio | null | undefined): NormalizedCropAspectRatio;
 /**
  * Open a crop session. Builds a {@link CropSession} that captures:
  *
@@ -299,7 +302,8 @@ export interface CropControllerContext {
  * @param context - Editor dependency bundle — see {@link CropControllerContext}.
  *
  */
-export declare function enterCropMode(context: CropControllerContext): void;
+export declare function enterCropMode(context: CropControllerContext, cropModeOptions?: CropModeOptions): void;
+export declare function setCropAspectRatio(context: CropControllerContext, aspectRatioInput: CropAspectRatio | null | undefined): void;
 /**
  * Close an open crop session WITHOUT applying the crop. Restores the
  * pre-crop `canvas.selection`, the per-object `evented` / `selectable`

package/dist/types/crop/crop-controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"crop-controller.d.ts","sourceRoot":"","sources":["../../../src/crop/crop-controller.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0HG;AAEH,OAAO,KAAK,KAAK,QAAQ,MAAM,QAAQ,CAAC;AAGxC,OAAO,KAAK,EACR,WAAW,EACX,eAAe,EACf,YAAY,EACZ,aAAa,EACb,gBAAgB,EAChB,UAAU,EAGV,eAAe,EAClB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAW,KAAK,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAoB7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAM,WAAW,WAAW;IACxB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,OAAO,CAAC;IACvB,WAAW,EAAE,eAAe,EAAE,CAAC;IAC/B,8EAA8E;IAC9E,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,QAAQ,EAAE,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC;IAC/B,QAAQ,EAAE,WAAW,EAAE,CAAC;CAC3B;AAID;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,qBAAqB;IAClC,6DAA6D;IAC7D,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,0BAA0B;IAC1B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;IACjC;;yEAEqE;IACrE,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,uEAAuE;IACvE,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IAExC;;;;;;OAMG;IACH,aAAa,IAAI,OAAO,CAAC;IAEzB;;;;OAIG;IACH,gBAAgB,IAAI,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC;IAEhD;;;OAGG;IACH,uBAAuB,CAAC,IAAI,aAAa,GAAG,IAAI,CAAC;IAEjD,8CAA8C;IAC9C,cAAc,IAAI,WAAW,GAAG,IAAI,CAAC;IACrC,uEAAuE;IACvE,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,IAAI,GAAG,IAAI,CAAC;IAElD;;;;;OAKG;IACH,SAAS,IAAI,MAAM,CAAC;IAEpB;;;;OAIG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C;;;;OAIG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1E;;;;;;;;;;OAUG;IACH,cAAc,CAAC,IAAI,MAAM,CAAC;IAE1B;;;OAGG;IACH,cAAc,CAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEjC;;;;;OAKG;IACH,cAAc,CAAC,IAAI,IAAI,CAAC;CAC3B;AA4bD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0CG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAyLlE;AAID;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,UAAU,CAAC,OAAO,EAAE,qBAAqB,GAAG,IAAI,CAiB/D;AAID;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkFG;AACH,wBAAsB,SAAS,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoJ7E"}
+{"version":3,"file":"crop-controller.d.ts","sourceRoot":"","sources":["../../../src/crop/crop-controller.ts"],"names":[],"mappings":"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"}

package/dist/types/export/export-format.d.ts

@@ -1,41 +1,12 @@
 /**
- * Pure helpers that normalize the user-facing
- * `Base64ExportOptions` / `ImageFileExportOptions` surface into the
- * canvas-/Fabric-shaped values consumed by `export/export-service.ts`.
- *
- * The module owns three small, individually testable building blocks plus
- * one orchestrating function, mirroring the shape of
- * `image/image-resampler.ts`:
- *
- * - {@link normalizeImageFormat} — collapses `'jpg'` to `'jpeg'`, strips
- *   the `image/` MIME prefix, and falls back to `'jpeg'` for unknown or
- *   omitted input.
- * - {@link mimeTypeFor}          — derives the matching `image/...` MIME
- *   for a normalized format token.
- * - {@link clampQuality}         — coerces input to a finite number and
- *   clamps it into `[0, 1]`, falling back to a caller-supplied default
- *   when the input is not finite.
- * - {@link resolveExportFormat}  — composes the above with the documented
- *   `fileType`-wins-over-`format` precedence and drops `quality` for PNG
- *   output.
- *
- * legacy parity:
- * - The format mapping table mirrors `_normalizeImageFormat` from
- *   `src/image-editor.js@legacy.4.0`, including the lowercase lookup and the
- *   `'jpeg'` default for unknown input.
- * - The quality clamp mirrors `_normalizeQuality` from the same legacy file:
- *   non-finite input falls back to `options.downsampleQuality`, finite
- *   input is clamped to `[0, 1]`.
- *
- * This module is internal — it is NOT re-exported from `src/index.ts`.
- *
- *    Fabric.
- *    lossless.
- *    `quality` defaulting to `options.downsampleQuality`.
+ * Export format normalization helpers.
+ *
+ * Converts public `ImageExportOptions` values into the normalized format,
+ * MIME type, and quality values consumed by `export/export-service.ts`.
  *
  * @module
  */
-import type { Base64ExportOptions, ImageFileExportOptions, ImageMimeType, NormalizedImageFormat } from '../core/public-types.js';
+import type { ImageExportOptions, ImageMimeType, NormalizedImageFormat } from '../core/public-types.js';
 /**
  * Result of {@link resolveExportFormat}.
  *
@@ -109,7 +80,7 @@ export declare function clampQuality(quality: unknown, fallback: number): number
  * Resolve the user-facing export options into the canvas-/Fabric-shaped
  * values consumed by `export/export-service.ts`.
  *
- * Precedence (matches legacy `exportImageBase64` / `exportImageFile`):
+ * Precedence:
  *   1. `options.fileType` wins over `options.format` when both are supplied
  *      and `options.fileType` is truthy. Falsy `fileType` falls through to
  *      `options.format`. Both omitted → `'jpeg'`.
@@ -121,16 +92,14 @@ export declare function clampQuality(quality: unknown, fallback: number): number
  *
  * Pure function — no DOM access, safe to call from property tests.
  *
- * @param options - Subset of `Base64ExportOptions` /
- *                           `ImageFileExportOptions` carrying `fileType`,
+ * @param options - Subset of `ImageExportOptions` carrying `fileType`,
  *                           `format`, and `quality`. Other fields are
- *                           ignored. `format` is only read from options
- *                           that declare it (i.e. `Base64ExportOptions`).
+ *                           ignored.
  * @param downsampleQuality - Default quality used when `options.quality` is
  *                           omitted or non-finite. Sourced from
  *                           `ResolvedOptions.downsampleQuality`.
  * @returns The resolved `{ format, mimeType, quality}` triple.
  *
  */
-export declare function resolveExportFormat(options: Pick<Base64ExportOptions, 'fileType' | 'format' | 'quality'> | Pick<ImageFileExportOptions, 'fileType' | 'quality'> | undefined | null, downsampleQuality: number): ResolvedExportFormat;
+export declare function resolveExportFormat(options: Pick<ImageExportOptions, 'fileType' | 'format' | 'quality'> | undefined | null, downsampleQuality: number): ResolvedExportFormat;
 //# sourceMappingURL=export-format.d.ts.map

package/dist/types/export/export-format.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export-format.d.ts","sourceRoot":"","sources":["../../../src/export/export-format.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AAEH,OAAO,KAAK,EACR,mBAAmB,EACnB,sBAAsB,EACtB,aAAa,EACb,qBAAqB,EACxB,MAAM,yBAAyB,CAAC;AAEjC;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACjC,8CAA8C;IAC9C,MAAM,EAAE,qBAAqB,CAAC;IAC9B,gEAAgE;IAChE,QAAQ,EAAE,aAAa,CAAC;IACxB,yDAAyD;IACzD,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B;AA+BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,qBAAqB,CAEjF;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,qBAAqB,GAAG,IAAI,CAS3F;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,qBAAqB,GAAG,aAAa,CAExE;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAIvE;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,wBAAgB,mBAAmB,CAC/B,OAAO,EACD,IAAI,CAAC,mBAAmB,EAAE,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC,GAC5D,IAAI,CAAC,sBAAsB,EAAE,UAAU,GAAG,SAAS,CAAC,GACpD,SAAS,GACT,IAAI,EACV,iBAAiB,EAAE,MAAM,GAC1B,oBAAoB,CA8BtB"}
+{"version":3,"file":"export-format.d.ts","sourceRoot":"","sources":["../../../src/export/export-format.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EACR,kBAAkB,EAClB,aAAa,EACb,qBAAqB,EACxB,MAAM,yBAAyB,CAAC;AAEjC;;;;;;GAMG;AACH,MAAM,WAAW,oBAAoB;IACjC,8CAA8C;IAC9C,MAAM,EAAE,qBAAqB,CAAC;IAC9B,gEAAgE;IAChE,QAAQ,EAAE,aAAa,CAAC;IACxB,yDAAyD;IACzD,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;CAC/B;AA+BD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,qBAAqB,CAEjF;AAED;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,qBAAqB,GAAG,IAAI,CAS3F;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,qBAAqB,GAAG,aAAa,CAExE;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAIvE;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,mBAAmB,CAC/B,OAAO,EAAE,IAAI,CAAC,kBAAkB,EAAE,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC,GAAG,SAAS,GAAG,IAAI,EACvF,iBAAiB,EAAE,MAAM,GAC1B,oBAAoB,CA8BtB"}

package/dist/types/export/export-service.d.ts

@@ -13,17 +13,17 @@
  *   so it is not serialized into the output. The discard is performed
  *   unconditionally; calling `canvas.discardActiveObject` with no active
  *   selection is a documented no-op.
- * - `exportImageBase64(options?: Base64ExportOptions)`
- *   is the only canonical base64 export entry point. It accepts both
- *   `fileType` and `format` for ergonomic interop and
- *   returns a `Promise<string>` resolving to a `data:image/...;base64...`
- *   data URL.
- * - `exportImageFile(options?: ImageFileExportOptions)`
- *   resolves to a `File` whose name comes from `options.fileName` or the
- *   editor's `defaultDownloadFileName`.
- * - `downloadImage(fileName?: string)` triggers a
- *   browser download with the resolved filename. The bytes match the same
- *   pipeline used by `exportImageBase64`.
+ * - `exportImageBase64(options?: ImageExportOptions)`
+ *   is the canonical base64 export entry point. It accepts both
+ *   `fileType` and `format` for ergonomic interop and returns a
+ *   `Promise<string>` resolving to a `data:image/...;base64...` data URL.
+ * - `exportImageFile(options?: ImageExportOptions)` resolves to a `File`
+ *   whose name comes from `options.fileName` or the editor's
+ *   `defaultDownloadFileName`, with the final extension resolved from
+ *   the output format.
+ * - `downloadImage(options?: ImageExportOptions)` triggers a browser
+ *   download through a generated object URL. The bytes match the same
+ *   rendering core used by `exportImageBase64` and `exportImageFile`.
  * - When `isImageLoaded` is `false`, the three
  *   entry points exhibit the documented "no image loaded" shapes:
  *
@@ -31,7 +31,7 @@
  *   | -------------------- | ----------------------------------- |
  *   | `exportImageBase64`  | resolves to `''`                    |
  *   | `exportImageFile`    | rejects with `ExportNotReadyError`  |
- *   | `downloadImage`      | no-op (returns synchronously)       |
+ *   | `downloadImage`      | resolves without throwing           |
  *
  * Each path emits a single `console.warn` naming the missing image so
  * the consumer's logs identify which export attempt was skipped.
@@ -42,7 +42,7 @@
  *   No intermediate `<canvas>` element is created, and sub-pixel
  *   width/height values are floored to integer pixels through the
  *   {@link floorRegion} helper before Fabric receives the region.
- * - When `mergeMask` is
+ * - When `mergeMasks` is
  *   `true`, every mask's live style (`opacity`, `fill`, `stroke`,
  *   `strokeWidth`, `selectable`, `lockRotation`) is captured BEFORE the
  *   mutator forces the bake-in style (`opacity: 1, fill: '#000',
@@ -91,8 +91,9 @@
  * @module
  */
 import type * as FabricNS from 'fabric';
-import type { Base64ExportOptions, FabricModule, ImageFileExportOptions, LoadImageOptions, ResolvedOptions } from '../core/public-types.js';
-import { type HistoryManager } from '../history/history-manager.js';
+import type { FabricModule, ImageExportOptions, LoadImageOptions, AnnotationObject, MaskObject, ResolvedOptions } from '../core/public-types.js';
+import type { HistoryManager } from '../history/history-manager.js';
+import { type OverlayMergeTransactionContext } from './overlay-merge-service.js';
 /**
  * Dependency bundle passed by the `ImageEditor` facade into every export
  * entry point. The service has no class state of its own — every editor
@@ -150,60 +151,56 @@ export interface ExportServiceContext {
  * 6. **Render** through {@link withMaskExportState} so mask styles are
  *    captured, the export bake-in (`opacity: 1, fill: '#000',
  *    strokeWidth: 0, stroke: null, selectable: false`) is applied for
- *    `mergeMask === true` exports, and the live styles are
+ *    `mergeMasks === true` exports, and the live styles are
  *    restored in a `finally` block whether the render resolved or
  *    threw. The inner step is a single
  *    `canvas.toDataURL` call — no intermediate `<canvas>`.
  *
  * @param context - Export context bundle.
- * @param options - Optional {@link Base64ExportOptions}. Both `fileType`
+ * @param options - Optional {@link ImageExportOptions}. Both `fileType`
  *                 and `format` are accepted; when
  *                 both are supplied, `fileType` wins.
  * @returns        Resolves to a `data:image/...;base64...` URL on
  *                 success, or `''` when no image is loaded.
  *
  */
-export declare function exportImageBase64(context: ExportServiceContext, options?: Base64ExportOptions): Promise<string>;
+export declare function exportImageBase64(context: ExportServiceContext, options?: ImageExportOptions): Promise<string>;
 /**
  * Render the live canvas to a `File`.
  *
- * The bytes come from {@link exportImageBase64} so format/quality/
- * multiplier resolution stays consistent with the base64 path. The
- * resulting data URL is repainted through an offscreen `<canvas>` only
+ * The bytes come from the same private rendering core used by
+ * {@link exportImageBase64}. The resulting data URL is repainted
+ * through an offscreen `<canvas>` only
  * when its MIME prefix does not match the requested type — some browsers
  * silently fall back to PNG when the requested format is unsupported,
  * and the export contract requires the output MIME to match the resolved
  * `fileType`.
  *
  * @param context - Export context bundle.
- * @param options - Optional {@link ImageFileExportOptions}.
+ * @param options - Optional {@link ImageExportOptions}.
  * @returns        Resolves with the rendered `File`.
  * @throws         {@link ExportNotReadyError} when no image is loaded.
  *
  */
-export declare function exportImageFile(context: ExportServiceContext, options?: ImageFileExportOptions): Promise<File>;
+export declare function exportImageFile(context: ExportServiceContext, options?: ImageExportOptions): Promise<File>;
 /**
  * Trigger a browser download of the live canvas.
  *
- * Mirrors legacy's "anchor with `download` attribute" approach: an `<a>`
- * element is created, pointed at the data URL, appended to the document
- * so Firefox dispatches the click, clicked, and removed. The function
- * returns synchronously; the data URL is rendered
- * asynchronously and the click is deferred until that promise resolves.
+ * Mirrors legacy's "anchor with `download` attribute" approach: a `File`
+ * is rendered, an object URL is created, and an `<a>` element is appended
+ * to the document so Firefox dispatches the click.
  *
  * No-image gate emits the same `console.warn` as the
  * other entry points and returns without touching the DOM.
  *
- * Errors raised by the underlying `exportImageBase64` call are reported
- * with `console.error` rather than rethrown — `downloadImage` returns
- * `void` and there is no caller-visible promise to reject.
+ * Errors raised by the underlying export are reported with `console.error`
+ * and rethrown through the returned promise.
  *
  * @param context - Export context bundle.
- * @param fileName - Optional filename override. Defaults to
- *                  `options.defaultDownloadFileName`.
+ * @param options - Optional {@link ImageExportOptions}.
  *
  */
-export declare function downloadImage(context: ExportServiceContext, fileName?: string): void;
+export declare function downloadImage(context: ExportServiceContext, options?: ImageExportOptions): Promise<void>;
 /**
  * Dependency bundle passed by the `ImageEditor` facade into
  * {@link mergeMasks}. Extends {@link ExportServiceContext} with the
@@ -229,7 +226,7 @@ export declare function downloadImage(context: ExportServiceContext, fileName?:
  * this bundle from its own state.
  *
  */
-export interface MergeMasksContext extends ExportServiceContext {
+export interface MergeMasksContext extends ExportServiceContext, OverlayMergeTransactionContext {
     /** History manager that records the single merge command. */
     readonly historyManager: HistoryManager;
     /**
@@ -246,12 +243,6 @@ export interface MergeMasksContext extends ExportServiceContext {
      * the success path.
      */
     loadImage(imageBase64: string, options?: LoadImageOptions): Promise<void>;
-    /**
-     * Capture a snapshot suitable for {@link loadFromStateFn}. Reads the
-     * orchestrator's `lastSnapshot`-producing path so the merge stores
-     * exactly the same wire format used by `undo` / `redo`.
-     */
-    saveState(): string;
     /**
      * Restore a snapshot produced by {@link saveStateFn}. Used both as
      * the `undo` callback of the merge command and
@@ -265,6 +256,18 @@ export interface MergeMasksContext extends ExportServiceContext {
      * of its own history push.
      */
     removeAllMasksNoHistory(): void;
+    getAnnotations(): AnnotationObject[];
+    restoreAnnotations(objects: AnnotationObject[]): void | Promise<void>;
+}
+export interface MergeAnnotationsContext extends ExportServiceContext, OverlayMergeTransactionContext {
+    readonly historyManager: HistoryManager;
+    readonly containerElement: HTMLElement | null;
+    loadImage(imageBase64: string, options?: LoadImageOptions): Promise<void>;
+    captureSnapshot(): string;
+    loadFromState(snapshot: string): Promise<void>;
+    removeAllAnnotationsNoHistory(): void;
+    getMasks(): MaskObject[];
+    restoreMasks(objects: MaskObject[]): void | Promise<void>;
 }
 /**
  * Flatten every mask into the base image and reload the flattened
@@ -330,4 +333,5 @@ export interface MergeMasksContext extends ExportServiceContext {
  *
  */
 export declare function mergeMasks(context: MergeMasksContext): Promise<void>;
+export declare function mergeAnnotations(context: MergeAnnotationsContext): Promise<void>;
 //# sourceMappingURL=export-service.d.ts.map

package/dist/types/export/export-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"export-service.d.ts","sourceRoot":"","sources":["../../../src/export/export-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2FG;AAEH,OAAO,KAAK,KAAK,QAAQ,MAAM,QAAQ,CAAC;AAIxC,OAAO,KAAK,EACR,mBAAmB,EAEnB,YAAY,EACZ,sBAAsB,EACtB,gBAAgB,EAGhB,eAAe,EAClB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAW,KAAK,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAsC7E;;;;;;;;;;GAUG;AACH,MAAM,WAAW,oBAAoB;IACjC,4DAA4D;IAC5D,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,uEAAuE;IACvE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;IACjC;;iCAE6B;IAC7B,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAElC;;;;OAIG;IACH,aAAa,IAAI,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,gBAAgB,IAAI,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC;CACnD;AAsqBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAsB,iBAAiB,CACnC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,CAAC,EAAE,mBAAmB,GAC9B,OAAO,CAAC,MAAM,CAAC,CAiDjB;AAID;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,eAAe,CACjC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,CAAC,EAAE,sBAAsB,GACjC,OAAO,CAAC,IAAI,CAAC,CAsCf;AAID;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,oBAAoB,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAmCpF;AAID;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB;IAC3D,6DAA6D;IAC7D,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC;;;;;OAKG;IACH,QAAQ,CAAC,gBAAgB,EAAE,WAAW,GAAG,IAAI,CAAC;IAE9C;;;;;OAKG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1E;;;;OAIG;IACH,SAAS,IAAI,MAAM,CAAC;IAEpB;;;;OAIG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C;;;;;OAKG;IACH,uBAAuB,IAAI,IAAI,CAAC;CACnC;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAyH1E"}
+{"version":3,"file":"export-service.d.ts","sourceRoot":"","sources":["../../../src/export/export-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2FG;AAEH,OAAO,KAAK,KAAK,QAAQ,MAAM,QAAQ,CAAC;AAIxC,OAAO,KAAK,EAER,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,EAChB,UAAU,EAEV,eAAe,EAClB,MAAM,yBAAyB,CAAC;AAEjC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAYpE,OAAO,EAEH,KAAK,8BAA8B,EACtC,MAAM,4BAA4B,CAAC;AA6BpC;;;;;;;;;;GAUG;AACH,MAAM,WAAW,oBAAoB;IACjC,4DAA4D;IAC5D,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC;IAC9B,uEAAuE;IACvE,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;IACjC;;iCAE6B;IAC7B,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAElC;;;;OAIG;IACH,aAAa,IAAI,OAAO,CAAC;IAEzB;;;;;;OAMG;IACH,gBAAgB,IAAI,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC;CACnD;AAwwBD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,wBAAsB,iBAAiB,CACnC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,CAAC,EAAE,kBAAkB,GAC7B,OAAO,CAAC,MAAM,CAAC,CAQjB;AAID;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,eAAe,CACjC,OAAO,EAAE,oBAAoB,EAC7B,OAAO,CAAC,EAAE,kBAAkB,GAC7B,OAAO,CAAC,IAAI,CAAC,CA4Bf;AAID;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,aAAa,CAC/B,OAAO,EAAE,oBAAoB,EAC7B,OAAO,CAAC,EAAE,kBAAkB,GAC7B,OAAO,CAAC,IAAI,CAAC,CAoBf;AA2BD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,WAAW,iBAAkB,SAAQ,oBAAoB,EAAE,8BAA8B;IAC3F,6DAA6D;IAC7D,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC;;;;;OAKG;IACH,QAAQ,CAAC,gBAAgB,EAAE,WAAW,GAAG,IAAI,CAAC;IAE9C;;;;;OAKG;IACH,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE1E;;;;OAIG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C;;;;;OAKG;IACH,uBAAuB,IAAI,IAAI,CAAC;IAChC,cAAc,IAAI,gBAAgB,EAAE,CAAC;IACrC,kBAAkB,CAAC,OAAO,EAAE,gBAAgB,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACzE;AAED,MAAM,WAAW,uBACb,SAAQ,oBAAoB,EAAE,8BAA8B;IAC5D,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,gBAAgB,EAAE,WAAW,GAAG,IAAI,CAAC;IAC9C,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,eAAe,IAAI,MAAM,CAAC;IAC1B,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,6BAA6B,IAAI,IAAI,CAAC;IACtC,QAAQ,IAAI,UAAU,EAAE,CAAC;IACzB,YAAY,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7D;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8DG;AACH,wBAAsB,UAAU,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiB1E;AAED,wBAAsB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiBtF"}

package/dist/types/export/overlay-merge-service.d.ts

@@ -0,0 +1,38 @@
+/**
+ * Shared transaction service for baking editable overlays into the base image.
+ *
+ * Mask and annotation merges use the same snapshot, export, reload, restore,
+ * history, and rollback flow while preserving the opposite overlay group.
+ *
+ * @module
+ */
+import type * as FabricNS from 'fabric';
+import type { AnnotationObject, ImageExportOptions, LoadImageOptions, MaskObject, ResolvedOptions } from '../core/public-types.js';
+import { type HistoryManager } from '../history/history-manager.js';
+export type OverlayMergeOperation = 'mergeMasks' | 'mergeAnnotations';
+export interface OverlayMergeTransactionContext {
+    readonly canvas: FabricNS.Canvas;
+    readonly options: ResolvedOptions;
+    readonly historyManager: HistoryManager;
+    readonly containerElement: HTMLElement | null;
+    isImageLoaded(): boolean;
+    captureSnapshot(): string;
+    loadFromState(snapshot: string): Promise<void>;
+    loadImage(imageBase64: string, options?: LoadImageOptions): Promise<void>;
+    exportImageBase64(options: ImageExportOptions): Promise<string>;
+    updateUi(): void;
+    updateInputs(): void;
+}
+export interface OverlayMergeGroupOptions<TTarget extends FabricNS.FabricObject, TPreserved extends FabricNS.FabricObject> {
+    operation: OverlayMergeOperation;
+    exportOptions: ImageExportOptions & {
+        exportArea: 'image';
+        fileType: 'png';
+    };
+    getTargets(): TTarget[];
+    getPreservedObjects(): TPreserved[];
+    removeTargetsNoHistory(): void;
+    restorePreservedObjects(objects: TPreserved[]): void | Promise<void>;
+}
+export declare function flattenOverlayGroupToBaseImage<TTarget extends MaskObject | AnnotationObject, TPreserved extends MaskObject | AnnotationObject>(context: OverlayMergeTransactionContext, options: OverlayMergeGroupOptions<TTarget, TPreserved>): Promise<void>;
+//# sourceMappingURL=overlay-merge-service.d.ts.map

package/dist/types/export/overlay-merge-service.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"overlay-merge-service.d.ts","sourceRoot":"","sources":["../../../src/export/overlay-merge-service.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,KAAK,QAAQ,MAAM,QAAQ,CAAC;AAIxC,OAAO,KAAK,EACR,gBAAgB,EAChB,kBAAkB,EAClB,gBAAgB,EAChB,UAAU,EACV,eAAe,EAClB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAW,KAAK,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE7E,MAAM,MAAM,qBAAqB,GAAG,YAAY,GAAG,kBAAkB,CAAC;AAEtE,MAAM,WAAW,8BAA8B;IAC3C,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAC;IACxC,QAAQ,CAAC,gBAAgB,EAAE,WAAW,GAAG,IAAI,CAAC;IAC9C,aAAa,IAAI,OAAO,CAAC;IACzB,eAAe,IAAI,MAAM,CAAC;IAC1B,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,SAAS,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1E,iBAAiB,CAAC,OAAO,EAAE,kBAAkB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChE,QAAQ,IAAI,IAAI,CAAC;IACjB,YAAY,IAAI,IAAI,CAAC;CACxB;AAED,MAAM,WAAW,wBAAwB,CACrC,OAAO,SAAS,QAAQ,CAAC,YAAY,EACrC,UAAU,SAAS,QAAQ,CAAC,YAAY;IAExC,SAAS,EAAE,qBAAqB,CAAC;IACjC,aAAa,EAAE,kBAAkB,GAAG;QAChC,UAAU,EAAE,OAAO,CAAC;QACpB,QAAQ,EAAE,KAAK,CAAC;KACnB,CAAC;IACF,UAAU,IAAI,OAAO,EAAE,CAAC;IACxB,mBAAmB,IAAI,UAAU,EAAE,CAAC;IACpC,sBAAsB,IAAI,IAAI,CAAC;IAC/B,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AA0BD,wBAAsB,8BAA8B,CAChD,OAAO,SAAS,UAAU,GAAG,gBAAgB,EAC7C,UAAU,SAAS,UAAU,GAAG,gBAAgB,EAEhD,OAAO,EAAE,8BAA8B,EACvC,OAAO,EAAE,wBAAwB,CAAC,OAAO,EAAE,UAAU,CAAC,GACvD,OAAO,CAAC,IAAI,CAAC,CAuDf"}

package/dist/types/history/history-manager.d.ts

@@ -4,11 +4,11 @@
  *
  * Behavior contract:
  *
- *  • {@link HistoryManager.execute} and {@link HistoryManager.push} are
- *  **synchronous** for the history-push step so callers can immediately
- *  inspect {@link HistoryManager.canUndo} / {@link HistoryManager.canRedo}
- *  on the next line (e.g. `updateUi` calls that immediately follow
- *  `saveState`).
+ *  • {@link HistoryManager.push} is **synchronous** for the history-push
+ *  step so callers can immediately inspect {@link HistoryManager.canUndo} /
+ *  {@link HistoryManager.canRedo} on the next line (e.g. `updateUi` calls
+ *  that immediately follow `saveState`). {@link HistoryManager.execute}
+ *  awaits the command before pushing it.
  *
  *  • {@link HistoryManager.undo} and {@link HistoryManager.redo} are
  *  **async** and protected by an internal `isProcessing` lock. Overlapping
@@ -50,7 +50,7 @@
  *     await canvas.loadFromJSON(beforeJson);
  *   },
  * );
- * historyManager.execute(cmd);
+ * await historyManager.execute(cmd);
  * ```
  */
 export declare class Command {
@@ -76,16 +76,13 @@ export declare class HistoryManager {
      */
     constructor(maxSize?: number);
     /**
-     * Records a command on the history stack **and** fires its `execute`
-     * (fire-and-forget).
+     * Awaits a command's `execute` closure and records it on the history stack
+     * only after the closure succeeds.
      *
-     * The history push is synchronous so that {@link canUndo} /
-     * {@link canRedo} reflect the new state on the next line. In the
-     * `saveState` pattern, `command.execute` is a no-op on its first
-     * invocation (guarded by an `executedOnce` flag inside the closure), so
-     * the fire-and-forget is safe and produces no canvas side-effect.
+     * Use {@link push} when the operation has already been performed and
+     * should become undoable synchronously.
      */
-    execute(command: Command): void;
+    execute(command: Command): Promise<void>;
     /**
      * Pushes a command onto the history stack **without** calling
      * `execute`. Use this when the operation has already been performed

package/dist/types/history/history-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"history-manager.d.ts","sourceRoot":"","sources":["../../../src/history/history-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,OAAO;IAChB,4CAA4C;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,0BAA0B;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;gBAEvB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;CAItE;AAED;;;GAGG;AACH,qBAAa,cAAc;IACvB,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,YAAY,CAAM;IAC1B,OAAO,CAAC,YAAY,CAAS;IAE7B,2CAA2C;IAC3C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB;;;OAGG;gBACS,OAAO,GAAE,MAAW;IAIhC;;;;;;;;;OASG;IACH,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAQ/B;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAI5B,8DAA8D;IAC9D,OAAO,IAAI,OAAO;IAIlB,8DAA8D;IAC9D,OAAO,IAAI,OAAO;IAIlB;;;;;;;;;OASG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW;CAgBtB"}
+{"version":3,"file":"history-manager.d.ts","sourceRoot":"","sources":["../../../src/history/history-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,qBAAa,OAAO;IAChB,4CAA4C;IAC5C,QAAQ,CAAC,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,0BAA0B;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;gBAEvB,OAAO,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC;CAItE;AAED;;;GAGG;AACH,qBAAa,cAAc;IACvB,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,YAAY,CAAM;IAC1B,OAAO,CAAC,YAAY,CAAS;IAE7B,2CAA2C;IAC3C,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB;;;OAGG;gBACS,OAAO,GAAE,MAAW;IAIhC;;;;;;OAMG;IACG,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9C;;;;OAIG;IACH,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAI5B,8DAA8D;IAC9D,OAAO,IAAI,OAAO;IAIlB,8DAA8D;IAC9D,OAAO,IAAI,OAAO;IAIlB;;;;;;;;;OASG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAc3B;;;;;;;;OAQG;IACH,OAAO,CAAC,WAAW;CAgBtB"}