@signiphi/page-assembly 0.2.0-beta.17 → 0.2.0-beta.18

package/dist/index.d.mts

@@ -64,6 +64,13 @@ type TrackedFormField = {
     label?: string;
     required?: boolean;
     options?: string[];
+    /** RADIO: each option's circle rect, top-origin, on `position.page`. */
+    optionPositions?: Array<{
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    }>;
     placeholder?: string;
     defaultValue?: string;
     assignedSignerEmail?: string;
@@ -307,6 +314,17 @@ interface ExtractedField {
     options?: string[];
     fieldId?: string;
     signer?: string;
+    /**
+     * RADIO: each option's circle widget rect on this page, top-origin, in
+     * option order — exactly as read, so a re-add can put every circle back
+     * where it was. `x/y/width/height` above is only the first circle.
+     */
+    optionPositions?: Array<{
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    }>;
 }
 /**
  * One field's metadata entry, as stored in the block.
@@ -398,7 +416,8 @@ interface SigniphiMetadata {
     checkboxLabelsBaked?: boolean;
 }
 /**
- * Extract SigniphiMetadata from a PDF document
+ * Extract SigniphiMetadata from a PDF document. Delegates to the contract
+ * package's reader; null when there is no block or it will not parse.
  */
 declare function getSigniphiMetadata(pdfDoc: PDFDocument): SigniphiMetadata | null;
 /**
@@ -408,7 +427,8 @@ declare function getSigniphiMetadata(pdfDoc: PDFDocument): SigniphiMetadata | nu
  */
 declare function extractFieldsFromPdf(pdfBytes: Uint8Array): Promise<ExtractedField[]>;
 /**
- * Set SigniphiMetadata in a PDF document
+ * Set SigniphiMetadata in a PDF document. Delegates to the contract package's
+ * writer, which stores hex and throws on failure.
  */
 declare function setSigniphiMetadata(pdfDoc: PDFDocument, metadata: SigniphiMetadata): void;
 
@@ -457,6 +477,17 @@ interface FormFieldForPdf {
     multiline?: boolean;
     maxLength?: number;
     assignedSignerEmail?: string;
+    /**
+     * RADIO: each option's circle widget rect, top-origin, on `position.page`,
+     * as `extractFieldsFromPdf` read it. When it covers every option, the circles
+     * are re-added exactly there instead of being laid out afresh in `position`.
+     */
+    optionPositions?: Array<{
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    }>;
 }
 /**
  * Add form fields to a PDF document

package/dist/index.d.ts

@@ -64,6 +64,13 @@ type TrackedFormField = {
     label?: string;
     required?: boolean;
     options?: string[];
+    /** RADIO: each option's circle rect, top-origin, on `position.page`. */
+    optionPositions?: Array<{
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    }>;
     placeholder?: string;
     defaultValue?: string;
     assignedSignerEmail?: string;
@@ -307,6 +314,17 @@ interface ExtractedField {
     options?: string[];
     fieldId?: string;
     signer?: string;
+    /**
+     * RADIO: each option's circle widget rect on this page, top-origin, in
+     * option order — exactly as read, so a re-add can put every circle back
+     * where it was. `x/y/width/height` above is only the first circle.
+     */
+    optionPositions?: Array<{
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    }>;
 }
 /**
  * One field's metadata entry, as stored in the block.
@@ -398,7 +416,8 @@ interface SigniphiMetadata {
     checkboxLabelsBaked?: boolean;
 }
 /**
- * Extract SigniphiMetadata from a PDF document
+ * Extract SigniphiMetadata from a PDF document. Delegates to the contract
+ * package's reader; null when there is no block or it will not parse.
  */
 declare function getSigniphiMetadata(pdfDoc: PDFDocument): SigniphiMetadata | null;
 /**
@@ -408,7 +427,8 @@ declare function getSigniphiMetadata(pdfDoc: PDFDocument): SigniphiMetadata | nu
  */
 declare function extractFieldsFromPdf(pdfBytes: Uint8Array): Promise<ExtractedField[]>;
 /**
- * Set SigniphiMetadata in a PDF document
+ * Set SigniphiMetadata in a PDF document. Delegates to the contract package's
+ * writer, which stores hex and throws on failure.
  */
 declare function setSigniphiMetadata(pdfDoc: PDFDocument, metadata: SigniphiMetadata): void;
 
@@ -457,6 +477,17 @@ interface FormFieldForPdf {
     multiline?: boolean;
     maxLength?: number;
     assignedSignerEmail?: string;
+    /**
+     * RADIO: each option's circle widget rect, top-origin, on `position.page`,
+     * as `extractFieldsFromPdf` read it. When it covers every option, the circles
+     * are re-added exactly there instead of being laid out afresh in `position`.
+     */
+    optionPositions?: Array<{
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    }>;
 }
 /**
  * Add form fields to a PDF document

package/dist/index.js

@@ -343,16 +343,23 @@ var AlertDialogOverlay = React7__namespace.forwardRef(({ className, ...props },
   }
 ));
 AlertDialogOverlay.displayName = AlertDialogPrimitive__namespace.Overlay.displayName;
-var AlertDialogContent = React7__namespace.forwardRef(({ className, ...props }, ref) => /* @__PURE__ */ jsxRuntime.jsxs(AlertDialogPortal, { container: document.querySelector(".signiphi-page-assembly"), children: [
+var CENTERED = {
+  position: "fixed",
+  left: "50%",
+  top: "50%",
+  transform: "translate(-50%, -50%)"
+};
+var AlertDialogContent = React7__namespace.forwardRef(({ className, style, ...props }, ref) => /* @__PURE__ */ jsxRuntime.jsxs(AlertDialogPortal, { container: document.querySelector(".signiphi-page-assembly"), children: [
   /* @__PURE__ */ jsxRuntime.jsx(AlertDialogOverlay, {}),
   /* @__PURE__ */ jsxRuntime.jsx(
     AlertDialogPrimitive__namespace.Content,
     {
       ref,
       className: cn(
-        "fixed left-[50%] top-[50%] z-[9999] grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+        "z-[9999] grid w-full max-w-lg gap-4 border bg-background p-6 shadow-lg sm:rounded-lg",
         className
       ),
+      style: { ...CENTERED, ...style },
       ...props
     }
   )
@@ -1401,6 +1408,46 @@ function downloadPdf(pdfBytes, filename) {
   a.click();
   URL.revokeObjectURL(url);
 }
+var KEY = "SigniphiMetadata";
+function readMetadata(doc, pdfLib) {
+  let blockPresent = false;
+  try {
+    const infoRef = doc.context.trailerInfo.Info;
+    if (!infoRef) return { metadata: null, blockPresent };
+    const info = doc.context.lookup(infoRef);
+    if (!info || typeof info.get !== "function") return { metadata: null, blockPresent };
+    const value = info.get(pdfLib.PDFName.of(KEY));
+    if (!value) return { metadata: null, blockPresent };
+    blockPresent = true;
+    const json = typeof value.decodeText === "function" ? value.decodeText() : stripDelimiters(value.toString());
+    return { metadata: JSON.parse(json), blockPresent };
+  } catch {
+    return { metadata: null, blockPresent };
+  }
+}
+function writeMetadata(doc, metadata, pdfLib) {
+  const info = doc.context.lookup(doc.context.trailerInfo.Info);
+  if (!info || typeof info.set !== "function") {
+    throw new Error("Cannot write SigniphiMetadata: the PDF has no Info dictionary");
+  }
+  info.set(pdfLib.PDFName.of(KEY), pdfLib.PDFHexString.fromText(JSON.stringify(metadata)));
+}
+function stripDelimiters(raw) {
+  const wrapped = raw.startsWith("(") && raw.endsWith(")") || raw.startsWith("<") && raw.endsWith(">");
+  return wrapped ? raw.slice(1, -1) : raw;
+}
+function textLabelPlacements(source) {
+  const fields = source.metadata?.fields;
+  if (!fields || !source.pages?.length) return [];
+  const out = [];
+  for (const [name, entry] of Object.entries(fields)) {
+    if (entry.type !== "text_label" || !entry.position) continue;
+    for (const { source: page, combined } of source.pages) {
+      if (page === entry.position.page) out.push({ name, page: combined });
+    }
+  }
+  return out;
+}
 function toCombinedPage(entry, page) {
   if (!entry.position && !entry.radioPositions && !entry.radioOptions) return entry;
   const carried = { ...entry };
@@ -1411,78 +1458,55 @@ function toCombinedPage(entry, page) {
   }
   return carried;
 }
-function mergeSourceMetadata(sources) {
+function assembleMetadata(sources) {
   const merged = { version: "1.0", fields: {}, fieldIdIndex: {} };
   let radioLabelsBaked;
   let textLabelsBaked;
   let checkboxLabelsBaked;
+  let legacyRadioStripped;
   for (const source of sources) {
     const meta = source.metadata;
-    if (!meta || source.fields.length === 0) continue;
+    if (!meta || source.fields.length === 0 && !source.pages?.length) 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;
+    legacyRadioStripped = meta.legacyRadioStripped === true && legacyRadioStripped !== false;
   }
   for (const source of sources) {
     const meta = source.metadata;
     if (!meta) continue;
     const sourceTextLabelsBaked = meta.textLabelsBaked !== false;
-    for (const { name, page } of source.fields) {
+    for (const { name, page } of [...source.fields, ...textLabelPlacements(source)]) {
       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 (!entry) continue;
+      const carried = toCombinedPage(entry, page);
+      merged.fields[key] = textLabelsBaked === false && sourceTextLabelsBaked ? { ...carried, textLabelBaked: true } : carried;
+      if (entry.fieldId) merged.fieldIdIndex[entry.fieldId] = key;
     }
   }
   if (radioLabelsBaked !== void 0) merged.radioLabelsBaked = radioLabelsBaked;
   if (textLabelsBaked !== void 0) merged.textLabelsBaked = textLabelsBaked;
   if (checkboxLabelsBaked !== void 0) merged.checkboxLabelsBaked = checkboxLabelsBaked;
+  if (legacyRadioStripped) merged.legacyRadioStripped = true;
   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 mergeSourceMetadata(sources) {
+  return assembleMetadata(sources);
+}
 function getSigniphiMetadata(pdfDoc) {
-  try {
-    const infoRef = pdfDoc.context.trailerInfo.Info;
-    if (!infoRef) {
-      return null;
-    }
-    const infoObj = pdfDoc.context.lookup(infoRef);
-    if (!infoObj || typeof infoObj.get !== "function") {
-      return null;
-    }
-    const infoDict = infoObj;
-    const metadataObj = infoDict.get(pdfLib.PDFName.of("SigniphiMetadata"));
-    if (!metadataObj) {
-      return null;
-    }
-    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;
-  } catch (error) {
-    console.error("Failed to load Signiphi metadata:", error);
-    return null;
+  const { metadata, blockPresent } = readMetadata(pdfDoc, { PDFName: pdfLib.PDFName });
+  if (blockPresent && !metadata) {
+    console.error("Failed to load Signiphi metadata: the block is present but will not parse");
   }
+  return metadata;
 }
 function getBaseFieldName(encodedName) {
   let baseName = encodedName;
@@ -1541,6 +1565,10 @@ async function extractFieldsFromPdf(pdfBytes) {
   const metadata = getSigniphiMetadata(pdfDoc);
   const form = pdfDoc.getForm();
   const pdfFields = form.getFields();
+  const pages = pdfDoc.getPages();
+  const pageHeights = pages.map((p) => p.getHeight());
+  const pageIndexByRef = new Map(pages.map((p, i) => [p.ref, i + 1]));
+  const pageNumberOf = (ref) => ref && pageIndexByRef.get(ref) || 1;
   for (const field of pdfFields) {
     const fieldName = field.getName();
     const widgets = field.acroField.getWidgets();
@@ -1569,19 +1597,20 @@ async function extractFieldsFromPdf(pdfBytes) {
     } else {
       console.log(`[field-extraction] Unknown field type "${fieldName}" - defaulting required=false`);
     }
+    const optionPositionsByPage = /* @__PURE__ */ new Map();
+    if (widgetType === "radio") {
+      for (const w of widgets) {
+        const pageNumber = pageNumberOf(w.P());
+        const r = w.getRectangle();
+        const top = pageHeights[pageNumber - 1] - r.y - r.height;
+        const bucket = optionPositionsByPage.get(pageNumber) ?? [];
+        bucket.push({ x: r.x, y: top, width: r.width, height: r.height });
+        optionPositionsByPage.set(pageNumber, bucket);
+      }
+    }
     for (const widget of widgets) {
       const rect = widget.getRectangle();
-      const pageRef = widget.P();
-      let pageNumber = 1;
-      if (pageRef) {
-        const pages = pdfDoc.getPages();
-        for (let i = 0; i < pages.length; i++) {
-          if (pages[i].ref === pageRef) {
-            pageNumber = i + 1;
-            break;
-          }
-        }
-      }
+      const pageNumber = pageNumberOf(widget.P());
       const pageQualifiedKey = `${baseName}_p${pageNumber}`;
       let fieldMetadata = metadata?.fields?.[pageQualifiedKey];
       if (!fieldMetadata) {
@@ -1598,8 +1627,7 @@ async function extractFieldsFromPdf(pdfBytes) {
       if (fieldMetadata?.options?.length) {
         fieldOptions = fieldMetadata.options;
       }
-      const page = pdfDoc.getPage(pageNumber - 1);
-      const pageHeight = page.getHeight();
+      const pageHeight = pageHeights[pageNumber - 1];
       const extractedField = {
         name: baseName,
         // Use clean base name without __SIGNER__ encoding (signer stored in signer property)
@@ -1616,6 +1644,9 @@ async function extractFieldsFromPdf(pdfBytes) {
         signer: signerFromName
         // Extract signer from encoded name
       };
+      if (widgetType === "radio") {
+        extractedField.optionPositions = optionPositionsByPage.get(pageNumber) ?? [];
+      }
       if (fieldMetadata) {
         if (fieldMetadata.fieldId) {
           extractedField.fieldId = fieldMetadata.fieldId;
@@ -1661,20 +1692,14 @@ async function extractFieldsFromPdf(pdfBytes) {
 }
 function setSigniphiMetadata(pdfDoc, metadata) {
   try {
-    const infoRef = pdfDoc.context.trailerInfo.Info;
-    const infoObj = pdfDoc.context.lookup(infoRef);
-    if (!infoObj || typeof infoObj.set !== "function") {
-      throw new Error("Info object is not a PDFDict or does not have set method");
-    }
-    const infoDict = infoObj;
-    const metadataString = JSON.stringify(metadata);
-    infoDict.set(pdfLib.PDFName.of("SigniphiMetadata"), pdfLib.PDFHexString.fromText(metadataString));
+    writeMetadata(pdfDoc, metadata, { PDFName: pdfLib.PDFName, PDFHexString: pdfLib.PDFHexString });
   } catch (error) {
     console.error("Failed to set Signiphi metadata:", error);
     throw error;
   }
 }
 var SIGNIPHI_CHECKBOX_LABEL_MARKER = "SiPL_Check";
+var RADIO_BORDER_WIDTH = 1;
 var FormFieldType = /* @__PURE__ */ ((FormFieldType2) => {
   FormFieldType2["TEXT"] = "text";
   FormFieldType2["SIGNATURE"] = "signature";
@@ -1971,7 +1996,24 @@ async function addFormFieldsToPdf(pdfBytes, formFields, options = {}) {
         case "radio" /* RADIO */: {
           const encodedName = encodeFieldNameWithSigner(uniqueFieldName, field.assignedSignerEmail);
           const radioGroup = form.createRadioGroup(encodedName);
-          if (field.options && field.options.length > 0) {
+          if (field.options && field.options.length > 0 && field.optionPositions?.length === field.options.length) {
+            const optionPositions = field.optionPositions;
+            field.options.forEach((option, index) => {
+              const at = optionPositions[index];
+              radioGroup.addOptionToPage(option, page, {
+                x: at.x + RADIO_BORDER_WIDTH / 2,
+                y: pageHeight - at.y - at.height + RADIO_BORDER_WIDTH / 2,
+                width: at.width - RADIO_BORDER_WIDTH,
+                height: at.height - RADIO_BORDER_WIDTH,
+                borderWidth: RADIO_BORDER_WIDTH,
+                borderColor: pdfLib.rgb(0.5, 0.5, 0.5),
+                backgroundColor: pdfLib.rgb(1, 1, 1)
+              });
+            });
+            if (field.defaultValue && field.options.includes(field.defaultValue)) {
+              radioGroup.select(field.defaultValue);
+            }
+          } else if (field.options && field.options.length > 0) {
             const optionHeight = Math.min(20, field.position.height / field.options.length);
             const spacing = field.position.height / field.options.length;
             field.options.forEach((option, index) => {
@@ -3116,12 +3158,19 @@ var PageAssembler = React7.forwardRef(
             if (sourcePdf && !sourceMetadata) {
               console.warn(`[PageAssembler] No readable SigniphiMetadata in "${fileName}"`);
             }
+            const pageUsageForFile = filePageUsage.get(fileId) || /* @__PURE__ */ new Map();
             const placements = [];
-            metadataSources.push({ metadata: sourceMetadata, fields: placements });
+            const pageLandings = [];
+            for (const [srcIndex, pageInstances] of pageUsageForFile) {
+              for (const pageInstance of pageInstances) {
+                const combined = pageIdToNewPageNumber.get(pageInstance.id);
+                if (combined !== void 0) pageLandings.push({ source: srcIndex + 1, combined });
+              }
+            }
+            metadataSources.push({ metadata: sourceMetadata, fields: placements, pages: pageLandings });
             console.log(`[PageAssembler] Extracting fields from "${fileName}"`);
             const extractedFields = await extractFieldsFromPdf(pdfBytes2);
             console.log(`[PageAssembler] Found ${extractedFields.length} fields in "${fileName}"`);
-            const pageUsageForFile = filePageUsage.get(fileId) || /* @__PURE__ */ new Map();
             for (const field of extractedFields) {
               const originalPage = field.page;
               const srcIndex = originalPage - 1;
@@ -3145,6 +3194,7 @@ var PageAssembler = React7.forwardRef(
                     label: field.label,
                     required: field.required,
                     options: field.options,
+                    optionPositions: field.optionPositions,
                     placeholder: field.placeholder,
                     fieldId: field.fieldId,
                     assignedSignerEmail: field.signer
@@ -3249,6 +3299,7 @@ var PageAssembler = React7.forwardRef(
               label: field.label,
               required: field.required,
               options: field.options,
+              optionPositions: field.optionPositions,
               placeholder: field.placeholder,
               assignedSignerEmail: field.assignedSignerEmail
             }));