dtable-utils 5.0.20 → 5.0.21-beta.11

package/lib/cell-value-set/geolocation.js

@@ -2,42 +2,155 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
+var column = require('../constants/column.js');
+require('../constants/filter/filter-column-options.js');
+require('../constants/filter/filter-modifier.js');
+require('../constants/filter/filter-predicate.js');
+require('../constants/filter/filter-is-within.js');
+require('../constants/formula.js');
+require('../constants/sort.js');
+require('../constants/group.js');
+var geolocation = require('../constants/geolocation.js');
+var number = require('../number.js');
+
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
+
 var provinceReg = /.+省|.+自治区|.+特别行政区|北京市|天津市|上海市|重庆市|安徽|福建|甘肃|广东|广西|贵州|海南|河北|河南|黑龙江|湖北|湖南|吉林|江苏|江西|辽宁|内蒙古|宁夏|青海|山东|山西|陕西|四川|西藏|新疆|云南|浙江|北京|上海|天津|重庆/;
 var cityReg = /.+自治州|[^市]+市|.+盟|.+地区|.+区划/;
 var districtReg = /(.+市|.+县|.+旗|.+区)/;
+var LNG_LAT_REG = /^-?([1-9]\d*\.\d+|0\.\d+|[1-9]\d*|0)$/;
+var DMS_DEG_REG = new RegExp("(\\d+(?:\\.\\d+)?)".concat(geolocation.DMS_SPLITTER_TYPE.DEG));
+var DMS_MIN_REG = new RegExp("(\\d+(?:\\.\\d+)?)".concat(geolocation.DMS_SPLITTER_TYPE.MIN));
+var DMS_SEC_REG = new RegExp("(\\d+(?:\\.\\d+)?)".concat(geolocation.DMS_SPLITTER_TYPE.SEC));
+var parseDMS = function parseDMS(dms, direction) {
+  if (typeof dms !== 'string') {
+    return null;
+  }
+  var degMatches = dms.match(DMS_DEG_REG);
+  var minMatches = dms.match(DMS_MIN_REG);
+  var secMatches = dms.match(DMS_SEC_REG);
+  var strDeg = degMatches && degMatches[1];
+  var strMin = minMatches && minMatches[1];
+  var strSec = secMatches && secMatches[1];
+  if (!strDeg && !strMin && !strSec) {
+    // invalid DMS
+    return null;
+  }
+  var deg = Number.parseFloat(strDeg);
+  var min = Number.parseFloat(strMin);
+  var sec = Number.parseFloat(strSec);
+  if (!number.isNumber(deg) && !number.isNumber(min) && !number.isNumber(sec)) {
+    return null;
+  }
+  deg = deg || 0;
+  min = min || 0;
+  sec = sec || 0;
+  var decimal = deg + min / 60 + sec / 3600;
+  if (direction === geolocation.LAT_DIRECTION_TYPE.S || direction === geolocation.LNG_DIRECTION_TYPE.W) {
+    return -Math.abs(decimal);
+  }
+  return decimal;
+};
+
+/**
+ * Parse LatLng-DMS string to degree
+ * e.g. 'N30°50′50.55″, E30.50′50.55″'
+ * @param {string} strLatLng
+ * @returns { lat, lng }, object
+ */
+var parseLatLngDMS = function parseLatLngDMS(strLatLngDMS) {
+  if (typeof strLatLngDMS !== 'string') {
+    return {};
+  }
+  var _strLatLngDMS$split$m = strLatLngDMS.split(',').map(function (str) {
+      return str ? str.trim() : '';
+    }),
+    _strLatLngDMS$split$m2 = _slicedToArray__default["default"](_strLatLngDMS$split$m, 2),
+    strLatDMS = _strLatLngDMS$split$m2[0],
+    strLngDMS = _strLatLngDMS$split$m2[1];
+  if (!strLatDMS || !strLngDMS) {
+    // invalid LatLng DMS
+    return {};
+  }
+  var latDirection = strLatDMS[0];
+  var lngDirection = strLngDMS[0];
+  if (!latDirection || !lngDirection || latDirection !== geolocation.LAT_DIRECTION_TYPE.N && latDirection !== geolocation.LAT_DIRECTION_TYPE.S || lngDirection !== geolocation.LNG_DIRECTION_TYPE.E && lngDirection !== geolocation.LNG_DIRECTION_TYPE.W) {
+    // invalid lat/lng direction
+    return {};
+  }
+  var strLat = strLatDMS.substring(1);
+  var strLng = strLngDMS.substring(1);
+  var lat = parseDMS(strLat, latDirection);
+  var lng = parseDMS(strLng, lngDirection);
+  if (!number.isNumber(lat) || !number.isNumber(lng)) {
+    return {};
+  }
+  return {
+    lat: lat,
+    lng: lng
+  };
+};
+
+/**
+ * Parse LatLng-DMS string to degree
+ * e.g. '30.50, 30.50'
+ * @param {string} strLatLng
+ * @returns { lat, lng }, object
+ */
+var parseLngLatDegree = function parseLngLatDegree(strLngLat) {
+  // match floating point numbers
+  // ^[1-9]\d*\.\d+$ --> floating point type that does not start with 0
+  // ^0\.\d+$        --> floating point type starting with 0
+  // ^[1-9]\d*$      --> non-zero integer
+  // 0
+  if (typeof strLngLat !== 'string') {
+    return {};
+  }
+  var _strLngLat$split$map = strLngLat.split(',').map(function (str) {
+      return str ? str.trim() : '';
+    }),
+    _strLngLat$split$map2 = _slicedToArray__default["default"](_strLngLat$split$map, 2),
+    strLng = _strLngLat$split$map2[0],
+    strLat = _strLngLat$split$map2[1];
+  if (!strLng || !strLat || !strLng.match(LNG_LAT_REG) || !strLat.match(LNG_LAT_REG)) {
+    return {};
+  }
+  var numLng = Number(strLng);
+  var numLat = Number(strLat);
+  if (!number.isNumber(numLng) || !number.isNumber(numLat)) {
+    return {};
+  }
+  return {
+    lat: numLat,
+    lng: numLng
+  };
+};
+
+/**
+ * Parse LatLng-DMS/LngLat-Degree string to degree
+ * @param {string} strLatLng
+ * @returns { lat, lng }, object
+ */
+var parseLatLng = function parseLatLng(strLatLng) {
+  if (strLatLng && (strLatLng.includes(geolocation.LAT_DIRECTION_TYPE.N) && strLatLng.includes(geolocation.LNG_DIRECTION_TYPE.E) || strLatLng.includes(geolocation.LAT_DIRECTION_TYPE.S) && strLatLng.includes(geolocation.LNG_DIRECTION_TYPE.W))) {
+    return parseLatLngDMS(strLatLng);
+  }
+  return parseLngLatDegree(strLatLng);
+};
 var formatTextToGeolocation = function formatTextToGeolocation(value, columnData) {
   // compatible with the old version, the old version data may be null or undefined
   var _ref = columnData || {},
     _ref$geo_format = _ref.geo_format,
-    geo_format = _ref$geo_format === void 0 ? 'geolocation' : _ref$geo_format;
+    geo_format = _ref$geo_format === void 0 ? column.GEOLOCATION_FORMAT.GEOLOCATION : _ref$geo_format;
   var cellValue = value || '';
   if (cellValue.length < 3) {
     return {};
   }
-  if (geo_format === 'lng_lat') {
-    // match floating point numbers
-    // ^[1-9]\d*\.\d+$ --> floating point type that does not start with 0
-    // ^0\.\d+$        --> floating point type starting with 0
-    // ^[1-9]\d*$      --> non-zero integer
-    // 0
-    var reg = /^-?([1-9]\d*\.\d+|0\.\d+|[1-9]\d*|0)$/;
-    if (cellValue.indexOf(',') < 0) return {};
-    var lng_lat = cellValue.split(',');
-    if (lng_lat.length !== 2) {
-      return {};
-    }
-    var lng = lng_lat[0].trim();
-    var lat = lng_lat[1].trim();
-    if (!lng || !lat) {
-      return {};
-    }
-    if (!lng.match(reg) || !lat.match(reg)) {
-      return {};
-    }
-    return {
-      lng: lng,
-      lat: lat
-    };
+  if (geo_format === column.GEOLOCATION_FORMAT.LNG_LAT) {
+    return parseLatLng(cellValue);
   }
   var matchedProvince = cellValue.match(provinceReg);
   var province = '';
@@ -70,3 +183,7 @@ var formatTextToGeolocation = function formatTextToGeolocation(value, columnData
 };
 
 exports.formatTextToGeolocation = formatTextToGeolocation;
+exports.parseDMS = parseDMS;
+exports.parseLatLng = parseLatLng;
+exports.parseLatLngDMS = parseLatLngDMS;
+exports.parseLngLatDegree = parseLngLatDegree;

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

@@ -43,6 +43,11 @@ var MATCHER_EXPRESSIONS = {
   YYYY: [MATCH4, column.DATE_UNIT.YEAR]
 };
 var MATCHER_DATE_PARTS = ['YYYY', 'MM', 'M', 'DD', 'D'];
+var WEEK_DAY_TO_NUM_MAP = {
+  Monday: 1,
+  Saturday: 6,
+  Sunday: 0
+};
 var DateUtils = /*#__PURE__*/function () {
   function DateUtils() {
     _classCallCheck__default["default"](this, DateUtils);
@@ -97,13 +102,15 @@ var DateUtils = /*#__PURE__*/function () {
      * returns the formatted date with granularity.
      * @param {string|date object} date
      * @param {string} granularity
+     * @param {string} firstDayOfWeek - 'Saturday','Sunday' or 'Monday', default is Monday
      * @returns formatted date
      */
   }, {
     key: "getDateByGranularity",
     value: function getDateByGranularity(date, granularity) {
+      var firstDayOfWeek = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'Monday';
       var dateObject = this.getValidDate(date);
-      if (!dateObject) {
+      if (!dateObject || !Object.keys(WEEK_DAY_TO_NUM_MAP).includes(firstDayOfWeek)) {
         return '';
       }
       var upperCaseGranularity = granularity && granularity.toUpperCase();
@@ -127,8 +134,10 @@ var DateUtils = /*#__PURE__*/function () {
           }
         case 'WEEK':
           {
+            var firstDayOfWeekNum = WEEK_DAY_TO_NUM_MAP[firstDayOfWeek];
             var weekNum = dateObject.getDay();
-            var startOfWeekDay = dateObject.getDate() + (weekNum === 0 ? -6 : 1 - weekNum);
+            var daysToFirstDay = (weekNum - firstDayOfWeekNum + 7) % 7;
+            var startOfWeekDay = dateObject.getDate() - daysToFirstDay;
             var startOfWeekDate = new Date(year, dateObject.getMonth(), startOfWeekDay);
             var _month2 = startOfWeekDate.getMonth() + 1;
             var day = startOfWeekDate.getDate();

package/lib/group/group-row.js

@@ -52,6 +52,7 @@ var _getCellValue = function _getCellValue(row, formulaRows, groupby) {
   return cellValue;
 };
 var _getFormattedCellValue = function _getFormattedCellValue(cellValue$1, groupby) {
+  var firstDayOfWeek = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'Monday';
   var column = groupby.column,
     countType = groupby.count_type;
   var columnType = column.type,
@@ -70,7 +71,7 @@ var _getFormattedCellValue = function _getFormattedCellValue(cellValue$1, groupb
     case cellType.CellType.CTIME:
     case cellType.CellType.MTIME:
       {
-        return date.DateUtils.getDateByGranularity(cellValue$1, countType) || null;
+        return date.DateUtils.getDateByGranularity(cellValue$1, countType, firstDayOfWeek) || null;
       }
     case cellType.CellType.NUMBER:
     case cellType.CellType.DURATION:
@@ -107,7 +108,7 @@ var _getFormattedCellValue = function _getFormattedCellValue(cellValue$1, groupb
           return cellValue$1 || cellValue$1 === 0 ? cellValue$1 : null;
         }
         if (result_type === formula.FORMULA_RESULT_TYPE.DATE) {
-          return date.DateUtils.getDateByGranularity(cellValue$1, countType) || null;
+          return date.DateUtils.getDateByGranularity(cellValue$1, countType, firstDayOfWeek) || null;
         }
         if (result_type === formula.FORMULA_RESULT_TYPE.BOOL) {
           return !!cellValue$1;
@@ -115,7 +116,7 @@ var _getFormattedCellValue = function _getFormattedCellValue(cellValue$1, groupb
         if (result_type === formula.FORMULA_RESULT_TYPE.ARRAY) {
           var newCellValue = cellValue$1;
           if (date$1.isDateColumn(column) && Array.isArray(cellValue$1) && cellValue$1.length > 0) {
-            return date.DateUtils.getDateByGranularity(cellValue$1[0], countType) || null;
+            return date.DateUtils.getDateByGranularity(cellValue$1[0], countType, firstDayOfWeek) || null;
           }
 
           // convert to string
@@ -263,6 +264,12 @@ var _getSortedGroups = function getSortedGroups(groups, groupbys, value, level)
 };
 var groupRowsWithMultipleGroupbys = function groupRowsWithMultipleGroupbys(groupbys, rows, formulaRows, value) {
   var validGroupbys = groupbys.length > group.MAX_GROUP_LEVEL ? groupbys.slice(0, group.MAX_GROUP_LEVEL) : _toConsumableArray__default["default"](groupbys);
+  var settings = value.settings;
+  var _ref3 = settings || {},
+    date_settings = _ref3.date_settings;
+  var _ref4 = date_settings || {},
+    _ref4$first_day_of_we = _ref4.first_day_of_week,
+    firstDayOfWeek = _ref4$first_day_of_we === void 0 ? 'Monday' : _ref4$first_day_of_we;
   var groups = [];
   var cellValue2GroupIndexMap = {};
   rows.forEach(function (row) {
@@ -275,7 +282,7 @@ var groupRowsWithMultipleGroupbys = function groupRowsWithMultipleGroupbys(group
         column_key = currentGroupby.column_key;
       var columnType = column.type;
       var cellValue = _getCellValue(row, formulaRows, currentGroupby);
-      var formattedValue = _getFormattedCellValue(cellValue, currentGroupby);
+      var formattedValue = _getFormattedCellValue(cellValue, currentGroupby, firstDayOfWeek);
       var sCellValue = _getStrCellValue(formattedValue, columnType);
       var group = {
         cell_value: formattedValue,
@@ -340,11 +347,17 @@ var groupTableRows = function groupTableRows(groupbys, rows, formulaRows, value)
   var column_key = groupby.column_key,
     column = groupby.column;
   var columnType = column.type;
+  var settings = value.settings;
+  var _ref5 = settings || {},
+    date_settings = _ref5.date_settings;
+  var _ref6 = date_settings || {},
+    _ref6$first_day_of_we = _ref6.first_day_of_week,
+    firstDayOfWeek = _ref6$first_day_of_we === void 0 ? 'Monday' : _ref6$first_day_of_we;
   var groups = [];
   var cellValue2GroupIndexMap = {};
   rows.forEach(function (r) {
     var cellValue = _getCellValue(r, formulaRows, groupby);
-    var formattedValue = _getFormattedCellValue(cellValue, groupby);
+    var formattedValue = _getFormattedCellValue(cellValue, groupby, firstDayOfWeek);
     var sCellValue = _getStrCellValue(formattedValue, columnType);
     var groupedRowIndex = _findGroupIndex(sCellValue, cellValue2GroupIndexMap, groups.length);
     if (groupedRowIndex > -1) {
@@ -398,9 +411,9 @@ var groupViewRows = function groupViewRows(groupbys, table, rowsIds, formulaRows
       row_ids, subgroups, summaries, ...}, ...], array
  */
 var getGroupedRowsWithoutFormulaCalculation = function getGroupedRowsWithoutFormulaCalculation(groupbys, rows, table, value) {
-  var _ref3 = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {},
-    _ref3$formulaRows = _ref3.formulaRows,
-    formulaRows = _ref3$formulaRows === void 0 ? null : _ref3$formulaRows;
+  var _ref7 = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {},
+    _ref7$formulaRows = _ref7.formulaRows,
+    formulaRows = _ref7$formulaRows === void 0 ? null : _ref7$formulaRows;
   var columns = table.columns;
   var validGroupbys = core.deleteInvalidGroupby(groupbys, columns, table, value);
   return core$1.isTableRows(rows) ? groupTableRows(validGroupbys, rows, formulaRows, value) : groupViewRows(validGroupbys, table, rows, formulaRows, value);

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.20",
+  "version": "5.0.21-beta.11",
   "description": "dtable common utils",
   "main": "./lib/index.js",
   "module": "./es/index.js",