@softwear/latestcollectioncore 1.0.205 → 1.0.207

package/dist/articleStatus.js

@@ -18,13 +18,13 @@ SELLOUT_PERCENTAGE, ROI, QTY_AVG_STOCK, VALUE_AVG_STOCK, QTY_TURNOVER_VELOCITY,
 const VECTOR_LENGTH = 50;
 const BEGIN_STOCK_VECTOR_START = QTY_STOCK;
 const BEGIN_STOCK_VECTOR_END = AMOUNT_SHELF_STOCK + 1;
+const TOTAL_KEY = '** TOTAL **';
 const msYear = 24 * 3600 * 365 * 1000;
-const globalJoinableTables = { customer: 'custnr', sku: 'ean', wh: 'wh', transaction: 'row' }; // defines the keys we can join on
+const globalJoinableTables = { customer: 'custnr', sku: 'ean', wh: 'wh' }; // defines the keys we can join on
 /**
  * Global variables
  */
 let globalRelations = {}; // holds the joined tables
-let globalNrAggegationExpressions = 0; // tracks the # aggregations rows so we can quit computing if it grows out of bounds
 /**
  * The propFunction for FiltreX needs some data that can't be passed as parameters. That's why the 'globalsRelations' variable is needed.
  * TODO: Functional: Experiment with curried functions
@@ -32,17 +32,28 @@ let globalNrAggegationExpressions = 0; // tracks the # aggregations rows so we c
 function resolvePath(obj, path) {
     return path.reduce((o, key) => o === null || o === void 0 ? void 0 : o[key], obj);
 }
+const MAX_PARSED_PROPERTIES = 1000;
+const parsedProperties = new Map();
+function parseProperty(propertyName) {
+    let parsed = parsedProperties.get(propertyName);
+    if (parsed)
+        return parsed;
+    const positionOfDot = propertyName.indexOf('.');
+    parsed = positionOfDot < 0 ? { table: undefined, path: [propertyName] } : { table: propertyName.substring(0, positionOfDot), path: propertyName.substring(positionOfDot + 1).split('.') };
+    if (parsedProperties.size >= MAX_PARSED_PROPERTIES)
+        parsedProperties.clear();
+    parsedProperties.set(propertyName, parsed);
+    return parsed;
+}
 function propFunction(propertyName, getPropertyName, obj) {
     var _a;
-    const positionOfDot = propertyName.indexOf('.');
-    if (positionOfDot < 0)
+    const { table, path } = parseProperty(propertyName);
+    if (table === undefined)
         return obj[propertyName];
-    const table = propertyName.substring(0, positionOfDot);
-    const path = propertyName.substring(positionOfDot + 1).split('.');
     if (table == 'transaction')
-        return resolvePath(obj, path);
+        return path.length == 1 ? obj[path[0]] : resolvePath(obj, path);
     const joinedRecord = (_a = globalRelations[table]) === null || _a === void 0 ? void 0 : _a[obj[globalJoinableTables[table]]];
-    return resolvePath(joinedRecord, path) || '~ ?';
+    return (path.length == 1 ? joinedRecord === null || joinedRecord === void 0 ? void 0 : joinedRecord[path[0]] : resolvePath(joinedRecord, path)) || '~ ?';
 }
 const lower = (s) => s.toLowerCase();
 const upper = (s) => s.toUpperCase();
@@ -50,23 +61,50 @@ const filtrexOptions = {
     extraFunctions: { lower, upper },
     customProp: propFunction,
 };
-// This is how the actual joining of 2 vectors happens
+const filtrexKeywords = ['and', 'or', 'not', 'in', 'of', 'if', 'then', 'else', 'mod'];
+/**
+ * The transaction fields an expression result depends on. Two transactions with the same values for
+ * these fields give the same result, so the expression is evaluated once per combination.
+ * - A joined table (sku., wh., customer.) depends on its join key.
+ * - transaction.<field> and a bare <field> depend on that field of the transaction itself.
+ * A field too many only costs cache hits; a field too few would give wrong results.
+ */
+function getExpressionGranularity(expression) {
+    const fields = [];
+    const addField = (field) => {
+        if (fields.indexOf(field) < 0)
+            fields.push(field);
+    };
+    Object.entries(globalJoinableTables).forEach(([table, joinKey]) => {
+        if (expression.includes(table + '.'))
+            addField(joinKey);
+    });
+    const withoutStrings = expression.replace(/"(?:[^"\\]|\\.)*"/g, '""');
+    // 'quoted symbol' | symbol, optionally followed by "(" when it is a function call
+    const symbolPattern = /'((?:[^'\\]|\\.)*)'|([A-Za-z_$][A-Za-z0-9_$.]*)(\s*\()?/g;
+    let match;
+    while ((match = symbolPattern.exec(withoutStrings))) {
+        let symbol = match[2];
+        if (match[1] !== undefined)
+            symbol = match[1].replace(/\\(.)/g, '$1');
+        else if (match[3] || filtrexKeywords.indexOf(symbol) >= 0)
+            continue;
+        const positionOfDot = symbol.indexOf('.');
+        if (positionOfDot < 0)
+            addField(symbol);
+        else if (symbol.substring(0, positionOfDot) == 'transaction')
+            addField(symbol.substring(positionOfDot + 1).split('.')[0]);
+    }
+    return fields;
+}
+// Deprecated schema: transactions that still carry a stored vector are added slot by slot.
 function addVectors(targetVector, otherVector, begin, end) {
+    if (end > otherVector.length)
+        end = otherVector.length;
     for (let i = begin; i < end; i++)
         targetVector[i] += otherVector[i] || 0;
 }
