leoric 2.0.0 → 2.0.1

package/History.md

@@ -1,3 +1,12 @@
+2.0.1 / 2022-01-05
+==================
+
+## What's Changed
+* fix: format numeric result by @JimmyDaddy in https://github.com/cyjake/leoric/pull/253
+* fix: should still return number if value is '0.000' by @cyjake in https://github.com/cyjake/leoric/pull/254
+
+**Full Changelog**: https://github.com/cyjake/leoric/compare/v1.15.1...v2.0.1
+
 2.0.0 / 2021-12-28
 ==================
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leoric",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "JavaScript Object-relational mapping alchemy",
   "main": "index.js",
   "types": "types/index.d.ts",

package/src/collection.js

@@ -1,5 +1,8 @@
 'use strict';
 
+const { AGGREGATOR_MAP } = require('./contants');
+
+const AGGREGATORS = Object.values(AGGREGATOR_MAP);
 /**
  * An extended Array to represent collections of models.
  */
@@ -87,8 +90,14 @@ function dispatch(spell, rows, fields) {
     const { type, value, args } = columns[0];
     if (type === 'alias' && args && args[0].type === 'func') {
       const row = rows[0];
-      const result = row && (row[''] || row[table]);
-      return result && result[value] || 0;
+      const record = row && (row[''] || row[table]);
+      const result = record && record[value];
+      // see https://www.w3schools.com/mysql/mysql_ref_functions.asp
+      if (AGGREGATORS.includes(args[0].name)) {
+        const num = Number(result);
+        return isNaN(num) ? result : num;
+      }
+      return result;
     }
   }
 

package/src/contants.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const AGGREGATOR_MAP = {
+  count: 'count',
+  average: 'avg',
+  minimum: 'min',
+  maximum: 'max',
+  sum: 'sum'
+};
+
+module.exports = {
+  AGGREGATOR_MAP
+};

package/src/spell.js

@@ -11,6 +11,7 @@ const { isPlainObject } = require('./utils');
 const { IndexHint, INDEX_HINT_TYPE, Hint } = require('./hint');
 const { parseObject } = require('./query_object');
 const Raw = require('./raw');
+const { AGGREGATOR_MAP } = require('./contants');
 
 /**
  * Parse condition expressions
@@ -903,14 +904,6 @@ class Spell {
   }
 }
 
-const AGGREGATOR_MAP = {
-  count: 'count',
-  average: 'avg',
-  minimum: 'min',
-  maximum: 'max',
-  sum: 'sum'
-};
-
 for (const aggregator in AGGREGATOR_MAP) {
   const func = AGGREGATOR_MAP[aggregator];
   Object.defineProperty(Spell.prototype, `$${aggregator}`, {