@steedos/filters 2.3.1 → 2.3.2-beta.3

package/lib/format.js

@@ -1,32 +1,26 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.formatFiltersToODataQuery = exports.formatFiltersToDev = void 0;
-
 var _filter = _interopRequireDefault(require("./filter"));
-
 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 = /\;|\/|\?|\:|\@|\&|\=|\+|\$|\,|\#|\^|(\\\()|(\\\))|(\\\.)|\\|\||\[|\]|\{|\}/;
+
 /**
     ^$()*+?.\|[]{}等特殊符号需要转义，否则有可能会报错且无法正确识别
     encodeURIComponent函数并不能完全编码上述所有特殊符号
     这里保持跟版本1.23一样的处理逻辑，只是额外判断了下避免重复转义或重复执行encodeURIComponent编码的可能
  */
-
 var convertSpecialCharacter = function convertSpecialCharacter(str) {
   // if(str.indexOf("\\") > -1){
   //     // 如果有转义符号就按已经执行过转义处理，否则重复转义会有问题
@@ -38,31 +32,25 @@ var convertSpecialCharacter = function convertSpecialCharacter(str) {
   if (str.indexOf("%5C(") > -1 || str.indexOf("%5C)") > -1) {
     return str;
   }
-
   if (str.indexOf("%5C.") > -1) {
     return str;
   }
-
   if (str.indexOf("%5C*") > -1) {
     return str;
   }
-
   return str.replace(/([\^\$\(\)\*\+\?\.\\\|\[\]\{\}])/g, "\\$1");
 };
-
 var extendUserContext = function extendUserContext(userContext, utcOffset) {
   if (!userContext.now) {
     userContext.now = new Date();
-
-    if (utcOffset) {// 注意这里取的值是moment().utcOffset() / 60得到的，不是new Date().getTimezoneOffset() / 60
+    if (utcOffset) {
+      // 注意这里取的值是moment().utcOffset() / 60得到的，不是new Date().getTimezoneOffset() / 60
       // 它们的值正好为正负关系，北京时间前者为 +8，后者为 -8
       // userContext.now.setHours(userContext.now.getHours() - utcOffset);
     }
   }
-
   return userContext;
 };
-
 var formatFiltersToDev = function formatFiltersToDev(filters) {
   var userContext = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
     userId: null,
@@ -71,37 +59,28 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
       utcOffset: 0
     }
   };
-
   if ((0, _lodash.isNull)(filters) || (0, _lodash.isUndefined)(filters)) {
     return;
   }
-
   var utcOffset = userContext.user ? userContext.user.utcOffset : 0;
-  userContext = extendUserContext(userContext, utcOffset); // 2019-03-23T01:00:33.524Z、2019-03-23T01:00:33Z、2022-06-11T00:00:00.444+08:00这种格式
-
+  userContext = extendUserContext(userContext, utcOffset);
+  // 2019-03-23T01:00:33.524Z、2019-03-23T01:00:33Z、2022-06-11T00:00:00.444+08:00这种格式
   var regDate = /^\d{4}-\d{1,2}-\d{1,2}(T|\s)\d{1,2}\:\d{1,2}(\:\d{1,2}(\.\d{1,3})?)?(Z|((\+|\-)\d{1,2}\:\d{1,2}))?$/;
-
   var _filtersLooper, selector;
-
   if (!(0, _lodash.isFunction)(filters) && !filters.length) {
     return;
   }
-
   selector = [];
-
   _filtersLooper = function filtersLooper(filters_loop) {
     var builtinValue, field, i, isBetweenOperation, option, ref, sub_selector, tempFilters, tempLooperResult, value;
     tempFilters = [];
     tempLooperResult = null;
-
     if (filters_loop === "!") {
       return filters_loop;
     }
-
     if ((0, _lodash.isFunction)(filters_loop)) {
       filters_loop = filters_loop();
     }
-
     if (!(0, _lodash.isArray)(filters_loop)) {
       if ((0, _lodash.isObject)(filters_loop)) {
         // 当filters不是[Array]类型而是[Object]类型时，进行格式转换
@@ -114,11 +93,9 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
         return null;
       }
     }
-
     if (filters_loop.length === 1) {
       // 只有一个元素，进一步解析其内容
       tempLooperResult = _filtersLooper(filters_loop[0]);
-
       if (tempLooperResult) {
         tempFilters.push(tempLooperResult);
       }
@@ -126,7 +103,6 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
       // 只有两个元素，进一步解析其内容，省略"and"连接符，但是有"and"效果
       filters_loop.forEach(function (n, i) {
         tempLooperResult = _filtersLooper(n);
-
         if (tempLooperResult) {
           return tempFilters.push(tempLooperResult);
         }
@@ -140,28 +116,22 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
         // 所以不能直接写：tempFilters = [filtersLooper(filters_loop[0]), filters_loop[1], filtersLooper(filters_loop[2])]
         tempFilters = [];
         i = 0;
-
         while (i < filters_loop.length) {
           if ((0, _lodash.includes)(["or", "and"], filters_loop[i])) {
             i++;
             continue;
           }
-
           tempLooperResult = _filtersLooper(filters_loop[i]);
-
           if (!tempLooperResult) {
             i++;
             continue;
           }
-
           if (i > 0) {
             tempFilters.push(filters_loop[i - 1]);
           }
-
           tempFilters.push(tempLooperResult);
           i++;
         }
-
         if ((0, _lodash.includes)(["or", "and"], tempFilters[0])) {
           tempFilters.shift();
         }
@@ -171,30 +141,24 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
           field = filters_loop[0];
           option = filters_loop[1];
           value = filters_loop[2];
-
           if ((0, _lodash.isFunction)(value)) {
             value = value();
           }
-
           if (option === "!=") {
             // 支持!=为不等于操作
             option = "<>";
           }
-
           value = (0, _formula.evaluateFormula)(value, userContext);
           sub_selector = [];
           isBetweenOperation = (0, _utils.isBetweenFilterOperation)(option);
-
           if (isBetweenOperation && (0, _lodash.isString)(value)) {
             // 如果是between运算符内置值，则取出对应values作为过滤值
             // 比如value为last_year，返回对应的时间值
             builtinValue = (0, _utils.getBetweenBuiltinValueItem)(value, utcOffset);
-
             if (builtinValue) {
               value = builtinValue.values;
             }
           }
-
           if ((0, _lodash.isArray)(value)) {
             value = value.map(function (item) {
               if (typeof item === "string") {
@@ -202,7 +166,6 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
                 if (["contains", "startswith", "endswith", "notcontains", "notstartswith", "notendswith"].indexOf(option) > -1) {
                   item = convertSpecialCharacter(item);
                 }
-
                 if (regDate.test(item)) {
                   // 如果item正好是regDate格式，则转换为Date类型
                   item = new Date(item);
@@ -210,13 +173,12 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
                   item = encodeURIComponent(item);
                 }
               }
-
               return item;
             });
-
             if (["=", "in"].indexOf(option) > -1) {
               if (value.length) {
-                sub_selector.push([field, "in", "(".concat(JSON.stringify(value).replace(/\"/g, "'").slice(1).slice(0, -1), ")")], "and"); // _.each(value, function (v) {
+                sub_selector.push([field, "in", "(".concat(JSON.stringify(value).replace(/\"/g, "'").slice(1).slice(0, -1), ")")], "and");
+                // _.each(value, function (v) {
                 //     return sub_selector.push([field, "=", v], "or");
                 // });
               } else {
@@ -224,7 +186,8 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
                 sub_selector.push([field, "=", "__badQueryForEmptyArray"], "and");
               }
             } else if (["<>", "notin"].indexOf(option) > -1) {
-              sub_selector.push([field, "notin", "(".concat(JSON.stringify(value).replace(/\"/g, "'").slice(1).slice(0, -1), ")")], "and"); // _.each(value, function (v) {
+              sub_selector.push([field, "notin", "(".concat(JSON.stringify(value).replace(/\"/g, "'").slice(1).slice(0, -1), ")")], "and");
+              // _.each(value, function (v) {
               //     return sub_selector.push([field, "<>", v], "and");
               // });
             } else if (["notcontains", "notstartswith", "notendswith"].indexOf(option) > -1) {
@@ -237,12 +200,12 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
                   if ([null, undefined, ''].indexOf(value[0]) < 0) {
                     sub_selector.push([field, ">=", value[0]], "and");
                   }
-
                   if ([null, undefined, ''].indexOf(value[1]) < 0) {
                     sub_selector.push([field, "<=", value[1]], "and");
                   }
                 }
-              } else {// 如果是between连的空数组，不加任何条件，即查找所有数据
+              } else {
+                // 如果是between连的空数组，不加任何条件，即查找所有数据
               }
             } else {
               // contains、startswith、endswith等，如果value为空数组，不加任何条件，即查找所有数据
@@ -250,11 +213,9 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
                 return sub_selector.push([field, option, v], "or");
               });
             }
-
             if (sub_selector[sub_selector.length - 1] === "and" || sub_selector[sub_selector.length - 1] === "or") {
               sub_selector.pop();
             }
-
             if (sub_selector.length) {
               tempFilters = sub_selector;
             }
@@ -268,7 +229,8 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
               tempFilters = [field, "=", true];
             }
           } else {
-            if (isBetweenOperation && !(0, _lodash.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) {
@@ -278,7 +240,6 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
                   // 过滤器包部分特殊字符在ag-grid组件右侧过滤面板会报错 https://github.com/steedos/steedos-frontend/issues/126
                   value = convertSpecialCharacter(value);
                 }
-
                 if (regDate.test(value)) {
                   // 如果value正好是regDate格式，则转换为Date类型
                   value = new Date(value);
@@ -292,7 +253,6 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
                   }
                 }
               }
-
               tempFilters = [field, option, value];
             }
           }
@@ -300,7 +260,6 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
           // 普通数组，当成完整过虑条件进一步循环解析每个条件
           filters_loop.forEach(function (n, i) {
             tempLooperResult = _filtersLooper(n);
-
             if (tempLooperResult) {
               return tempFilters.push(tempLooperResult);
             }
@@ -316,28 +275,22 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
         // 所以不能直接写：tempFilters = [filtersLooper(filters_loop[0]), filters_loop[1], filtersLooper(filters_loop[2])]
         tempFilters = [];
         i = 0;
-
         while (i < filters_loop.length) {
           if ((0, _lodash.includes)(["or", "and"], filters_loop[i])) {
             i++;
             continue;
           }
-
           tempLooperResult = _filtersLooper(filters_loop[i]);
-
           if (!tempLooperResult) {
             i++;
             continue;
           }
-
           if (i > 0) {
             tempFilters.push(filters_loop[i - 1]);
           }
-
           tempFilters.push(tempLooperResult);
           i++;
         }
-
         if ((0, _lodash.includes)(["or", "and"], tempFilters[0])) {
           tempFilters.shift();
         }
@@ -345,30 +298,25 @@ var formatFiltersToDev = function formatFiltersToDev(filters) {
         // 普通过虑条件，当成完整过虑条件进一步循环解析每个条件
         filters_loop.forEach(function (n, i) {
           tempLooperResult = _filtersLooper(n);
-
           if (tempLooperResult) {
             return tempFilters.push(tempLooperResult);
           }
         });
       }
     }
-
     if (tempFilters.length) {
       return tempFilters;
     } else {
       return null;
     }
   };
-
   selector = _filtersLooper(filters);
   return selector;
 };
-
 var formatFiltersToODataQuery = function formatFiltersToODataQuery(filters, userContext, odataProtocolVersion, forceLowerCase) {
   var devFilters = formatFiltersToDev(filters, userContext);
   return new _filter["default"](devFilters, odataProtocolVersion, forceLowerCase).formatFiltersToODataQuery();
 };
-
 var _formatFiltersToDev = formatFiltersToDev;
 exports.formatFiltersToDev = _formatFiltersToDev;
 var _formatFiltersToODataQuery = formatFiltersToODataQuery;

package/lib/formula.js

@@ -4,13 +4,12 @@ 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);
-}; // "{userId}"转换为"this['userId']","{user.name}"转换为"this['user'].['name']"
-
+};
 
+// "{userId}"转换为"this['userId']","{user.name}"转换为"this['user'].['name']"
 var prepareFormula = function prepareFormula(formula) {
   var prefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "this";
   var reg, rev;
@@ -20,7 +19,6 @@ var prepareFormula = function prepareFormula(formula) {
   });
   return rev;
 };
-
 var evaluateFormula = function evaluateFormula(formula, context) {
   if (checkFormula(formula)) {
     formula = prepareFormula(formula);
@@ -31,6 +29,5 @@ var evaluateFormula = function evaluateFormula(formula, context) {
     return formula;
   }
 };
-
 var _evaluateFormula = evaluateFormula;
 exports.evaluateFormula = _evaluateFormula;

package/lib/graphql.js

@@ -4,24 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.formatFiltersToGraphqlQuery = void 0;
-
 var _lodash = require("lodash");
-
 var _format = require("./format");
-
 // 把"a.b.c"这种字符fieldName转换为{"a":{"b":{"c":{}}}}这种json
 var expandFieldName = function expandFieldName(initial, fieldName) {
   (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对象格式
-
+};
 
+// 把["a.b.c","x.y","x.z","m"]这种字符fieldName转换为{"a":{"b":{"c":{}}},"x":{"y":{},"z":{}},"m":{}}这种json对象格式
 var expandFieldNames = function expandFieldNames(fieldNames) {
   var initial = {};
   fieldNames.forEach(function (n) {
@@ -29,10 +25,10 @@ var expandFieldNames = function expandFieldNames(fieldNames) {
   });
   return initial;
 };
-
 var generateIndents = function generateIndents(count) {
   return Array(count).fill("    ").join("");
 };
+
 /** 
 把{"a":{"b":{"c":{}}}}这种json转换为字符格式：
 {
@@ -43,17 +39,13 @@ var generateIndents = function generateIndents(count) {
     }
 }
 */
-
-
 var reduceGraphqlFieldsQuery = function reduceGraphqlFieldsQuery(fields, indentsCount) {
   if (!indentsCount) {
     indentsCount = 0;
   }
-
   var itemQuery;
   return " {\n".concat((0, _lodash.map)(fields, function (fieldValue, fieldKey) {
     itemQuery = generateIndents(indentsCount) + generateIndents(1) + fieldKey;
-
     if ((0, _lodash.isEmpty)(fieldValue)) {
       itemQuery += "\n";
     } else {
@@ -61,19 +53,17 @@ var reduceGraphqlFieldsQuery = function reduceGraphqlFieldsQuery(fields, indents
       itemQuery += reduceGraphqlFieldsQuery(fieldValue, indentsCount);
       indentsCount -= 1;
     }
-
     return itemQuery;
   }).join("")).concat(generateIndents(indentsCount), "}\n");
 };
-
 var formatFieldsToGraphqlQuery = function formatFieldsToGraphqlQuery(fields) {
   if ((0, _lodash.isString)(fields)) {
     fields = fields.split(",");
   }
-
   var expandedFields = expandFieldNames(fields);
   return reduceGraphqlFieldsQuery(expandedFields, 3);
 };
+
 /**
  * 
  * 
@@ -96,18 +86,14 @@ var formatFieldsToGraphqlQuery = function formatFieldsToGraphqlQuery(fields) {
  * @param {*} filters ,请求的过滤条件
  * @param {*} fields ,请求的字段，支持["a.b.c","m","n"]或"a.b.c,m,n"这种语法
  */
-
-
 var formatFiltersToGraphqlQuery = function formatFiltersToGraphqlQuery(objectName, filters, fields, userContext, odataProtocolVersion, forceLowerCase) {
   if (!(0, _lodash.isString)(filters)) {
     filters = (0, _format.formatFiltersToODataQuery)(filters, userContext, odataProtocolVersion, forceLowerCase);
   }
-
   var filtersWrap = filters ? "(filters:\"".concat(filters, "\")") : "";
   var graphqlFields = formatFieldsToGraphqlQuery(fields);
   var graphqlQuery = "\n        query {\n            ".concat(objectName).concat(filtersWrap).concat(graphqlFields, "\n        }\n    ");
   return graphqlQuery;
 };
-
 var _formatFiltersToGraphqlQuery = formatFiltersToGraphqlQuery;
 exports.formatFiltersToGraphqlQuery = _formatFiltersToGraphqlQuery;

package/lib/index.js

@@ -1,7 +1,6 @@
 "use strict";
 
 var _typeof = require("@babel/runtime/helpers/typeof");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -9,13 +8,9 @@ var _exportNames = {
   SteedosFilter: true
 };
 exports.SteedosFilter = void 0;
-
 var _SteedosFilter = _interopRequireWildcard(require("./filter"));
-
 exports.SteedosFilter = _SteedosFilter;
-
 var _format = require("./format");
-
 Object.keys(_format).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -27,9 +22,7 @@ Object.keys(_format).forEach(function (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;
@@ -41,9 +34,7 @@ Object.keys(_utils).forEach(function (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;
@@ -55,9 +46,7 @@ Object.keys(_formula).forEach(function (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;
@@ -69,7 +58,5 @@ Object.keys(_graphql).forEach(function (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; }