@softwear/latestcollectioncore 1.0.186 → 1.0.188

package/dist/index.d.ts

@@ -14,6 +14,7 @@ export { default as hasOnlyDigits } from './hasOnlyDigits';
 export { default as imageBinder } from './imageBinder';
 export { default as isean13 } from './isean13';
 export { default as pivotTable } from './pivotTable';
+export { default as projectObject } from './projectObject';
 export { default as reports, genPDF } from './reports';
 export { default as round2 } from './round2';
 export { default as sizeToMap } from './sizeToMap';

package/dist/index.js

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAxiosError = exports.exponentialDelay = exports.axiosRetry = exports.createAxiosInstance = exports.lcAxios = exports.transaction = exports.sizeToMap = exports.round2 = exports.genPDF = exports.reports = exports.pivotTable = exports.isean13 = exports.imageBinder = exports.hasOnlyDigits = exports.hashBrand = exports.getPreferedPropertyMappings = exports.getBrandName = exports.findMetaBrandSetting = exports.findSkuByBarcode = exports.ensureImpliedProperties = exports.ensureArray = exports.edifact = exports.ean13 = exports.deepCopy = exports.buildPropertyMappingFn = exports.articleStatus = void 0;
+exports.isAxiosError = exports.exponentialDelay = exports.axiosRetry = exports.createAxiosInstance = exports.lcAxios = exports.transaction = exports.sizeToMap = exports.round2 = exports.genPDF = exports.reports = exports.projectObject = exports.pivotTable = exports.isean13 = exports.imageBinder = exports.hasOnlyDigits = exports.hashBrand = exports.getPreferedPropertyMappings = exports.getBrandName = exports.findMetaBrandSetting = exports.findSkuByBarcode = exports.ensureImpliedProperties = exports.ensureArray = exports.edifact = exports.ean13 = exports.deepCopy = exports.buildPropertyMappingFn = exports.articleStatus = void 0;
 var articleStatus_1 = require("./articleStatus");
 Object.defineProperty(exports, "articleStatus", { enumerable: true, get: function () { return __importDefault(articleStatus_1).default; } });
 var buildPropertyMappingFn_1 = require("./buildPropertyMappingFn");
@@ -50,6 +50,8 @@ var isean13_1 = require("./isean13");
 Object.defineProperty(exports, "isean13", { enumerable: true, get: function () { return __importDefault(isean13_1).default; } });
 var pivotTable_1 = require("./pivotTable");
 Object.defineProperty(exports, "pivotTable", { enumerable: true, get: function () { return __importDefault(pivotTable_1).default; } });
+var projectObject_1 = require("./projectObject");
+Object.defineProperty(exports, "projectObject", { enumerable: true, get: function () { return __importDefault(projectObject_1).default; } });
 var reports_1 = require("./reports");
 Object.defineProperty(exports, "reports", { enumerable: true, get: function () { return __importDefault(reports_1).default; } });
 Object.defineProperty(exports, "genPDF", { enumerable: true, get: function () { return reports_1.genPDF; } });

package/dist/projectObject.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Whitelist projection: builds a new object from a deep-cloned copy of `source`,
+ * copying only the listed property names (nested values are cloned with `source`).
+ */
+export default function projectObject<K extends string>(source: unknown, keys: readonly K[]): Record<K, unknown>;

package/dist/projectObject.js

@@ -0,0 +1,23 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const deepCopy_1 = __importDefault(require("./deepCopy"));
+/**
+ * Whitelist projection: builds a new object from a deep-cloned copy of `source`,
+ * copying only the listed property names (nested values are cloned with `source`).
+ */
+function projectObject(source, keys) {
+    const out = {};
+    if (source == null)
+        return out;
+    if (typeof source !== 'object')
+        return out;
+    const tmp = (0, deepCopy_1.default)(source);
+    for (const k of keys) {
+        out[k] = tmp[k];
+    }
+    return out;
+}
+exports.default = projectObject;

package/dist/reports.js

@@ -16,13 +16,13 @@ exports.genPDF = void 0;
 const jspdf_1 = require("jspdf");
 const date_fns_1 = require("date-fns");
 const deepCopy_1 = __importDefault(require("./deepCopy"));
