@signiphi/page-assembly 0.2.0-beta.19 → 0.2.0-beta.20

package/dist/index.mjs

@@ -3209,6 +3209,26 @@ var PageAssembler = forwardRef(
           console.log(`[PageAssembler] Total extracted fields: ${allExtractedFields.length}`);
           console.log(`[PageAssembler] Field names:`, allExtractedFields.map((f) => `${f.name} (page ${f.position.page})`));
           const combinedDoc = await PDFDocument5.create();
+          const copyOrderBySource = /* @__PURE__ */ new Map();
+          for (const file of state.files) {
+            for (const page of file.pages) {
+              const originalFileId = page.originalFileId || file.id;
+              const sourcePdf = fileMap.get(originalFileId)?.type === "pdf" ? loadedPdfs.get(originalFileId) : void 0;
+              if (!sourcePdf || page.srcIndex < 0 || page.srcIndex >= sourcePdf.getPageCount()) continue;
+              const order = copyOrderBySource.get(originalFileId) ?? [];
+              order.push(page.srcIndex);
+              copyOrderBySource.set(originalFileId, order);
+            }
+          }
+          const copiedPagesBySource = /* @__PURE__ */ new Map();
+          for (const [fileId, order] of copyOrderBySource) {
+            try {
+              copiedPagesBySource.set(fileId, await combinedDoc.copyPages(loadedPdfs.get(fileId), order));
+            } catch (copyError) {
+              console.error(`Error copying pages from ${fileId}:`, copyError);
+              throw new Error(`Failed to copy page: ${copyError instanceof Error ? copyError.message : String(copyError)}`);
+            }
+          }
           for (const file of state.files) {
             if (file.pages.length === 0) continue;
             for (const page of file.pages) {
@@ -3226,23 +3246,16 @@ var PageAssembler = forwardRef(
                 }
                 const sourcePageCount = sourcePdf.getPageCount();
                 if (page.srcIndex >= 0 && page.srcIndex < sourcePageCount) {
+                  const copiedPage = copiedPagesBySource.get(originalFileId).shift();
                   try {
-                    const copiedPages = await combinedDoc.copyPages(sourcePdf, [page.srcIndex]);
-                    copiedPages.forEach((copiedPage) => {
-                      try {
-                        const annotsRef = copiedPage.node.get(PDFName4.of("Annots"));
-                        if (annotsRef) {
-                          copiedPage.node.delete(PDFName4.of("Annots"));
-                        }
-                      } catch (annotError) {
-                        console.warn("Could not remove annotations from copied page:", annotError);
-                      }
-                      combinedDoc.addPage(copiedPage);
-                    });
-                  } catch (copyError) {
-                    console.error(`Error copying page ${page.srcIndex}:`, copyError);
-                    throw new Error(`Failed to copy page: ${copyError instanceof Error ? copyError.message : String(copyError)}`);
+                    const annotsRef = copiedPage.node.get(PDFName4.of("Annots"));
+                    if (annotsRef) {
+                      copiedPage.node.delete(PDFName4.of("Annots"));
+                    }
+                  } catch (annotError) {
+                    console.warn("Could not remove annotations from copied page:", annotError);
                   }
+                  combinedDoc.addPage(copiedPage);
                 }
               } else if (sourceFile.type === "image" && sourceFile.originalFile) {
                 try {