@softwear/latestcollectioncore 1.0.201 → 1.0.203

package/dist/articleStatus.js

@@ -33,7 +33,7 @@ function resolvePath(obj, path) {
     return path.reduce((o, key) => o === null || o === void 0 ? void 0 : o[key], obj);
 }
 function propFunction(propertyName, getPropertyName, obj) {
-    var _a, _b;
+    var _a;
     const positionOfDot = propertyName.indexOf('.');
     if (positionOfDot < 0)
         return obj[propertyName];
@@ -42,7 +42,7 @@ function propFunction(propertyName, getPropertyName, obj) {
     if (table == 'transaction')
         return resolvePath(obj, path);
     const joinedRecord = (_a = globalRelations[table]) === null || _a === void 0 ? void 0 : _a[obj[globalJoinableTables[table]]];
-    return (_b = resolvePath(joinedRecord, path)) !== null && _b !== void 0 ? _b : '~ ?';
+    return resolvePath(joinedRecord, path) || '~ ?';
 }
 const lower = (s) => s.toLowerCase();
 const upper = (s) => s.toUpperCase();
@@ -86,18 +86,9 @@ function addTransactionToAggregations(beginTimestamp, endTimestamp, aggregateKey
     // Calculate derived fields
     aggregateVector[QTY_RETURN] += v[QTY_SOLD] < 0 ? v[QTY_SOLD] : 0;
     aggregateVector[AMOUNT_RETURN] += v[AMOUNT_SOLD_EXCL] < 0 ? v[AMOUNT_SOLD_EXCL] : 0;
-    aggregateVector[STOCK_TIME_PRODUCT] +=
-        ((v[QTY_RECIEVED] || 0) + (v[QTY_TRANSIT] || 0) + (v[QTY_CHANGE] || 0) - (v[QTY_SOLD] || 0) - (v[QTY_B2B_SOLD] || 0) - (v[QTY_B2B_RESOLD] || 0) + (v[QTY_B2B_RETURN] || 0)) *
-            (endTimestamp - transaction.time);
+    aggregateVector[STOCK_TIME_PRODUCT] += ((v[QTY_RECIEVED] || 0) + (v[QTY_TRANSIT] || 0) + (v[QTY_CHANGE] || 0) - (v[QTY_SOLD] || 0) - (v[QTY_B2B_SOLD] || 0) - (v[QTY_B2B_RESOLD] || 0) + (v[QTY_B2B_RETURN] || 0)) * (endTimestamp - transaction.time);
     aggregateVector[STOCKAMOUNT_TIME_PRODUCT] +=
-        ((v[AMOUNT_RECIEVED] || 0) +
-            (v[AMOUNT_TRANSIT] || 0) +
-            (v[AMOUNT_CHANGE] || 0) -
-            (v[COSTPRICE_SOLD] || 0) -
-            (v[COSTPRICE_B2B_SOLD] || 0) -
-            (v[COSTPRICE_B2B_RESOLD] || 0) +
-            (v[COSTPRICE_B2B_RETURN] || 0)) *
-            (endTimestamp - transaction.time);
+        ((v[AMOUNT_RECIEVED] || 0) + (v[AMOUNT_TRANSIT] || 0) + (v[AMOUNT_CHANGE] || 0) - (v[COSTPRICE_SOLD] || 0) - (v[COSTPRICE_B2B_SOLD] || 0) - (v[COSTPRICE_B2B_RESOLD] || 0) + (v[COSTPRICE_B2B_RETURN] || 0)) * (endTimestamp - transaction.time);
 }
 function buildAggregationEvaluator(aggregationExpression) {
     return (0, filtrex_1.compileExpression)(aggregationExpression, filtrexOptions);
@@ -149,7 +140,7 @@ function getTrieLeaf(root, transaction, keys) {
  *
  * @returns {Function} - The aggregator function
  */
-function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregationExpression, rawAggregations, maxRows, totals, subtotalsForOuterGrouper, parentGroupTotals, }) {
+function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregationExpression, rawAggregations, maxRows, totals, subtotalsForOuterGrouper, parentGroupTotals }) {
     let filter;
     let filterGranularity = [];
     const filterTrieRoot = {};
@@ -219,7 +210,7 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
         }
     };
 }
