@softwear/latestcollectioncore 1.0.177 → 1.0.179

package/dist/pdf.d.ts

@@ -54,7 +54,7 @@ export interface ContainerLayoutObject extends BaseLayoutObject {
     minHeightBeforeBreak?: number;
     /** When true, container and children are drawn only once at the end of the report, not on every page */
     printOnlyAtEnd?: boolean;
-    /** When true, container and children are drawn only once before other body containers (first page header block) */
+    /** Only effective on top-level `layout.objects` (PDF engine ignores this flag on nested containers). */
     printOnlyAtStart?: boolean;
 }
 export type LayoutObject = TextLayoutObject | FieldLayoutObject | RectangleLayoutObject | ImageLayoutObject | ContainerLayoutObject;

package/dist/reports.js

@@ -43,9 +43,21 @@ function getProperty(propertyName, object) {
     }
     return property;
 }
-/** Repeat once over the current buffer when the container is only a visual group (no `source` binding). */
+/** Repeat once when the container has no data binding (`source` empty / whitespace-only). */
+function dummyLayoutSource(source) {
+    return source === undefined || String(source).trim() === '';
+}
+/** Like repeatOnOverflow: redraw after a page break so nested overflowing content can proceed. */
+function containerRedrawsAfterContinuationPage(child) {
+    if (child.type !== 'container')
+        return false;
+    const c = child;
+    if (c.repeatOnOverflow)
+        return true;
+    return dummyLayoutSource(c.source);
+}
 function containerLoopSource(container, printBuffer) {
-    if (!container.source || container.source === '')
+    if (dummyLayoutSource(container.source))
         return [printBuffer];
     return getProperty(container.source, printBuffer);
 }
@@ -368,6 +380,7 @@ function drawSimpleObject(x, y, doc, object, printBuffer, width, height, options
     }
 }
 function addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, containerChain, context) {
+    context.pendingRootStartBumpTenths = 0;
     if (context.mode === 'measurement') {
         // Track page count in measurement mode
         if (context.currentPageCount === undefined) {
@@ -392,7 +405,7 @@ function addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, opti
         absoluteLowerRightHandSide.y = originY / 10;
         containerChain.forEach((link) => {
             link.object.children.forEach((child) => {
-                if (!child.snapToBottom && (child.type != 'container' || child.repeatOnOverflow)) {
+                if (!child.snapToBottom && (child.type != 'container' || containerRedrawsAfterContinuationPage(child))) {
                     const childLowerRightHandSide = addObjectToPDF(originX, originY, doc, child, link.printBuffer, paperSize, layout, options, rootPrintBuffer, [], context);
                     absoluteLowerRightHandSide.x = Math.max(absoluteLowerRightHandSide.x, childLowerRightHandSide.x);
                     absoluteLowerRightHandSide.y = Math.max(absoluteLowerRightHandSide.y, childLowerRightHandSide.y);
@@ -441,9 +454,10 @@ function drawBottomDwellers(object, originX, originY, absoluteLowerRightHandSide
  * Use originX,originY as origin to displace the object's own x,y coordinates
  */
 addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize, layout, options, rootPrintBuffer, containerChain, context) {
-    var _a;
+    var _a, _b;
+    const rootBump = containerChain.length === 0 ? (_a = context.pendingRootStartBumpTenths) !== null && _a !== void 0 ? _a : 0 : 0;
     const x = (originX + object.x) / 10;
-    const y = (originY + object.y) / 10;
+    const y = (originY + object.y + rootBump) / 10;
     const width = object.width / 10;
     const height = object.height / 10;
     // Keep track of the lower righthandside of all objects in this container
@@ -458,7 +472,7 @@ addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize
         let originX = x * 10, originY = y * 10;
         const source = containerLoopSource(object, printBuffer);
         if (source === undefined) {
-            (_a = options.onAlert) === null || _a === void 0 ? void 0 : _a.call(options, { header: 'containernotfound', body: object.source, type: 'warning', timeout: 10000 });
+            (_b = options.onAlert) === null || _b === void 0 ? void 0 : _b.call(options, { header: 'containernotfound', body: object.source, type: 'warning', timeout: 10000 });
             return absoluteLowerRightHandSide;
         }
         const nrContainers = source.length;
@@ -663,21 +677,25 @@ function genPDF(layout, printBuffer, options = {}) {
         }
         drawStaticPartOfPage(measurementDoc, layout, printBuffer, paperSize, options, measurementContext);
         // Draw containers in measurement mode (same order as render)
+        let measurementTopPrintedStartBottomTenths = 0;
         layout.objects
             .filter((object) => object.type == 'container' && object.printOnlyAtStart)
             .forEach((object) => {
-            addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext);
+            const lh = addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext);
+            measurementTopPrintedStartBottomTenths = Math.max(measurementTopPrintedStartBottomTenths, lh.y * 10);
         });
         layout.objects
             .filter((object) => object.type == 'container' &&
             !object.printOnlyAtEnd &&
             !object.printOnlyAtStart)
             .forEach((object) => {
+            measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y);
             addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext);
         });
         layout.objects
             .filter((object) => object.type == 'container' && object.printOnlyAtEnd)
             .forEach((object) => {
+            measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y);
             addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext);
         });
         // Get total page count from measurement pass
@@ -697,10 +715,12 @@ function genPDF(layout, printBuffer, options = {}) {
             defaultFontFamily: layout.defaultFontFamily,
         };
         drawStaticPartOfPage(doc, layout, printBuffer, paperSize, options, renderContext);
+        let renderTopPrintedStartBottomTenths = 0;
         layout.objects
             .filter((object) => object.type == 'container' && object.printOnlyAtStart)
             .forEach((object) => {
-            addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext);
+            const lh = addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext);
+            renderTopPrintedStartBottomTenths = Math.max(renderTopPrintedStartBottomTenths, lh.y * 10);
         });
         // Draw containers in rendering mode (body containers after printOnlyAtStart)
         layout.objects
@@ -708,11 +728,13 @@ function genPDF(layout, printBuffer, options = {}) {
             !object.printOnlyAtEnd &&
             !object.printOnlyAtStart)
             .forEach((object) => {
+            renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y);
             addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext);
         });
         // Draw printOnlyAtEnd containers once at the end (at their layout coordinates on current page)
         const printOnlyAtEndContainers = layout.objects.filter((object) => object.type == 'container' && object.printOnlyAtEnd);
         printOnlyAtEndContainers.forEach((object) => {
+            renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y);
             addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext);
         });
         return doc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.177",