-// This function takes a transaction and adds it to the aggregations
-function addTransactionToAggregations(beginTimestamp, endTimestamp, aggregateKey, rawAggregations, transaction, maxRows) {
-    let aggregateVector = rawAggregations[aggregateKey];
-    if (globalNrAggegationExpressions >= maxRows)
-        return;
-    if (!aggregateVector) {
-        globalNrAggegationExpressions++;
-        aggregateVector = new Float64Array(VECTOR_LENGTH);
-        rawAggregations[aggregateKey] = aggregateVector;
-    }
-    if (!transaction.vector)
-        transaction.vector = transaction_1.default.buildVector(transaction);
+function addStoredVector(beginTimestamp, endTimestamp, aggregateVector, transaction) {
     if (Array.isArray(transaction.vector))
         transaction.vector = Float64Array.from(transaction.vector);
     const v = transaction.vector;
@@ -118,6 +156,8 @@ function getTrieLeaf(root, transaction, keys) {
     }
     return node;
 }
+// The most fields a single transaction adds to an aggregation row (a returned sale: 10)
+const MAX_CONTRIBUTIONS = 12;
 /*
  * A factory function that returns a function that can be used to aggregate transactions
  * The factory function is called once for each aggregationExpression
@@ -146,19 +186,228 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
     const filterTrieRoot = {};
     if (filterExpression) {
         filter = (0, filtrex_1.compileExpression)(filterExpression, filtrexOptions);
-        filterGranularity = Object.entries(globalJoinableTables)
-            .filter((join) => filterExpression.includes(join[0] + '.'))
-            .map((join) => join[1]);
+        filterGranularity = getExpressionGranularity(filterExpression);
     }
     // Empty aggregation expression = no groupers → only the totals row
     const totalsOnly = !aggregationExpression;
     const aggregationEvaluator = totalsOnly ? undefined : buildAggregationEvaluator(aggregationExpression);
-    const aggregationGranularity = totalsOnly
-        ? []
-        : Object.entries(globalJoinableTables)
-            .filter((join) => aggregationExpression.includes(join[0] + '.'))
-            .map((join) => join[1]);
+    const aggregationGranularity = totalsOnly ? [] : getExpressionGranularity(aggregationExpression);
     const aggregationTrieRoot = {};
+    let nrNewRows = 0; // tracks the # rows added so we can quit computing if it grows out of bounds
+    let totalVector;
+    // What the current transaction adds to an aggregation row: computed once, added to its row, subtotal and total
+    const slots = new Int32Array(MAX_CONTRIBUTIONS);
+    const values = new Float64Array(MAX_CONTRIBUTIONS);
+    let nrContributions = 0;
+    // NaN (a missing qty or price) counts as 0
+    function contribute(slot, value) {
+        slots[nrContributions] = slot;
+        values[nrContributions++] = value || 0;
+    }
+    function contributeStockTime(qty, amount, timeLeft) {
+        slots[nrContributions] = STOCK_TIME_PRODUCT;
+        values[nrContributions++] = qty * timeLeft;
+        slots[nrContributions] = STOCKAMOUNT_TIME_PRODUCT;
+        values[nrContributions++] = amount * timeLeft;
+    }
+    // Same numbers as transaction.buildVector, without building a vector per transaction
+    function prepareContributions(transaction) {
+        nrContributions = 0;
+        const time = transaction.time;
+        const type = typeof transaction.type == 'string' ? transaction.type : String(transaction.type);
+        const qty = +transaction.qty;
+        if (time <= beginTimestamp) {
+            // Before the period: begin stock, plus outstanding picklists/consignments so endShelf remains stable
+            // when only the start date changes for a fixed end date.
+            switch (type) {
+                case types_1.transactionTypeE.RECEIVING:
+                case types_1.transactionTypeE.TRANSIT:
+                case types_1.transactionTypeE.CHANGE:
+                case types_1.transactionTypeE.START_STOCK:
+                case types_1.transactionTypeE.RETURN_CUSTOMER: {
+                    const cost = (0, index_1.round2)(transaction.buyprice * transaction.qty);
+                    contribute(QTY_STOCK, qty);
+                    contribute(AMOUNT_STOCK, cost);
+                    contribute(QTY_SHELF_STOCK, qty);
+                    contribute(AMOUNT_SHELF_STOCK, cost);
+                    return;
+                }
+                case types_1.transactionTypeE.SALE:
+                case types_1.transactionTypeE.B2B_SOLD:
+                case types_1.transactionTypeE.B2B_RE_SOLD: {
+                    const cost = (0, index_1.round2)(-transaction.buyprice * transaction.qty);
+                    contribute(QTY_STOCK, -qty);
+                    contribute(AMOUNT_STOCK, cost);
+                    contribute(QTY_SHELF_STOCK, -qty);
+                    contribute(AMOUNT_SHELF_STOCK, cost);
+                    return;
+                }
+                case types_1.transactionTypeE.RE_VALUATION: {
+                    const cost = (0, index_1.round2)(transaction.buyprice * transaction.qty);
+                    contribute(AMOUNT_STOCK, cost);
+                    contribute(AMOUNT_SHELF_STOCK, cost);
+                    return;
+                }
+                case types_1.transactionTypeE.START_SHELF_STOCK:
+                    // Type 10 subtracts outstanding picktickets of previous shards from the shelf stock
+                    contribute(QTY_SHELF_STOCK, qty);
+                    contribute(AMOUNT_SHELF_STOCK, (0, index_1.round2)(transaction.buyprice * transaction.qty));
+                    return;
+                case types_1.transactionTypeE.PICK_LIST:
+                    contribute(QTY_PICKLIST, qty);
+                    contribute(AMOUNT_PICKLIST, (0, index_1.round2)(transaction.sellprice * transaction.qty));
+                    contribute(COSTPRICE_PICKLIST, (0, index_1.round2)(transaction.buyprice * transaction.qty));
+                    return;
+                case types_1.transactionTypeE.CONSIGNMENT:
+                    contribute(QTY_CONSIGNMENT, qty);
+                    contribute(AMOUNT_CONSIGNMENT, (0, index_1.round2)(transaction.sellprice * transaction.qty));
+                    contribute(COSTPRICE_CONSIGNMENT, (0, index_1.round2)(transaction.buyprice * transaction.qty));
+                    return;
+            }
+            return;
+        }
+        if (time > endTimestamp)
+            return;
+        // Period transactions
+        const timeLeft = endTimestamp - time;
+        switch (type) {
+            case types_1.transactionTypeE.SALE: {
+                const sku = globalRelations['sku'][transaction.ean];
+                const amountSoldExcl = (0, index_1.round2)((transaction.sellprice / ((100 + (transaction.vat || 0)) / 100)) * transaction.qty);
+                const costprice = (0, index_1.round2)(transaction.buyprice * transaction.qty);
+                const amountSoldMax = (0, index_1.round2)((((sku === null || sku === void 0 ? void 0 : sku.price) || 0) / ((100 + (transaction.vat || (sku === null || sku === void 0 ? void 0 : sku.vat) || 21)) / 100)) * qty);
+                contribute(QTY_SOLD, qty);
+                contribute(AMOUNT_SOLD, (0, index_1.round2)(transaction.sellprice * transaction.qty));
+                contribute(AMOUNT_SOLD_EXCL, amountSoldExcl);
+                contribute(COSTPRICE_SOLD, costprice);
+                contribute(AMOUNT_SOLD_MAX, amountSoldMax);
+                contribute(AMOUNT_SOLD_DISCOUNT, (0, index_1.round2)(amountSoldMax - amountSoldExcl));
+                if (qty < 0)
+                    contribute(QTY_RETURN, qty);
+                if (amountSoldExcl < 0)
+                    contribute(AMOUNT_RETURN, amountSoldExcl);
+                contributeStockTime(-(qty || 0), -(costprice || 0), timeLeft);
+                return;
+            }
+            case types_1.transactionTypeE.RECEIVING: {
+                const cost = (0, index_1.round2)(transaction.buyprice * transaction.qty);
+                contribute(QTY_RECIEVED, qty);
+                contribute(AMOUNT_RECIEVED, cost);
+                contributeStockTime(qty || 0, cost || 0, timeLeft);
+                return;
+            }
+            case types_1.transactionTypeE.TRANSIT: {
+                const cost = (0, index_1.round2)(transaction.buyprice * transaction.qty);
+                contribute(QTY_TRANSIT, qty);
+                contribute(AMOUNT_TRANSIT, cost);
+                contributeStockTime(qty || 0, cost || 0, timeLeft);
+                return;
+            }
+            case types_1.transactionTypeE.CHANGE:
+            case types_1.transactionTypeE.START_STOCK: {
+                const cost = (0, index_1.round2)(transaction.buyprice * transaction.qty);
+                contribute(QTY_CHANGE, qty);
+                contribute(AMOUNT_CHANGE, cost);
+                contributeStockTime(qty || 0, cost || 0, timeLeft);
+                return;
+            }
+            case types_1.transactionTypeE.B2B_SOLD: {
+                const cost = (0, index_1.round2)(transaction.buyprice * transaction.qty);
+                contribute(QTY_B2B_SOLD, qty);
+                contribute(AMOUNT_B2B_SOLD, (0, index_1.round2)(transaction.sellprice * transaction.qty));
+                contribute(COSTPRICE_B2B_SOLD, cost);
+                contributeStockTime(-(qty || 0), -(cost || 0), timeLeft);
+                return;
+            }
+            case types_1.transactionTypeE.B2B_RE_SOLD: {
+                const cost = (0, index_1.round2)(transaction.buyprice * transaction.qty);
+                contribute(QTY_B2B_RESOLD, qty);
+                contribute(AMOUNT_B2B_RESOLD, (0, index_1.round2)(transaction.sellprice * transaction.qty));
+                contribute(COSTPRICE_B2B_RESOLD, cost);
+                contributeStockTime(-(qty || 0), -(cost || 0), timeLeft);
+                return;
+            }
+            case types_1.transactionTypeE.RETURN_CUSTOMER: {
+                const cost = (0, index_1.round2)(transaction.buyprice * transaction.qty);
+                contribute(QTY_B2B_RETURN, qty);
+                contribute(AMOUNT_B2B_RETURN, (0, index_1.round2)(transaction.sellprice * transaction.qty));
+                contribute(COSTPRICE_B2B_RETURN, cost);
+                contributeStockTime(qty || 0, cost || 0, timeLeft);
+                return;
+            }
+            case types_1.transactionTypeE.CREDIT_INVOICE:
+                contribute(AMOUNT_B2B_RETURN, (0, index_1.round2)(transaction.sellprice * transaction.qty));
+                return;
+            case types_1.transactionTypeE.RE_VALUATION:
+                contribute(AMOUNT_REVALUATE, (0, index_1.round2)(transaction.buyprice * transaction.qty));
+                return;
+            case types_1.transactionTypeE.PURCHASE_ORDER:
+                contribute(QTY_PO, qty);
+                contribute(AMOUNT_PO, (0, index_1.round2)(transaction.buyprice * transaction.qty));
+                return;
+            case types_1.transactionTypeE.PURCHASE_ORDER_COMPLETE:
+                contribute(QTY_PO_COMPLETE, qty);
+                contribute(AMOUNT_PO_COMPLETE, (0, index_1.round2)(transaction.buyprice * transaction.qty));
+                return;
+            case types_1.transactionTypeE.MINIMUM_STOCK:
+                contribute(QTY_MINIMUM_STOCK, qty);
+                contribute(AMOUNT_MINIMUM_STOCK, (0, index_1.round2)(transaction.buyprice * transaction.qty));
+                return;
+            case types_1.transactionTypeE.ORDER:
+                contribute(QTY_ORDER, qty);
+                contribute(AMOUNT_ORDER, (0, index_1.round2)(transaction.sellprice * transaction.qty));
+                contribute(COSTPRICE_ORDER, (0, index_1.round2)(transaction.buyprice * transaction.qty));
+                return;
+            case types_1.transactionTypeE.RE_ORDER:
+                contribute(QTY_REORDER, qty);
+                contribute(AMOUNT_REORDER, (0, index_1.round2)(transaction.sellprice * transaction.qty));
+                contribute(COSTPRICE_REORDER, (0, index_1.round2)(transaction.buyprice * transaction.qty));
+                return;
+            case types_1.transactionTypeE.PICK_LIST:
+                // Picklists reduce shelfStock, which is handled by subtracting QTY_PICKLIST in postAgg
+                contribute(QTY_PICKLIST, qty);
+                contribute(AMOUNT_PICKLIST, (0, index_1.round2)(transaction.sellprice * transaction.qty));
+                contribute(COSTPRICE_PICKLIST, (0, index_1.round2)(transaction.buyprice * transaction.qty));
+                return;
+            case types_1.transactionTypeE.CONSIGNMENT:
+                // Consignments reduce shelfStock, which is handled by subtracting QTY_CONSIGNMENT in postAgg
+                contribute(QTY_CONSIGNMENT, qty);
+                contribute(AMOUNT_CONSIGNMENT, (0, index_1.round2)(transaction.sellprice * transaction.qty));
+                contribute(COSTPRICE_CONSIGNMENT, (0, index_1.round2)(transaction.buyprice * transaction.qty));
+                return;
+        }
+    }
+    // Deprecated schema: derived sale fields live in the stored vector
+    function prepareStoredVector(transaction) {
+        if (transaction.type != types_1.transactionTypeE.SALE)
+            return;
+        const sku = globalRelations['sku'][transaction.ean];
+        if (Array.isArray(transaction.vector)) {
+            const tmp = new Float64Array(AMOUNT_SOLD_DISCOUNT + 1);
+            tmp.set(transaction.vector);
+            transaction.vector = tmp;
+        }
+        const v = transaction.vector;
+        v[AMOUNT_SOLD_MAX] = (0, index_1.round2)((((sku === null || sku === void 0 ? void 0 : sku.price) || 0) / ((100 + (transaction.vat || (sku === null || sku === void 0 ? void 0 : sku.vat) || 21)) / 100)) * v[QTY_SOLD]);
+        v[AMOUNT_SOLD_DISCOUNT] = (0, index_1.round2)(v[AMOUNT_SOLD_MAX] - v[AMOUNT_SOLD_EXCL]);
+    }
+    function getAggregateVector(aggregateKey) {
+        let aggregateVector = rawAggregations[aggregateKey];
+        if (!aggregateVector) {
+            nrNewRows++;
+            aggregateVector = new Float64Array(VECTOR_LENGTH);
+            rawAggregations[aggregateKey] = aggregateVector;
+        }
+        return aggregateVector;
+    }
+    function addTransactionToVector(aggregateVector, transaction) {
+        if (transaction.vector)
+            return addStoredVector(beginTimestamp, endTimestamp, aggregateVector, transaction);
+        if (transaction.type == types_1.transactionTypeE.RECEIVING && transaction.time > aggregateVector[MAX_RECIEVE_TIMESTAMP])
+            aggregateVector[MAX_RECIEVE_TIMESTAMP] = transaction.time;
+        for (let i = 0; i < nrContributions; i++)
+            aggregateVector[slots[i]] += values[i];
+    }
     return function (transaction) {
         if (filter) {
             const filterLeaf = getTrieLeaf(filterTrieRoot, transaction, filterGranularity);
@@ -170,22 +419,15 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
                     return;
             }
         }
-        // Prepare joined values for derived fields
-        if (transaction.type == types_1.transactionTypeE.SALE) {
-            const sku = globalRelations['sku'][transaction.ean];
-            if (!transaction.vector)
-                transaction.vector = transaction_1.default.buildVector(transaction);
-            if (Array.isArray(transaction.vector)) {
-                const tmp = new Float64Array(AMOUNT_SOLD_DISCOUNT + 1);
-                tmp.set(transaction.vector);
-                transaction.vector = tmp;
-            }
-            const v = transaction.vector;
-            v[AMOUNT_SOLD_MAX] = (0, index_1.round2)((((sku === null || sku === void 0 ? void 0 : sku.price) || 0) / ((100 + (transaction.vat || (sku === null || sku === void 0 ? void 0 : sku.vat) || 21)) / 100)) * v[QTY_SOLD]);
-            v[AMOUNT_SOLD_DISCOUNT] = (0, index_1.round2)(v[AMOUNT_SOLD_MAX] - v[AMOUNT_SOLD_EXCL]);
+        if (transaction.vector)
+            prepareStoredVector(transaction);
+        else
+            prepareContributions(transaction);
+        if ((totals || totalsOnly) && nrNewRows < maxRows) {
+            if (!totalVector)
+                totalVector = getAggregateVector(TOTAL_KEY);
+            addTransactionToVector(totalVector, transaction);
         }
-        if (totals || totalsOnly)
-            addTransactionToAggregations(beginTimestamp, endTimestamp, '** TOTAL **', rawAggregations, transaction, maxRows);
         // No detail/subtotal rows when there are no groupers
         if (totalsOnly)
             return;
@@ -198,20 +440,19 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
         // Example: for 4 groupers we have rows like
         // g0 g1 g2 g3 <- normal row with no subtotal
         // g0          <- subtotal for g0
-        if (subtotalsForOuterGrouper == true) {
-            addTransactionToAggregations(beginTimestamp, endTimestamp, `${aggregateKey.substr(0, aggregateKey.indexOf('\t'))} Σ`, rawAggregations, transaction, maxRows);
-        }
-        if (parentGroupTotals) {
-            const KPIKey = prepareSubTotalAggKey(aggregateKey);
-            addTransactionToAggregations(beginTimestamp, endTimestamp, KPIKey, rawAggregations, transaction, maxRows);
-        }
-        else {
-            addTransactionToAggregations(beginTimestamp, endTimestamp, aggregateKey, rawAggregations, transaction, maxRows);
+        if (subtotalsForOuterGrouper == true && nrNewRows < maxRows) {
+            if (!aggregateKeyLeaf.subtotalVector)
+                aggregateKeyLeaf.subtotalVector = getAggregateVector(`${aggregateKey.substr(0, aggregateKey.indexOf('\t'))} Σ`);
+            addTransactionToVector(aggregateKeyLeaf.subtotalVector, transaction);
         }
+        if (nrNewRows >= maxRows)
+            return;
+        if (!aggregateKeyLeaf.vector)
+            aggregateKeyLeaf.vector = getAggregateVector(parentGroupTotals ? prepareSubTotalAggKey(aggregateKey) : aggregateKey);
+        addTransactionToVector(aggregateKeyLeaf.vector, transaction);
     };
 }
 function aggregate({ beginTimestamp, endTimestamp, filterExpression, aggregationExpression, transactions, beginStock, relations, rawAggregations, maxRows, totals, subtotalsForOuterGrouper, parentGroupTotals }) {
-    globalNrAggegationExpressions = 0;
     globalRelations = relations;
     const compiledAggregator = aggregator({
         beginTimestamp,

package/dist/barcodeCanvas.d.ts

@@ -0,0 +1,11 @@
+export interface BarcodeCanvasResult {
+    dataUrl: string;
+    width: number;
+    height: number;
+}
+/**
+ * Render a barcode to a PNG data URL.
+ * Module width is fixed; the caller must scale the image uniformly into the layout box
+ * so bars are not distorted.
+ */
+export declare function renderBarcodeToDataUrl(value: string): BarcodeCanvasResult | null;

package/dist/barcodeCanvas.js

@@ -0,0 +1,61 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderBarcodeToDataUrl = void 0;
+const jsbarcode_1 = __importDefault(require("jsbarcode"));
+/** Vite / CJS interop sometimes wraps the function as `{ default: fn }`. */
+function resolveJsBarcode() {
+    const mod = jsbarcode_1.default;
+    if (typeof mod === 'function')
+        return mod;
+    if (mod && typeof mod.default === 'function')
+        return mod.default;
+    return null;
+}
+function createCanvasElement() {
+    if (typeof document !== 'undefined' && typeof document.createElement === 'function') {
+        return document.createElement('canvas');
+    }
+    return null;
+}
+/**
+ * Render a barcode to a PNG data URL.
+ * Module width is fixed; the caller must scale the image uniformly into the layout box
+ * so bars are not distorted.
+ */
+function renderBarcodeToDataUrl(value) {
+    if (!value)
+        return null;
+    const canvas = createCanvasElement();
+    if (!canvas)
+        return null;
+    const JsBarcode = resolveJsBarcode();
+    if (!JsBarcode)
+        return null;
+    try {
+        JsBarcode(canvas, value, {
+            // Fixed module geometry — do not stretch independently in X/Y when placing on the page.
+            // CODE128 accepts arbitrary values.
+            format: 'CODE128',
+            width: 2,
+            height: 60,
+            displayValue: false,
+            margin: 0,
+        });
+    }
+    catch (e) {
+        if (typeof console !== 'undefined')
+            console.warn('Barcode render failed', value, e);
+        return null;
+    }
+    if (!canvas.width || !canvas.height)
+        return null;
+    return {
+        dataUrl: canvas.toDataURL('image/png'),
+        width: canvas.width,
+        height: canvas.height,
+    };
+}
+exports.renderBarcodeToDataUrl = renderBarcodeToDataUrl;

package/dist/pdf.d.ts

@@ -5,7 +5,7 @@ export interface PaperSize {
     footerHeight: number;
 }
 export type TextAlign = 1 | 2 | 3;
-export type ObjectType = 'text' | 'field' | 'rectangle' | 'image' | 'container';
+export type ObjectType = 'text' | 'field' | 'rectangle' | 'image' | 'container' | 'barcode';
 export type RepeatContainer = 'horizontal' | 'vertical' | undefined;
 export interface BaseLayoutObject {
     type: ObjectType;
@@ -44,6 +44,14 @@ export interface ImageLayoutObject extends BaseLayoutObject {
     url?: string;
     image?: HTMLImageElement;
 }
+/**
+ * Renders a 1D barcode from printBuffer via `source` (default `barcode`).
+ * Drawn with uniform scale to fit width×height (never independently stretched).
+ */
+export interface BarcodeLayoutObject extends BaseLayoutObject {
+    type: 'barcode';
+    source?: string;
+}
 export interface ContainerLayoutObject extends BaseLayoutObject {
     type: 'container';
     source: string;
@@ -61,7 +69,7 @@ export interface ContainerLayoutObject extends BaseLayoutObject {
      */
     printOnlyAtStart?: boolean;
 }
-export type LayoutObject = TextLayoutObject | FieldLayoutObject | RectangleLayoutObject | ImageLayoutObject | ContainerLayoutObject;
+export type LayoutObject = TextLayoutObject | FieldLayoutObject | RectangleLayoutObject | ImageLayoutObject | BarcodeLayoutObject | ContainerLayoutObject;
 export interface Layout {
     name?: string;
     group?: string;

package/dist/reports.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.genPDF = exports.computeImageDrawRect = void 0;
 const jspdf_1 = require("jspdf");
 const date_fns_1 = require("date-fns");
+const barcodeCanvas_1 = require("./barcodeCanvas");
 const deepCopy_1 = __importDefault(require("./deepCopy"));
 const layoutFieldFormat_1 = require("./layoutFieldFormat");
 /** Measurement uses context `currentPageNumber` (1-based). Rendering uses jsPDF’s `getCurrentPageInfo().pageNumber`, which is already 1-based (first page is 1). */
@@ -287,7 +288,7 @@ function truncateTextToFitWidth(doc, text, maxWidth) {
     return truncatedText + ELLIPSIS;
 }
 function drawSimpleObject(x, y, doc, object, printBuffer, width, height, options, context) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _f;
     let text = ''; // Will hold text to display for either 'text' or 'field'
     // Get text from object for text objects
     if (object.type == 'text') {
@@ -377,6 +378,28 @@ function drawSimpleObject(x, y, doc, object, printBuffer, width, height, options
             }
         }
     }
+    // Draw barcode for barcode objects (uniform scale into the layout box — never stretch bars)
+    if (object.type == 'barcode') {
+        const barcodeObj = object;
+        const source = barcodeObj.source || 'barcode';
+        const raw = getProperty(source, printBuffer);
+        const value = raw == null ? '' : String(raw);
+        if (!value) {
+            (_d = options.onAlert) === null || _d === void 0 ? void 0 : _d.call(options, { header: 'fieldnotfound', body: source, type: 'warning', timeout: 10000 });
+        }
+        else {
+            const rendered = (0, barcodeCanvas_1.renderBarcodeToDataUrl)(value);
+            if (rendered) {
+                const { x: drawX, y: drawY, width: drawWidth, height: drawHeight } = computeImageDrawRect(x, y, width, height, rendered.width, rendered.height);
+                try {
+                    doc.addImage(rendered.dataUrl, 'PNG', drawX, drawY, drawWidth, drawHeight);
+                }
+                catch (_e) {
+                    // Skip if jsPDF cannot embed the canvas data URL
+                }
+            }
+        }
+    }
     // Draw text for text and field objets
     if ((object.type == 'text' || object.type == 'field') && text) {
         let textAlign;
@@ -394,7 +417,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 && ((_d = options.isCustomPdfFont) === null || _d === void 0 ? void 0 : _d.call(options, object.fontFamily)) ? object.fontFamily : context.defaultFontFamily || object.fontFamily || 'Helvetica';
+        const fontFamily = object.fontFamily && ((_f = options.isCustomPdfFont) === null || _f === void 0 ? void 0 : _f.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' });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-  "version": "1.0.205",
+  "version": "1.0.207",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -38,6 +38,7 @@
   "dependencies": {
     "date-fns": "^2.29.3",
     "filtrex": "^2.2.3",
+    "jsbarcode": "^3.12.3",
     "jspdf": "^4.2.1"
   }
 }