@softwear/latestcollectioncore 1.0.160 → 1.0.162

package/dist/articleStatus.js

@@ -99,6 +99,28 @@ function buildAggregationEvaluator(aggregationExpression) {
 function prepareSubTotalAggKey(aggKey) {
     return aggKey.split('\t').slice(0, -1).join('\t').concat(' Σ');
 }
+/** Same as filtrex std.coerceBoolean(customProp(...)) for bare join keys on the transaction */
+function coerceJoinKeyValue(v) {
+    return typeof v === 'boolean' ? +v : v;
+}
+function getTrieLeaf(root, transaction, keys) {
+    const nrKeys = keys.length;
+    if (nrKeys === 0)
+        return root;
+    let node = root;
+    for (let i = 0; i < nrKeys; i++) {
+        const k = coerceJoinKeyValue(transaction[keys[i]]);
+        if (!node.children)
+            node.children = new Map();
+        let next = node.children.get(k);
+        if (!next) {
+            next = {};
+            node.children.set(k, next);
+        }
+        node = next;
+    }
+    return node;
+}
 /*
  * A factory function that returns a function that can be used to aggregate transactions
  * The factory function is called once for each aggregationExpression
@@ -122,47 +144,36 @@ function prepareSubTotalAggKey(aggKey) {
  * @returns {Function} - The aggregator function
  */
 function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregationExpression, rawAggregations, maxRows, totals, subtotalsForOuterGrouper, parentGroupTotals, }) {
-    const filterExpressionCache = {};
     let filter;
-    let filterDependencyEvaluator;
+    let filterGranularity = [];
+    const filterTrieRoot = {};
     if (filterExpression) {
         filter = (0, filtrex_1.compileExpression)(filterExpression, filtrexOptions);
-        // Maintain a cache of evaluated filterExpressions
-        // The granularity of the cache is determined by the joined tables in the filterExpression
-        const filterGranularity = Object.entries(globalJoinableTables)
+        filterGranularity = Object.entries(globalJoinableTables)
             .filter((join) => filterExpression.includes(join[0] + '.'))
             .map((join) => join[1]);
-        filterDependencyEvaluator = (0, filtrex_1.compileExpression)(filterGranularity.join('+'), filtrexOptions);
     }
     const aggregationEvaluator = buildAggregationEvaluator(aggregationExpression);
-    // Maintain a cache of evaluated aggregationExpressions
-    // The granularity of the cache is determined by the joined tables in the aggregationExpression
-    const aggregationExpressionCache = {};
     const aggregationGranularity = Object.entries(globalJoinableTables)
         .filter((join) => aggregationExpression.includes(join[0] + '.'))
         .map((join) => join[1]);
-    let aggregationDependencyExpression = aggregationGranularity.join('+');
-    if (!aggregationDependencyExpression)
-        aggregationDependencyExpression = '"N.A."';
-    const aggregationDependencyEvaluator = (0, filtrex_1.compileExpression)(aggregationDependencyExpression, filtrexOptions);
+    const aggregationTrieRoot = {};
     return function (transaction) {
         if (filter) {
-            const filterDependency = filterDependencyEvaluator(transaction);
-            const filterExpression = filterExpressionCache[filterDependency];
-            if (filterExpression == -1)
+            const filterLeaf = getTrieLeaf(filterTrieRoot, transaction, filterGranularity);
+            if (filterLeaf.filterResult === -1)
                 return;
-            if (!filterExpression) {
-                filterExpressionCache[filterDependency] = filter(transaction) ? 1 : -1;
-                if (filterExpressionCache[filterDependency] == -1)
+            if (filterLeaf.filterResult === undefined) {
+                filterLeaf.filterResult = filter(transaction) ? 1 : -1;
+                if (filterLeaf.filterResult === -1)
                     return;
             }
         }
-        const aggregationDependency = aggregationDependencyEvaluator(transaction);
-        let aggregateKey = aggregationExpressionCache[aggregationDependency];
-        if (!aggregateKey) {
-            aggregateKey = aggregationEvaluator(transaction);
-            aggregationExpressionCache[aggregationDependency] = aggregateKey;
+        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];

package/dist/buildPropertyMappingFn.d.ts

@@ -1,3 +1,2 @@
-import { SkuI, BrandSettingI } from './index';
-import { mappingStrategyE } from './types';
+import { SkuI, BrandSettingI, mappingStrategyE } from './index';
 export default function (brands: Array<BrandSettingI>, strategy: mappingStrategyE): (sku: SkuI) => SkuI;

package/dist/index.d.ts

@@ -15,14 +15,7 @@ export { default as pivotTable } from './pivotTable';
 export { default as round2 } from './round2';
 export { default as sizeToMap } from './sizeToMap';
 export { default as transaction } from './transaction';
-export type { AggregateFnI, AggregatorFnI, AttributeI, BrandSettingI, ColorI, dbTransactionI, DocumentItemI, GroupI, HrTimeframeI, ImageI, MarkedSkuI, MatrixI, ProductI, RaGI, RowI, SkuI, StockTransferDataI, StockTransferMatrixI, StockTransferSelectionI, TransactionI, } from './types';
-import * as types from './types';
-export declare const mappingStrategyE: typeof types.mappingStrategyE;
-export declare const subscriptionE: typeof types.subscriptionE;
-export declare const tagTypeE: typeof types.tagTypeE;
-export declare const TimeGranularityE: typeof types.TimeGranularityE;
-export declare const transactionTypeE: typeof types.transactionTypeE;
-export declare const vatCategoryE: typeof types.vatCategoryE;
+export * from './types';
 export * from './consts';
 export { default as lcAxios, createAxiosInstance, axiosRetry, exponentialDelay, isAxiosError, } from './lcAxios';
 export type { AxiosRequestConfig, AxiosResponse, AxiosPromise, AxiosError, AxiosTransformer, AxiosRetryOptions, AxiosRequestConfigAny, } from './lcAxios';

package/dist/index.js

@@ -10,18 +10,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
@@ -29,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.vatCategoryE = exports.transactionTypeE = exports.TimeGranularityE = exports.tagTypeE = exports.subscriptionE = exports.mappingStrategyE = exports.transaction = exports.sizeToMap = exports.round2 = exports.pivotTable = exports.isean13 = exports.imageBinder = exports.hasOnlyDigits = exports.hashBrand = exports.getPreferedPropertyMappings = exports.getBrandName = exports.findSkuByBarcode = 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.pivotTable = exports.isean13 = exports.imageBinder = exports.hasOnlyDigits = exports.hashBrand = exports.getPreferedPropertyMappings = exports.getBrandName = exports.findSkuByBarcode = 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");
@@ -64,16 +52,7 @@ var sizeToMap_1 = require("./sizeToMap");
 Object.defineProperty(exports, "sizeToMap", { enumerable: true, get: function () { return __importDefault(sizeToMap_1).default; } });
 var transaction_1 = require("./transaction");
 Object.defineProperty(exports, "transaction", { enumerable: true, get: function () { return __importDefault(transaction_1).default; } });
-// Runtime enums: use `export const x = types.x`, not `export { x } from './types'`.
-// TS emits `Object.defineProperty(exports, "x", { get: ... })` for re-exports; Vite/esbuild
-// does not treat those getters as static named exports for ESM interop.
-const types = __importStar(require("./types"));
-exports.mappingStrategyE = types.mappingStrategyE;
-exports.subscriptionE = types.subscriptionE;
-exports.tagTypeE = types.tagTypeE;
-exports.TimeGranularityE = types.TimeGranularityE;
-exports.transactionTypeE = types.transactionTypeE;
-exports.vatCategoryE = types.vatCategoryE;
+__exportStar(require("./types"), exports);
 __exportStar(require("./consts"), exports);
 var lcAxios_1 = require("./lcAxios");
 Object.defineProperty(exports, "lcAxios", { enumerable: true, get: function () { return __importDefault(lcAxios_1).default; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@softwear/latestcollectioncore",
-	"version": "1.0.160",
+  "version": "1.0.162",
   "description": "Core functions for LatestCollections applications",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,12 +16,9 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "verify": "node scripts/verify-exports.mjs",
-    "postbuild": "npm run verify",
     "build:watch": "tsc -p tsconfig.json --watch",
     "test": "vitest run",
     "test:watch": "vitest",
-    "prepublishOnly": "npm run build && npm test",
     "dev": "concurrently \"npm:build:watch\" \"npm:test:watch\""
   },
   "repository": {
@@ -40,8 +37,8 @@
     "typescript": "^4.9.4",
     "vitest": "^1.0.0"
   },
-	"dependencies": {
-		"date-fns": "^2.29.3",
+  "dependencies": {
+    "date-fns": "^2.29.3",
     "filtrex": "^2.2.3"
   }
-}
+}

package/src/articleStatus.ts

@@ -167,6 +167,31 @@ function prepareSubTotalAggKey(aggKey) {
   return aggKey.split('\t').slice(0, -1).join('\t').concat(' Σ')
 }
 
+/** Same as filtrex std.coerceBoolean(customProp(...)) for bare join keys on the transaction */
+function coerceJoinKeyValue(v: unknown): unknown {
+  return typeof v === 'boolean' ? +v : v
+}
+
+type AggregateKeyTrieNode = { aggregateKey?: string; children?: Map<unknown, AggregateKeyTrieNode> }
+type FilterResultTrieNode = { filterResult?: 1 | -1; children?: Map<unknown, FilterResultTrieNode> }
+
+function getTrieLeaf<T extends { children?: Map<unknown, T> }>(root: T, transaction: TransactionI, keys: string[]): T {
+  const nrKeys = keys.length
+  if (nrKeys === 0) return root
+  let node = root
+  for (let i = 0; i < nrKeys; i++) {
+    const k = coerceJoinKeyValue(transaction[keys[i] as keyof TransactionI] as unknown)
+    if (!node.children) node.children = new Map()
+    let next = node.children.get(k) as T | undefined
+    if (!next) {
+      next = {} as T
+      node.children.set(k, next)
+    }
+    node = next
+  }
+  return node
+}
+
 /*
  * A factory function that returns a function that can be used to aggregate transactions
  * The factory function is called once for each aggregationExpression
@@ -200,46 +225,35 @@ function aggregator({
   subtotalsForOuterGrouper,
   parentGroupTotals,
 }: AggregatorFnI) {
-  const filterExpressionCache = {}
-
-  let filter
-  let filterDependencyEvaluator
+  let filter: ((transaction: TransactionI) => unknown) | undefined
+  let filterGranularity: string[] = []
+  const filterTrieRoot: FilterResultTrieNode = {}
   if (filterExpression) {
     filter = compileExpression(filterExpression, filtrexOptions)
-    // Maintain a cache of evaluated filterExpressions
-    // The granularity of the cache is determined by the joined tables in the filterExpression
-    const filterGranularity = Object.entries(globalJoinableTables)
+    filterGranularity = Object.entries(globalJoinableTables)
       .filter((join) => filterExpression.includes(join[0] + '.'))
       .map((join) => join[1])
-    filterDependencyEvaluator = compileExpression(filterGranularity.join('+'), filtrexOptions)
   }
   const aggregationEvaluator = buildAggregationEvaluator(aggregationExpression)
-  // Maintain a cache of evaluated aggregationExpressions
-  // The granularity of the cache is determined by the joined tables in the aggregationExpression
-  const aggregationExpressionCache = {}
   const aggregationGranularity = Object.entries(globalJoinableTables)
     .filter((join) => aggregationExpression.includes(join[0] + '.'))
     .map((join) => join[1])
+  const aggregationTrieRoot: AggregateKeyTrieNode = {}
 
-  let aggregationDependencyExpression = aggregationGranularity.join('+')
-  if (!aggregationDependencyExpression) aggregationDependencyExpression = '"N.A."'
-  const aggregationDependencyEvaluator = compileExpression(aggregationDependencyExpression, filtrexOptions)
   return function (transaction: TransactionI): void {
     if (filter) {
-      const filterDependency = filterDependencyEvaluator(transaction)
-      const filterExpression = filterExpressionCache[filterDependency]
-      if (filterExpression == -1) return
-      if (!filterExpression) {
-        filterExpressionCache[filterDependency] = filter(transaction) ? 1 : -1
-        if (filterExpressionCache[filterDependency] == -1) return
+      const filterLeaf = getTrieLeaf<FilterResultTrieNode>(filterTrieRoot, transaction, filterGranularity)
+      if (filterLeaf.filterResult === -1) return
+      if (filterLeaf.filterResult === undefined) {
+        filterLeaf.filterResult = filter(transaction) ? 1 : -1
+        if (filterLeaf.filterResult === -1) return
       }
     }
-    const aggregationDependency = aggregationDependencyEvaluator(transaction)
-    let aggregateKey = aggregationExpressionCache[aggregationDependency]
-    if (!aggregateKey) {
-      aggregateKey = aggregationEvaluator(transaction)
-      aggregationExpressionCache[aggregationDependency] = aggregateKey
+    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]

package/src/buildPropertyMappingFn.ts

@@ -1,5 +1,4 @@
-import { hashBrand, SkuI, BrandSettingI } from './index'
-import { mappingStrategyE } from './types'
+import { hashBrand, SkuI, BrandSettingI, mappingStrategyE } from './index'
 
 // The order of the following mappingPairs is significant.
 // - If no mapping is available, we prefer colorFamily to be copied from colorSupplier, not colorCodeSupplier.

package/src/index.ts

@@ -15,39 +15,7 @@ export { default as pivotTable } from './pivotTable'
 export { default as round2 } from './round2'
 export { default as sizeToMap } from './sizeToMap'
 export { default as transaction } from './transaction'
-// Types-only re-exports (no runtime).
-export type {
-  AggregateFnI,
-  AggregatorFnI,
-  AttributeI,
-  BrandSettingI,
-  ColorI,
-  dbTransactionI,
-  DocumentItemI,
-  GroupI,
-  HrTimeframeI,
-  ImageI,
-  MarkedSkuI,
-  MatrixI,
-  ProductI,
-  RaGI,
-  RowI,
-  SkuI,
-  StockTransferDataI,
-  StockTransferMatrixI,
-  StockTransferSelectionI,
-  TransactionI,
-} from './types'
-// Runtime enums: use `export const x = types.x`, not `export { x } from './types'`.
-// TS emits `Object.defineProperty(exports, "x", { get: ... })` for re-exports; Vite/esbuild
-// does not treat those getters as static named exports for ESM interop.
-import * as types from './types'
-export const mappingStrategyE = types.mappingStrategyE
-export const subscriptionE = types.subscriptionE
-export const tagTypeE = types.tagTypeE
-export const TimeGranularityE = types.TimeGranularityE
-export const transactionTypeE = types.transactionTypeE
-export const vatCategoryE = types.vatCategoryE
+export * from './types'
 export * from './consts'
 export {
   default as lcAxios,