-/** Measurement uses context `currentPageNumber` (1-based). Rendering normalizes jsPDF’s internal 0-based page index to 1-based so overlap rules match `pageNumber` fields. */
+/** Measurement uses context `currentPageNumber` (1-based). Rendering uses jsPDF’s `getCurrentPageInfo().pageNumber`, which is already 1-based (first page is 1). */
 function getCurrentPageNumber(doc, context) {
     var _a;
     if (context.mode === 'measurement') {
         return (_a = context.currentPageNumber) !== null && _a !== void 0 ? _a : 1;
     }
-    return doc.getCurrentPageInfo().pageNumber + 1;
+    return doc.getCurrentPageInfo().pageNumber;
 }
 // We have to declare some functions that will be called by other functions but also have to call those other functions
 // We overwrite the function definition as soon as those other functions have been declared
@@ -507,9 +507,14 @@ addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize
     const layoutXtenths = originX + object.x;
     const layoutYtenths = originY + object.y;
     const rawPrintOnlyAtStartOffset = printOnlyAtStartContainersOffset !== null && printOnlyAtStartContainersOffset !== void 0 ? printOnlyAtStartContainersOffset : 0;
-    const effectivePrintOnlyAtStartContainersOffset = containerChain.length === 0 && rawPrintOnlyAtStartOffset > 0 && getCurrentPageNumber(doc, context) === 1 ? rawPrintOnlyAtStartOffset : 0;
+    /** Must consult current page on every read: `addPage` can move to page 2+ mid-invocation while this call stays open. */
+    const effectivePrintOnlyAtStartContainersOffsetNow = () => containerChain.length === 0 &&
+        rawPrintOnlyAtStartOffset > 0 &&
+        getCurrentPageNumber(doc, context) === 1
+        ? rawPrintOnlyAtStartOffset
+        : 0;
     const x = layoutXtenths / 10;
-    const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffset) / 10;
+    const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffsetNow()) / 10;
     const width = object.width / 10;
     const height = object.height / 10;
     // Keep track of the lower righthandside of all objects in this container
@@ -530,7 +535,7 @@ addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize
         }
         const nrContainers = source.length;
         let originX = layoutXtenths;
