@signiphi/page-assembly 0.2.0-beta.13 → 0.2.0-beta.15

package/dist/index.d.mts

@@ -309,24 +309,93 @@ interface ExtractedField {
     signer?: string;
 }
 /**
- * SigniphiMetadata structure stored in PDF Info dictionary
+ * One field's metadata entry, as stored in the block.
+ */
+interface SigniphiFieldMetadata {
+    fieldId?: string;
+    label?: string;
+    signer?: string;
+    placeholder?: string;
+    required?: boolean;
+    options?: string[];
+    acknowledgements?: Array<{
+        id: string;
+        title: string;
+        description: string;
+    }>;
+    /**
+     * TEXT_LABEL only: this entry's text is already in the page stream, so the
+     * sign-time pass must not redraw it. See `mergeSourceMetadata`, which sets it
+     * when a source that had baked its labels is merged with one that deferred.
+     */
+    textLabelBaked?: boolean;
+    /**
+     * CHECKBOX only: this field's caption is already in the page stream, written
+     * by document-prepare's bake. Declared so the merge carries it through — it
+     * is what pdf-signer's `checkboxLabelSource` actually decides on, the
+     * document-level `checkboxLabelsBaked` below being only the bake's mode.
+     * Nothing here sets or reads it.
+     */
+    checkboxCaptionBaked?: boolean;
+    /**
+     * Persisted geometry, written by `document-prepare` for RADIO and TEXT_LABEL
+     * fields only. Declared here for ONE reason: its `page` is the SOURCE
+     * document's page number, and the merge has to rewrite it to the combined
+     * one. Nothing in page-assembly reads x/y/width/height.
+     */
+    position?: SigniphiFieldPosition;
+    /** Radio-only, per-option. Re-paged alongside {@link SigniphiFieldMetadata.position}. */
+    radioPositions?: SigniphiFieldPosition[];
+    /** Radio-only bound list (options ↔ circle positions); its pages are re-paged too. */
+    radioOptions?: Array<{
+        label: string;
+        exportValue: string;
+        position: SigniphiFieldPosition;
+    }>;
+}
+/**
+ * A persisted field rect, as `document-prepare` writes it. `page` is 1-indexed
+ * and scoped to the document it was written in — which is exactly why the merge
+ * cannot carry it across unchanged.
+ */
+interface SigniphiFieldPosition {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    page: number;
+}
+/**
+ * SigniphiMetadata structure stored in PDF Info dictionary.
+ *
+ * Exported because `getSigniphiMetadata` / `setSigniphiMetadata` are public
+ * (`utils/index.ts`) and a caller cannot name their argument otherwise — which
+ * is what pushed the call sites here into `as never` casts that would have
+ * silenced any future shape mismatch.
  */
 interface SigniphiMetadata {
     version: string;
-    fields: Record<string, {
-        fieldId?: string;
-        label?: string;
-        signer?: string;
-        placeholder?: string;
-        required?: boolean;
-        options?: string[];
-        acknowledgements?: Array<{
-            id: string;
-            title: string;
-            description: string;
-        }>;
-    }>;
+    fields: Record<string, SigniphiFieldMetadata>;
     fieldIdIndex?: Record<string, string>;
+    /**
+     * Document-level: radio group and option text is already drawn into the page
+     * stream, so the sign-time pass must not redraw it. Absent on legacy PDFs,
+     * which pdf-signer reads as "draw".
+     */
+    radioLabelsBaked?: boolean;
+    /**
+     * Document-level: `false` means TEXT_LABEL text was deliberately NOT baked
+     * (multi-signer), so the sign-time pass redraws it per signer. Absent/`true`
+     * means it is already in the page stream.
+     */
+    textLabelsBaked?: boolean;
+    /**
+     * Document-level: `false` means CHECKBOX captions were deliberately NOT baked
+     * beside their boxes (multi-signer), so the sign-time pass draws them per
+     * signer. `true` means they are already in the page stream. Absent means the
+     * source predates baked captions, which pdf-signer also reads as "draw".
+     */
+    checkboxLabelsBaked?: boolean;
 }
 /**
  * Extract SigniphiMetadata from a PDF document

package/dist/index.d.ts

@@ -309,24 +309,93 @@ interface ExtractedField {
     signer?: string;
 }
 /**
- * SigniphiMetadata structure stored in PDF Info dictionary
+ * One field's metadata entry, as stored in the block.
+ */
+interface SigniphiFieldMetadata {
+    fieldId?: string;
+    label?: string;
+    signer?: string;
+    placeholder?: string;
+    required?: boolean;
+    options?: string[];
+    acknowledgements?: Array<{
+        id: string;
+        title: string;
+        description: string;
+    }>;
+    /**
+     * TEXT_LABEL only: this entry's text is already in the page stream, so the
+     * sign-time pass must not redraw it. See `mergeSourceMetadata`, which sets it
+     * when a source that had baked its labels is merged with one that deferred.
+     */
+    textLabelBaked?: boolean;
+    /**
+     * CHECKBOX only: this field's caption is already in the page stream, written
+     * by document-prepare's bake. Declared so the merge carries it through — it
+     * is what pdf-signer's `checkboxLabelSource` actually decides on, the
+     * document-level `checkboxLabelsBaked` below being only the bake's mode.
+     * Nothing here sets or reads it.
+     */
+    checkboxCaptionBaked?: boolean;
+    /**
+     * Persisted geometry, written by `document-prepare` for RADIO and TEXT_LABEL
+     * fields only. Declared here for ONE reason: its `page` is the SOURCE
+     * document's page number, and the merge has to rewrite it to the combined
+     * one. Nothing in page-assembly reads x/y/width/height.
+     */
+    position?: SigniphiFieldPosition;
+    /** Radio-only, per-option. Re-paged alongside {@link SigniphiFieldMetadata.position}. */
+    radioPositions?: SigniphiFieldPosition[];
+    /** Radio-only bound list (options ↔ circle positions); its pages are re-paged too. */
+    radioOptions?: Array<{
+        label: string;
+        exportValue: string;
+        position: SigniphiFieldPosition;
+    }>;
+}
+/**
+ * A persisted field rect, as `document-prepare` writes it. `page` is 1-indexed
+ * and scoped to the document it was written in — which is exactly why the merge
+ * cannot carry it across unchanged.
+ */
+interface SigniphiFieldPosition {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+    page: number;
+}
+/**
+ * SigniphiMetadata structure stored in PDF Info dictionary.
+ *
+ * Exported because `getSigniphiMetadata` / `setSigniphiMetadata` are public
+ * (`utils/index.ts`) and a caller cannot name their argument otherwise — which
+ * is what pushed the call sites here into `as never` casts that would have
+ * silenced any future shape mismatch.
  */
 interface SigniphiMetadata {
     version: string;
-    fields: Record<string, {
-        fieldId?: string;
-        label?: string;
-        signer?: string;
-        placeholder?: string;
-        required?: boolean;
-        options?: string[];
-        acknowledgements?: Array<{
-            id: string;
-            title: string;
-            description: string;
-        }>;
-    }>;
+    fields: Record<string, SigniphiFieldMetadata>;
     fieldIdIndex?: Record<string, string>;
+    /**
+     * Document-level: radio group and option text is already drawn into the page
+     * stream, so the sign-time pass must not redraw it. Absent on legacy PDFs,
+     * which pdf-signer reads as "draw".
+     */
+    radioLabelsBaked?: boolean;
+    /**
+     * Document-level: `false` means TEXT_LABEL text was deliberately NOT baked
+     * (multi-signer), so the sign-time pass redraws it per signer. Absent/`true`
+     * means it is already in the page stream.
+     */
+    textLabelsBaked?: boolean;
+    /**
+     * Document-level: `false` means CHECKBOX captions were deliberately NOT baked
+     * beside their boxes (multi-signer), so the sign-time pass draws them per
+     * signer. `true` means they are already in the page stream. Absent means the
+     * source predates baked captions, which pdf-signer also reads as "draw".
+     */
+    checkboxLabelsBaked?: boolean;
 }
 /**
  * Extract SigniphiMetadata from a PDF document

package/dist/index.js

@@ -1399,6 +1399,55 @@ function downloadPdf(pdfBytes, filename) {
   a.click();
   URL.revokeObjectURL(url);
 }
+function toCombinedPage(entry, page) {
+  if (!entry.position && !entry.radioPositions && !entry.radioOptions) return entry;
+  const carried = { ...entry };
+  if (entry.position) carried.position = { ...entry.position, page };
+  if (entry.radioPositions) carried.radioPositions = entry.radioPositions.map((p) => ({ ...p, page }));
+  if (entry.radioOptions) {
+    carried.radioOptions = entry.radioOptions.map((o) => ({ ...o, position: { ...o.position, page } }));
+  }
+  return carried;
+}
+function mergeSourceMetadata(sources) {
+  const merged = { version: "1.0", fields: {}, fieldIdIndex: {} };
+  let radioLabelsBaked;
+  let textLabelsBaked;
+  let checkboxLabelsBaked;
+  for (const source of sources) {
+    const meta = source.metadata;
+    if (!meta || source.fields.length === 0) continue;
+    if (meta.radioLabelsBaked === false) radioLabelsBaked = false;
+    else if (meta.radioLabelsBaked === true && radioLabelsBaked === void 0) radioLabelsBaked = true;
+    if (meta.textLabelsBaked === false) textLabelsBaked = false;
+    else if (meta.textLabelsBaked === true && textLabelsBaked === void 0) textLabelsBaked = true;
+    if (meta.checkboxLabelsBaked === false) checkboxLabelsBaked = false;
+    else if (meta.checkboxLabelsBaked === true && checkboxLabelsBaked === void 0) checkboxLabelsBaked = true;
+  }
+  for (const source of sources) {
+    const meta = source.metadata;
+    if (!meta) continue;
+    const sourceTextLabelsBaked = meta.textLabelsBaked !== false;
+    for (const { name, page } of source.fields) {
+      const key = `${name}_p${page}`;
+      const entry = meta.fields?.[name];
+      if (entry) {
+        const carried = toCombinedPage(entry, page);
+        merged.fields[key] = textLabelsBaked === false && sourceTextLabelsBaked ? { ...carried, textLabelBaked: true } : carried;
+      }
+      const fieldId = meta.fieldIdIndex?.[name];
+      if (fieldId) merged.fieldIdIndex[key] = fieldId;
+    }
+  }
+  if (radioLabelsBaked !== void 0) merged.radioLabelsBaked = radioLabelsBaked;
+  if (textLabelsBaked !== void 0) merged.textLabelsBaked = textLabelsBaked;
+  if (checkboxLabelsBaked !== void 0) merged.checkboxLabelsBaked = checkboxLabelsBaked;
+  const hasEntries = Object.keys(merged.fields).length > 0;
+  const hasMarkers = radioLabelsBaked !== void 0 || textLabelsBaked !== void 0 || checkboxLabelsBaked !== void 0;
+  if (!hasEntries && !hasMarkers) return null;
+  if (Object.keys(merged.fieldIdIndex).length === 0) delete merged.fieldIdIndex;
+  return merged;
+}
 function getSigniphiMetadata(pdfDoc) {
   try {
     const infoRef = pdfDoc.context.trailerInfo.Info;
@@ -1414,12 +1463,17 @@ function getSigniphiMetadata(pdfDoc) {
     if (!metadataObj) {
       return null;
     }
-    const metadataStr = metadataObj.toString();
-    let jsonStr = metadataStr;
-    if (metadataStr.startsWith("(") && metadataStr.endsWith(")")) {
-      jsonStr = metadataStr.slice(1, -1);
-    } else if (metadataStr.startsWith("<") && metadataStr.endsWith(">")) {
-      jsonStr = metadataStr.slice(1, -1);
+    let jsonStr;
+    if (typeof metadataObj.decodeText === "function") {
+      jsonStr = metadataObj.decodeText();
+    } else {
+      const metadataStr = metadataObj.toString();
+      jsonStr = metadataStr;
+      if (metadataStr.startsWith("(") && metadataStr.endsWith(")")) {
+        jsonStr = metadataStr.slice(1, -1);
+      } else if (metadataStr.startsWith("<") && metadataStr.endsWith(">")) {
+        jsonStr = metadataStr.slice(1, -1);
+      }
     }
     const metadata = JSON.parse(jsonStr);
     return metadata;
@@ -1612,12 +1666,13 @@ function setSigniphiMetadata(pdfDoc, metadata) {
     }
     const infoDict = infoObj;
     const metadataString = JSON.stringify(metadata);
-    infoDict.set(pdfLib.PDFName.of("SigniphiMetadata"), pdfLib.PDFString.of(metadataString));
+    infoDict.set(pdfLib.PDFName.of("SigniphiMetadata"), pdfLib.PDFHexString.fromText(metadataString));
   } catch (error) {
     console.error("Failed to set Signiphi metadata:", error);
     throw error;
   }
 }
+var SIGNIPHI_CHECKBOX_LABEL_MARKER = "SiPL_Check";
 var FormFieldType = /* @__PURE__ */ ((FormFieldType2) => {
   FormFieldType2["TEXT"] = "text";
   FormFieldType2["SIGNATURE"] = "signature";
@@ -1703,6 +1758,7 @@ async function addFormFieldsToPdf(pdfBytes, formFields, options = {}) {
     }
   }
   const font = await pdfDoc.embedFont(pdfLib.StandardFonts.Helvetica);
+  const bakedCheckboxCaptions = /* @__PURE__ */ new Map();
   const fieldNamePages = /* @__PURE__ */ new Map();
   for (const field of formFields) {
     const baseName = field.name;
@@ -1799,10 +1855,15 @@ async function addFormFieldsToPdf(pdfBytes, formFields, options = {}) {
             } catch {
             }
             if (drawLabels) {
-              const fontSize = Math.min(12, field.position.height * 0.6);
+              const fontSize = Math.max(1, Math.min(10, field.position.height * 0.4));
               const labelX = pdfX + field.position.width + 5;
               const labelY = pdfY + (field.position.height - fontSize) / 2;
+              page.pushOperators(
+                pdfLib.PDFOperator.of(pdfLib.PDFOperatorNames.BeginMarkedContent, [pdfLib.PDFName.of(SIGNIPHI_CHECKBOX_LABEL_MARKER)])
+              );
               page.drawText(field.label, { x: labelX, y: labelY, size: fontSize, font, color: pdfLib.rgb(0, 0, 0) });
+              page.pushOperators(pdfLib.PDFOperator.of(pdfLib.PDFOperatorNames.EndMarkedContent));
+              bakedCheckboxCaptions.set(encodedName, field);
             }
           }
           break;
@@ -1954,8 +2015,28 @@ async function addFormFieldsToPdf(pdfBytes, formFields, options = {}) {
       console.error(`Error adding field ${field.name}:`, error);
     }
   }
