@steedos/filters 2.3.1 → 2.3.2-beta.2

package/lib/date.formatter.js

@@ -4,15 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getFormatter = void 0;
-
 function leftPad(text, length) {
   while (text.length < length) {
     text = "0" + text;
   }
-
   return text;
 }
-
 var FORMAT_TYPES = {
   "3": "abbreviated",
   "4": "wide",
@@ -21,42 +18,34 @@ var FORMAT_TYPES = {
 var LDML_FORMATTERS = {
   y: function y(date, count, useUtc) {
     var year = date[useUtc ? "getUTCFullYear" : "getFullYear"]();
-
     if (count === 2) {
       year = year % 100;
     }
-
     return leftPad(year.toString(), count);
   },
   M: function M(date, count, useUtc, dateParts) {
     var month = date[useUtc ? "getUTCMonth" : "getMonth"]();
     var formatType = FORMAT_TYPES[count];
-
     if (formatType) {
       return dateParts.getMonthNames(formatType, "format")[month];
     }
-
     return leftPad((month + 1).toString(), Math.min(count, 2));
   },
   L: function L(date, count, useUtc, dateParts) {
     var month = date[useUtc ? "getUTCMonth" : "getMonth"]();
     var formatType = FORMAT_TYPES[count];
-
     if (formatType) {
       return dateParts.getMonthNames(formatType, "standalone")[month];
     }
-
     return leftPad((month + 1).toString(), Math.min(count, 2));
   },
   Q: function Q(date, count, useUtc, dateParts) {
     var month = date[useUtc ? "getUTCMonth" : "getMonth"]();
     var quarter = Math.floor(month / 3);
     var formatType = FORMAT_TYPES[count];
-
     if (formatType) {
       return dateParts.getQuarterNames(formatType)[quarter];
     }
-
     return leftPad((quarter + 1).toString(), Math.min(count, 2));
   },
   E: function E(date, count, useUtc, dateParts) {
@@ -66,8 +55,8 @@ var LDML_FORMATTERS = {
   },
   a: function a(date, count, useUtc, dateParts) {
     var hours = date[useUtc ? "getUTCHours" : "getHours"](),
-        period = hours < 12 ? 0 : 1,
-        formatType = FORMAT_TYPES[count];
+      period = hours < 12 ? 0 : 1,
+      formatType = FORMAT_TYPES[count];
     return dateParts.getPeriodNames(formatType)[period];
   },
   d: function d(date, count, useUtc) {
@@ -91,69 +80,59 @@ var LDML_FORMATTERS = {
   },
   x: function x(date, count, useUtc) {
     var timezoneOffset = useUtc ? 0 : date.getTimezoneOffset(),
-        signPart = timezoneOffset > 0 ? "-" : "+",
-        timezoneOffsetAbs = Math.abs(timezoneOffset),
-        hours = Math.floor(timezoneOffsetAbs / 60),
-        minutes = timezoneOffsetAbs % 60,
-        hoursPart = leftPad(hours.toString(), 2),
-        minutesPart = leftPad(minutes.toString(), 2);
+      signPart = timezoneOffset > 0 ? "-" : "+",
+      timezoneOffsetAbs = Math.abs(timezoneOffset),
+      hours = Math.floor(timezoneOffsetAbs / 60),
+      minutes = timezoneOffsetAbs % 60,
+      hoursPart = leftPad(hours.toString(), 2),
+      minutesPart = leftPad(minutes.toString(), 2);
     return signPart + hoursPart + (count >= 3 ? ":" : "") + (count > 1 || minutes ? minutesPart : "");
   },
   X: function X(date, count, useUtc) {
     if (useUtc || !date.getTimezoneOffset()) {
       return "Z";
     }
-
     return LDML_FORMATTERS.x(date, count, useUtc);
   },
   Z: function Z(date, count, useUtc) {
     return LDML_FORMATTERS.X(date, count >= 5 ? 3 : 2, useUtc);
   }
 };
-
 var getFormatter = function getFormatter(format, dateParts) {
   return function (date) {
     var charIndex,
-        formatter,
-        _char,
-        charCount = 0,
-        separator = "'",
-        isEscaping = false,
-        isCurrentCharEqualsNext,
-        result = "";
-
+      formatter,
+      _char,
+      charCount = 0,
+      separator = "'",
+      isEscaping = false,
+      isCurrentCharEqualsNext,
+      result = "";
     if (!date) return null;
     if (!format) return date;
     var useUtc = format[format.length - 1] === "Z" || format.slice(-3) === "'Z'";
-
     for (charIndex = 0; charIndex < format.length; charIndex++) {
       _char = format[charIndex];
       formatter = LDML_FORMATTERS[_char];
       isCurrentCharEqualsNext = _char === format[charIndex + 1];
       charCount++;
-
       if (!isCurrentCharEqualsNext) {
         if (formatter && !isEscaping) {
           result += formatter(date, charCount, useUtc, dateParts);
         }
-
         charCount = 0;
       }
-
       if (_char === separator && !isCurrentCharEqualsNext) {
         isEscaping = !isEscaping;
       } else if (isEscaping || !formatter) {
         result += _char;
       }
-
       if (_char === separator && isCurrentCharEqualsNext) {
         charIndex++;
       }
     }
-
     return result;
   };
 };
-
 var _getFormatter = getFormatter;
 exports.getFormatter = _getFormatter;

package/lib/default_date_names.js

@@ -9,10 +9,9 @@ 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"],
-    QUARTERS = ["Q1", "Q2", "Q3", "Q4"];
-
+  DAYS = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
+  PERIODS = ["AM", "PM"],
+  QUARTERS = ["Q1", "Q2", "Q3", "Q4"];
 var cutCaptions = function cutCaptions(captions, format) {
   var lengthByFormat = {
     abbreviated: 3,
@@ -23,23 +22,18 @@ var cutCaptions = function cutCaptions(captions, format) {
     return caption.substr(0, lengthByFormat[format]);
   });
 };
-
 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,

package/lib/filter.js

@@ -1,28 +1,20 @@
 "use strict";
 
 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 Guid = require("devextreme/core/guid");
 // const EdmLiteral = require("devextreme/data/odata/utils").EdmLiteral;
+
 var DevExpressData = {
   utils: {
     isConjunctiveOperator: function isConjunctiveOperator(condition) {
@@ -35,16 +27,16 @@ var DevExpressData = {
       return crit[0] === "!" && Array.isArray(crit[1]);
     }
   }
-}; // const defaultDateNames = DevExpress.localization.date;
+};
+
+// const defaultDateNames = DevExpress.localization.date;
 
 var DevExpressOData = {
   pad: function pad(text, length, right) {
     text = String(text);
-
     while (text.length < length) {
       text = right ? text + "0" : "0" + text;
     }
-
     return text;
   },
   padLeft2: function padLeft2(text) {
@@ -59,17 +51,13 @@ var DevExpressOData = {
       // 有可能serializeValueV4函数中if (value instanceof Guid)逻辑被注释掉造成的，放开应该就会自动返回null
       return null;
     }
-
     switch (protocolVersion) {
       case 2:
         return this.serializeValueV2(value);
-
       case 3:
         return this.serializeValueV2(value);
-
       case 4:
         return this.serializeValueV4(value);
-
       default:
         return this.serializeValueV4(value);
     }
@@ -77,36 +65,31 @@ var DevExpressOData = {
   serializeValueV2: function serializeValueV2(value) {
     if (value instanceof Date) {
       return this.serializeDate(value);
-    } // if (value instanceof Guid) {
+    }
+    // if (value instanceof Guid) {
     //     return "guid'" + value + "'";
     // }
     // if (value instanceof EdmLiteral) {
     //     return value.valueOf();
     // }
-
-
     if (typeof value === "string") {
       return this.serializeString(value);
     }
-
     return String(value);
   },
   serializeValueV4: function serializeValueV4(value) {
     var _this = this;
-
     if (value instanceof Date) {
       return this.formatISO8601(value, false, false);
-    } // if (value instanceof Guid) {
+    }
+    // if (value instanceof Guid) {
     //     return value.valueOf();
     // }
-
-
     if (Array.isArray(value)) {
       return "[" + value.map(function (item) {
         return _this.serializeValueV4(item);
       }).join(",") + "]";
     }
-
     return this.serializeValueV2(value);
   },
   serializeString: function serializeString(value) {
@@ -116,30 +99,24 @@ var DevExpressOData = {
     if (!serializationFormat) {
       return value;
     }
-
     if (!(value instanceof Date)) {
       return null;
     }
-
     if (serializationFormat === "number") {
       return value && value.valueOf ? value.valueOf() : null;
     }
-
     return (0, _date.getFormatter)(serializationFormat, _default_date_names["default"])(value);
   },
   formatISO8601: function formatISO8601(date, skipZeroTime, skipTimezone) {
     var bag = [];
-
     var isZeroTime = function isZeroTime() {
       return date.getUTCHours() + date.getUTCMinutes() + date.getUTCSeconds() + date.getUTCMilliseconds() < 1;
     };
-
     bag.push(date.getUTCFullYear());
     bag.push("-");
     bag.push(this.padLeft2(date.getUTCMonth() + 1));
     bag.push("-");
     bag.push(this.padLeft2(date.getUTCDate()));
-
     if (!(skipZeroTime && isZeroTime())) {
       bag.push("T");
       bag.push(this.padLeft2(date.getUTCHours()));
@@ -147,21 +124,17 @@ var DevExpressOData = {
       bag.push(this.padLeft2(date.getUTCMinutes()));
       bag.push(":");
       bag.push(this.padLeft2(date.getUTCSeconds()));
-
       if (date.getUTCMilliseconds()) {
         bag.push(".");
         bag.push(this.pad(date.getUTCMilliseconds(), 3));
       }
-
       if (!skipTimezone) {
         bag.push("Z");
       }
     }
-
     return bag.join("");
   }
 };
-
 var SteedosFilter = /*#__PURE__*/function () {
   function SteedosFilter(filters) {
     var odataProtocolVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 4;
@@ -193,7 +166,6 @@ var SteedosFilter = /*#__PURE__*/function () {
       "notin": this.createBinaryOperationFormatter("notin")
     });
   }
-
   (0, _createClass2["default"])(SteedosFilter, [{
     key: "createBinaryOperationFormatter",
     value: function createBinaryOperationFormatter(op) {
@@ -205,22 +177,18 @@ var SteedosFilter = /*#__PURE__*/function () {
     key: "createStringFuncFormatter",
     value: function createStringFuncFormatter(op, reverse) {
       var _this2 = this;
-
       return function (prop, val) {
         var bag = [op, "("];
-
         if (_this2.forceLowerCase) {
           // prop = prop.indexOf("tolower(") === -1 ? "tolower(" + prop + ")" : prop;
           // forceLowerCase时不需要在prop外面增加tolower(..)，因为odata-v4-mongodb等包不支持
           val = val.toLowerCase();
         }
-
         if (reverse) {
           bag.push(val, ",", prop);
         } else {
           bag.push(prop, ",", val);
         }
-
         bag.push(")");
         return bag.join("");
       };
@@ -229,28 +197,24 @@ var SteedosFilter = /*#__PURE__*/function () {
     key: "compileUnary",
     value: function compileUnary(criteria) {
       var op = criteria[0],
-          crit = this.compileCore(criteria[1]);
-
+        crit = this.compileCore(criteria[1]);
       if (op === "!") {
         return "not (" + crit + ")";
       }
-
       throw new Error("E4003");
     }
   }, {
     key: "compileGroup",
     value: function compileGroup(criteria) {
       var _this3 = this;
-
       var bag = [],
-          groupOperator,
-          nextGroupOperator;
+        groupOperator,
+        nextGroupOperator;
       criteria.forEach(function (criterion) {
         if (Array.isArray(criterion)) {
           if (bag.length > 1 && groupOperator !== nextGroupOperator) {
             throw new Error("E4019");
           }
-
           bag.push("(" + _this3.compileCore(criterion) + ")");
           groupOperator = nextGroupOperator;
           nextGroupOperator = "and";
@@ -265,15 +229,13 @@ var SteedosFilter = /*#__PURE__*/function () {
     value: function compileBinary(criteria) {
       criteria = DevExpressData.utils.normalizeBinaryCriterion(criteria);
       var op = criteria[1],
-          formatters = this.protocolVersion === 4 ? this.formattersV4 : this.formattersV2,
-          formatter = formatters[op.toLowerCase()];
-
+        formatters = this.protocolVersion === 4 ? this.formattersV4 : this.formattersV2,
+        formatter = formatters[op.toLowerCase()];
       if (!formatter) {
         throw new Error("E4003");
       }
-
       var fieldName = criteria[0],
-          value = criteria[2];
+        value = criteria[2];
       return formatter(DevExpressOData.serializePropName(fieldName), op === 'in' || op === 'notin' ? value : DevExpressOData.serializeValue(value, this.protocolVersion));
     }
   }, {
@@ -282,15 +244,12 @@ var SteedosFilter = /*#__PURE__*/function () {
       if (!criteria || criteria.length === 0) {
         return "";
       }
-
       if (Array.isArray(criteria[0])) {
         return this.compileGroup(criteria);
       }
-
       if (DevExpressData.utils.isUnaryOperation(criteria)) {
         return this.compileUnary(criteria);
       }
-
       return this.compileBinary(criteria);
     }
   }, {
@@ -304,6 +263,5 @@ var SteedosFilter = /*#__PURE__*/function () {
   }]);
   return SteedosFilter;
 }();
-
 var _default = SteedosFilter;
 exports["default"] = _default;