@softwear/latestcollectioncore 1.0.170 → 1.0.172

package/dist/articleStatus.js

@@ -70,7 +70,9 @@ function addTransactionToAggregations(beginTimestamp, endTimestamp, aggregateKey
         aggregateVector[MAX_RECIEVE_TIMESTAMP] = transaction.time;
     if (transaction.time <= beginTimestamp) {
         addVectors(aggregateVector, v, BEGIN_STOCK_VECTOR_START, BEGIN_STOCK_VECTOR_END);
-        // addVectors(aggregateVector, v, QTY_CONSIGNMENT, COSTPRICE_PICKLIST + 1)
+        // Keep pre-start outstanding picklists/consignments in state so endShelf remains stable
+        // when only the start date changes for a fixed end date.
+        addVectors(aggregateVector, v, QTY_CONSIGNMENT, COSTPRICE_PICKLIST + 1);
         return;
     }
     if (transaction.time > endTimestamp)

package/dist/hashBrand.js

@@ -5,8 +5,8 @@ const DIACRITIC_REGEX = /[\u0300-\u036f]/g;
 // '~.<>!@#$%^&*():'"? /-\\'
 // Note: '-' is placed at the end of the class so it is treated literally,
 // and '\' is escaped.
-const REMOVE_CHARS_TEST_REGEX = /[~.<>!@#$%^&*():´'"? \/\\-]/;
-const REMOVE_CHARS_REGEX = /[~.<>!@#$%^&*():´'"? \/\\-]/g;
+const REMOVE_CHARS_TEST_REGEX = /[~.<>!@#$%^&*():´`'"? \/\\-]/;
+const REMOVE_CHARS_REGEX = /[~.<>!@#$%^&*():´`'"? \/\\-]/g;
 // Fast check: returns true if the string contains any non-ASCII character,
 // which we treat as a potential diacritic and normalize only in that case.
 function hasPotentialDiacritics(str) {

package/dist/transaction.js

@@ -271,8 +271,7 @@ const buildTransaction = function (transaction) {
         dbTransaction.customer = transaction.customer;
     if (transaction.agent)
         dbTransaction.agent = transaction.agent;
-    if (transaction.type == types_1.transactionTypeE.START_SHELF_STOCK)
-        dbTransaction.type = types_1.transactionTypeE.START_STOCK;
+    // if (transaction.type == transactionTypeE.START_SHELF_STOCK) dbTransaction.type = transactionTypeE.START_STOCK
     return dbTransaction;
 };
 exports.default = { dbTransactionVector, buildTransaction, buildVector };

package/package.json

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

package/src/articleStatus.ts

@@ -134,7 +134,9 @@ function addTransactionToAggregations(beginTimestamp: number, endTimestamp: numb
   if (transaction.type == transactionTypeE.RECEIVING && transaction.time > aggregateVector[MAX_RECIEVE_TIMESTAMP]) aggregateVector[MAX_RECIEVE_TIMESTAMP] = transaction.time
   if (transaction.time <= beginTimestamp) {
     addVectors(aggregateVector, v, BEGIN_STOCK_VECTOR_START, BEGIN_STOCK_VECTOR_END)
-    // addVectors(aggregateVector, v, QTY_CONSIGNMENT, COSTPRICE_PICKLIST + 1)
+    // Keep pre-start outstanding picklists/consignments in state so endShelf remains stable
+    // when only the start date changes for a fixed end date.
+    addVectors(aggregateVector, v, QTY_CONSIGNMENT, COSTPRICE_PICKLIST + 1)
     return
   }
   if (transaction.time > endTimestamp) return

package/src/hashBrand.ts

@@ -3,8 +3,8 @@ const DIACRITIC_REGEX = /[\u0300-\u036f]/g
 // '~.<>!@#$%^&*():'"? /-\\'
 // Note: '-' is placed at the end of the class so it is treated literally,
 // and '\' is escaped.
-const REMOVE_CHARS_TEST_REGEX = /[~.<>!@#$%^&*():´'"? \/\\-]/
-const REMOVE_CHARS_REGEX = /[~.<>!@#$%^&*():´'"? \/\\-]/g
+const REMOVE_CHARS_TEST_REGEX = /[~.<>!@#$%^&*():´`'"? \/\\-]/
+const REMOVE_CHARS_REGEX = /[~.<>!@#$%^&*():´`'"? \/\\-]/g
 
 // Fast check: returns true if the string contains any non-ASCII character,
 // which we treat as a potential diacritic and normalize only in that case.

package/src/transaction.ts

@@ -284,7 +284,7 @@ const buildTransaction = function (transaction: TransactionI): dbTransactionI |
   if (transaction.vat !== undefined) dbTransaction.vat = transaction.vat
   if (transaction.customer) dbTransaction.customer = transaction.customer
   if (transaction.agent) dbTransaction.agent = transaction.agent
-  if (transaction.type == transactionTypeE.START_SHELF_STOCK) dbTransaction.type = transactionTypeE.START_STOCK
+  // if (transaction.type == transactionTypeE.START_SHELF_STOCK) dbTransaction.type = transactionTypeE.START_STOCK
 
   return dbTransaction
 }

package/test/articleStatus.spec.js

@@ -389,6 +389,71 @@ describe('articleStatus', () => {
       expect(testResult.vector[articleStatus.AMOUNT_END_SHELF_STOCK]).toBe(1085)
     })
 
+    it('should keep end shelfStock stable for fixed end date when start date changes', () => {
+      const stableShelfTransactions = [
+        {
+          time: Date.parse('2026-01-01T00:00:00.000Z'),
+          type: '0',
+          ean: 'TEST_STABLE',
+          wh: '50',
+          qty: 10,
+          buyprice: 10,
+          docnr: 'BEGINSTOCK',
+        },
+        {
+          // Will be in-period for early start and pre-start for later start
+          time: Date.parse('2026-01-05T00:00:00.000Z'),
+          type: '95',
+          ean: 'TEST_STABLE',
+          wh: '50',
+          qty: 2,
+          buyprice: 10,
+          sellprice: 15,
+          docnr: 'CONS-1',
+        },
+        {
+          time: Date.parse('2026-01-10T00:00:00.000Z'),
+          type: '95',
+          ean: 'TEST_STABLE',
+          wh: '50',
+          qty: -1,
+          buyprice: 10,
+          sellprice: 15,
+          docnr: 'CONS-1-RETURN',
+        },
+      ]
+
+      const run = (startIso) => {
+        const dateRange = articleStatus.getDateRangeFromDatePair([startIso, '2026-01-31T00:00:00.000Z'])
+        const rawAggregations = {}
+        articleStatus.runQuery(
+          dateRange,
+          rawAggregations,
+          true,
+          stableShelfTransactions,
+          ['transaction.ean'],
+          {},
+          {},
+          {},
+          false,
+          '',
+          false
+        )
+        const vector = [].slice.call(rawAggregations['TEST_STABLE'])
+        articleStatus.postAgg(vector, dateRange.timeFrame)
+        return vector
+      }
+
+      const earlyStart = run('2026-01-01T00:00:00.000Z')
+      const lateStart = run('2026-01-15T00:00:00.000Z')
+
+      // Net consignment outstanding is +1, so end shelf should be 10 - 1 = 9 regardless of start date.
+      expect(earlyStart[articleStatus.QTY_END_STOCK]).toBe(10)
+      expect(lateStart[articleStatus.QTY_END_STOCK]).toBe(10)
+      expect(earlyStart[articleStatus.QTY_END_SHELF_STOCK]).toBe(9)
+      expect(lateStart[articleStatus.QTY_END_SHELF_STOCK]).toBe(9)
+    })
+
     it('#getDateRangeFromPicker', () => {
       const dateRange = articleStatus.getDateRangeFromPicker(['2024-01-01', '2024-12-31'])
       expect(dateRange.beginTimeStamp).toBe(1704063600000)

package/test/transaction.spec.js

@@ -46,31 +46,6 @@ describe('#Transactions', () => {
       })
       expect(transaction.vector).toBe(undefined)
     })
-
-    it('should map type 10 to type 0 and still not generate vector', () => {
-      const transaction = buildTransaction({
-        type: '10',
-        ean: '1234567890128',
-        wh: '51',
-        time: 314159265,
-        qty: 123,
-        buyprice: 9.95,
-        vat: 21,
-        docnr: '51-123',
-      })
-
-      expect(transaction).toEqual({
-        type: '0',
-        ean: '1234567890128',
-        wh: '51',
-        time: 314159265,
-        qty: 123,
-        buyprice: 9.95,
-        vat: 21,
-        docnr: '51-123',
-      })
-      expect(transaction.vector).toBe(undefined)
-    })
   })
 
   describe('#buildVector', () => {
@@ -84,7 +59,51 @@ describe('#Transactions', () => {
         label: 'type 2 (=sale)',
         input: { type: '2', ean: '1234567890128', wh: '51', time: 314159265, qty: 123, sellprice: 19.95, buyprice: 9.95, vat: 21, docnr: '51-123' },
         expected: [
-          123, -123, -1223.85, -123, -1223.85, 0, 0, 0, 123, 2453.85, 2027.98, 123 * 9.95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+          123,
+          -123,
+          -1223.85,
+          -123,
+          -1223.85,
+          0,
+          0,
+          0,
+          123,
+          2453.85,
+          2027.98,
+          123 * 9.95,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
         ],
       },
       {
@@ -151,7 +170,46 @@ describe('#Transactions', () => {
         label: 'type 6 (=b2b return to customer)',
         input: { type: '6', ean: '1234567890128', wh: '51', time: 314159265, qty: 123, buyprice: 9.95, sellprice: 19.95, vat: 21, docnr: '51-123' },
         expected: [
-          123, 123, 123 * 9.95, 123, 123 * 9.95, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 123, 123 * 19.95, 123 * 9.95,
+          123,
+          123,
+          123 * 9.95,
+          123,
+          123 * 9.95,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          0,
+          123,
+          123 * 19.95,
+          123 * 9.95,
         ],
       },
       {