-function aggregate({ beginTimestamp, endTimestamp, filterExpression, aggregationExpression, transactions, beginStock, relations, rawAggregations, maxRows, totals, subtotalsForOuterGrouper, parentGroupTotals, }) {
+function aggregate({ beginTimestamp, endTimestamp, filterExpression, aggregationExpression, transactions, beginStock, relations, rawAggregations, maxRows, totals, subtotalsForOuterGrouper, parentGroupTotals }) {
     globalNrAggegationExpressions = 0;
     globalRelations = relations;
     const compiledAggregator = aggregator({
@@ -290,8 +281,7 @@ function postAgg(v, timeFrame) {
     // - beginStock from type 0 (same as QTY_STOCK)
     // - beginShelfStock adjustment from type 10 (negative picktickets from previous shards)
     v[QTY_END_SHELF_STOCK] = v[QTY_SHELF_STOCK] + v[QTY_RECIEVED] + v[QTY_CHANGE] + v[QTY_TRANSIT] - totalQtySold - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST];
-    v[AMOUNT_END_SHELF_STOCK] =
-        v[AMOUNT_SHELF_STOCK] + v[AMOUNT_RECIEVED] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - totalCostSold - v[AMOUNT_CONSIGNMENT] - v[AMOUNT_PICKLIST];
+    v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_SHELF_STOCK] + v[AMOUNT_RECIEVED] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - totalCostSold - v[AMOUNT_CONSIGNMENT] - v[AMOUNT_PICKLIST];
     v[SELLOUT_PERCENTAGE] = (totalQtySold / (totalQtySold + v[QTY_END_STOCK])) * 100;
     v[ROI] = totalAmountSold - v[AMOUNT_RECIEVED] + v[AMOUNT_TRANSIT];
     v[QTY_AVG_STOCK] = (v[QTY_STOCK] * timeFrame + v[STOCK_TIME_PRODUCT]) / timeFrame;

package/dist/types.d.ts

@@ -129,6 +129,7 @@ interface SkuI {
     brandhash?: string;
     ATTRIBUTES?: object;
     IMAGES?: Array<ImageI>;
+    IMAGE_URLS?: Array<string>;
     SIZES?: unknown;
     FOOTPRINT?: number;
     /** UI-only clustering key for product tiles / matrices; not persisted. Phase 1 mirrors articleCodeSupplier after ensureImpliedProperties. */

package/package.json

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

package/src/articleStatus.ts

@@ -108,7 +108,7 @@ function propFunction(propertyName: string, getPropertyName: Function, obj: Reco
   const path = propertyName.substring(positionOfDot + 1).split('.')
   if (table == 'transaction') return resolvePath(obj, path)
   const joinedRecord = globalRelations[table]?.[obj[globalJoinableTables[table]]]
-  return resolvePath(joinedRecord, path) ?? '~ ?'
+  return resolvePath(joinedRecord, path) || '~ ?'
 }
 
 const lower = (s: string) => s.toLowerCase()
@@ -153,18 +153,9 @@ function addTransactionToAggregations(beginTimestamp: number, endTimestamp: numb
   aggregateVector[QTY_RETURN] += v[QTY_SOLD] < 0 ? v[QTY_SOLD] : 0
   aggregateVector[AMOUNT_RETURN] += v[AMOUNT_SOLD_EXCL] < 0 ? v[AMOUNT_SOLD_EXCL] : 0
 
-  aggregateVector[STOCK_TIME_PRODUCT] +=
-    ((v[QTY_RECIEVED] || 0) + (v[QTY_TRANSIT] || 0) + (v[QTY_CHANGE] || 0) - (v[QTY_SOLD] || 0) - (v[QTY_B2B_SOLD] || 0) - (v[QTY_B2B_RESOLD] || 0) + (v[QTY_B2B_RETURN] || 0)) *
-    (endTimestamp - transaction.time)
+  aggregateVector[STOCK_TIME_PRODUCT] += ((v[QTY_RECIEVED] || 0) + (v[QTY_TRANSIT] || 0) + (v[QTY_CHANGE] || 0) - (v[QTY_SOLD] || 0) - (v[QTY_B2B_SOLD] || 0) - (v[QTY_B2B_RESOLD] || 0) + (v[QTY_B2B_RETURN] || 0)) * (endTimestamp - transaction.time)
   aggregateVector[STOCKAMOUNT_TIME_PRODUCT] +=
-    ((v[AMOUNT_RECIEVED] || 0) +
-      (v[AMOUNT_TRANSIT] || 0) +
-      (v[AMOUNT_CHANGE] || 0) -
-      (v[COSTPRICE_SOLD] || 0) -
-      (v[COSTPRICE_B2B_SOLD] || 0) -
-      (v[COSTPRICE_B2B_RESOLD] || 0) +
-      (v[COSTPRICE_B2B_RETURN] || 0)) *
-    (endTimestamp - transaction.time)
+    ((v[AMOUNT_RECIEVED] || 0) + (v[AMOUNT_TRANSIT] || 0) + (v[AMOUNT_CHANGE] || 0) - (v[COSTPRICE_SOLD] || 0) - (v[COSTPRICE_B2B_SOLD] || 0) - (v[COSTPRICE_B2B_RESOLD] || 0) + (v[COSTPRICE_B2B_RETURN] || 0)) * (endTimestamp - transaction.time)
 }
 
 function buildAggregationEvaluator(aggregationExpression: string): Function {
@@ -222,17 +213,7 @@ function getTrieLeaf<T extends { children?: Map<unknown, T> }>(root: T, transact
  *
  * @returns {Function} - The aggregator function
  */
-function aggregator({
-  beginTimestamp,
-  endTimestamp,
-  filterExpression,
-  aggregationExpression,
-  rawAggregations,
-  maxRows,
-  totals,
-  subtotalsForOuterGrouper,
-  parentGroupTotals,
-}: AggregatorFnI) {
+function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregationExpression, rawAggregations, maxRows, totals, subtotalsForOuterGrouper, parentGroupTotals }: AggregatorFnI) {
   let filter: ((transaction: TransactionI) => unknown) | undefined
   let filterGranularity: string[] = []
   const filterTrieRoot: FilterResultTrieNode = {}
@@ -303,20 +284,7 @@ function aggregator({
   }
 }
 
-function aggregate({
-  beginTimestamp,
-  endTimestamp,
-  filterExpression,
-  aggregationExpression,
-  transactions,
-  beginStock,
-  relations,
-  rawAggregations,
-  maxRows,
-  totals,
-  subtotalsForOuterGrouper,
-  parentGroupTotals,
-}: AggregateFnI) {
+function aggregate({ beginTimestamp, endTimestamp, filterExpression, aggregationExpression, transactions, beginStock, relations, rawAggregations, maxRows, totals, subtotalsForOuterGrouper, parentGroupTotals }: AggregateFnI) {
   globalNrAggegationExpressions = 0
   globalRelations = relations
 
@@ -353,8 +321,7 @@ function whichShardsToProcess(dateRange: any, granularity: 'year' | 'month'): an
   else
     for (let year = dateRange.utcFromYear; year <= dateRange.utcToYear; year++) {
       if (year == dateRange.utcFromYear && year < dateRange.utcToYear) for (let month = dateRange.utcFromMonth; month <= 12; month++) result.push('' + year + '' + padl(month))
-      if (year == dateRange.utcFromYear && year == dateRange.utcToYear)
-        for (let month = dateRange.utcFromMonth; month <= dateRange.utcToMonth; month++) result.push('' + year + '' + padl(month))
+      if (year == dateRange.utcFromYear && year == dateRange.utcToYear) for (let month = dateRange.utcFromMonth; month <= dateRange.utcToMonth; month++) result.push('' + year + '' + padl(month))
       if (year != dateRange.utcFromYear && year != dateRange.utcToYear) for (let month = 1; month <= 12; month++) result.push('' + year + '' + padl(month))
       if (year != dateRange.utcFromYear && year == dateRange.utcToYear) for (let month = 1; month <= dateRange.utcToMonth; month++) result.push('' + year + '' + padl(month))
     }
@@ -378,8 +345,7 @@ function postAgg(v: any, timeFrame: number): void {
   // - beginStock from type 0 (same as QTY_STOCK)
   // - beginShelfStock adjustment from type 10 (negative picktickets from previous shards)
   v[QTY_END_SHELF_STOCK] = v[QTY_SHELF_STOCK] + v[QTY_RECIEVED] + v[QTY_CHANGE] + v[QTY_TRANSIT] - totalQtySold - v[QTY_CONSIGNMENT] - v[QTY_PICKLIST]
-  v[AMOUNT_END_SHELF_STOCK] =
-    v[AMOUNT_SHELF_STOCK] + v[AMOUNT_RECIEVED] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - totalCostSold - v[AMOUNT_CONSIGNMENT] - v[AMOUNT_PICKLIST]
+  v[AMOUNT_END_SHELF_STOCK] = v[AMOUNT_SHELF_STOCK] + v[AMOUNT_RECIEVED] + v[AMOUNT_CHANGE] + v[AMOUNT_TRANSIT] + v[AMOUNT_REVALUATE] - totalCostSold - v[AMOUNT_CONSIGNMENT] - v[AMOUNT_PICKLIST]
   v[SELLOUT_PERCENTAGE] = (totalQtySold / (totalQtySold + v[QTY_END_STOCK])) * 100
   v[ROI] = totalAmountSold - v[AMOUNT_RECIEVED] + v[AMOUNT_TRANSIT]
   v[QTY_AVG_STOCK] = (v[QTY_STOCK] * timeFrame + v[STOCK_TIME_PRODUCT]) / timeFrame

package/src/types.ts

@@ -138,6 +138,7 @@ interface SkuI {
   brandhash?: string
   ATTRIBUTES?: object
   IMAGES?: Array<ImageI>
+  IMAGE_URLS?: Array<string>
   SIZES?: unknown
   FOOTPRINT?: number
   /** UI-only clustering key for product tiles / matrices; not persisted. Phase 1 mirrors articleCodeSupplier after ensureImpliedProperties. */