+  "version": "1.0.179",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/pdf.ts

@@ -61,7 +61,7 @@ export interface ContainerLayoutObject extends BaseLayoutObject {
   minHeightBeforeBreak?: number
   /** When true, container and children are drawn only once at the end of the report, not on every page */
   printOnlyAtEnd?: boolean
-  /** When true, container and children are drawn only once before other body containers (first page header block) */
+  /** Only effective on top-level `layout.objects` (PDF engine ignores this flag on nested containers). */
   printOnlyAtStart?: boolean
 }
 

package/src/reports.ts

@@ -46,6 +46,8 @@ interface RenderContext {
   imageAssets?: Map<string, PdfImageAsset>
   /** Layout default font used when object.fontFamily is undefined */
   defaultFontFamily?: string
+  /** Vertical pad for root draws after printOnlyAtStart; set per root container; addPage resets to 0 after each page break. */
+  pendingRootStartBumpTenths?: number
 }
 
 // We have to declare some functions that will be called by other functions but also have to call those other functions
@@ -92,10 +94,22 @@ function getProperty(propertyName: string, object: any): any {
   return property
 }
 
-/** Repeat once over the current buffer when the container is only a visual group (no `source` binding). */
+/** Repeat once when the container has no data binding (`source` empty / whitespace-only). */
+function dummyLayoutSource(source?: string): boolean {
+  return source === undefined || String(source).trim() === ''
+}
+
+/** Like repeatOnOverflow: redraw after a page break so nested overflowing content can proceed. */
+function containerRedrawsAfterContinuationPage(child: LayoutObject): boolean {
+  if (child.type !== 'container') return false
+  const c = child as ContainerLayoutObject
+  if (c.repeatOnOverflow) return true
+  return dummyLayoutSource(c.source)
+}
+
 function containerLoopSource(container: ContainerLayoutObject, printBuffer: any): any {
-  if (!container.source || container.source === '') return [printBuffer]
-  return getProperty(container.source, printBuffer)
+  if (dummyLayoutSource(container.source)) return [printBuffer]
+  return getProperty(container.source as string, printBuffer)
 }
 
 /** jsPDF font style strings. fontStyle bitmask: 0=normal, 1=bold, 2=italic, 3=bold+italic */
