@softwear/latestcollectioncore 1.0.194 → 1.0.196

package/dist/imageBinder.js

@@ -61,6 +61,7 @@ const GLOBAL_PATTERNS = [
     ['colorCodeSupplier|colorSupplier', 'articleCode|articleCodeSupplier'],
     ['brand', 'collectionSupplier', 'colorCodeSupplier', 'articleCode|articleCodeSupplier'],
     ['brand', 'collectionSupplier', 'colorCodeSupplier', 'articleCode|articleCodeSupplier', 'buyPrice|valuePrice'],
+    ['brand', 'articleDescription', 'colorSupplier'],
 ];
 function prepFilterSkusImages(filteredSkus, merge = true, fileNames) {
     const skusCopy = (0, deepCopy_1.default)(filteredSkus);
@@ -161,7 +162,25 @@ function checkWithoutLast(fileName) {
             returnWithoutLast = true;
         else if (lastToken.length <= 2 && /^[A-Za-zÀ-ÖØ-öø-ÿ0-9]+$/.test(lastToken))
             returnWithoutLast = true;
+        const tokenLength = tokens.length;
         if (returnWithoutLast) {
+            let sliceIndex = -1;
+            if (tokenLength > 3 && tokens[tokenLength - 3] == 'press' && ((tokens[tokenLength - 2] == 'pack') || (tokens[tokenLength - 2] == 'model')))
+                sliceIndex = -3;
+            else if (tokenLength > 2 && tokens[tokenLength - 2] == 'packshot')
+                sliceIndex = -2;
+            return tokens
+                .slice(0, sliceIndex)
+                .join('')
+                .replace(/[^\p{L}\p{N}]+/gu, '');
+        }
+        if (tokenLength > 2 && tokens[tokenLength - 2] == 'press' && ((tokens[tokenLength - 1] == 'pack') || (tokens[tokenLength - 1] == 'model'))) {
+            return tokens
+                .slice(0, -2)
+                .join('')
+                .replace(/[^\p{L}\p{N}]+/gu, '');
+        }
+        else if (tokenLength > 1 && tokens[tokenLength - 1] == 'packshot') {
             return tokens
                 .slice(0, -1)
                 .join('')

package/dist/reports.d.ts

@@ -36,6 +36,13 @@ export interface GenPdfOptions {
     loadFont?: (url: string) => Promise<string>;
     loadImage?: (url: string) => Promise<PdfImageAsset | undefined>;
 }
+/** Fit image in layout box preserving aspect ratio (like CSS object-fit: contain). Stretch only when objectFit is fill/stretch. */
+export declare function computeImageDrawRect(x: number, y: number, boxWidth: number, boxHeight: number, imageWidth: number, imageHeight: number, objectFit?: string): {
+    x: number;
+    y: number;
+    width: number;
+    height: number;
+};
 export declare function genPDF(layout: Layout, printBuffer: any, options?: GenPdfOptions): Promise<jsPDF>;
 declare const _default: {
     genPDF: typeof genPDF;

package/dist/reports.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.genPDF = void 0;
+exports.genPDF = exports.computeImageDrawRect = void 0;
 const jspdf_1 = require("jspdf");
 const date_fns_1 = require("date-fns");
 const deepCopy_1 = __importDefault(require("./deepCopy"));
@@ -152,6 +152,23 @@ function getImageFormat(url, contentType, bytes) {
 function getImageMimeType(format) {
     return format === 'PNG' ? 'image/png' : 'image/jpeg';
 }
+/** Fit image in layout box preserving aspect ratio (like CSS object-fit: contain). Stretch only when objectFit is fill/stretch. */
+function computeImageDrawRect(x, y, boxWidth, boxHeight, imageWidth, imageHeight, objectFit) {
+    let drawX = x;
+    let drawY = y;
+    let drawWidth = boxWidth;
+    let drawHeight = boxHeight;
+    const stretch = objectFit === 'fill' || objectFit === 'stretch';
+    if (!stretch && imageWidth > 0 && imageHeight > 0) {
+        const scale = Math.min(boxWidth / imageWidth, boxHeight / imageHeight);
+        drawWidth = imageWidth * scale;
+        drawHeight = imageHeight * scale;
+        drawX = x + (boxWidth - drawWidth) / 2;
+        drawY = y + (boxHeight - drawHeight) / 2;
+    }
+    return { x: drawX, y: drawY, width: drawWidth, height: drawHeight };
+}
+exports.computeImageDrawRect = computeImageDrawRect;
 function getImageDimensions(bytes, format) {
     if (format === 'PNG' && bytes.length >= 24 && isPng(bytes)) {
         return { width: readUint32BE(bytes, 16), height: readUint32BE(bytes, 20) };
@@ -270,7 +287,7 @@ function truncateTextToFitWidth(doc, text, maxWidth) {
     return truncatedText + ELLIPSIS;
 }
 function drawSimpleObject(x, y, doc, object, printBuffer, width, height, options, context) {
-    var _a, _b;
+    var _a, _b, _c, _d;
     let text = ''; // Will hold text to display for either 'text' or 'field'
     // Get text from object for text objects
     if (object.type == 'text') {
@@ -351,18 +368,7 @@ function drawSimpleObject(x, y, doc, object, printBuffer, width, height, options
             const urlLower = String(imgUrl).toLowerCase();
             const imageAsset = (_a = context.imageAssets) === null || _a === void 0 ? void 0 : _a.get(String(imgUrl));
             const format = (imageAsset === null || imageAsset === void 0 ? void 0 : imageAsset.format) || (urlLower.endsWith('.png') ? 'PNG' : urlLower.endsWith('.jpg') || urlLower.endsWith('.jpeg') ? 'JPEG' : 'JPEG');
-            let drawX = x;
-            let drawY = y;
-            let drawWidth = width;
-            let drawHeight = height;
-            // Preserve aspect ratio when objectFit is 'contain' and we have dimensions
-            if (imgObj.objectFit === 'contain' && (imageAsset === null || imageAsset === void 0 ? void 0 : imageAsset.width) && (imageAsset === null || imageAsset === void 0 ? void 0 : imageAsset.height)) {
-                const scale = Math.min(width / imageAsset.width, height / imageAsset.height);
-                drawWidth = imageAsset.width * scale;
-                drawHeight = imageAsset.height * scale;
-                drawX = x + (width - drawWidth) / 2;
-                drawY = y + (height - drawHeight) / 2;
-            }
+            const { x: drawX, y: drawY, width: drawWidth, height: drawHeight } = computeImageDrawRect(x, y, width, height, (_b = imageAsset === null || imageAsset === void 0 ? void 0 : imageAsset.width) !== null && _b !== void 0 ? _b : 0, (_c = imageAsset === null || imageAsset === void 0 ? void 0 : imageAsset.height) !== null && _c !== void 0 ? _c : 0, imgObj.objectFit);
             try {
                 doc.addImage((imageAsset === null || imageAsset === void 0 ? void 0 : imageAsset.dataUrl) || imgUrl, format, drawX, drawY, drawWidth, drawHeight);
             }
@@ -388,7 +394,7 @@ function drawSimpleObject(x, y, doc, object, printBuffer, width, height, options
             return;
         const fontStyleStr = FONT_STYLES[object.fontStyle & 3] || 'normal';
         // Use object font if it's a custom font; otherwise layout default overrides standard fonts (Helvetica etc.)
-        const fontFamily = object.fontFamily && ((_b = options.isCustomPdfFont) === null || _b === void 0 ? void 0 : _b.call(options, object.fontFamily)) ? object.fontFamily : context.defaultFontFamily || object.fontFamily || 'Helvetica';
+        const fontFamily = object.fontFamily && ((_d = options.isCustomPdfFont) === null || _d === void 0 ? void 0 : _d.call(options, object.fontFamily)) ? object.fontFamily : context.defaultFontFamily || object.fontFamily || 'Helvetica';
         doc.setFont(fontFamily, fontStyleStr);
         doc.setFontSize(object.fontSize / 4);
         doc.text(truncateTextToFitWidth(doc, text, width), x, y, { align: textAlign, baseline: 'hanging' });
@@ -686,7 +692,7 @@ function genPDF(layout, printBuffer, options = {}) {
                     object.url = logoUrl;
             }
         });
-        // Preload image bytes for Node.js and dimensions for objectFit:contain
+        // Preload image bytes for Node.js and pixel dimensions for aspect-ratio fitting
         const imageAssets = new Map();
         const loadImage = options.loadImage || loadImageForPdf;
         const urls = collectImageUrlsFromLayout(layout, printBuffer);

package/package.json

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

package/src/imageBinder.ts

@@ -26,6 +26,7 @@ const GLOBAL_PATTERNS = [
   ['colorCodeSupplier|colorSupplier', 'articleCode|articleCodeSupplier'],
   ['brand', 'collectionSupplier', 'colorCodeSupplier', 'articleCode|articleCodeSupplier'],
   ['brand', 'collectionSupplier', 'colorCodeSupplier', 'articleCode|articleCodeSupplier', 'buyPrice|valuePrice'],
+  ['brand', 'articleDescription', 'colorSupplier'],
 ]
 
 function prepFilterSkusImages(filteredSkus: SkuI[], merge = true, fileNames: Array<string>) {
@@ -123,7 +124,22 @@ function checkWithoutLast(fileName: string) {
     else if (Number(lastToken)) returnWithoutLast = true
     else if (lastToken.length == 1 && /^[A-Za-zÀ-ÖØ-öø-ÿ]+$/.test(lastToken)) returnWithoutLast = true
     else if (lastToken.length <= 2 && /^[A-Za-zÀ-ÖØ-öø-ÿ0-9]+$/.test(lastToken)) returnWithoutLast = true
+    const tokenLength = tokens.length
     if (returnWithoutLast) {
+      let sliceIndex = -1
+      if (tokenLength > 3 && tokens[tokenLength - 3] == 'press' && ((tokens[tokenLength - 2] == 'pack') || (tokens[tokenLength - 2] == 'model'))) sliceIndex = -3
+      else if (tokenLength > 2 && tokens[tokenLength - 2] == 'packshot') sliceIndex = -2
+      return tokens
+        .slice(0, sliceIndex)
+        .join('')
+        .replace(/[^\p{L}\p{N}]+/gu, '')
+    }
+    if (tokenLength > 2 && tokens[tokenLength - 2] == 'press' && ((tokens[tokenLength - 1] == 'pack') || (tokens[tokenLength - 1] == 'model'))) {
+      return tokens
+        .slice(0, -2)
+        .join('')
+        .replace(/[^\p{L}\p{N}]+/gu, '')
+    } else if (tokenLength > 1 && tokens[tokenLength - 1] == 'packshot') {
       return tokens
         .slice(0, -1)
         .join('')

package/src/reports.ts

@@ -219,6 +219,31 @@ function getImageMimeType(format: 'PNG' | 'JPEG'): string {
   return format === 'PNG' ? 'image/png' : 'image/jpeg'
 }
 
+/** Fit image in layout box preserving aspect ratio (like CSS object-fit: contain). Stretch only when objectFit is fill/stretch. */
+export function computeImageDrawRect(
+  x: number,
+  y: number,
+  boxWidth: number,
+  boxHeight: number,
+  imageWidth: number,
+  imageHeight: number,
+  objectFit?: string
+): { x: number; y: number; width: number; height: number } {
+  let drawX = x
+  let drawY = y
+  let drawWidth = boxWidth
+  let drawHeight = boxHeight
+  const stretch = objectFit === 'fill' || objectFit === 'stretch'
+  if (!stretch && imageWidth > 0 && imageHeight > 0) {
+    const scale = Math.min(boxWidth / imageWidth, boxHeight / imageHeight)
+    drawWidth = imageWidth * scale
+    drawHeight = imageHeight * scale
+    drawX = x + (boxWidth - drawWidth) / 2
+    drawY = y + (boxHeight - drawHeight) / 2
+  }
+  return { x: drawX, y: drawY, width: drawWidth, height: drawHeight }
+}
+
 function getImageDimensions(bytes: Uint8Array, format: 'PNG' | 'JPEG'): { width?: number; height?: number } {
   if (format === 'PNG' && bytes.length >= 24 && isPng(bytes)) {
     return { width: readUint32BE(bytes, 16), height: readUint32BE(bytes, 20) }
@@ -411,18 +436,15 @@ function drawSimpleObject(x: number, y: number, doc: jsPDF, object: LayoutObject
       const urlLower = String(imgUrl).toLowerCase()
       const imageAsset = context.imageAssets?.get(String(imgUrl))
       const format = imageAsset?.format || (urlLower.endsWith('.png') ? 'PNG' : urlLower.endsWith('.jpg') || urlLower.endsWith('.jpeg') ? 'JPEG' : 'JPEG')
-      let drawX = x
-      let drawY = y
-      let drawWidth = width
-      let drawHeight = height
-      // Preserve aspect ratio when objectFit is 'contain' and we have dimensions
-      if (imgObj.objectFit === 'contain' && imageAsset?.width && imageAsset?.height) {
-        const scale = Math.min(width / imageAsset.width, height / imageAsset.height)
-        drawWidth = imageAsset.width * scale
-        drawHeight = imageAsset.height * scale
-        drawX = x + (width - drawWidth) / 2
-        drawY = y + (height - drawHeight) / 2
-      }
+      const { x: drawX, y: drawY, width: drawWidth, height: drawHeight } = computeImageDrawRect(
+        x,
+        y,
+        width,
+        height,
+        imageAsset?.width ?? 0,
+        imageAsset?.height ?? 0,
+        imgObj.objectFit
+      )
       try {
         doc.addImage(imageAsset?.dataUrl || imgUrl, format, drawX, drawY, drawWidth, drawHeight)
       } catch (_e) {
@@ -773,7 +795,7 @@ export async function genPDF(layout: Layout, printBuffer: any, options: GenPdfOp
       if (logoUrl) object.url = logoUrl
     }
   })
-  // Preload image bytes for Node.js and dimensions for objectFit:contain
+  // Preload image bytes for Node.js and pixel dimensions for aspect-ratio fitting
   const imageAssets = new Map<string, PdfImageAsset>()
   const loadImage = options.loadImage || loadImageForPdf
   const urls = collectImageUrlsFromLayout(layout, printBuffer)

package/test/reports.spec.ts

@@ -1,7 +1,19 @@
 import { describe, expect, it } from 'vitest'
-import { genPDF } from '../src/reports'
+import { computeImageDrawRect, genPDF } from '../src/reports'
 import type { Layout } from '../src/pdf'
 
+describe('computeImageDrawRect', () => {
+  it('preserves aspect ratio by default (object-fit: contain)', () => {
+    const rect = computeImageDrawRect(10, 20, 40, 30, 500, 500)
+    expect(rect).toEqual({ x: 15, y: 20, width: 30, height: 30 })
+  })
+
+  it('stretches when objectFit is fill', () => {
+    const rect = computeImageDrawRect(10, 20, 40, 30, 500, 375, 'fill')
+    expect(rect).toEqual({ x: 10, y: 20, width: 40, height: 30 })
+  })
+})
+
 /** Tiny valid JPEG as data URL — avoids flaky network-dependent image fetch in CI/sandbox. */
 function offlineJpegFixture(): string {
   const b64 =