dtable-utils 5.0.18 → 5.0.20-beta.1

package/lib/constants/geolocation.js

@@ -0,0 +1,23 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var LAT_DIRECTION_TYPE = {
+  N: 'N',
+  // North
+  S: 'S' // South
+};
+var LNG_DIRECTION_TYPE = {
+  E: 'E',
+  // East
+  W: 'W' // West
+};
+var DMS_SPLITTER_TYPE = {
+  DEG: '°',
+  MIN: '′',
+  SEC: '″'
+};
+
+exports.DMS_SPLITTER_TYPE = DMS_SPLITTER_TYPE;
+exports.LAT_DIRECTION_TYPE = LAT_DIRECTION_TYPE;
+exports.LNG_DIRECTION_TYPE = LNG_DIRECTION_TYPE;

package/lib/date.js

@@ -17,6 +17,22 @@ var MATCH_1_2 = /\d\d?/; // 0 - 99
 var MATCH2 = /\d\d/; // 00 - 99
 var MATCH4 = /\d{4}/; // 0000 - 9999
 
+var DATE_REG = /[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/;
+var DATE_WITH_TIME_REG = /[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1]) (2[0-3]|[01][0-9]):[0-5][0-9]/;
+var RU_DATE_REG = /^(0[1-9]|[1-2][0-9]|3[0-1])\.(0?[1-9]|1[012])\.\d{4}$/;
+var RU_TIME_REG = /^(0[1-9]|[1-2][0-9]|3[0-1])\.(0?[1-9]|1[012])\.\d{4} (2[0-3]|[01][0-9]):[0-5][0-9]$/;
+
+// month <=12 day <= 9
+// month <=12 day >= 13
+var US_DATE_REG = /^([1-9]|1[0-2])\/([1-9]|[1-2][3-9]|3[0-1])\/[0-9]{4}$/;
+var US_TIME_REG = /^([1-9]|1[0-2])\/([1-9]|[1-2][3-9]|3[0-1])\/[0-9]{4} (2[0-3]|[01][0-9]):[0-5][0-9]$/;
+
+// 9 < day <= 12
+// 9 < month <= 12
+var MID_DATE_REG = /^(1[0-2])\/(1[0-2])\/[0-9]{4}$/;
+var MID_TIME_REG = /^(1[0-2])\/(1[0-2])\/[0-9]{4} (2[0-3]|[01][0-9]):[0-5][0-9]$/;
+var EU_DATE_REG = /^(0[1-9]|[1-2][0-9]|3[0-1])[\/\.](0?[1-9]|1[012])[\/\.]\d{4}$/;
+var EU_TIME_REG = /^(0[1-9]|[1-2][0-9]|3[0-1])[\/\.](0?[1-9]|1[012])[\/\.]\d{4} (2[0-3]|[01][0-9]):[0-5][0-9]$/;
 var MATCHER_EXPRESSIONS = {
   mm: [MATCH_1_2, column.DATE_UNIT.MINUTES],
   HH: [MATCH_1_2, column.DATE_UNIT.HOURS],
@@ -174,13 +190,32 @@ var DateUtils = /*#__PURE__*/function () {
   }, {
     key: "parseDateWithFormat",
     value: function parseDateWithFormat(dateString, format) {
+      var newFormat = format;
       if (dateString.includes('T')) {
         // ISO 8601 format with "T" separator directly using Date object
         var dateObj = new Date(dateString);
         return this.isValidDateObject(dateObj) ? dateObj : this.getValidDate(dateString);
       }
+      if (dateString.match(DATE_REG) || dateString.match(DATE_WITH_TIME_REG)) {
+        newFormat = format.indexOf('HH:mm') > -1 ? "".concat(column.DEFAULT_DATE_FORMAT, " HH:mm") : column.DEFAULT_DATE_FORMAT;
+      }
+      if (dateString.match(RU_DATE_REG) || dateString.match(RU_TIME_REG)) {
+        newFormat = format.indexOf('HH:mm') > -1 ? 'DD.MM.YYYY HH:mm' : 'DD.MM.YYYY';
+      }
+      var isUSDate = dateString.match(US_DATE_REG) || dateString.match(US_TIME_REG);
+      if (isUSDate) {
+        newFormat = format.indexOf('HH:mm') > -1 ? 'M/D/YYYY HH:mm' : 'M/D/YYYY';
+      }
+      var isEUDate = dateString.match(EU_DATE_REG) || dateString.match(EU_TIME_REG);
+      var isUsOrEuDate = dateString.match(MID_DATE_REG) || dateString.match(MID_TIME_REG);
+      var isUSFormat = ['M/D/YYYY HH:mm', 'M/D/YYYY'].includes(newFormat);
+      if (isUsOrEuDate && isUSFormat) {
+        newFormat = format.indexOf('HH:mm') > -1 ? 'M/D/YYYY HH:mm' : 'M/D/YYYY';
+      } else if (isEUDate) {
+        newFormat = format.indexOf('HH:mm') > -1 ? 'DD/MM/YYYY HH:mm' : 'DD/MM/YYYY';
+      }
       try {
-        var parser = this.makeParser(format);
+        var parser = this.makeParser(newFormat);
         var _parser = parser(dateString),
           year = _parser.year,
           month = _parser.month,

package/lib/view/summaries.js

@@ -19,6 +19,7 @@ require('../constants/filter/filter-is-within.js');
 require('../constants/sort.js');
 require('../constants/group.js');
 var number = require('../column/number.js');
+require('@babel/runtime/helpers/slicedToArray');
 require('dayjs');
 var core$1 = require('../group/core.js');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-utils",
-  "version": "5.0.18",
+  "version": "5.0.20-beta.1",
   "description": "dtable common utils",
   "main": "./lib/index.js",
   "module": "./es/index.js",