-        let originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset;
+        let originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffsetNow();
         for (let containerIndex = 0; containerIndex < nrContainers; containerIndex++) {
             const newContainerChain = containerChain.filter(function () {
                 return true;
@@ -542,7 +547,8 @@ addObjectToPDF = function (originX, originY, doc, object, printBuffer, paperSize
             if (useOrphanCheck && (object.pageBreak || originY + minHeightMm > paperSize.height - paperSize.footerHeight)) {
                 // We ran out of paper
                 originX = layoutXtenths;
-                originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset;
+                // Continuation sheets must not reuse the page-1-only overlap bump: addPage hasn't run yet so getCurrentPageNumber is still 1.
+                originY = layoutYtenths;
                 const newOrigin = addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, newContainerChain, context);
                 originX = newOrigin.originX;
                 originY = newOrigin.originY;

package/package.json

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

package/src/index.ts

@@ -14,6 +14,7 @@ export { default as hasOnlyDigits } from './hasOnlyDigits'
 export { default as imageBinder } from './imageBinder'
 export { default as isean13 } from './isean13'
 export { default as pivotTable } from './pivotTable'
+export { default as projectObject } from './projectObject'
 export { default as reports, genPDF } from './reports'
 export { default as round2 } from './round2'
 export { default as sizeToMap } from './sizeToMap'

package/src/projectObject.ts

@@ -0,0 +1,16 @@
+import deepCopy from './deepCopy'
+
+/**
+ * Whitelist projection: builds a new object from a deep-cloned copy of `source`,
+ * copying only the listed property names (nested values are cloned with `source`).
+ */
+export default function projectObject<K extends string>(source: unknown, keys: readonly K[]): Record<K, unknown> {
+  const out = {} as Record<K, unknown>
+  if (source == null) return out
+  if (typeof source !== 'object') return out
+  const tmp = deepCopy(source) as Record<string, unknown>
+  for (const k of keys) {
+    out[k] = tmp[k]
+  }
+  return out
+}

package/src/reports.ts

@@ -50,12 +50,12 @@ interface RenderContext {
   defaultFontFamily?: string
 }
 
-/** Measurement uses context `currentPageNumber` (1-based). Rendering normalizes jsPDF’s internal 0-based page index to 1-based so overlap rules match `pageNumber` fields. */
+/** Measurement uses context `currentPageNumber` (1-based). Rendering uses jsPDF’s `getCurrentPageInfo().pageNumber`, which is already 1-based (first page is 1). */
 function getCurrentPageNumber(doc: jsPDF, context: RenderContext): number {
   if (context.mode === 'measurement') {
     return context.currentPageNumber ?? 1
   }
-  return doc.getCurrentPageInfo().pageNumber + 1
+  return doc.getCurrentPageInfo().pageNumber
 }
 
 // We have to declare some functions that will be called by other functions but also have to call those other functions
@@ -585,11 +585,16 @@ addObjectToPDF = function (
   const layoutXtenths = originX + object.x
   const layoutYtenths = originY + object.y
   const rawPrintOnlyAtStartOffset = printOnlyAtStartContainersOffset ?? 0
-  const effectivePrintOnlyAtStartContainersOffset =
-    containerChain.length === 0 && rawPrintOnlyAtStartOffset > 0 && getCurrentPageNumber(doc, context) === 1 ? rawPrintOnlyAtStartOffset : 0
+  /** Must consult current page on every read: `addPage` can move to page 2+ mid-invocation while this call stays open. */
+  const effectivePrintOnlyAtStartContainersOffsetNow = (): number =>
+    containerChain.length === 0 &&
+    rawPrintOnlyAtStartOffset > 0 &&
+    getCurrentPageNumber(doc, context) === 1
+      ? rawPrintOnlyAtStartOffset
+      : 0
 
   const x = layoutXtenths / 10
-  const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffset) / 10
+  const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffsetNow()) / 10
   const width = object.width / 10
   const height = object.height / 10
   // Keep track of the lower righthandside of all objects in this container
@@ -613,7 +618,7 @@ addObjectToPDF = function (
     const nrContainers = source.length
 
     let originX = layoutXtenths
-    let originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset
+    let originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffsetNow()
 
     for (let containerIndex = 0; containerIndex < nrContainers; containerIndex++) {
       const newContainerChain = containerChain.filter(function () {
@@ -626,7 +631,8 @@ addObjectToPDF = function (
       if (useOrphanCheck && (object.pageBreak || originY + minHeightMm > paperSize.height - paperSize.footerHeight)) {
         // We ran out of paper
         originX = layoutXtenths
-        originY = layoutYtenths + effectivePrintOnlyAtStartContainersOffset
+        // Continuation sheets must not reuse the page-1-only overlap bump: addPage hasn't run yet so getCurrentPageNumber is still 1.
+        originY = layoutYtenths
         const newOrigin = addPage(originX, originY, doc, layout, rootPrintBuffer, paperSize, options, newContainerChain, context)
         originX = newOrigin.originX
         originY = newOrigin.originY

package/test/projectObject.spec.js

@@ -0,0 +1,25 @@
+const { deepCopy, projectObject } = require('../dist/index')
+
+describe('projectObject', function () {
+  it('returns an empty object for null/undefined', function () {
+    expect(projectObject(null, ['a'])).toEqual({})
+    expect(projectObject(undefined, ['a'])).toEqual({})
+  })
+  it('returns an empty object for non-object primitives', function () {
+    expect(projectObject('x', ['a'])).toEqual({})
+    expect(projectObject(1, ['a'])).toEqual({})
+  })
+  it('copies only listed keys from a deep-cloned source', function () {
+    const src = { id: '1', name: 'n', extra: 'drop', nest: { x: 1 } }
+    const p = projectObject(src, ['id', 'nest'])
+    expect(p).toEqual({ id: '1', nest: { x: 1 } })
+    expect(p.nest).not.toBe(src.nest)
+    expect(deepCopy(src.nest)).toEqual(p.nest)
+  })
+  it('does not mutate the original when copying nested data', function () {
+    const src = { a: { b: 1 } }
+    const p = projectObject(src, ['a'])
+    p.a.b = 2
+    expect(src.a.b).toBe(1)
+  })
+})