@@ -433,6 +447,7 @@ function addPage(
   containerChain: { object: ContainerLayoutObject; printBuffer: any }[],
   context: RenderContext
 ): { originX: number; originY: number; x: number; y: number } {
+  context.pendingRootStartBumpTenths = 0
   if (context.mode === 'measurement') {
     // Track page count in measurement mode
     if (context.currentPageCount === undefined) {
@@ -456,7 +471,7 @@ function addPage(
     absoluteLowerRightHandSide.y = originY / 10
     containerChain.forEach((link) => {
       link.object.children.forEach((child) => {
-        if (!child.snapToBottom && (child.type != 'container' || child.repeatOnOverflow)) {
+        if (!child.snapToBottom && (child.type != 'container' || containerRedrawsAfterContinuationPage(child))) {
           const childLowerRightHandSide = addObjectToPDF(originX, originY, doc, child, link.printBuffer, paperSize, layout, options, rootPrintBuffer, [], context)
           absoluteLowerRightHandSide.x = Math.max(absoluteLowerRightHandSide.x, childLowerRightHandSide.x)
           absoluteLowerRightHandSide.y = Math.max(absoluteLowerRightHandSide.y, childLowerRightHandSide.y)
@@ -529,8 +544,9 @@ addObjectToPDF = function (
   containerChain: { object: ContainerLayoutObject; printBuffer: any }[],
   context: RenderContext
 ): { x: number; y: number } {
+  const rootBump = containerChain.length === 0 ? context.pendingRootStartBumpTenths ?? 0 : 0
   const x = (originX + object.x) / 10
-  const y = (originY + object.y) / 10
+  const y = (originY + object.y + rootBump) / 10
   const width = object.width / 10
   const height = object.height / 10
   // Keep track of the lower righthandside of all objects in this container
@@ -786,10 +802,12 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
   drawStaticPartOfPage(measurementDoc, layout, printBuffer, paperSize, options, measurementContext)
 
   // Draw containers in measurement mode (same order as render)
+  let measurementTopPrintedStartBottomTenths = 0
   layout.objects
     .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtStart)
     .forEach((object) => {
-      addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
+      const lh = addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
+      measurementTopPrintedStartBottomTenths = Math.max(measurementTopPrintedStartBottomTenths, lh.y * 10)
     })
   layout.objects
     .filter(
@@ -799,11 +817,13 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
         !(object as ContainerLayoutObject).printOnlyAtStart
     )
     .forEach((object) => {
+      measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y)
       addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
     })
   layout.objects
     .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd)
     .forEach((object) => {
+      measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y)
       addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
     })
 
@@ -826,10 +846,12 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
   }
   drawStaticPartOfPage(doc, layout, printBuffer, paperSize, options, renderContext)
 
+  let renderTopPrintedStartBottomTenths = 0
   layout.objects
     .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtStart)
     .forEach((object) => {
-      addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
+      const lh = addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
+      renderTopPrintedStartBottomTenths = Math.max(renderTopPrintedStartBottomTenths, lh.y * 10)
     })
 
   // Draw containers in rendering mode (body containers after printOnlyAtStart)
@@ -841,6 +863,7 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
         !(object as ContainerLayoutObject).printOnlyAtStart
     )
     .forEach((object) => {
+      renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y)
       addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
     })
 
@@ -849,6 +872,7 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
     (object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd
   )
   printOnlyAtEndContainers.forEach((object) => {
+    renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y)
     addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
   })
   return doc

package/test/reports.spec.ts

@@ -1,8 +1,15 @@
 import { describe, expect, it } from 'vitest'
 import { genPDF } from '../src/reports'
 import type { Layout } from '../src/pdf'
-// import fs from 'fs'
 
+/** Tiny valid JPEG as data URL — avoids flaky network-dependent image fetch in CI/sandbox. */
+function offlineJpegFixture(): string {
+  const b64 =
+    '/9j/4AAQSkZJRgABAQIAASABIAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAAKAAoDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAb/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIQAxAAAAHhAP/EABQQAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQEAAQkCf//EABQRAQAAAAAAAAAAAAAAAAAAAAD/2gAIAQMBAT8B/8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAgBAgMBPwF//8QAFBEBAAAAAAAAAAAAAAAAAAAAAP/aAAgBAQYPAj//xAAVEAEAAAAAAAAAAAAAAAAAAAAAAP/aAAgBAQBPCQ//Z'
+  return `data:image/jpeg;base64,${b64}`
+}
+
+// URL still used so collectImageUrlsFromLayout resolves the layout object
 const imageUrl = 'https://upload.wikimedia.org/wikipedia/commons/thumb/7/79/Phillips_PM5538.jpg/500px-Phillips_PM5538.jpg'
 
 describe('genPDF', () => {
@@ -59,7 +66,14 @@ describe('genPDF', () => {
       title: 'Minimal PDF',
     }
 
-    const doc = await genPDF(layout, printBuffer)
+    const doc = await genPDF(layout, printBuffer, {
+      loadImage: async () => ({
+        dataUrl: offlineJpegFixture(),
+        format: 'JPEG',
+        width: 500,
+        height: 375,
+      }),
+    })
     const pdf = doc.output('arraybuffer')
     const pdfText = Buffer.from(pdf).toString('latin1')
 
@@ -138,4 +152,115 @@ describe('genPDF', () => {
     expect(iStart).toBeLessThan(iMid)
     expect(iMid).toBeLessThan(iEnd)
   })
+
+  it('stacks top-level body containers below printOnlyAtStart when they share the same layout y', async () => {
+    const text = (name: string, label: string, y = 0, fontSize = 80) =>
+      ({
+        type: 'text' as const,
+        name,
+        x: 20,
+        y,
+        width: 900,
+        height: 400,
+        active: true,
+        text: label,
+        textAlign: 1 as const,
+        fontFamily: 'Helvetica',
+        fontSize,
+        fontStyle: 0,
+      }) as const
+
+    const sharedY = 400
+    const layout: Layout = {
+      name: 'same-y-stack',
+      paperSize: { width: 210, height: 297, footerHeight: 20 },
+      objects: [
+        {
+          type: 'container',
+          x: 0,
+          y: sharedY,
+          width: 1000,
+          height: 900,
+          active: true,
+          source: '',
+          printOnlyAtStart: true,
+          children: [text('h', 'PAGE1_HEADER_BLOCK')],
+        },
+        {
+          type: 'container',
+          x: 0,
+          y: sharedY,
+          width: 1000,
+          height: 500,
+          active: true,
+          source: '',
+          children: [text('b', 'BODY_AFTER_STACK', 0, 32)],
+        },
+      ],
+    }
+
+    const doc = await genPDF(layout, {})
+    const pdfText = Buffer.from(doc.output('arraybuffer')).toString('latin1')
+    expect(pdfText).toContain('(PAGE1_HEADER_BLOCK)')
+    expect(pdfText).toContain('(BODY_AFTER_STACK)')
+    const iH = pdfText.indexOf('(PAGE1_HEADER_BLOCK)')
+    const iB = pdfText.indexOf('(BODY_AFTER_STACK)')
+    expect(iH).toBeGreaterThanOrEqual(0)
+    expect(iB).toBeGreaterThanOrEqual(0)
+    expect(iH).toBeLessThan(iB)
+  })
+
+  it('redraws empty-source wrapper so inner vertical repeat spans multiple pages', async () => {
+    const rowField = {
+      type: 'field' as const,
+      name: 'ln',
+      x: 0,
+      y: 0,
+      width: 1600,
+      height: 80,
+      active: true,
+      source: 'line',
+      textAlign: 1 as const,
+      fontFamily: 'Helvetica',
+      fontSize: 36,
+      fontStyle: 0,
+    }
+    const ROWS = Array.from({ length: 40 }, (_, i) => ({ line: `ROW_${i}_MARK` }))
+    const layout: Layout = {
+      name: 'wrapper-overflow',
+      paperSize: { width: 210, height: 297, footerHeight: 20 },
+      objects: [
+        {
+          type: 'container',
+          name: 'wrap',
+          x: 50,
+          y: 100,
+          width: 1900,
+          height: 2800,
+          active: true,
+          source: '',
+          children: [
+            {
+              type: 'container',
+              name: 'rows',
+              x: 0,
+              y: 0,
+              width: 1800,
+              height: 120,
+              active: true,
+              source: 'ROWS',
+              repeatContainer: 'vertical' as const,
+              children: [rowField],
+            },
+          ],
+        },
+      ],
+    }
+
+    const doc = await genPDF(layout, { ROWS })
+    expect(doc.getNumberOfPages()).toBeGreaterThanOrEqual(2)
+    const pdfText = Buffer.from(doc.output('arraybuffer')).toString('latin1')
+    expect(pdfText).toContain('ROW_0_MARK')
+    expect(pdfText).toContain('ROW_35_MARK')
+  })
 })