@softwear/latestcollectioncore 1.0.85 → 1.0.87

package/dist/articleStatus.js

@@ -52,11 +52,11 @@ function propFunction(propertyName, getPropertyName, obj) {
     var _a, _b;
     const positionOfDot = propertyName.indexOf('.');
     if (positionOfDot < 0)
-        return getPropertyName(propertyName);
+        return obj[propertyName];
     const table = propertyName.substring(0, positionOfDot);
     const field = propertyName.substring(positionOfDot + 1);
     if (table == 'transaction')
-        return getPropertyName(field);
+        return obj[field];
     return ((_b = (_a = globalRelations[table]) === null || _a === void 0 ? void 0 : _a[obj[globalJoinableTables[table]]]) === null || _b === void 0 ? void 0 : _b[field]) || '~ ?';
 }
 const lower = (s) => s.toLowerCase();
@@ -135,7 +135,7 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
         const filterGranularity = Object.entries(globalJoinableTables)
             .filter((join) => filterExpression.includes(join[0] + '.'))
             .map((join) => join[1]);
-        filterDependencyEvaluator = (0, filtrex_1.compileExpression)(filterGranularity.join('+'));
+        filterDependencyEvaluator = (0, filtrex_1.compileExpression)(filterGranularity.join('+'), filtrexOptions);
     }
     const aggregationEvaluator = buildAggregationEvaluator(aggregationExpression);
     // Maintain a cache of evaluated aggregationExpressions
@@ -147,7 +147,7 @@ function aggregator({ beginTimestamp, endTimestamp, filterExpression, aggregatio
     let aggregationDependencyExpression = aggregationGranularity.join('+');
     if (!aggregationDependencyExpression)
         aggregationDependencyExpression = '"N.A."';
-    const aggregationDependencyEvaluator = (0, filtrex_1.compileExpression)(aggregationDependencyExpression);
+    const aggregationDependencyEvaluator = (0, filtrex_1.compileExpression)(aggregationDependencyExpression, filtrexOptions);
     return function (transaction) {
         if (filter) {
             const filterDependency = filterDependencyEvaluator(transaction);

package/dist/ean13.d.ts

@@ -1 +1 @@
-export default function (baseNumberAsString: string): number;
+export default function (baseNumberAsString: string): string;

package/dist/ean13.js

@@ -14,6 +14,6 @@ function default_1(baseNumberAsString) {
         return remainder === 0 ? 0 : 10 - remainder;
     };
     const checkDigit = calculateCheckDigit(baseNumberAsString);
-    return Number(baseNumberAsString) * 10 + checkDigit;
+    return baseNumberAsString + checkDigit;
 }
 exports.default = default_1;

package/package.json

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

package/src/articleStatus.ts

@@ -79,10 +79,10 @@ let globalNrAggegationExpressions = 0 // tracks the # aggregations rows so we ca
  */
 function propFunction(propertyName: string, getPropertyName: Function, obj: Record<string, any>): any {
   const positionOfDot = propertyName.indexOf('.')
-  if (positionOfDot < 0) return getPropertyName(propertyName)
+  if (positionOfDot < 0) return obj[propertyName]
   const table = propertyName.substring(0, positionOfDot)
   const field = propertyName.substring(positionOfDot + 1)
-  if (table == 'transaction') return getPropertyName(field)
+  if (table == 'transaction') return obj[field]
   return globalRelations[table]?.[obj[globalJoinableTables[table]]]?.[field] || '~ ?'
 }
 
@@ -177,7 +177,7 @@ function aggregator({
     const filterGranularity = Object.entries(globalJoinableTables)
       .filter((join) => filterExpression.includes(join[0] + '.'))
       .map((join) => join[1])
-    filterDependencyEvaluator = compileExpression(filterGranularity.join('+'))
+    filterDependencyEvaluator = compileExpression(filterGranularity.join('+'), filtrexOptions)
   }
   const aggregationEvaluator = buildAggregationEvaluator(aggregationExpression)
   // Maintain a cache of evaluated aggregationExpressions
@@ -189,7 +189,7 @@ function aggregator({
 
   let aggregationDependencyExpression = aggregationGranularity.join('+')
   if (!aggregationDependencyExpression) aggregationDependencyExpression = '"N.A."'
-  const aggregationDependencyEvaluator = compileExpression(aggregationDependencyExpression)
+  const aggregationDependencyEvaluator = compileExpression(aggregationDependencyExpression, filtrexOptions)
   return function (transaction: TransactionI): void {
     if (filter) {
       const filterDependency = filterDependencyEvaluator(transaction)

package/src/ean13.ts

@@ -1,4 +1,4 @@
-export default function (baseNumberAsString: string): number {
+export default function (baseNumberAsString: string): string {
   const calculateCheckDigit = function (baseNumberAsString: string): number {
     if (!Number(baseNumberAsString) || baseNumberAsString.length !== 12) {
       throw Error(`Not an EAN 13 base number. Must have a number with 12 digits, got ${baseNumberAsString}`)
@@ -16,5 +16,5 @@ export default function (baseNumberAsString: string): number {
     return remainder === 0 ? 0 : 10 - remainder
   }
   const checkDigit = calculateCheckDigit(baseNumberAsString)
-  return Number(baseNumberAsString) * 10 + checkDigit
+  return baseNumberAsString + checkDigit
 }

package/test/ean13.spec.js

@@ -10,8 +10,9 @@ describe('ean13 function', function () {
     })
   })
   it('should calculate a valid check digit', function () {
-    expect(ean13('123456789012')).to.equal(1234567890128)
-    expect(ean13('201480005032')).to.equal(2014800050323)
-    expect(ean13('201480000006')).to.equal(2014800000069)
+    expect(ean13('123456789012')).to.equal('1234567890128')
+    expect(ean13('201480005032')).to.equal('2014800050323')
+    expect(ean13('201480000006')).to.equal('2014800000069')
+    expect(ean13('088779175220')).to.equal('0887791752208')
   })
 })