@steedos/filters 2.2.53 → 2.2.54-beta.3

package/lib/date.formatter.js

@@ -1,5 +1,10 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getFormatter = void 0;
+
 function leftPad(text, length) {
   while (text.length < length) {
     text = "0" + text;
@@ -150,4 +155,5 @@ var getFormatter = function getFormatter(format, dateParts) {
   };
 };
 
-module.exports.getFormatter = getFormatter;
+var _getFormatter = getFormatter;
+exports.getFormatter = _getFormatter;

package/lib/default_date_names.js

@@ -1,5 +1,13 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+exports.getDayNames = getDayNames;
+exports.getMonthNames = getMonthNames;
+exports.getPeriodNames = getPeriodNames;
+exports.getQuarterNames = getQuarterNames;
 var MONTHS = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"],
     DAYS = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
     PERIODS = ["AM", "PM"],
@@ -16,17 +24,26 @@ var cutCaptions = function cutCaptions(captions, format) {
   });
 };
 
-module.exports = {
-  getMonthNames: function getMonthNames(format) {
-    return cutCaptions(MONTHS, format);
-  },
-  getDayNames: function getDayNames(format) {
-    return cutCaptions(DAYS, format);
-  },
-  getQuarterNames: function getQuarterNames(format) {
-    return QUARTERS;
-  },
-  getPeriodNames: function getPeriodNames(format) {
-    return PERIODS;
-  }
-};
+function getMonthNames(format) {
+  return cutCaptions(MONTHS, format);
+}
+
+function getDayNames(format) {
+  return cutCaptions(DAYS, format);
+}
+
+function getQuarterNames(format) {
+  return QUARTERS;
+}
+
+function getPeriodNames(format) {
+  return PERIODS;
+}
+
+var _default = {
+  getMonthNames: getMonthNames,
+  getDayNames: getDayNames,
+  getQuarterNames: getQuarterNames,
+  getPeriodNames: getPeriodNames
+};
+exports["default"] = _default;

package/lib/filter.js

@@ -2,23 +2,27 @@
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
+var _date = require("./date.formatter");
+
+var _default_date_names = _interopRequireDefault(require("./default_date_names"));
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
-// const DevExpress = require("devextreme/bundles/modules/core");
-// const DevExpressData = require("devextreme/bundles/modules/data");
-// const DevExpressOData = require("devextreme/bundles/modules/data.odata");
-var getLDMLFormatter = require("./date.formatter").getFormatter; // const Guid = require("devextreme/core/guid");
+// const Guid = require("devextreme/core/guid");
 // const EdmLiteral = require("devextreme/data/odata/utils").EdmLiteral;
