@softwear/latestcollectioncore 1.0.187 → 1.0.189

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.187",
+  "version": "1.0.189",
   "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

@@ -32,6 +32,12 @@ export interface PdfImageAsset {
 export interface GenPdfOptions {
   onAlert?: (alert: GenPdfAlert) => void
   translate?: (key: string) => string
+  /**
+   * Called for layout fields with `format: 'currency'`. Receives the raw string from `source` (e.g. `"123.45"`).
+   * Return the exact string to draw. Callers normally pass a closure created next to `genPDF` so it can read
+   * `printBuffer`, tenant currency, locale, etc. If omitted, defaults to a euro prefix plus two decimals (`€ 123.45`).
+   */
+  formatCurrency?: (rawAmountString: string) => string
   resolveLogoUrl?: () => string | undefined
   isCustomPdfFont?: (fontFamily: string) => boolean
   getPdfFontDefinition?: (fontFamily: string) => PdfFontDefinition | undefined
@@ -353,7 +359,10 @@ function drawSimpleObject(x: number, y: number, doc: jsPDF, object: LayoutObject
       options.onAlert?.({ header: 'fieldnotfound', body: object.source, type: 'warning', timeout: 10000 })
       text = ''
     }
-    if (object.format == 'currency') text = String.fromCharCode(128) + ' ' + parseFloat(text).toFixed(2)
+    if (object.format == 'currency') {
+      const raw = text
+      text = options.formatCurrency ? options.formatCurrency(raw) : '€ ' + parseFloat(raw).toFixed(2)
+    }
   }
   // Manipulate case as specified in object
   if ((object.type === 'text' || object.type === 'field') && object.case === 1) text = text.toUpperCase()
@@ -586,12 +595,7 @@ addObjectToPDF = function (
   const layoutYtenths = originY + object.y
   const rawPrintOnlyAtStartOffset = printOnlyAtStartContainersOffset ?? 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 effectivePrintOnlyAtStartContainersOffsetNow = (): number => (containerChain.length === 0 && rawPrintOnlyAtStartOffset > 0 && getCurrentPageNumber(doc, context) === 1 ? rawPrintOnlyAtStartOffset : 0)
 
   const x = layoutXtenths / 10
   const y = (layoutYtenths + effectivePrintOnlyAtStartContainersOffsetNow()) / 10

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)
+  })
+})

package/test/reports.spec.ts

@@ -331,4 +331,62 @@ describe('genPDF', () => {
     expect(chromeMatches?.length ?? 0).toBeGreaterThanOrEqual(doc.getNumberOfPages())
     expect(pdfText).toContain('SKU_20')
   })
+
+  it('uses GenPdfOptions.formatCurrency for currency fields when provided', async () => {
+    const layout: Layout = {
+      name: 'currency-inject',
+      paperSize: { width: 210, height: 297, footerHeight: 20 },
+      objects: [
+        {
+          type: 'field' as const,
+          name: 'amount',
+          x: 20,
+          y: 20,
+          width: 500,
+          height: 50,
+          active: true,
+          source: 'amount',
+          format: 'currency' as const,
+          textAlign: 1 as const,
+          fontFamily: 'Helvetica',
+          fontSize: 32,
+          fontStyle: 0,
+        },
+      ],
+    }
+    const printBuffer = { amount: '99.5', currency: 'USD' }
+    const doc = await genPDF(layout, printBuffer, {
+      formatCurrency: (raw) => `USD ${raw} BUF:${printBuffer.currency}`,
+    })
+    const pdfText = Buffer.from(doc.output('arraybuffer')).toString('latin1')
+    expect(pdfText).toContain('USD 99.5 BUF:USD')
+  })
+
+  it('defaults currency fields to euro-style prefix when formatCurrency is omitted', async () => {
+    const layout: Layout = {
+      name: 'currency-default',
+      paperSize: { width: 210, height: 297, footerHeight: 20 },
+      objects: [
+        {
+          type: 'field' as const,
+          name: 'amount',
+          x: 20,
+          y: 20,
+          width: 500,
+          height: 50,
+          active: true,
+          source: 'amount',
+          format: 'currency' as const,
+          textAlign: 1 as const,
+          fontFamily: 'Helvetica',
+          fontSize: 32,
+          fontStyle: 0,
+        },
+      ],
+    }
+    const doc = await genPDF(layout, { amount: '10' })
+    const pdfText = Buffer.from(doc.output('arraybuffer')).toString('latin1')
+    // jsPDF encodes U+20AC as WinAnsi 0x80 in the text operator; still one glyph before digits.
+    expect(pdfText).toMatch(/\(\s*.\s*10\.00\) Tj/)
+  })
 })