+  recordBakedCheckboxCaptions(pdfDoc, bakedCheckboxCaptions);
   return await pdfDoc.save();
 }
+function recordBakedCheckboxCaptions(pdfDoc, captions) {
+  if (captions.size === 0) return;
+  try {
+    const metadata = getSigniphiMetadata(pdfDoc);
+    if (!metadata) return;
+    metadata.fields ?? (metadata.fields = {});
+    for (const [name, field] of captions) {
+      metadata.fields[name] = {
+        signer: field.assignedSignerEmail,
+        label: field.label,
+        ...metadata.fields[name],
+        checkboxCaptionBaked: true
+      };
+    }
+    setSigniphiMetadata(pdfDoc, metadata);
+  } catch (error) {
+    console.warn("Failed to record baked checkbox captions:", error);
+  }
+}
 function mapFieldPositionsAfterAssembly(fields, pageMapping) {
   return fields.map((field) => {
     const mappingKey = String(field.position.page - 1);
@@ -2925,7 +3006,7 @@ var PageAssembler = React7.forwardRef(
         setIsLoading(true);
         setProcessingStatus("Assembling PDF...");
         try {
-          const { PDFDocument: PDFDocument5, PDFName: PDFName4, PDFString: PDFString4 } = await import('pdf-lib');
+          const { PDFDocument: PDFDocument5, PDFName: PDFName4 } = await import('pdf-lib');
           const loadedPdfs = /* @__PURE__ */ new Map();
           const fileMap = /* @__PURE__ */ new Map();
           const pdfFiles = state.files.filter((f) => f.type === "pdf" && f.originalBytes?.length > 0);
@@ -3004,11 +3085,7 @@ var PageAssembler = React7.forwardRef(
           }
           console.log("[PageAssembler] Starting multi-PDF assembly with field preservation");
           const allExtractedFields = [];
-          const mergedMetadata = {
-            version: "1.0",
-            fields: {},
-            fieldIdIndex: {}
-          };
+          const metadataSources = [];
           const filePageUsage = /* @__PURE__ */ new Map();
           for (const file of state.files) {
             for (const page of file.pages) {
@@ -3033,28 +3110,12 @@ var PageAssembler = React7.forwardRef(
           }
           console.log("[PageAssembler] Page mapping:", Object.fromEntries(pageIdToNewPageNumber));
           const extractAndMapFields = async (fileId, fileName, pdfBytes2, sourcePdf) => {
-            let sourceMetadata = null;
-            if (sourcePdf) {
-              try {
-                const sourceInfoRef = sourcePdf.context.trailerInfo.Info;
-                if (sourceInfoRef) {
-                  const sourceInfoDict = sourcePdf.context.lookup(sourceInfoRef);
-                  if (sourceInfoDict && typeof sourceInfoDict.get === "function") {
-                    const metadataObj = sourceInfoDict.get(PDFName4.of("SigniphiMetadata"));
-                    if (metadataObj) {
-                      const metadataStr = metadataObj.toString();
-                      let jsonStr = metadataStr;
-                      if (metadataStr.startsWith("(") && metadataStr.endsWith(")")) {
-                        jsonStr = metadataStr.slice(1, -1);
-                      }
-                      sourceMetadata = JSON.parse(jsonStr);
-                    }
-                  }
-                }
-              } catch (metadataError) {
-                console.warn(`Could not read metadata from PDF ${fileName}:`, metadataError);
-              }
+            const sourceMetadata = sourcePdf ? getSigniphiMetadata(sourcePdf) : null;
+            if (sourcePdf && !sourceMetadata) {
+              console.warn(`[PageAssembler] No readable SigniphiMetadata in "${fileName}"`);
             }
+            const placements = [];
+            metadataSources.push({ metadata: sourceMetadata, fields: placements });
             console.log(`[PageAssembler] Extracting fields from "${fileName}"`);
             const extractedFields = await extractFieldsFromPdf(pdfBytes2);
             console.log(`[PageAssembler] Found ${extractedFields.length} fields in "${fileName}"`);
@@ -3088,13 +3149,7 @@ var PageAssembler = React7.forwardRef(
                   };
                   allExtractedFields.push(trackedField);
                   console.log(`[PageAssembler] Mapped field "${field.name}" from page ${originalPage} to page ${newPageNumber}`);
-                  const metadataKey = `${field.name}_p${newPageNumber}`;
-                  if (sourceMetadata?.fields?.[field.name]) {
-                    mergedMetadata.fields[metadataKey] = sourceMetadata.fields[field.name];
-                  }
-                  if (sourceMetadata?.fieldIdIndex?.[field.name]) {
-                    mergedMetadata.fieldIdIndex[metadataKey] = sourceMetadata.fieldIdIndex[field.name];
-                  }
+                  placements.push({ name: field.name, page: newPageNumber });
                 }
               }
             }
@@ -3172,21 +3227,15 @@ var PageAssembler = React7.forwardRef(
               }
             }
           }
-          if (Object.keys(mergedMetadata.fields).length > 0) {
+          const mergedMetadata = mergeSourceMetadata(metadataSources);
+          if (mergedMetadata) {
             try {
-              const newInfoRef = combinedDoc.context.trailerInfo.Info;
-              if (newInfoRef) {
-                const newInfoDict = combinedDoc.context.lookup(newInfoRef);
-                if (newInfoDict && typeof newInfoDict.set === "function") {
-                  newInfoDict.set(
-                    PDFName4.of("SigniphiMetadata"),
-                    PDFString4.of(JSON.stringify(mergedMetadata))
-                  );
-                }
-              }
+              setSigniphiMetadata(combinedDoc, mergedMetadata);
             } catch (metadataError) {
               console.warn("Could not write merged metadata:", metadataError);
             }
+          } else {
+            console.warn("[PageAssembler] No source metadata survived the merge; the assembled document will read as unprepared downstream");
           }
           let pdfBytes = await combinedDoc.save();
           if (allExtractedFields.length > 0) {