@softwear/latestcollectioncore 1.0.198 → 1.0.201

package/dist/articleStatus.js

@@ -159,10 +159,14 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
             .filter((join) => filterExpression.includes(join[0] + '.'))
             .map((join) => join[1]);
     }
-    const aggregationEvaluator = buildAggregationEvaluator(aggregationExpression);
-    const aggregationGranularity = Object.entries(globalJoinableTables)
-        .filter((join) => aggregationExpression.includes(join[0] + '.'))
-        .map((join) => join[1]);
+    // 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 aggregationTrieRoot = {};
     return function (transaction) {
         if (filter) {
@@ -175,11 +179,6 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
                     return;
             }
         }
-        const aggregateKeyLeaf = getTrieLeaf(aggregationTrieRoot, transaction, aggregationGranularity);
-        if (!aggregateKeyLeaf.aggregateKey) {
-            aggregateKeyLeaf.aggregateKey = aggregationEvaluator(transaction);
-        }
-        const aggregateKey = aggregateKeyLeaf.aggregateKey;
         // Prepare joined values for derived fields
         if (transaction.type == types_1.transactionTypeE.SALE) {
             const sku = globalRelations['sku'][transaction.ean];
@@ -194,8 +193,16 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
             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 (totals)
+        if (totals || totalsOnly)
             addTransactionToAggregations(beginTimestamp, endTimestamp, '** TOTAL **', rawAggregations, transaction, maxRows);
+        // No detail/subtotal rows when there are no groupers
+        if (totalsOnly)
+            return;
+        const aggregateKeyLeaf = getTrieLeaf(aggregationTrieRoot, transaction, aggregationGranularity);
+        if (!aggregateKeyLeaf.aggregateKey) {
+            aggregateKeyLeaf.aggregateKey = aggregationEvaluator(transaction);
+        }
+        const aggregateKey = aggregateKeyLeaf.aggregateKey;
         // Single subtotals are subtotals for first grouper level
         // Example: for 4 groupers we have rows like
         // g0 g1 g2 g3 <- normal row with no subtotal
@@ -357,6 +364,51 @@ function runQuery(timeframe, rawAggregations, beginStock, transactions, selected
     }
     return rawAggregations;
 }
+/** True when the bound casts to an ISO instant. A calendar day or a stray "T" does not. */
+function hasClockTime(raw) {
+    const value = String(raw).trim();
+    const cast = new Date(value);
+    if (Number.isNaN(cast.getTime()))
+        return false;
+    const iso = cast.toISOString();
+    // yyyy-MM-dd casts to UTC midnight, but the string is only that date prefix.
+    if (iso.slice(0, 10) === value)
+        return false;
+    // The time designator is the character after yyyy-MM-dd, not a stray "T".
+    return value.length > 10 && value[10] === 'T';
+}
+/**
+ * Exact begin/end for two ISO instants. The end bound is that instant, not end-of-day.
+ */
+function getDateRangeFromIsoInstant(inputDates) {
+    const dates = inputDates.slice();
+    dates.sort((a, b) => {
+        return ('' + a).localeCompare(b);
+    });
+    const fromDate = new Date(Date.parse(dates[0]));
+    const toDate = new Date(Date.parse(dates[1]));
+    const beginTimeStamp = fromDate.getTime();
+    const endTimeStamp = toDate.getTime();
+    const timeFrame = endTimeStamp - beginTimeStamp;
+    return {
+        beginTimeStamp,
+        endTimeStamp,
+        timeFrame,
+        utcFromYear: fromDate.getUTCFullYear(),
+        utcToYear: toDate.getUTCFullYear(),
+        utcFromMonth: fromDate.getUTCMonth() + 1,
+        utcToMonth: toDate.getUTCMonth() + 1,
+        fromYear: parseInt((0, date_fns_1.format)(fromDate, 'yyyy')),
+        toYear: parseInt((0, date_fns_1.format)(toDate, 'yyyy')),
+        fromMonth: parseInt((0, date_fns_1.format)(fromDate, 'MM')),
+        toMonth: parseInt((0, date_fns_1.format)(toDate, 'MM')),
+        hrYear: (0, date_fns_1.format)(fromDate, 'yyyy'),
+        hrQuarter: (0, date_fns_1.format)(fromDate, 'yyyy-QQQ'),
+        hrMonth: (0, date_fns_1.format)(fromDate, 'yyyy-MM'),
+        hrWeek: (0, date_fns_1.format)(fromDate, 'RRRR-II'),
+        hrDay: (0, date_fns_1.format)(fromDate, 'yyyy-MM-dd'),
+    };
+}
 /**
  * @param inputDates array of two YYYY-MM-DD strings
  */