-
-
 var DevExpressData = {
   utils: {
     isConjunctiveOperator: function isConjunctiveOperator(condition) {
@@ -33,8 +37,6 @@ var DevExpressData = {
   }
 }; // const defaultDateNames = DevExpress.localization.date;
 
-var defaultDateNames = require("./default_date_names");
-
 var DevExpressOData = {
   pad: function pad(text, length, right) {
     text = String(text);
@@ -123,7 +125,7 @@ var DevExpressOData = {
       return value && value.valueOf ? value.valueOf() : null;
     }
 
-    return getLDMLFormatter(serializationFormat, defaultDateNames)(value);
+    return (0, _date.getFormatter)(serializationFormat, _default_date_names["default"])(value);
   },
   formatISO8601: function formatISO8601(date, skipZeroTime, skipTimezone) {
     var bag = [];
@@ -303,4 +305,5 @@ var SteedosFilter = /*#__PURE__*/function () {
   return SteedosFilter;
 }();
 
-module.exports = SteedosFilter;
+var _default = SteedosFilter;
+exports["default"] = _default;

package/lib/format.js

@@ -1,18 +1,25 @@
 "use strict";
 
-var SteedosFilter = require("./filter");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _ = require('underscore');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatFiltersToODataQuery = exports.formatFiltersToDev = void 0;
 
-var utils = require("./utils");
+var _filter = _interopRequireDefault(require("./filter"));
 
-var formula = require("./formula"); // 正则包括encodeURIComponent函数编码的11个特殊符号;/?:@&=+$,#
+var _lodash = require("lodash");
+
+var _utils = require("./utils");
+
+var _formula = require("./formula");
+
+// 正则包括encodeURIComponent函数编码的11个特殊符号;/?:@&=+$,#
 // 还包括convertSpecialCharacter函数中转义的特殊符号^$()*+?.\|[]{}
 // 注意encodeURIComponent("\\(")的结果是%5C(，需要特别处理
 // 注意encodeURIComponent("\\.")的结果是%5C.，需要特别处理
 // 注意encodeURIComponent("\\*")的结果是%5C*，因为不需要encodeURIComponent函数编码，所以不用加入REG_FOR_ENCORD变量
-
-
 var REG_FOR_ENCORD = /\;|\/|\?|\:|\@|\&|\=|\+|\$|\,|\#|\^|(\\\()|(\\\))|(\\\.)|\\|\||\[|\]|\{|\}/;
 /**
     ^$()*+?.\|[]{}等特殊符号需要转义，否则有可能会报错且无法正确识别
@@ -65,7 +72,7 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
     }
   };
 
-  if (_.isNull(filters) || _.isUndefined(filters)) {
+  if ((0, _lodash.isNull)(filters) || (0, _lodash.isUndefined)(filters)) {
     return;
   }
 
@@ -76,7 +83,7 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
 
   var _filtersLooper, selector;
 
-  if (!_.isFunction(filters) && !filters.length) {
+  if (!(0, _lodash.isFunction)(filters) && !filters.length) {
     return;
   }
 
@@ -91,12 +98,12 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
       return filters_loop;
     }
 
-    if (_.isFunction(filters_loop)) {
+    if ((0, _lodash.isFunction)(filters_loop)) {
       filters_loop = filters_loop();
     }
 
-    if (!_.isArray(filters_loop)) {
-      if (_.isObject(filters_loop)) {
+    if (!(0, _lodash.isArray)(filters_loop)) {
+      if ((0, _lodash.isObject)(filters_loop)) {
         // 当filters不是[Array]类型而是[Object]类型时，进行格式转换
         if (filters_loop.operation) {
           filters_loop = [filters_loop.field, filters_loop.operation, filters_loop.value];
@@ -126,7 +133,7 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
       });
     } else if (filters_loop.length === 3) {
       // 只有三个元素，可能中间是"or","and"连接符也可能是普通数组，区别对待解析
-      if (_.include(["or", "and"], filters_loop[1])) {
+      if ((0, _lodash.includes)(["or", "and"], filters_loop[1])) {
         // 中间有"or","and"连接符，则循环filters_loop，依次用filtersLooper解析其过虑条件
         // 最后生成的结果格式：tempFilters = [filtersLooper(filters_loop[0]), filters_loop[1], filtersLooper(filters_loop[2]), ...]
         // 因要判断filtersLooper(filters_loop[0])及filtersLooper(filters_loop[2])是否为空
@@ -135,7 +142,7 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
         i = 0;
 
         while (i < filters_loop.length) {
-          if (_.include(["or", "and"], filters_loop[i])) {
+          if ((0, _lodash.includes)(["or", "and"], filters_loop[i])) {
             i++;
             continue;
           }
@@ -155,17 +162,17 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
           i++;
         }
 
-        if (_.include(["or", "and"], tempFilters[0])) {
+        if ((0, _lodash.includes)(["or", "and"], tempFilters[0])) {
           tempFilters.shift();
         }
       } else {
-        if (_.isString(filters_loop[1])) {
+        if ((0, _lodash.isString)(filters_loop[1])) {
           // 第二个元素为字符串，则认为是某一个具体的过虑条件
           field = filters_loop[0];
           option = filters_loop[1];
           value = filters_loop[2];
 
-          if (_.isFunction(value)) {
+          if ((0, _lodash.isFunction)(value)) {
             value = value();
           }
 
@@ -174,21 +181,21 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
             option = "<>";
           }
 
-          value = formula.evaluateFormula(value, userContext);
+          value = (0, _formula.evaluateFormula)(value, userContext);
           sub_selector = [];
-          isBetweenOperation = utils.isBetweenFilterOperation(option);
+          isBetweenOperation = (0, _utils.isBetweenFilterOperation)(option);
 
-          if (isBetweenOperation && _.isString(value)) {
+          if (isBetweenOperation && (0, _lodash.isString)(value)) {
             // 如果是between运算符内置值，则取出对应values作为过滤值
             // 比如value为last_year，返回对应的时间值
-            builtinValue = utils.getBetweenBuiltinValueItem(value, utcOffset);
+            builtinValue = (0, _utils.getBetweenBuiltinValueItem)(value, utcOffset);
 
             if (builtinValue) {
               value = builtinValue.values;
             }
           }
 
-          if (_.isArray(value)) {
+          if ((0, _lodash.isArray)(value)) {
             value = value.map(function (item) {
               if (typeof item === "string") {
                 if (["contains", "startswith", "endswith", "notcontains", "notstartswith", "notendswith"].indexOf(option) > -1) {
@@ -220,7 +227,7 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
               //     return sub_selector.push([field, "<>", v], "and");
               // });
             } else if (["notcontains", "notstartswith", "notendswith"].indexOf(option) > -1) {
-              _.each(value, function (v) {
+              (0, _lodash.each)(value, function (v) {
                 return sub_selector.push([field, option, v], "and");
               });
             } else if (isBetweenOperation) {
@@ -238,7 +245,7 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
               }
             } else {
               // contains、startswith、endswith等，如果value为空数组，不加任何条件，即查找所有数据
-              _.each(value, function (v) {
+              (0, _lodash.each)(value, function (v) {
                 return sub_selector.push([field, option, v], "or");
               });
             }
@@ -260,7 +267,7 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
               tempFilters = [field, "=", true];
             }
           } else {
-            if (isBetweenOperation && !_.isArray(value)) {// between操作符时，value必须是数组，不能是undefined等其他值
+            if (isBetweenOperation && !(0, _lodash.isArray)(value)) {// between操作符时，value必须是数组，不能是undefined等其他值
             } else {
               if (typeof value === "string") {
                 if (["contains", "startswith", "endswith", "notcontains", "notstartswith", "notendswith"].indexOf(option) > -1) {
@@ -291,7 +298,7 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
       }
     } else {
       // 超过3个元素的数组，可能中间是"or","and"连接符也可能是普通数组，区别对待解析
-      if ((ref = _.intersection(["or", "and"], filters_loop)) != null ? ref.length : void 0) {
+      if ((ref = (0, _lodash.intersection)(["or", "and"], filters_loop)) != null ? ref.length : void 0) {
         // 中间有"or","and"连接符，则循环filters_loop，依次用filtersLooper解析其过虑条件
         // 最后生成的结果格式：tempFilters = [filtersLooper(filters_loop[0]), filters_loop[1], filtersLooper(filters_loop[2]), ...]
         // 因要判断filtersLooper(filters_loop[0])及filtersLooper(filters_loop[2])是否为空
@@ -300,7 +307,7 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
         i = 0;
 
         while (i < filters_loop.length) {
-          if (_.include(["or", "and"], filters_loop[i])) {
+          if ((0, _lodash.includes)(["or", "and"], filters_loop[i])) {
             i++;
             continue;
           }
@@ -320,7 +327,7 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
           i++;
         }
 
-        if (_.include(["or", "and"], tempFilters[0])) {
+        if ((0, _lodash.includes)(["or", "and"], tempFilters[0])) {
           tempFilters.shift();
         }
       } else {
@@ -348,8 +355,10 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
 
 var formatFiltersToODataQuery = function formatFiltersToODataQuery(filters, userContext, odataProtocolVersion, forceLowerCase) {
   var devFilters = formatFiltersToDev(filters, userContext);
-  return new SteedosFilter(devFilters, odataProtocolVersion, forceLowerCase).formatFiltersToODataQuery();
+  return new _filter["default"](devFilters, odataProtocolVersion, forceLowerCase).formatFiltersToODataQuery();
 };
 
-exports.formatFiltersToDev = formatFiltersToDev;
-exports.formatFiltersToODataQuery = formatFiltersToODataQuery;
+var _formatFiltersToDev = formatFiltersToDev;
+exports.formatFiltersToDev = _formatFiltersToDev;
+var _formatFiltersToODataQuery = formatFiltersToODataQuery;
+exports.formatFiltersToODataQuery = _formatFiltersToODataQuery;

package/lib/formula.js

@@ -1,5 +1,10 @@
 "use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.evaluateFormula = void 0;
+
 // "{userId}"或"{user.name}"格式
 var checkFormula = function checkFormula(formula) {
   return typeof formula === "string" && /\{\w+(\.\w+)?\}/.test(formula);
@@ -27,4 +32,5 @@ var evaluateFormula = function evaluateFormula(formula, context) {
   }
 };
 
-exports.evaluateFormula = evaluateFormula;
+var _evaluateFormula = evaluateFormula;
+exports.evaluateFormula = _evaluateFormula;

package/lib/graphql.js

@@ -1,20 +1,23 @@
 "use strict";
 
-var _ = require('underscore');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.formatFiltersToGraphqlQuery = void 0;
 
-var _require = require("./format"),
-    formatFiltersToODataQuery = _require.formatFiltersToODataQuery; // 把"a.b.c"这种字符fieldName转换为{"a":{"b":{"c":{}}}}这种json
+var _lodash = require("lodash");
 
+var _format = require("./format");
 
+// 把"a.b.c"这种字符fieldName转换为{"a":{"b":{"c":{}}}}这种json
 var expandFieldName = function expandFieldName(initial, fieldName) {
-  _.reduce(fieldName.split("."), function (m, k) {
+  (0, _lodash.reduce)(fieldName.split("."), function (m, k) {
     if (!m[k]) {
       m[k] = {};
     }
 
     return m[k];
   }, initial);
-
   return initial;
 }; // 把["a.b.c","x.y","x.z","m"]这种字符fieldName转换为{"a":{"b":{"c":{}}},"x":{"y":{},"z":{}},"m":{}}这种json对象格式
 
@@ -48,10 +51,10 @@ var reduceGraphqlFieldsQuery = function reduceGraphqlFieldsQuery(fields, indents
   }
 
   var itemQuery;
-  return " {\n".concat(_.map(fields, function (fieldValue, fieldKey) {
+  return " {\n".concat((0, _lodash.map)(fields, function (fieldValue, fieldKey) {
     itemQuery = generateIndents(indentsCount) + generateIndents(1) + fieldKey;
 
-    if (_.isEmpty(fieldValue)) {
+    if ((0, _lodash.isEmpty)(fieldValue)) {
       itemQuery += "\n";
     } else {
       indentsCount += 1;
@@ -64,7 +67,7 @@ var reduceGraphqlFieldsQuery = function reduceGraphqlFieldsQuery(fields, indents
 };
 
 var formatFieldsToGraphqlQuery = function formatFieldsToGraphqlQuery(fields) {
-  if (_.isString(fields)) {
+  if ((0, _lodash.isString)(fields)) {
     fields = fields.split(",");
   }
 
@@ -96,8 +99,8 @@ var formatFieldsToGraphqlQuery = function formatFieldsToGraphqlQuery(fields) {
 
 
 var formatFiltersToGraphqlQuery = function formatFiltersToGraphqlQuery(objectName, filters, fields, userContext, odataProtocolVersion, forceLowerCase) {
-  if (!_.isString(filters)) {
-    filters = formatFiltersToODataQuery(filters, userContext, odataProtocolVersion, forceLowerCase);
+  if (!(0, _lodash.isString)(filters)) {
+    filters = (0, _format.formatFiltersToODataQuery)(filters, userContext, odataProtocolVersion, forceLowerCase);
   }
 
   var filtersWrap = filters ? "(filters:\"".concat(filters, "\")") : "";
@@ -106,4 +109,5 @@ var formatFiltersToGraphqlQuery = function formatFiltersToGraphqlQuery(objectNam
   return graphqlQuery;
 };
 
-exports.formatFiltersToGraphqlQuery = formatFiltersToGraphqlQuery;
+var _formatFiltersToGraphqlQuery = formatFiltersToGraphqlQuery;
+exports.formatFiltersToGraphqlQuery = _formatFiltersToGraphqlQuery;

package/lib/index.js

@@ -1,14 +1,75 @@
 "use strict";
 
-var SteedosFilter = require("./filter");
+var _typeof = require("@babel/runtime/helpers/typeof");
 
-var format = require('./format');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {
+  SteedosFilter: true
+};
+exports.SteedosFilter = void 0;
 
-var utils = require('./utils');
+var _SteedosFilter = _interopRequireWildcard(require("./filter"));
 
-var formula = require('./formula');
+exports.SteedosFilter = _SteedosFilter;
 
-var graphql = require('./graphql');
+var _format = require("./format");
 
-exports.SteedosFilter = SteedosFilter;
-Object.assign(exports, utils, formula, format, graphql);
+Object.keys(_format).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _format[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _format[key];
+    }
+  });
+});
+
+var _utils = require("./utils");
+
+Object.keys(_utils).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _utils[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _utils[key];
+    }
+  });
+});
+
+var _formula = require("./formula");
+
+Object.keys(_formula).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _formula[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _formula[key];
+    }
+  });
+});
+
+var _graphql = require("./graphql");
+
+Object.keys(_graphql).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _graphql[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _graphql[key];
+    }
+  });
+});
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/utils.js

@@ -1,8 +1,13 @@
 "use strict";
 
-var moment = require('moment');
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
-var _ = require('underscore');
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isBetweenFilterOperation = exports.getQuarterStartMonth = exports.getNextQuarterFirstDay = exports.getMonthDays = exports.getLastQuarterFirstDay = exports.getLastMonthFirstDay = exports.getBetweenTimeBuiltinValueItem = exports.getBetweenBuiltinValueItem = void 0;
+
+var _moment = _interopRequireDefault(require("moment"));
 
 var t = function t(key) {
   return key;
@@ -22,6 +27,8 @@ var getMonthDays = function getMonthDays(year, month) {
   return days;
 };
 
+exports.getMonthDays = getMonthDays;
+
 var getNextQuarterFirstDay = function getNextQuarterFirstDay(year, month) {
   if (!year) {
     year = new Date().getFullYear();
@@ -45,6 +52,8 @@ var getNextQuarterFirstDay = function getNextQuarterFirstDay(year, month) {
   return new Date(year, month, 1);
 };
 
+exports.getNextQuarterFirstDay = getNextQuarterFirstDay;
+
 var getLastMonthFirstDay = function getLastMonthFirstDay(year, month) {
   if (!year) {
     year = new Date().getFullYear();
@@ -66,6 +75,8 @@ var getLastMonthFirstDay = function getLastMonthFirstDay(year, month) {
   return new Date(year, month, 1);
 };
 
+exports.getLastMonthFirstDay = getLastMonthFirstDay;
+
 var getQuarterStartMonth = function getQuarterStartMonth(month) {
   if (!month) {
     month = new Date().getMonth();
@@ -82,6 +93,8 @@ var getQuarterStartMonth = function getQuarterStartMonth(month) {
   return 9;
 };
 
+exports.getQuarterStartMonth = getQuarterStartMonth;
+
 var getLastQuarterFirstDay = function getLastQuarterFirstDay(year, month) {
   if (!year) {
     year = new Date().getFullYear();
@@ -105,6 +118,8 @@ var getLastQuarterFirstDay = function getLastQuarterFirstDay(year, month) {
   return new Date(year, month, 1);
 };
 
+exports.getLastQuarterFirstDay = getLastQuarterFirstDay;
+
 var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key, utcOffset) {
   // 过滤器between运算符，现算日期/日期时间类型字段的values值
   var currentMonth, currentYear, endValue, firstDay, label, lastDay, lastMonday, lastMonthFinalDay, lastMonthFirstDay, lastQuarterEndDay, lastQuarterStartDay, lastSunday, last_120_days, last_30_days, last_60_days, last_7_days, last_90_days, millisecond, minusDay, monday, month, nextMonday, nextMonthFinalDay, nextMonthFirstDay, nextQuarterEndDay, nextQuarterStartDay, nextSunday, nextYear, next_120_days, next_30_days, next_60_days, next_7_days, next_90_days, now, previousYear, startValue, strEndDay, strFirstDay, strLastDay, strMonday, strStartDay, strSunday, strToday, strTomorrow, strYestday, sunday, thisQuarterEndDay, thisQuarterStartDay, tomorrow, values, week, year, yestday;
@@ -192,8 +207,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "last_quarter":
       // 上季度
-      strFirstDay = moment(lastQuarterStartDay).format("YYYY-MM-DD");
-      strLastDay = moment(lastQuarterEndDay).format("YYYY-MM-DD");
+      strFirstDay = (0, _moment["default"])(lastQuarterStartDay).format("YYYY-MM-DD");
+      strLastDay = (0, _moment["default"])(lastQuarterEndDay).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_last_quarter");
       startValue = new Date(strFirstDay + "T00:00:00Z");
       endValue = new Date(strLastDay + "T23:59:59Z");
@@ -201,8 +216,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "this_quarter":
       // 本季度
-      strFirstDay = moment(thisQuarterStartDay).format("YYYY-MM-DD");
-      strLastDay = moment(thisQuarterEndDay).format("YYYY-MM-DD");
+      strFirstDay = (0, _moment["default"])(thisQuarterStartDay).format("YYYY-MM-DD");
+      strLastDay = (0, _moment["default"])(thisQuarterEndDay).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_this_quarter");
       startValue = new Date(strFirstDay + "T00:00:00Z");
       endValue = new Date(strLastDay + "T23:59:59Z");
@@ -210,8 +225,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "next_quarter":
       // 下季度
-      strFirstDay = moment(nextQuarterStartDay).format("YYYY-MM-DD");
-      strLastDay = moment(nextQuarterEndDay).format("YYYY-MM-DD");
+      strFirstDay = (0, _moment["default"])(nextQuarterStartDay).format("YYYY-MM-DD");
+      strLastDay = (0, _moment["default"])(nextQuarterEndDay).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_next_quarter");
       startValue = new Date(strFirstDay + "T00:00:00Z");
       endValue = new Date(strLastDay + "T23:59:59Z");
@@ -219,8 +234,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "last_month":
       // 上月
-      strFirstDay = moment(lastMonthFirstDay).format("YYYY-MM-DD");
-      strLastDay = moment(lastMonthFinalDay).format("YYYY-MM-DD");
+      strFirstDay = (0, _moment["default"])(lastMonthFirstDay).format("YYYY-MM-DD");
+      strLastDay = (0, _moment["default"])(lastMonthFinalDay).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_last_month");
       startValue = new Date(strFirstDay + "T00:00:00Z");
       endValue = new Date(strLastDay + "T23:59:59Z");
@@ -228,8 +243,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "this_month":
       // 本月
-      strFirstDay = moment(firstDay).format("YYYY-MM-DD");
-      strLastDay = moment(lastDay).format("YYYY-MM-DD");
+      strFirstDay = (0, _moment["default"])(firstDay).format("YYYY-MM-DD");
+      strLastDay = (0, _moment["default"])(lastDay).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_this_month");
       startValue = new Date(strFirstDay + "T00:00:00Z");
       endValue = new Date(strLastDay + "T23:59:59Z");
@@ -237,8 +252,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "next_month":
       // 下月
-      strFirstDay = moment(nextMonthFirstDay).format("YYYY-MM-DD");
-      strLastDay = moment(nextMonthFinalDay).format("YYYY-MM-DD");
+      strFirstDay = (0, _moment["default"])(nextMonthFirstDay).format("YYYY-MM-DD");
+      strLastDay = (0, _moment["default"])(nextMonthFinalDay).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_next_month");
       startValue = new Date(strFirstDay + "T00:00:00Z");
       endValue = new Date(strLastDay + "T23:59:59Z");
@@ -246,8 +261,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "last_week":
       // 上周
-      strMonday = moment(lastMonday).format("YYYY-MM-DD");
-      strSunday = moment(lastSunday).format("YYYY-MM-DD");
+      strMonday = (0, _moment["default"])(lastMonday).format("YYYY-MM-DD");
+      strSunday = (0, _moment["default"])(lastSunday).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_last_week");
       startValue = new Date(strMonday + "T00:00:00Z");
       endValue = new Date(strSunday + "T23:59:59Z");
@@ -255,8 +270,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "this_week":
       // 本周
-      strMonday = moment(monday).format("YYYY-MM-DD");
-      strSunday = moment(sunday).format("YYYY-MM-DD");
+      strMonday = (0, _moment["default"])(monday).format("YYYY-MM-DD");
+      strSunday = (0, _moment["default"])(sunday).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_this_week");
       startValue = new Date(strMonday + "T00:00:00Z");
       endValue = new Date(strSunday + "T23:59:59Z");
@@ -264,8 +279,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "next_week":
       // 下周
-      strMonday = moment(nextMonday).format("YYYY-MM-DD");
-      strSunday = moment(nextSunday).format("YYYY-MM-DD");
+      strMonday = (0, _moment["default"])(nextMonday).format("YYYY-MM-DD");
+      strSunday = (0, _moment["default"])(nextSunday).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_next_week");
       startValue = new Date(strMonday + "T00:00:00Z");
       endValue = new Date(strSunday + "T23:59:59Z");
@@ -273,7 +288,7 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "yestday":
       // 昨天
-      strYestday = moment(yestday).format("YYYY-MM-DD");
+      strYestday = (0, _moment["default"])(yestday).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_yestday");
       startValue = new Date(strYestday + "T00:00:00Z");
       endValue = new Date(strYestday + "T23:59:59Z");
@@ -281,7 +296,7 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "today":
       // 今天
-      strToday = moment(now).format("YYYY-MM-DD");
+      strToday = (0, _moment["default"])(now).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_today");
       startValue = new Date(strToday + "T00:00:00Z");
       endValue = new Date(strToday + "T23:59:59Z");
@@ -289,7 +304,7 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "tomorrow":
       // 明天
-      strTomorrow = moment(tomorrow).format("YYYY-MM-DD");
+      strTomorrow = (0, _moment["default"])(tomorrow).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_tomorrow");
       startValue = new Date(strTomorrow + "T00:00:00Z");
       endValue = new Date(strTomorrow + "T23:59:59Z");
@@ -297,8 +312,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "last_7_days":
       // 过去7天
-      strStartDay = moment(last_7_days).format("YYYY-MM-DD");
-      strEndDay = moment(now).format("YYYY-MM-DD");
+      strStartDay = (0, _moment["default"])(last_7_days).format("YYYY-MM-DD");
+      strEndDay = (0, _moment["default"])(now).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_last_7_days");
       startValue = new Date(strStartDay + "T00:00:00Z");
       endValue = new Date(strEndDay + "T23:59:59Z");
@@ -306,8 +321,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "last_30_days":
       // 过去30天
-      strStartDay = moment(last_30_days).format("YYYY-MM-DD");
-      strEndDay = moment(now).format("YYYY-MM-DD");
+      strStartDay = (0, _moment["default"])(last_30_days).format("YYYY-MM-DD");
+      strEndDay = (0, _moment["default"])(now).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_last_30_days");
       startValue = new Date(strStartDay + "T00:00:00Z");
       endValue = new Date(strEndDay + "T23:59:59Z");
@@ -315,8 +330,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "last_60_days":
       // 过去60天
-      strStartDay = moment(last_60_days).format("YYYY-MM-DD");
-      strEndDay = moment(now).format("YYYY-MM-DD");
+      strStartDay = (0, _moment["default"])(last_60_days).format("YYYY-MM-DD");
+      strEndDay = (0, _moment["default"])(now).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_last_60_days");
       startValue = new Date(strStartDay + "T00:00:00Z");
       endValue = new Date(strEndDay + "T23:59:59Z");
@@ -324,8 +339,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "last_90_days":
       // 过去90天
-      strStartDay = moment(last_90_days).format("YYYY-MM-DD");
-      strEndDay = moment(now).format("YYYY-MM-DD");
+      strStartDay = (0, _moment["default"])(last_90_days).format("YYYY-MM-DD");
+      strEndDay = (0, _moment["default"])(now).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_last_90_days");
       startValue = new Date(strStartDay + "T00:00:00Z");
       endValue = new Date(strEndDay + "T23:59:59Z");
@@ -333,8 +348,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "last_120_days":
       // 过去120天
-      strStartDay = moment(last_120_days).format("YYYY-MM-DD");
-      strEndDay = moment(now).format("YYYY-MM-DD");
+      strStartDay = (0, _moment["default"])(last_120_days).format("YYYY-MM-DD");
+      strEndDay = (0, _moment["default"])(now).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_last_120_days");
       startValue = new Date(strStartDay + "T00:00:00Z");
       endValue = new Date(strEndDay + "T23:59:59Z");
@@ -342,8 +357,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "next_7_days":
       // 未来7天
-      strStartDay = moment(now).format("YYYY-MM-DD");
-      strEndDay = moment(next_7_days).format("YYYY-MM-DD");
+      strStartDay = (0, _moment["default"])(now).format("YYYY-MM-DD");
+      strEndDay = (0, _moment["default"])(next_7_days).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_next_7_days");
       startValue = new Date(strStartDay + "T00:00:00Z");
       endValue = new Date(strEndDay + "T23:59:59Z");
@@ -351,8 +366,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "next_30_days":
       // 未来30天
-      strStartDay = moment(now).format("YYYY-MM-DD");
-      strEndDay = moment(next_30_days).format("YYYY-MM-DD");
+      strStartDay = (0, _moment["default"])(now).format("YYYY-MM-DD");
+      strEndDay = (0, _moment["default"])(next_30_days).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_next_30_days");
       startValue = new Date(strStartDay + "T00:00:00Z");
       endValue = new Date(strEndDay + "T23:59:59Z");
@@ -360,8 +375,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "next_60_days":
       // 未来60天
-      strStartDay = moment(now).format("YYYY-MM-DD");
-      strEndDay = moment(next_60_days).format("YYYY-MM-DD");
+      strStartDay = (0, _moment["default"])(now).format("YYYY-MM-DD");
+      strEndDay = (0, _moment["default"])(next_60_days).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_next_60_days");
       startValue = new Date(strStartDay + "T00:00:00Z");
       endValue = new Date(strEndDay + "T23:59:59Z");
@@ -369,8 +384,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "next_90_days":
       // 未来90天
-      strStartDay = moment(now).format("YYYY-MM-DD");
-      strEndDay = moment(next_90_days).format("YYYY-MM-DD");
+      strStartDay = (0, _moment["default"])(now).format("YYYY-MM-DD");
+      strEndDay = (0, _moment["default"])(next_90_days).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_next_90_days");
       startValue = new Date(strStartDay + "T00:00:00Z");
       endValue = new Date(strEndDay + "T23:59:59Z");
@@ -378,8 +393,8 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
 
     case "next_120_days":
       // 未来120天
-      strStartDay = moment(now).format("YYYY-MM-DD");
-      strEndDay = moment(next_120_days).format("YYYY-MM-DD");
+      strStartDay = (0, _moment["default"])(now).format("YYYY-MM-DD");
+      strEndDay = (0, _moment["default"])(next_120_days).format("YYYY-MM-DD");
       label = t("creator_filter_operation_between_next_120_days");
       startValue = new Date(strStartDay + "T00:00:00Z");
       endValue = new Date(strEndDay + "T23:59:59Z");
@@ -413,19 +428,16 @@ var getBetweenTimeBuiltinValueItem = function getBetweenTimeBuiltinValueItem(key
   };
 };
 
+exports.getBetweenTimeBuiltinValueItem = getBetweenTimeBuiltinValueItem;
+
 var getBetweenBuiltinValueItem = function getBetweenBuiltinValueItem(key, utcOffset) {
   return getBetweenTimeBuiltinValueItem(key, utcOffset);
 };
 
+exports.getBetweenBuiltinValueItem = getBetweenBuiltinValueItem;
+
 var isBetweenFilterOperation = function isBetweenFilterOperation(operation) {
   return operation === "between";
 };
 
-exports.getMonthDays = getMonthDays;
-exports.getQuarterStartMonth = getQuarterStartMonth;
-exports.getLastMonthFirstDay = getLastMonthFirstDay;
-exports.getLastQuarterFirstDay = getLastQuarterFirstDay;
-exports.getNextQuarterFirstDay = getNextQuarterFirstDay;
-exports.getBetweenBuiltinValueItem = getBetweenBuiltinValueItem;
-exports.getBetweenTimeBuiltinValueItem = getBetweenTimeBuiltinValueItem;
 exports.isBetweenFilterOperation = isBetweenFilterOperation;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos/filters",
   "private": false,
-  "version": "2.2.53",
+  "version": "2.2.54-beta.3",
   "description": "filters lib for steedos",
   "main": "lib/index.js",
   "files": [
@@ -9,13 +9,16 @@
   ],
   "license": "Apache",
   "scripts": {
-    "test": "yarn build && mocha test/**/*.js",
-    "build": "babel -d lib src/"
+    "test": "yarn build-babel && mocha test/**/*.js",
+    "build": "yarn build-babel && yarn build-rollup && yarn build-uglifyjs",
+    "build-babel": "babel -d lib src/",
+    "build-rollup": "rollup -c rollup.config.js",
+    "build-uglifyjs": "yarn uglifyjs dist/steedos-filters.umd.js -o dist/steedos-filters.umd.min.js"
   },
   "dependencies": {
     "@babel/runtime": "7.12.18",
-    "moment": "^2.24.0",
-    "underscore": "^1.9.1"
+    "lodash": "4.17.21",
+    "moment": "^2.24.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.8.4",
@@ -31,5 +34,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "769c7fa373467a407961e132bbc5cc9d164ae42a"
+  "gitHead": "e83b0f819481cfc1e98ec8b67a2e29e70a520f68"
 }