@embedpdf/engines 1.0.13 → 1.0.14

package/dist/{engine-B0ZTENqz.js → engine-O49988D4.js}

@@ -1,4 +1,4 @@
-import { NoopLogger, PdfTaskHelper, PdfErrorCode, Rotation, Task, PdfAnnotationSubtype, stripPdfUnwantedMarkers, PdfAnnotationBorderStyle, dateToPdfDate, PdfAnnotationColorType, PdfAnnotationLineEnding, PdfPageObjectType, pdfAlphaColorToWebAlphaColor, webAlphaColorToPdfAlphaColor, quadToRect, pdfDateToDate, flagsToNames, namesToFlags, PDF_FORM_FIELD_TYPE, AppearanceMode, toIntRect, transformRect, makeMatrix, toIntSize, transformSize, PdfActionType, PdfZoomMode, MatchFlag, rectToQuad } from "@embedpdf/models";
+import { NoopLogger, PdfTaskHelper, PdfErrorCode, Rotation, Task, PdfAnnotationSubtype, stripPdfUnwantedMarkers, PdfAnnotationBorderStyle, dateToPdfDate, PdfAnnotationColorType, PdfAnnotationLineEnding, PdfPageObjectType, pdfColorToWebColor, webColorToPdfColor, pdfAlphaToWebOpacity, webOpacityToPdfAlpha, quadToRect, pdfDateToDate, PdfStandardFont, flagsToNames, namesToFlags, PDF_FORM_FIELD_TYPE, AppearanceMode, toIntRect, transformRect, makeMatrix, toIntSize, transformSize, PdfActionType, PdfZoomMode, MatchFlag, rectToQuad } from "@embedpdf/models";
 function readString(wasmModule, readChars, parseChars, defaultLength = 100) {
   let buffer = wasmModule.wasmExports.malloc(defaultLength);
   for (let i = 0; i < defaultLength; i++) {
@@ -982,6 +982,9 @@ class PdfiumEngine {
           annotation.contents
         );
         break;
+      case PdfAnnotationSubtype.FREETEXT:
+        isSucceed = this.addFreeTextContent(page, pageCtx.pagePtr, annotationPtr, annotation);
+        break;
       case PdfAnnotationSubtype.LINE:
         isSucceed = this.addLineContent(page, pageCtx.pagePtr, annotationPtr, annotation);
         break;
@@ -1119,6 +1122,11 @@ class PdfiumEngine {
         );
         break;
       }
+      /* ── Free text ────────────────────────────────────────────────────────── */
+      case PdfAnnotationSubtype.FREETEXT: {
+        ok = this.addFreeTextContent(page, pageCtx.pagePtr, annotPtr, annotation);
+        break;
+      }
       /* ── Shape ───────────────────────────────────────────────────────────── */
       case PdfAnnotationSubtype.CIRCLE:
       case PdfAnnotationSubtype.SQUARE: {
@@ -1920,6 +1928,55 @@ class PdfiumEngine {
   free(ptr) {
     this.pdfiumModule.pdfium.wasmExports.free(ptr);
   }
+  addFreeTextContent(page, pagePtr, annotationPtr, annotation) {
+    if (!this.setBorderStyle(annotationPtr, PdfAnnotationBorderStyle.SOLID, 0)) {
+      return false;
+    }
+    if (!this.setAnnotString(annotationPtr, "Contents", annotation.contents ?? "")) {
+      return false;
+    }
+    if (!this.setPageAnnoRect(page, pagePtr, annotationPtr, annotation.rect)) {
+      return false;
+    }
+    if (!this.setAnnotString(annotationPtr, "T", annotation.author || "")) {
+      return false;
+    }
+    if (!this.setAnnotString(annotationPtr, "M", dateToPdfDate(annotation.modified))) {
+      return false;
+    }
+    if (!this.setAnnotationOpacity(annotationPtr, annotation.opacity ?? 1)) {
+      return false;
+    }
+    if (!this.setAnnotationTextAlignment(annotationPtr, annotation.textAlign)) {
+      return false;
+    }
+    if (!this.setAnnotationVerticalAlignment(annotationPtr, annotation.verticalAlign)) {
+      return false;
+    }
+    if (!this.setAnnotationDefaultAppearance(
+      annotationPtr,
+      annotation.fontFamily,
+      annotation.fontSize,
+      annotation.fontColor
+    )) {
+      return false;
+    }
+    if (annotation.intent && !this.setAnnotIntent(annotationPtr, annotation.intent)) {
+      return false;
+    }
+    if (!annotation.backgroundColor || annotation.backgroundColor === "transparent") {
+      if (!this.pdfiumModule.EPDFAnnot_ClearColor(annotationPtr, PdfAnnotationColorType.Color)) {
+        return false;
+      }
+    } else if (!this.setAnnotationColor(
+      annotationPtr,
+      annotation.backgroundColor ?? "#FFFFFF",
+      PdfAnnotationColorType.Color
+    )) {
+      return false;
+    }
+    return true;
+  }
   /**
    * Set the rect of specified annotation
    * @param page - page info that the annotation is belonged to
@@ -1946,12 +2003,12 @@ class PdfiumEngine {
     if (!this.setAnnotString(annotationPtr, "M", dateToPdfDate(annotation.modified))) {
       return false;
     }
+    if (!this.setAnnotationOpacity(annotationPtr, annotation.opacity ?? 1)) {
+      return false;
+    }
     if (!this.setAnnotationColor(
       annotationPtr,
-      {
-        color: annotation.color ?? "#FFFF00",
-        opacity: annotation.opacity ?? 1
-      },
+      annotation.color ?? "#FFFF00",
       PdfAnnotationColorType.Color
     )) {
       return false;
@@ -2012,20 +2069,17 @@ class PdfiumEngine {
       }
     } else if (!this.setAnnotationColor(
       annotationPtr,
-      {
-        color: annotation.color ?? "#FFFF00",
-        opacity: annotation.opacity ?? 1
-      },
+      annotation.color ?? "#FFFF00",
       PdfAnnotationColorType.InteriorColor
     )) {
       return false;
     }
+    if (!this.setAnnotationOpacity(annotationPtr, annotation.opacity ?? 1)) {
+      return false;
+    }
     if (!this.setAnnotationColor(
       annotationPtr,
-      {
-        color: annotation.strokeColor ?? "#FFFF00",
-        opacity: annotation.opacity ?? 1
-      },
+      annotation.strokeColor ?? "#FFFF00",
       PdfAnnotationColorType.Color
     )) {
       return false;
@@ -2081,20 +2135,17 @@ class PdfiumEngine {
       }
     } else if (!this.setAnnotationColor(
       annotationPtr,
-      {
-        color: annotation.color ?? "#FFFF00",
-        opacity: annotation.opacity ?? 1
-      },
+      annotation.color ?? "#FFFF00",
       PdfAnnotationColorType.InteriorColor
     )) {
       return false;
     }
+    if (!this.setAnnotationOpacity(annotationPtr, annotation.opacity ?? 1)) {
+      return false;
+    }
     if (!this.setAnnotationColor(
       annotationPtr,
-      {
-        color: annotation.strokeColor ?? "#FFFF00",
-        opacity: annotation.opacity ?? 1
-      },
+      annotation.strokeColor ?? "#FFFF00",
       PdfAnnotationColorType.Color
     )) {
       return false;
@@ -2139,20 +2190,17 @@ class PdfiumEngine {
       }
     } else if (!this.setAnnotationColor(
       annotationPtr,
-      {
-        color: annotation.color ?? "#FFFF00",
-        opacity: annotation.opacity ?? 1
-      },
+      annotation.color ?? "#FFFF00",
       PdfAnnotationColorType.InteriorColor
     )) {
       return false;
     }
+    if (!this.setAnnotationOpacity(annotationPtr, annotation.opacity ?? 1)) {
+      return false;
+    }
     if (!this.setAnnotationColor(
       annotationPtr,
-      {
-        color: annotation.strokeColor ?? "#FFFF00",
-        opacity: annotation.opacity ?? 1
-      },
+      annotation.strokeColor ?? "#FFFF00",
       PdfAnnotationColorType.Color
     )) {
       return false;
@@ -2184,12 +2232,12 @@ class PdfiumEngine {
     if (!this.setAnnotString(annotationPtr, "M", dateToPdfDate(annotation.modified))) {
       return false;
     }
+    if (!this.setAnnotationOpacity(annotationPtr, annotation.opacity ?? 1)) {
+      return false;
+    }
     if (!this.setAnnotationColor(
       annotationPtr,
-      {
-        color: annotation.color ?? "#FFFF00",
-        opacity: annotation.opacity ?? 1
-      },
+      annotation.color ?? "#FFFF00",
       PdfAnnotationColorType.Color
     )) {
       return false;
@@ -2953,41 +3001,32 @@ class PdfiumEngine {
     const rPtr = this.malloc(4);
     const gPtr = this.malloc(4);
     const bPtr = this.malloc(4);
-    const aPtr = this.malloc(4);
-    const ok = this.pdfiumModule.EPDFAnnot_GetColor(
-      annotationPtr,
-      colorType,
-      rPtr,
-      gPtr,
-      bPtr,
-      aPtr
-    );
+    const ok = this.pdfiumModule.EPDFAnnot_GetColor(annotationPtr, colorType, rPtr, gPtr, bPtr);
     let colour;
     if (ok) {
       colour = {
         red: this.pdfiumModule.pdfium.getValue(rPtr, "i32") & 255,
         green: this.pdfiumModule.pdfium.getValue(gPtr, "i32") & 255,
-        blue: this.pdfiumModule.pdfium.getValue(bPtr, "i32") & 255,
-        alpha: this.pdfiumModule.pdfium.getValue(aPtr, "i32") & 255
-        // 0 = transparent, 255 = opaque
+        blue: this.pdfiumModule.pdfium.getValue(bPtr, "i32") & 255
       };
     }
     this.free(rPtr);
     this.free(gPtr);
     this.free(bPtr);
-    this.free(aPtr);
     return colour;
   }
-  // 2) Implementation
-  resolveAnnotationColor(annotationPtr, colorType = PdfAnnotationColorType.Color, fallback) {
+  /**
+   * Get the fill/stroke colour annotation.
+   *
+   * @param annotationPtr - pointer to the annotation whose colour is being set
+   * @param colorType - which colour to get (0 = fill, 1 = stroke)
+   * @returns WebColor with hex color
+   *
+   * @private
+   */
+  getAnnotationColor(annotationPtr, colorType = PdfAnnotationColorType.Color) {
     const annotationColor = this.readAnnotationColor(annotationPtr, colorType);
-    if (annotationColor) {
-      return pdfAlphaColorToWebAlphaColor(annotationColor);
-    }
-    if (fallback !== void 0) {
-      return pdfAlphaColorToWebAlphaColor(fallback);
-    }
-    return void 0;
+    return annotationColor ? pdfColorToWebColor(annotationColor) : void 0;
   }
   /**
    * Set the fill/stroke colour for a **Highlight / Underline / StrikeOut / Squiggly** markup annotation.
@@ -3000,15 +3039,143 @@ class PdfiumEngine {
    *
    * @private
    */
-  setAnnotationColor(annotationPtr, webAlphaColor, colorType = PdfAnnotationColorType.Color) {
-    const pdfAlphaColor = webAlphaColorToPdfAlphaColor(webAlphaColor);
+  setAnnotationColor(annotationPtr, webColor, colorType = PdfAnnotationColorType.Color) {
+    const pdfColor = webColorToPdfColor(webColor);
     return this.pdfiumModule.EPDFAnnot_SetColor(
       annotationPtr,
       colorType,
-      pdfAlphaColor.red & 255,
-      pdfAlphaColor.green & 255,
-      pdfAlphaColor.blue & 255,
-      (pdfAlphaColor.alpha ?? 255) & 255
+      pdfColor.red & 255,
+      pdfColor.green & 255,
+      pdfColor.blue & 255
+    );
+  }
+  /**
+   * Get the opacity of the annotation.
+   *
+   * @param annotationPtr - pointer to the annotation whose opacity is being set
+   * @returns opacity (0-1)
+   *
+   * @private
+   */
+  getAnnotationOpacity(annotationPtr) {
+    const opacityPtr = this.malloc(4);
+    const ok = this.pdfiumModule.EPDFAnnot_GetOpacity(annotationPtr, opacityPtr);
+    const opacity = ok ? this.pdfiumModule.pdfium.getValue(opacityPtr, "i32") : 255;
+    this.free(opacityPtr);
+    return pdfAlphaToWebOpacity(opacity);
+  }
+  /**
+   * Set the opacity of the annotation.
+   *
+   * @param annotationPtr - pointer to the annotation whose opacity is being set
+   * @param opacity - opacity (0-1)
+   * @returns true on success
+   *
+   * @private
+   */
+  setAnnotationOpacity(annotationPtr, opacity) {
+    const pdfOpacity = webOpacityToPdfAlpha(opacity);
+    return this.pdfiumModule.EPDFAnnot_SetOpacity(annotationPtr, pdfOpacity & 255);
+  }
+  /**
+   * Fetch the `/Q` text-alignment value from a **FreeText** annotation.
+   *
+   * @param annotationPtr pointer returned by `FPDFPage_GetAnnot`
+   * @returns `PdfTextAlignment`
+   */
+  getAnnotationTextAlignment(annotationPtr) {
+    return this.pdfiumModule.EPDFAnnot_GetTextAlignment(annotationPtr);
+  }
+  /**
+   * Write the `/Q` text-alignment value into a **FreeText** annotation
+   * and clear the existing appearance stream so it can be regenerated.
+   *
+   * @param annotationPtr pointer returned by `FPDFPage_GetAnnot`
+   * @param alignment     `PdfTextAlignment`
+   * @returns `true` on success
+   */
+  setAnnotationTextAlignment(annotationPtr, alignment) {
+    return !!this.pdfiumModule.EPDFAnnot_SetTextAlignment(annotationPtr, alignment);
+  }
+  /**
+   * Fetch the `/EPDF:VerticalAlignment` vertical-alignment value from a **FreeText** annotation.
+   *
+   * @param annotationPtr pointer returned by `FPDFPage_GetAnnot`
+   * @returns `PdfVerticalAlignment`
+   */
+  getAnnotationVerticalAlignment(annotationPtr) {
+    return this.pdfiumModule.EPDFAnnot_GetVerticalAlignment(annotationPtr);
+  }
+  /**
+   * Write the `/EPDF:VerticalAlignment` vertical-alignment value into a **FreeText** annotation
+   * and clear the existing appearance stream so it can be regenerated.
+   *
+   * @param annotationPtr pointer returned by `FPDFPage_GetAnnot`
+   * @param alignment     `PdfVerticalAlignment`
+   * @returns `true` on success
+   */
+  setAnnotationVerticalAlignment(annotationPtr, alignment) {
+    return !!this.pdfiumModule.EPDFAnnot_SetVerticalAlignment(annotationPtr, alignment);
+  }
+  /**
+   * Return the **default appearance** (font, size, colour) declared in the
+   * `/DA` string of a **FreeText** annotation.
+   *
+   * @param annotationPtr  pointer to `FPDF_ANNOTATION`
+   * @returns `{ font, fontSize, color }` or `undefined` when PDFium returns false
+   *
+   * NOTE – `font` is the raw `FPDF_STANDARD_FONT` enum value that PDFium uses
+   *        (same range as the C API: 0 = Courier, 12 = ZapfDingbats, …).
+   */
+  getAnnotationDefaultAppearance(annotationPtr) {
+    const fontPtr = this.malloc(4);
+    const sizePtr = this.malloc(4);
+    const rPtr = this.malloc(4);
+    const gPtr = this.malloc(4);
+    const bPtr = this.malloc(4);
+    const ok = !!this.pdfiumModule.EPDFAnnot_GetDefaultAppearance(
+      annotationPtr,
+      fontPtr,
+      sizePtr,
+      rPtr,
+      gPtr,
+      bPtr
+    );
+    if (!ok) {
+      [fontPtr, sizePtr, rPtr, gPtr, bPtr].forEach((p) => this.free(p));
+      return;
+    }
+    const pdf = this.pdfiumModule.pdfium;
+    const font = pdf.getValue(fontPtr, "i32");
+    const fontSize = pdf.getValue(sizePtr, "float");
+    const red = pdf.getValue(rPtr, "i32") & 255;
+    const green = pdf.getValue(gPtr, "i32") & 255;
+    const blue = pdf.getValue(bPtr, "i32") & 255;
+    [fontPtr, sizePtr, rPtr, gPtr, bPtr].forEach((p) => this.free(p));
+    return {
+      fontFamily: font,
+      fontSize,
+      fontColor: pdfColorToWebColor({ red, green, blue })
+    };
+  }
+  /**
+   * Write a **default appearance** (`/DA`) into a FreeText annotation.
+   *
+   * @param annotationPtr pointer to `FPDF_ANNOTATION`
+   * @param font          `FPDF_STANDARD_FONT` enum value
+   * @param fontSize      size in points (≥ 0)
+   * @param color         CSS-style `#rrggbb` string (alpha ignored)
+   * @returns `true` on success
+   */
+  setAnnotationDefaultAppearance(annotationPtr, font, fontSize, color) {
+    const { red, green, blue } = webColorToPdfColor(color);
+    return !!this.pdfiumModule.EPDFAnnot_SetDefaultAppearance(
+      annotationPtr,
+      font,
+      fontSize,
+      red & 255,
+      green & 255,
+      blue & 255
     );
   }
   /**
@@ -3397,14 +3564,16 @@ class PdfiumEngine {
     const contents = this.getAnnotString(annotationPtr, "Contents") || "";
     const state = this.getAnnotString(annotationPtr, "State");
     const stateModel = this.getAnnotString(annotationPtr, "StateModel");
-    const webAlphaColor = this.resolveAnnotationColor(annotationPtr);
+    const color = this.getAnnotationColor(annotationPtr);
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     const inReplyToId = this.getInReplyToId(pagePtr, annotationPtr);
     return {
       pageIndex: page.index,
       id: index,
       type: PdfAnnotationSubtype.TEXT,
       contents,
-      ...webAlphaColor,
+      color: color ?? "#FFFF00",
+      opacity,
       rect,
       inReplyToId,
       author,
@@ -3429,12 +3598,26 @@ class PdfiumEngine {
     const contents = this.getAnnotString(annotationPtr, "Contents") || "";
     const author = this.getAnnotString(annotationPtr, "T");
     const modifiedRaw = this.getAnnotString(annotationPtr, "M");
+    const defaultStyle = this.getAnnotString(annotationPtr, "DS");
+    const da = this.getAnnotationDefaultAppearance(annotationPtr);
+    const backgroundColor = this.getAnnotationColor(annotationPtr);
+    const textAlign = this.getAnnotationTextAlignment(annotationPtr);
+    const verticalAlign = this.getAnnotationVerticalAlignment(annotationPtr);
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     const modified = pdfDateToDate(modifiedRaw);
     const richContent = this.getAnnotRichContent(annotationPtr);
     return {
       pageIndex: page.index,
       id: index,
       type: PdfAnnotationSubtype.FREETEXT,
+      fontFamily: (da == null ? void 0 : da.fontFamily) ?? PdfStandardFont.Unknown,
+      fontSize: (da == null ? void 0 : da.fontSize) ?? 12,
+      fontColor: (da == null ? void 0 : da.fontColor) ?? "#000000",
+      verticalAlign,
+      backgroundColor,
+      opacity,
+      textAlign,
+      defaultStyle,
       richContent,
       contents,
       author,
@@ -3576,7 +3759,8 @@ class PdfiumEngine {
     const author = this.getAnnotString(annotationPtr, "T");
     const modifiedRaw = this.getAnnotString(annotationPtr, "M");
     const modified = pdfDateToDate(modifiedRaw);
-    const webAlphaColor = this.resolveAnnotationColor(annotationPtr);
+    const color = this.getAnnotationColor(annotationPtr);
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     const { width: strokeWidth } = this.getBorderStyle(annotationPtr);
     const inkList = this.getInkList(page, annotationPtr);
     const blendMode = this.pdfiumModule.EPDFAnnot_GetBlendMode(annotationPtr);
@@ -3587,8 +3771,9 @@ class PdfiumEngine {
       type: PdfAnnotationSubtype.INK,
       ...intent && { intent },
       blendMode,
-      ...webAlphaColor,
-      strokeWidth,
+      color: color ?? "#FF0000",
+      opacity,
+      strokeWidth: strokeWidth === 0 ? 1 : strokeWidth,
       rect,
       inkList,
       author,
@@ -3613,12 +3798,12 @@ class PdfiumEngine {
     const modified = pdfDateToDate(modifiedRaw);
     const vertices = this.readPdfAnnoVertices(page, pagePtr, annotationPtr);
     const contents = this.getAnnotString(annotationPtr, "Contents") || "";
-    const strokeColor = this.resolveAnnotationColor(annotationPtr);
-    const interiorColor = this.resolveAnnotationColor(
+    const strokeColor = this.getAnnotationColor(annotationPtr);
+    const interiorColor = this.getAnnotationColor(
       annotationPtr,
-      PdfAnnotationColorType.InteriorColor,
-      void 0
+      PdfAnnotationColorType.InteriorColor
     );
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     let { style: strokeStyle, width: strokeWidth } = this.getBorderStyle(annotationPtr);
     let strokeDashArray;
     if (strokeStyle === PdfAnnotationBorderStyle.DASHED) {
@@ -3639,9 +3824,9 @@ class PdfiumEngine {
       id: index,
       type: PdfAnnotationSubtype.POLYGON,
       contents,
-      strokeColor: strokeColor.color,
-      color: (interiorColor == null ? void 0 : interiorColor.color) ?? "transparent",
-      opacity: (interiorColor == null ? void 0 : interiorColor.opacity) ?? strokeColor.opacity,
+      strokeColor: strokeColor ?? "#FF0000",
+      color: interiorColor ?? "transparent",
+      opacity,
       strokeWidth: strokeWidth === 0 ? 1 : strokeWidth,
       strokeStyle,
       strokeDashArray,
@@ -3669,12 +3854,12 @@ class PdfiumEngine {
     const modified = pdfDateToDate(modifiedRaw);
     const vertices = this.readPdfAnnoVertices(page, pagePtr, annotationPtr);
     const contents = this.getAnnotString(annotationPtr, "Contents") || "";
-    const strokeColor = this.resolveAnnotationColor(annotationPtr);
-    const interiorColor = this.resolveAnnotationColor(
+    const strokeColor = this.getAnnotationColor(annotationPtr);
+    const interiorColor = this.getAnnotationColor(
       annotationPtr,
-      PdfAnnotationColorType.InteriorColor,
-      void 0
+      PdfAnnotationColorType.InteriorColor
     );
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     let { style: strokeStyle, width: strokeWidth } = this.getBorderStyle(annotationPtr);
     let strokeDashArray;
     if (strokeStyle === PdfAnnotationBorderStyle.DASHED) {
@@ -3689,9 +3874,9 @@ class PdfiumEngine {
       id: index,
       type: PdfAnnotationSubtype.POLYLINE,
       contents,
-      strokeColor: strokeColor.color,
-      color: (interiorColor == null ? void 0 : interiorColor.color) ?? "transparent",
-      opacity: (interiorColor == null ? void 0 : interiorColor.opacity) ?? strokeColor.opacity,
+      strokeColor: strokeColor ?? "#FF0000",
+      color: interiorColor ?? "transparent",
+      opacity,
       strokeWidth: strokeWidth === 0 ? 1 : strokeWidth,
       strokeStyle,
       strokeDashArray,
@@ -3721,12 +3906,12 @@ class PdfiumEngine {
     const linePoints = this.getLinePoints(annotationPtr, page);
     const lineEndings = this.getLineEndings(annotationPtr);
     const contents = this.getAnnotString(annotationPtr, "Contents") || "";
-    const strokeColor = this.resolveAnnotationColor(annotationPtr);
-    const interiorColor = this.resolveAnnotationColor(
+    const strokeColor = this.getAnnotationColor(annotationPtr);
+    const interiorColor = this.getAnnotationColor(
       annotationPtr,
-      PdfAnnotationColorType.InteriorColor,
-      void 0
+      PdfAnnotationColorType.InteriorColor
     );
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     let { style: strokeStyle, width: strokeWidth } = this.getBorderStyle(annotationPtr);
     let strokeDashArray;
     if (strokeStyle === PdfAnnotationBorderStyle.DASHED) {
@@ -3744,9 +3929,9 @@ class PdfiumEngine {
       strokeWidth: strokeWidth === 0 ? 1 : strokeWidth,
       strokeStyle,
       strokeDashArray,
-      strokeColor: strokeColor.color,
-      color: (interiorColor == null ? void 0 : interiorColor.color) ?? "transparent",
-      opacity: (interiorColor == null ? void 0 : interiorColor.opacity) ?? strokeColor.opacity,
+      strokeColor: strokeColor ?? "#FF0000",
+      color: interiorColor ?? "transparent",
+      opacity,
       linePoints: linePoints || { start: { x: 0, y: 0 }, end: { x: 0, y: 0 } },
       lineEndings: lineEndings || {
         start: PdfAnnotationLineEnding.None,
@@ -3770,7 +3955,8 @@ class PdfiumEngine {
     const pageRect = this.readPageAnnoRect(annotationPtr);
     const rect = this.convertPageRectToDeviceRect(page, pagePtr, pageRect);
     const segmentRects = this.getQuadPointsAnno(page, annotationPtr);
-    const webAlphaColor = this.resolveAnnotationColor(annotationPtr);
+    const color = this.getAnnotationColor(annotationPtr);
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     const blendMode = this.pdfiumModule.EPDFAnnot_GetBlendMode(annotationPtr);
     const author = this.getAnnotString(annotationPtr, "T");
     const modifiedRaw = this.getAnnotString(annotationPtr, "M");
@@ -3784,7 +3970,8 @@ class PdfiumEngine {
       rect,
       contents,
       segmentRects,
-      ...webAlphaColor,
+      color: color ?? "#FFFF00",
+      opacity,
       author,
       modified
     };
@@ -3807,7 +3994,8 @@ class PdfiumEngine {
     const modified = pdfDateToDate(modifiedRaw);
     const segmentRects = this.getQuadPointsAnno(page, annotationPtr);
     const contents = this.getAnnotString(annotationPtr, "Contents") || "";
-    const webAlphaColor = this.resolveAnnotationColor(annotationPtr);
+    const color = this.getAnnotationColor(annotationPtr);
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     const blendMode = this.pdfiumModule.EPDFAnnot_GetBlendMode(annotationPtr);
     return {
       pageIndex: page.index,
@@ -3817,7 +4005,8 @@ class PdfiumEngine {
       rect,
       contents,
       segmentRects,
-      ...webAlphaColor,
+      color: color ?? "#FF0000",
+      opacity,
       author,
       modified
     };
@@ -3840,7 +4029,8 @@ class PdfiumEngine {
     const modified = pdfDateToDate(modifiedRaw);
     const segmentRects = this.getQuadPointsAnno(page, annotationPtr);
     const contents = this.getAnnotString(annotationPtr, "Contents") || "";
-    const webAlphaColor = this.resolveAnnotationColor(annotationPtr);
+    const color = this.getAnnotationColor(annotationPtr);
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     const blendMode = this.pdfiumModule.EPDFAnnot_GetBlendMode(annotationPtr);
     return {
       pageIndex: page.index,
@@ -3850,7 +4040,8 @@ class PdfiumEngine {
       rect,
       contents,
       segmentRects,
-      ...webAlphaColor,
+      color: color ?? "#FF0000",
+      opacity,
       author,
       modified
     };
@@ -3873,7 +4064,8 @@ class PdfiumEngine {
     const modified = pdfDateToDate(modifiedRaw);
     const segmentRects = this.getQuadPointsAnno(page, annotationPtr);
     const contents = this.getAnnotString(annotationPtr, "Contents") || "";
-    const webAlphaColor = this.resolveAnnotationColor(annotationPtr);
+    const color = this.getAnnotationColor(annotationPtr);
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     const blendMode = this.pdfiumModule.EPDFAnnot_GetBlendMode(annotationPtr);
     return {
       pageIndex: page.index,
@@ -3883,7 +4075,8 @@ class PdfiumEngine {
       rect,
       contents,
       segmentRects,
-      ...webAlphaColor,
+      color: color ?? "#FF0000",
+      opacity,
       author,
       modified
     };
@@ -4166,12 +4359,12 @@ class PdfiumEngine {
     const author = this.getAnnotString(annotationPtr, "T");
     const modifiedRaw = this.getAnnotString(annotationPtr, "M");
     const modified = pdfDateToDate(modifiedRaw);
-    const interiorColor = this.resolveAnnotationColor(
+    const interiorColor = this.getAnnotationColor(
       annotationPtr,
-      PdfAnnotationColorType.InteriorColor,
-      void 0
+      PdfAnnotationColorType.InteriorColor
     );
-    const { color: strokeColor, opacity: strokeOpacity } = this.resolveAnnotationColor(annotationPtr);
+    const strokeColor = this.getAnnotationColor(annotationPtr);
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     let { style: strokeStyle, width: strokeWidth } = this.getBorderStyle(annotationPtr);
     let strokeDashArray;
     if (strokeStyle === PdfAnnotationBorderStyle.DASHED) {
@@ -4185,10 +4378,10 @@ class PdfiumEngine {
       id: index,
       type: PdfAnnotationSubtype.CIRCLE,
       flags,
-      color: (interiorColor == null ? void 0 : interiorColor.color) ?? "transparent",
-      opacity: (interiorColor == null ? void 0 : interiorColor.opacity) ?? strokeOpacity,
+      color: interiorColor ?? "transparent",
+      opacity,
       strokeWidth,
-      strokeColor,
+      strokeColor: strokeColor ?? "#FF0000",
       strokeStyle,
       rect,
       author,
@@ -4213,12 +4406,12 @@ class PdfiumEngine {
     const author = this.getAnnotString(annotationPtr, "T");
     const modifiedRaw = this.getAnnotString(annotationPtr, "M");
     const modified = pdfDateToDate(modifiedRaw);
-    const interiorColor = this.resolveAnnotationColor(
+    const interiorColor = this.getAnnotationColor(
       annotationPtr,
-      PdfAnnotationColorType.InteriorColor,
-      void 0
+      PdfAnnotationColorType.InteriorColor
     );
-    const { color: strokeColor, opacity: strokeOpacity } = this.resolveAnnotationColor(annotationPtr);
+    const strokeColor = this.getAnnotationColor(annotationPtr);
+    const opacity = this.getAnnotationOpacity(annotationPtr);
     let { style: strokeStyle, width: strokeWidth } = this.getBorderStyle(annotationPtr);
     let strokeDashArray;
     if (strokeStyle === PdfAnnotationBorderStyle.DASHED) {
@@ -4232,9 +4425,9 @@ class PdfiumEngine {
       id: index,
       type: PdfAnnotationSubtype.SQUARE,
       flags,
-      color: (interiorColor == null ? void 0 : interiorColor.color) ?? "transparent",
-      opacity: (interiorColor == null ? void 0 : interiorColor.opacity) ?? strokeOpacity,
-      strokeColor,
+      color: interiorColor ?? "transparent",
+      opacity,
+      strokeColor: strokeColor ?? "#FF0000",
       strokeWidth,
       strokeStyle,
       rect,
@@ -5069,70 +5262,6 @@ class PdfiumEngine {
     this.free(bufferPtr);
     return ap;
   }
-  /**
-   * Change the visible colour (and opacity) of an existing annotation.
-   *
-   * For markup annotations (highlight / underline / strikeout / squiggly) we
-   * first clear the AP dictionary entry, otherwise the stored appearance stream
-   * will override the new tint.  For all other sub-types we keep the existing
-   * AP so custom artwork isn't lost.
-   *
-   * @param doc         logical document object
-   * @param page        logical page object
-   * @param annotation  the annotation we want to recolour
-   * @param colour      RGBA tuple (0-255 per channel)
-   * @param which       0 = stroke/fill colour  (PDFium's "colourType" param)
-   *
-   * @returns `true` when the operation succeeded
-   */
-  updateAnnotationColor(doc, page, annotation, color, which = 0) {
-    this.logger.debug(
-      LOG_SOURCE,
-      LOG_CATEGORY,
-      "setAnnotationColor",
-      doc,
-      page,
-      annotation,
-      color,
-      which
-    );
-    this.logger.perf(LOG_SOURCE, LOG_CATEGORY, "setAnnotationColor", "Begin", doc.id);
-    const task = PdfTaskHelper.create();
-    try {
-      const ctx = this.cache.getContext(doc.id);
-      if (!ctx) {
-        this.logger.perf(LOG_SOURCE, LOG_CATEGORY, "setAnnotationColor", "End", doc.id);
-        this.logger.warn(LOG_SOURCE, LOG_CATEGORY, "setAnnotationColor: doc closed");
-        task.resolve(false);
-        return task;
-      }
-      const pageCtx = ctx.acquirePage(page.index);
-      const annotPtr = this.pdfiumModule.FPDFPage_GetAnnot(pageCtx.pagePtr, annotation.id);
-      if (!annotPtr) {
-        this.logger.perf(LOG_SOURCE, LOG_CATEGORY, "setAnnotationColor", "End", doc.id);
-        this.logger.warn(LOG_SOURCE, LOG_CATEGORY, "setAnnotationColor: annot not found");
-        pageCtx.release();
-        task.resolve(false);
-        return task;
-      }
-      const ok = this.setAnnotationColor(annotPtr, color, which);
-      if (ok) {
-        this.pdfiumModule.FPDFPage_GenerateContent(pageCtx.pagePtr);
-      }
-      this.pdfiumModule.FPDFPage_CloseAnnot(annotPtr);
-      pageCtx.release();
-      this.logger.perf(LOG_SOURCE, LOG_CATEGORY, "setAnnotationColor", "End", doc.id);
-      task.resolve(!!ok);
-    } catch (error) {
-      this.logger.perf(LOG_SOURCE, LOG_CATEGORY, "setAnnotationColor", "End", doc.id);
-      this.logger.error(LOG_SOURCE, LOG_CATEGORY, "setAnnotationColor: error", error);
-      task.reject({
-        code: PdfErrorCode.Unknown,
-        message: `Failed to set annotation color: ${error instanceof Error ? error.message : String(error)}`
-      });
-    }
-    return task;
-  }
   /**
    * Set the rect of specified annotation
    * @param page - page info that the annotation is belonged to
@@ -5438,4 +5567,4 @@ export {
   readArrayBuffer as c,
   readString as r
 };
-//# sourceMappingURL=engine-B0ZTENqz.js.map
+//# sourceMappingURL=engine-O49988D4.js.map