@@ -380,6 +432,8 @@ const getDateRangeFromPicker = function (inputDates) {
             hrWeek: '',
             hrDay: '',
         };
+    if (hasClockTime(inputDates[0]) || hasClockTime(inputDates[1]))
+        return getDateRangeFromIsoInstant(inputDates);
     const dates = inputDates.slice();
     dates.sort((a, b) => {
         return ('' + a).localeCompare(b);
@@ -432,6 +486,8 @@ const getDateRangeFromDatePair = function (inputDates) {
             hrWeek: '',
             hrDay: '',
         };
+    if (hasClockTime(inputDates[0]) || hasClockTime(inputDates[1]))
+        return getDateRangeFromIsoInstant(inputDates);
     const dates = inputDates.slice();
     dates.sort((a, b) => {
         return ('' + a).localeCompare(b);

package/dist/index.d.ts

@@ -13,6 +13,7 @@ export { default as hashBrand } from './hashBrand';
 export { default as hasOnlyDigits } from './hasOnlyDigits';
 export { default as imageBinder } from './imageBinder';
 export { default as isean13 } from './isean13';
+export { default as parseScannedBarcode } from './parseScannedBarcode';
 export { default as pivotTable } from './pivotTable';
 export { default as projectObject } from './projectObject';
 export { default as reports, genPDF } from './reports';

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.shouldSuppressZeroField = exports.resolveLayoutFieldText = exports.isZeroFieldValue = exports.isCurrencyFieldFormat = 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;
+exports.isAxiosError = exports.exponentialDelay = exports.axiosRetry = exports.createAxiosInstance = exports.lcAxios = exports.shouldSuppressZeroField = exports.resolveLayoutFieldText = exports.isZeroFieldValue = exports.isCurrencyFieldFormat = exports.transaction = exports.sizeToMap = exports.round2 = exports.genPDF = exports.reports = exports.projectObject = exports.pivotTable = exports.parseScannedBarcode = 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");
@@ -48,6 +48,8 @@ var imageBinder_1 = require("./imageBinder");
 Object.defineProperty(exports, "imageBinder", { enumerable: true, get: function () { return __importDefault(imageBinder_1).default; } });
 var isean13_1 = require("./isean13");
 Object.defineProperty(exports, "isean13", { enumerable: true, get: function () { return __importDefault(isean13_1).default; } });
+var parseScannedBarcode_1 = require("./parseScannedBarcode");
+Object.defineProperty(exports, "parseScannedBarcode", { enumerable: true, get: function () { return __importDefault(parseScannedBarcode_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");

package/dist/parseScannedBarcode.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Gate for scanner / typed barcode input.
+ * Strips a leading `#` (scanner prefix), then accepts only 12- or 13-digit strings.
+ * Does not validate the EAN check digit (isean13) and does not pad a leading 0 (findSkuByBarcode).
+ */
+export default function parseScannedBarcode(raw: unknown): string | null;

package/dist/parseScannedBarcode.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const hasOnlyDigits_1 = __importDefault(require("./hasOnlyDigits"));
+/**
+ * Gate for scanner / typed barcode input.
+ * Strips a leading `#` (scanner prefix), then accepts only 12- or 13-digit strings.
+ * Does not validate the EAN check digit (isean13) and does not pad a leading 0 (findSkuByBarcode).
+ */
+function parseScannedBarcode(raw) {
+    if (typeof raw !== 'string')
+        return null;
+    const scan = raw.startsWith('#') ? raw.substring(1) : raw;
+    if (scan.length !== 12 && scan.length !== 13)
+        return null;
+    if (!(0, hasOnlyDigits_1.default)(scan))
+        return null;
+    return scan;
+}
+exports.default = parseScannedBarcode;

package/package.json

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

package/src/articleStatus.ts

@@ -242,10 +242,14 @@ function aggregator({
       .filter((join) => filterExpression.includes(join[0] + '.'))
       .map((join) => join[1])
   }
-  const aggregationEvaluator = buildAggregationEvaluator(aggregationExpression)
-  const aggregationGranularity = Object.entries(globalJoinableTables)
-    .filter((join) => aggregationExpression.includes(join[0] + '.'))
-    .map((join) => join[1])
+  // 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 aggregationTrieRoot: AggregateKeyTrieNode = {}
 
   return function (transaction: TransactionI): void {
@@ -257,11 +261,6 @@ function aggregator({
         if (filterLeaf.filterResult === -1) return
       }
     }
-    const aggregateKeyLeaf = getTrieLeaf<AggregateKeyTrieNode>(aggregationTrieRoot, transaction, aggregationGranularity)
-    if (!aggregateKeyLeaf.aggregateKey) {
-      aggregateKeyLeaf.aggregateKey = aggregationEvaluator(transaction) as string
-    }
-    const aggregateKey = aggregateKeyLeaf.aggregateKey as string
     // Prepare joined values for derived fields
     if (transaction.type == transactionTypeE.SALE) {
       const sku = globalRelations['sku'][transaction.ean]
@@ -276,7 +275,16 @@ function aggregator({
       v[AMOUNT_SOLD_DISCOUNT] = round2(v[AMOUNT_SOLD_MAX] - v[AMOUNT_SOLD_EXCL])
     }
 
-    if (totals) addTransactionToAggregations(beginTimestamp, endTimestamp, '** TOTAL **', rawAggregations, transaction, maxRows)
+    if (totals || totalsOnly) addTransactionToAggregations(beginTimestamp, endTimestamp, '** TOTAL **', rawAggregations, transaction, maxRows)
+
+    // No detail/subtotal rows when there are no groupers
+    if (totalsOnly) return
+
+    const aggregateKeyLeaf = getTrieLeaf<AggregateKeyTrieNode>(aggregationTrieRoot, transaction, aggregationGranularity)
+    if (!aggregateKeyLeaf.aggregateKey) {
+      aggregateKeyLeaf.aggregateKey = aggregationEvaluator!(transaction) as string
+    }
+    const aggregateKey = aggregateKeyLeaf.aggregateKey as string
 
     // Single subtotals are subtotals for first grouper level
     // Example: for 4 groupers we have rows like
@@ -449,6 +457,51 @@ function runQuery(
   return rawAggregations
 }
 
+/** True when the bound casts to an ISO instant. A calendar day or a stray "T" does not. */
+function hasClockTime(raw: string): boolean {
+  const value = String(raw).trim()
+  const cast = new Date(value)
+  if (Number.isNaN(cast.getTime())) return false
+  const iso = cast.toISOString()
+  // yyyy-MM-dd casts to UTC midnight, but the string is only that date prefix.
+  if (iso.slice(0, 10) === value) return false
+  // The time designator is the character after yyyy-MM-dd, not a stray "T".
+  return value.length > 10 && value[10] === 'T'
+}
+
+/**
+ * Exact begin/end for two ISO instants. The end bound is that instant, not end-of-day.
+ */
+function getDateRangeFromIsoInstant(inputDates: string[]): HrTimeframeI {
+  const dates = inputDates.slice()
+  dates.sort((a, b) => {
+    return ('' + a).localeCompare(b)
+  })
+  const fromDate = new Date(Date.parse(dates[0]))
+  const toDate = new Date(Date.parse(dates[1]))
+  const beginTimeStamp = fromDate.getTime()
+  const endTimeStamp = toDate.getTime()
+  const timeFrame = endTimeStamp - beginTimeStamp
+  return {
+    beginTimeStamp,
+    endTimeStamp,
+    timeFrame,
+    utcFromYear: fromDate.getUTCFullYear(),
+    utcToYear: toDate.getUTCFullYear(),
+    utcFromMonth: fromDate.getUTCMonth() + 1,
+    utcToMonth: toDate.getUTCMonth() + 1,
+    fromYear: parseInt(format(fromDate, 'yyyy')),
+    toYear: parseInt(format(toDate, 'yyyy')),
+    fromMonth: parseInt(format(fromDate, 'MM')),
+    toMonth: parseInt(format(toDate, 'MM')),
+    hrYear: format(fromDate, 'yyyy'),
+    hrQuarter: format(fromDate, 'yyyy-QQQ'),
+    hrMonth: format(fromDate, 'yyyy-MM'),
+    hrWeek: format(fromDate, 'RRRR-II'),
+    hrDay: format(fromDate, 'yyyy-MM-dd'),
+  }
+}
+
 /**
  * @param inputDates array of two YYYY-MM-DD strings
  */
@@ -472,6 +525,7 @@ const getDateRangeFromPicker = function (inputDates: string[]): HrTimeframeI {
       hrWeek: '',
       hrDay: '',
     }
+  if (hasClockTime(inputDates[0]) || hasClockTime(inputDates[1])) return getDateRangeFromIsoInstant(inputDates)
   const dates = inputDates.slice()
   dates.sort((a, b) => {
     return ('' + a).localeCompare(b)
@@ -526,6 +580,7 @@ const getDateRangeFromDatePair = function (inputDates: string[]): HrTimeframeI {
       hrWeek: '',
       hrDay: '',
     }
+  if (hasClockTime(inputDates[0]) || hasClockTime(inputDates[1])) return getDateRangeFromIsoInstant(inputDates)
   const dates = inputDates.slice()
   dates.sort((a, b) => {
     return ('' + a).localeCompare(b)

package/src/index.ts

@@ -13,6 +13,7 @@ export { default as hashBrand } from './hashBrand'
 export { default as hasOnlyDigits } from './hasOnlyDigits'
 export { default as imageBinder } from './imageBinder'
 export { default as isean13 } from './isean13'
+export { default as parseScannedBarcode } from './parseScannedBarcode'
 export { default as pivotTable } from './pivotTable'
 export { default as projectObject } from './projectObject'
 export { default as reports, genPDF } from './reports'

package/src/parseScannedBarcode.ts

@@ -0,0 +1,14 @@
+import hasOnlyDigits from './hasOnlyDigits'
+
+/**
+ * Gate for scanner / typed barcode input.
+ * Strips a leading `#` (scanner prefix), then accepts only 12- or 13-digit strings.
+ * Does not validate the EAN check digit (isean13) and does not pad a leading 0 (findSkuByBarcode).
+ */
+export default function parseScannedBarcode(raw: unknown): string | null {
+  if (typeof raw !== 'string') return null
+  const scan = raw.startsWith('#') ? raw.substring(1) : raw
+  if (scan.length !== 12 && scan.length !== 13) return null
+  if (!hasOnlyDigits(scan)) return null
+  return scan
+}

package/test/articleStatus.spec.js

@@ -178,6 +178,29 @@ describe('articleStatus', () => {
       expect(result[2].vector[articleStatus.VALUE_AVG_STOCK]).toBe(84.15000000000002)
     })
 
+    it('should calculate only the totals row when no groupers are selected', () => {
+      const rawAggregations = {}
+      articleStatus.runQuery(
+        { beginTimeStamp: 1569316408000, endTimeStamp: 1569316409000 + msYear },
+        rawAggregations,
+        true,
+        TRANSACTIONS,
+        [],
+        SKUS,
+        {},
+        {},
+        false,
+        'transaction.ean=="000558000143"',
+        false
+      )
+
+      expect(Object.keys(rawAggregations)).toEqual(['** TOTAL **'])
+      const vector = [].slice.call(rawAggregations['** TOTAL **'])
+      articleStatus.postAgg(vector, msYear)
+      expect(vector[articleStatus.QTY_STOCK]).toBe(18)
+      expect(vector[articleStatus.QTY_END_STOCK]).toBe(17)
+    })
+
     it('should calculate aggregations', () => {
       const rawAggregations = {}
       articleStatus.runQuery(
@@ -526,6 +549,7 @@ describe('articleStatus', () => {
     it('#getDateRangeFromDatePair', () => {
       const dateRange = articleStatus.getDateRangeFromDatePair(['2023-12-31T23:00:00.000Z', '2024-12-31T23:00:00.000Z'])
       expect(dateRange.beginTimeStamp).toBe(1704063600000)
+      expect(dateRange.endTimeStamp).toBe(Date.parse('2024-12-31T23:00:00.000Z'))
       expect(dateRange.fromYear).toBe(2024)
       expect(dateRange.fromMonth).toBe(1)
       expect(dateRange.toYear).toBe(2025)
@@ -535,7 +559,39 @@ describe('articleStatus', () => {
       expect(dateRange.hrMonth).toBe('2024-01')
       expect(dateRange.hrWeek).toBe('2024-01')
       expect(dateRange.hrDay).toBe('2024-01-01')
-      expect(dateRange.timeFrame).toBe(367 * 24 * 3600 * 1000)
+      expect(dateRange.timeFrame).toBe(366 * 24 * 3600 * 1000)
+    })
+
+    it('#getDateRangeFromDatePair keeps clock time for since-last-run windows', () => {
+      const from = '2026-09-18T11:04:01.000Z'
+      const to = '2026-09-21T15:04:32.000Z'
+      const dateRange = articleStatus.getDateRangeFromDatePair([from, to])
+      expect(dateRange.beginTimeStamp).toBe(Date.parse(from))
+      expect(dateRange.endTimeStamp).toBe(Date.parse(to))
+      expect(dateRange.timeFrame).toBe(Date.parse(to) - Date.parse(from))
+    })
+
+    it('#getDateRangeFromDatePair date-only still includes the end day', () => {
+      const dateRange = articleStatus.getDateRangeFromDatePair(['2024-01-01', '2024-01-01'])
+      expect(dateRange.beginTimeStamp).toBe(Date.parse('2024-01-01'))
+      expect(dateRange.endTimeStamp).toBe(Date.parse('2024-01-01') + 24 * 3600 * 1000)
+      expect(dateRange.timeFrame).toBe(24 * 3600 * 1000)
+    })
+
+    it('#getDateRangeFromPicker delegates ISO bounds to exact timestamps', () => {
+      const from = '2026-09-18T11:04:01.000Z'
+      const to = '2026-09-21T15:04:32.000Z'
+      const dateRange = articleStatus.getDateRangeFromPicker([from, to])
+      expect(dateRange.beginTimeStamp).toBe(Date.parse(from))
+      expect(dateRange.endTimeStamp).toBe(Date.parse(to))
+    })
+
+    it('#getDateRangeFromDatePair keeps a real ISO instant that is not the canonical spelling', () => {
+      const raw = '2024-01-01T00:00:00Z'
+      const dateRange = articleStatus.getDateRangeFromDatePair([raw, raw])
+      expect(new Date(raw).toISOString()).not.toBe(raw)
+      expect(dateRange.beginTimeStamp).toBe(new Date(raw).getTime())
+      expect(dateRange.endTimeStamp).toBe(new Date(raw).getTime())
     })
 
     it('should calculate ROI percentage from post-aggregated values', () => {

package/test/parseScannedBarcode.spec.js

@@ -0,0 +1,30 @@
+const { parseScannedBarcode } = require('../dist/index')
+
+describe('parseScannedBarcode', function () {
+  it('returns null for non-strings and empty input', function () {
+    expect(parseScannedBarcode(undefined)).toBe(null)
+    expect(parseScannedBarcode(null)).toBe(null)
+    expect(parseScannedBarcode(1234567890123)).toBe(null)
+    expect(parseScannedBarcode('')).toBe(null)
+    expect(parseScannedBarcode('#')).toBe(null)
+  })
+
+  it('strips a leading # and accepts 12- or 13-digit scans', function () {
+    expect(parseScannedBarcode('195093100888')).toBe('195093100888')
+    expect(parseScannedBarcode('0195093100888')).toBe('0195093100888')
+    expect(parseScannedBarcode('#195093100888')).toBe('195093100888')
+    expect(parseScannedBarcode('#0195093100888')).toBe('0195093100888')
+  })
+
+  it('rejects wrong length, letters, and commas', function () {
+    expect(parseScannedBarcode('12345678901')).toBe(null)
+    expect(parseScannedBarcode('12345678901234')).toBe(null)
+    expect(parseScannedBarcode('19509310088a')).toBe(null)
+    expect(parseScannedBarcode('19509310088,8')).toBe(null)
+    expect(parseScannedBarcode('12e3456789012')).toBe(null)
+  })
+
+  it('does not require a valid EAN check digit', function () {
+    expect(parseScannedBarcode('1234567890129')).toBe('1234567890129')
+  })
+})