@softwear/latestcollectioncore 1.0.180 → 1.0.182

package/dist/reports.js

@@ -382,6 +382,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;
     context.applyRootStartBumpToThisCall = false;
+    context.remainingRootStartBumpTenths = 0;
     if (context.mode === 'measurement') {
         // Track page count in measurement mode
         if (context.currentPageCount === undefined) {
@@ -404,9 +405,24 @@ function addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, opti
         originY = containerChain[0].object.y;
         absoluteLowerRightHandSide.x = originX / 10;
         absoluteLowerRightHandSide.y = originY / 10;
-        containerChain.forEach((link) => {
+        containerChain.forEach((link, linkIdx) => {
+            var _a;
+            const chainChild = (_a = containerChain[linkIdx + 1]) === null || _a === void 0 ? void 0 : _a.object;
             link.object.children.forEach((child) => {
-                if (!child.snapToBottom && (child.type != 'container' || containerRedrawsAfterContinuationPage(child))) {
+                if (child.snapToBottom)
+                    return;
+                // Advance past bound repeat containers on the overflow path (they are not redrawn here; the
+                // innermost link draws their leaves). Without this, nested x/y offsets are lost on page 2+.
+                if (child.type === 'container' &&
+                    chainChild &&
+                    child === chainChild &&
+                    !containerRedrawsAfterContinuationPage(child)) {
+                    const c = child;
+                    originX += c.x;
+                    originY += c.y;
+                    return;
+                }
+                if (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);
@@ -455,33 +471,48 @@ 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, _b;
-    let rootBump = 0;
+    var _a, _b, _c, _d, _f;
     if (context.applyRootStartBumpToThisCall) {
-        rootBump = (_a = context.pendingRootStartBumpTenths) !== null && _a !== void 0 ? _a : 0;
+        context.remainingRootStartBumpTenths = (_a = context.pendingRootStartBumpTenths) !== null && _a !== void 0 ? _a : 0;
         context.applyRootStartBumpToThisCall = false;
         context.pendingRootStartBumpTenths = 0;
     }
-    const x = (originX + object.x) / 10;
-    const y = (originY + object.y + rootBump) / 10;
+    const layoutXtenths = originX + object.x;
+    const layoutYtenths = originY + object.y;
+    /** printOnlyAtStart offset only for outermost recursion and only until first positioning or addPage clears it */
+    const bumpForDrawNonContainer = containerChain.length === 0 ? (_b = context.remainingRootStartBumpTenths) !== null && _b !== void 0 ? _b : 0 : 0;
+    const x = layoutXtenths / 10;
+    const y = (layoutYtenths + bumpForDrawNonContainer) / 10;
     const width = object.width / 10;
     const height = object.height / 10;
     // Keep track of the lower righthandside of all objects in this container
     // We need to return this object so whatever calls addObjectToPDF knows how big our drawing was
     let absoluteLowerRightHandSide = { x: x + width, y: y + height };
-    if (!object.active)
+    if (!object.active) {
+        if (bumpForDrawNonContainer !== 0)
+            context.remainingRootStartBumpTenths = 0;
         return absoluteLowerRightHandSide;
-    if (object.type != 'container')
+    }
+    if (object.type != 'container') {
+        if (bumpForDrawNonContainer !== 0)
+            context.remainingRootStartBumpTenths = 0;
         drawSimpleObject(x, y, doc, object, printBuffer, width, height, options, context);
+    }
     // Recursively draw all child objects from a container object
     if (object.type == 'container') {
-        let originX = x * 10, originY = y * 10;
         const source = containerLoopSource(object, printBuffer);
         if (source === undefined) {
-            (_b = options.onAlert) === null || _b === void 0 ? void 0 : _b.call(options, { header: 'containernotfound', body: object.source, type: 'warning', timeout: 10000 });
+            (_c = options.onAlert) === null || _c === void 0 ? void 0 : _c.call(options, { header: 'containernotfound', body: object.source, type: 'warning', timeout: 10000 });
+            if (containerChain.length === 0)
+                context.remainingRootStartBumpTenths = 0;
             return absoluteLowerRightHandSide;
         }
         const nrContainers = source.length;
+        let bumpOnce = containerChain.length === 0 ? (_d = context.remainingRootStartBumpTenths) !== null && _d !== void 0 ? _d : 0 : 0;
+        if (bumpOnce !== 0 && containerChain.length === 0)
+            context.remainingRootStartBumpTenths = 0;
+        let originX = layoutXtenths;
+        let originY = layoutYtenths + bumpOnce;
         for (let containerIndex = 0; containerIndex < nrContainers; containerIndex++) {
             const newContainerChain = containerChain.filter(function () {
                 return true;
@@ -492,8 +523,8 @@ addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize
             const useOrphanCheck = minHeightMm != null && minHeightMm > 0;
             if (useOrphanCheck && (object.pageBreak || originY + minHeightMm > paperSize.height - paperSize.footerHeight)) {
                 // We ran out of paper
-                originX = x * 10;
-                originY = y * 10;
+                originX = layoutXtenths;
+                originY = layoutYtenths + (containerChain.length === 0 ? (_f = context.remainingRootStartBumpTenths) !== null && _f !== void 0 ? _f : 0 : 0);
                 const newOrigin = addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, newContainerChain, context);
                 originX = newOrigin.originX;
                 originY = newOrigin.originY;
@@ -685,25 +716,31 @@ function genPDF(layout, printBuffer, options = {}) {
         // Draw containers in measurement mode (same order as render)
         let measurementTopPrintedStartBottomTenths = 0;
         layout.objects
-            .filter((object) => object.type == 'container' && object.printOnlyAtStart)
+            .filter((object) => object.type == 'container' && object.printOnlyAtStart === true)
             .forEach((object) => {
             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)
+            object.printOnlyAtEnd !== true &&
+            object.printOnlyAtStart !== true)
             .forEach((object) => {
-            measurementContext.applyRootStartBumpToThisCall = true;
-            measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y);
+            const bumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y);
+            if (bumpTenths > 0) {
+                measurementContext.applyRootStartBumpToThisCall = true;
+                measurementContext.pendingRootStartBumpTenths = bumpTenths;
+            }
             addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext);
         });
         layout.objects
-            .filter((object) => object.type == 'container' && object.printOnlyAtEnd)
+            .filter((object) => object.type == 'container' && object.printOnlyAtEnd === true)
             .forEach((object) => {
-            measurementContext.applyRootStartBumpToThisCall = true;
-            measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y);
+            const bumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y);
+            if (bumpTenths > 0) {
+                measurementContext.applyRootStartBumpToThisCall = true;
+                measurementContext.pendingRootStartBumpTenths = bumpTenths;
+            }
             addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext);
         });
         // Get total page count from measurement pass
@@ -725,7 +762,7 @@ function genPDF(layout, printBuffer, options = {}) {
         drawStaticPartOfPage(doc, layout, printBuffer, paperSize, options, renderContext);
         let renderTopPrintedStartBottomTenths = 0;
         layout.objects
-            .filter((object) => object.type == 'container' && object.printOnlyAtStart)
+            .filter((object) => object.type == 'container' && object.printOnlyAtStart === true)
             .forEach((object) => {
             const lh = addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext);
             renderTopPrintedStartBottomTenths = Math.max(renderTopPrintedStartBottomTenths, lh.y * 10);
@@ -733,18 +770,24 @@ function genPDF(layout, printBuffer, options = {}) {
         // Draw containers in rendering mode (body containers after printOnlyAtStart)
         layout.objects
             .filter((object) => object.type == 'container' &&
-            !object.printOnlyAtEnd &&
-            !object.printOnlyAtStart)
+            object.printOnlyAtEnd !== true &&
+            object.printOnlyAtStart !== true)
             .forEach((object) => {
-            renderContext.applyRootStartBumpToThisCall = true;
-            renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y);
+            const bumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y);
+            if (bumpTenths > 0) {
+                renderContext.applyRootStartBumpToThisCall = true;
+                renderContext.pendingRootStartBumpTenths = bumpTenths;
+            }
             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);
+        const printOnlyAtEndContainers = layout.objects.filter((object) => object.type == 'container' && object.printOnlyAtEnd === true);
         printOnlyAtEndContainers.forEach((object) => {
-            renderContext.applyRootStartBumpToThisCall = true;
-            renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y);
+            const bumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y);
+            if (bumpTenths > 0) {
+                renderContext.applyRootStartBumpToThisCall = true;
+                renderContext.pendingRootStartBumpTenths = bumpTenths;
+            }
             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.180",
+  "version": "1.0.182",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/reports.ts

@@ -46,10 +46,14 @@ interface RenderContext {
   imageAssets?: Map<string, PdfImageAsset>
   /** Layout default font used when object.fontFamily is undefined */
   defaultFontFamily?: string
-  /** Set with {@link pendingRootStartBumpTenths} only for top-level genPDF container draws; consumed on first addObjectToPDF read. */
+  /** Set with {@link pendingRootStartBumpTenths} only for top-level genPDF container draws; moved to remaining on entry. */
   applyRootStartBumpToThisCall?: boolean
   /** Vertical pad (tenths-mm) so body roots sit below rendered printOnlyAtStart siblings; use with applyRootStartBumpToThisCall only. */
   pendingRootStartBumpTenths?: number
+  /**
+   * First-fragment bump for top-level draws from genPDF — applied with layout coords, then cleared after first positioning or addPage().
+   */
+  remainingRootStartBumpTenths?: number
 }
 
 // We have to declare some functions that will be called by other functions but also have to call those other functions
@@ -451,6 +455,7 @@ function addPage(
 ): { originX: number; originY: number; x: number; y: number } {
   context.pendingRootStartBumpTenths = 0
   context.applyRootStartBumpToThisCall = false
+  context.remainingRootStartBumpTenths = 0
   if (context.mode === 'measurement') {
     // Track page count in measurement mode
     if (context.currentPageCount === undefined) {
@@ -472,9 +477,24 @@ function addPage(
     originY = containerChain[0].object.y
     absoluteLowerRightHandSide.x = originX / 10
     absoluteLowerRightHandSide.y = originY / 10
-    containerChain.forEach((link) => {
+    containerChain.forEach((link, linkIdx) => {
+      const chainChild = containerChain[linkIdx + 1]?.object
       link.object.children.forEach((child) => {
-        if (!child.snapToBottom && (child.type != 'container' || containerRedrawsAfterContinuationPage(child))) {
+        if (child.snapToBottom) return
+        // Advance past bound repeat containers on the overflow path (they are not redrawn here; the
+        // innermost link draws their leaves). Without this, nested x/y offsets are lost on page 2+.
+        if (
+          child.type === 'container' &&
+          chainChild &&
+          child === chainChild &&
+          !containerRedrawsAfterContinuationPage(child)
+        ) {
+          const c = child as ContainerLayoutObject
+          originX += c.x
+          originY += c.y
+          return
+        }
+        if (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)
@@ -547,34 +567,49 @@ addObjectToPDF = function (
   containerChain: { object: ContainerLayoutObject; printBuffer: any }[],
   context: RenderContext
 ): { x: number; y: number } {
-  let rootBump = 0
   if (context.applyRootStartBumpToThisCall) {
-    rootBump = context.pendingRootStartBumpTenths ?? 0
+    context.remainingRootStartBumpTenths = context.pendingRootStartBumpTenths ?? 0
     context.applyRootStartBumpToThisCall = false
     context.pendingRootStartBumpTenths = 0
   }
-  const x = (originX + object.x) / 10
-  const y = (originY + object.y + rootBump) / 10
+  const layoutXtenths = originX + object.x
+  const layoutYtenths = originY + object.y
+  /** printOnlyAtStart offset only for outermost recursion and only until first positioning or addPage clears it */
+  const bumpForDrawNonContainer =
+    containerChain.length === 0 ? context.remainingRootStartBumpTenths ?? 0 : 0
+
+  const x = layoutXtenths / 10
+  const y = (layoutYtenths + bumpForDrawNonContainer) / 10
   const width = object.width / 10
   const height = object.height / 10
   // Keep track of the lower righthandside of all objects in this container
   // We need to return this object so whatever calls addObjectToPDF knows how big our drawing was
   let absoluteLowerRightHandSide = { x: x + width, y: y + height }
 
-  if (!object.active) return absoluteLowerRightHandSide
-  if (object.type != 'container') drawSimpleObject(x, y, doc, object, printBuffer, width, height, options, context)
+  if (!object.active) {
+    if (bumpForDrawNonContainer !== 0) context.remainingRootStartBumpTenths = 0
+    return absoluteLowerRightHandSide
+  }
+  if (object.type != 'container') {
+    if (bumpForDrawNonContainer !== 0) context.remainingRootStartBumpTenths = 0
+    drawSimpleObject(x, y, doc, object, printBuffer, width, height, options, context)
+  }
 
   // Recursively draw all child objects from a container object
   if (object.type == 'container') {
-    let originX = x * 10,
-      originY = y * 10
-
     const source = containerLoopSource(object as ContainerLayoutObject, printBuffer)
     if (source === undefined) {
       options.onAlert?.({ header: 'containernotfound', body: object.source, type: 'warning', timeout: 10000 })
+      if (containerChain.length === 0) context.remainingRootStartBumpTenths = 0
       return absoluteLowerRightHandSide
     }
     const nrContainers = source.length
+
+    let bumpOnce = containerChain.length === 0 ? context.remainingRootStartBumpTenths ?? 0 : 0
+    if (bumpOnce !== 0 && containerChain.length === 0) context.remainingRootStartBumpTenths = 0
+    let originX = layoutXtenths
+    let originY = layoutYtenths + bumpOnce
+
     for (let containerIndex = 0; containerIndex < nrContainers; containerIndex++) {
       const newContainerChain = containerChain.filter(function () {
         return true
@@ -585,8 +620,8 @@ addObjectToPDF = function (
       const useOrphanCheck = minHeightMm != null && minHeightMm > 0
       if (useOrphanCheck && (object.pageBreak || originY + minHeightMm > paperSize.height - paperSize.footerHeight)) {
         // We ran out of paper
-        originX = x * 10
-        originY = y * 10
+        originX = layoutXtenths
+        originY = layoutYtenths + (containerChain.length === 0 ? context.remainingRootStartBumpTenths ?? 0 : 0)
         const newOrigin = addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, newContainerChain, context)
         originX = newOrigin.originX
         originY = newOrigin.originY
@@ -812,7 +847,7 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
   // Draw containers in measurement mode (same order as render)
   let measurementTopPrintedStartBottomTenths = 0
   layout.objects
-    .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtStart)
+    .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtStart === true)
     .forEach((object) => {
       const lh = addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
       measurementTopPrintedStartBottomTenths = Math.max(measurementTopPrintedStartBottomTenths, lh.y * 10)
@@ -821,19 +856,25 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
     .filter(
       (object) =>
         object.type == 'container' &&
-        !(object as ContainerLayoutObject).printOnlyAtEnd &&
-        !(object as ContainerLayoutObject).printOnlyAtStart
+        (object as ContainerLayoutObject).printOnlyAtEnd !== true &&
+        (object as ContainerLayoutObject).printOnlyAtStart !== true
     )
     .forEach((object) => {
-      measurementContext.applyRootStartBumpToThisCall = true
-      measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y)
+      const bumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y)
+      if (bumpTenths > 0) {
+        measurementContext.applyRootStartBumpToThisCall = true
+        measurementContext.pendingRootStartBumpTenths = bumpTenths
+      }
       addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
     })
   layout.objects
-    .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd)
+    .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd === true)
     .forEach((object) => {
-      measurementContext.applyRootStartBumpToThisCall = true
-      measurementContext.pendingRootStartBumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y)
+      const bumpTenths = Math.max(0, measurementTopPrintedStartBottomTenths - object.y)
+      if (bumpTenths > 0) {
+        measurementContext.applyRootStartBumpToThisCall = true
+        measurementContext.pendingRootStartBumpTenths = bumpTenths
+      }
       addObjectToPDF(0, 0, measurementDoc, object, printBuffer, paperSize, layout, options, printBuffer, [], measurementContext)
     })
 
@@ -858,7 +899,7 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
 
   let renderTopPrintedStartBottomTenths = 0
   layout.objects
-    .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtStart)
+    .filter((object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtStart === true)
     .forEach((object) => {
       const lh = addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
       renderTopPrintedStartBottomTenths = Math.max(renderTopPrintedStartBottomTenths, lh.y * 10)
@@ -869,22 +910,28 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
     .filter(
       (object) =>
         object.type == 'container' &&
-        !(object as ContainerLayoutObject).printOnlyAtEnd &&
-        !(object as ContainerLayoutObject).printOnlyAtStart
+        (object as ContainerLayoutObject).printOnlyAtEnd !== true &&
+        (object as ContainerLayoutObject).printOnlyAtStart !== true
     )
     .forEach((object) => {
-      renderContext.applyRootStartBumpToThisCall = true
-      renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y)
+      const bumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y)
+      if (bumpTenths > 0) {
+        renderContext.applyRootStartBumpToThisCall = true
+        renderContext.pendingRootStartBumpTenths = bumpTenths
+      }
       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 as ContainerLayoutObject).printOnlyAtEnd
+    (object) => object.type == 'container' && (object as ContainerLayoutObject).printOnlyAtEnd === true
   )
   printOnlyAtEndContainers.forEach((object) => {
-    renderContext.applyRootStartBumpToThisCall = true
-    renderContext.pendingRootStartBumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y)
+    const bumpTenths = Math.max(0, renderTopPrintedStartBottomTenths - object.y)
+    if (bumpTenths > 0) {
+      renderContext.applyRootStartBumpToThisCall = true
+      renderContext.pendingRootStartBumpTenths = bumpTenths
+    }
     addObjectToPDF(0, 0, doc, object, printBuffer, paperSize, layout, options, printBuffer, [], renderContext)
   })
   return doc

package/test/reports.spec.ts

@@ -243,8 +243,8 @@ describe('genPDF', () => {
             {
               type: 'container',
               name: 'rows',
-              x: 0,
-              y: 0,
+              x: 30,
+              y: 40,
               width: 1800,
               height: 120,
               active: true,