@azteam/express 1.2.301 → 1.2.303

package/lib/Server.js

@@ -20,6 +20,7 @@ var _psl = _interopRequireDefault(require("psl"));
 var _ejs = _interopRequireDefault(require("ejs"));
 require("express-async-errors");
 var _error = require("@azteam/error");
+var _util = require("@azteam/util");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -41,23 +42,6 @@ var RES_TYPE = {
   OBJECT: 'OBJECT',
   DOCS: 'DOCS'
 };
-function omitItem(item, guard, allow) {
-  var guardFields = guard;
-  var itemFields = item;
-  if (_lodash["default"].isArray(guardFields)) {
-    guardFields = _lodash["default"].difference(guardFields, allow);
-  }
-  if (itemFields.toJSON) {
-    itemFields = item.toJSON();
-  }
-  if (_lodash["default"].isObject(itemFields)) {
-    if (guardFields === '*') {
-      return _lodash["default"].pick(itemFields, allow);
-    }
-    return _lodash["default"].omit(itemFields, guardFields);
-  }
-  return itemFields;
-}
 var Server = /*#__PURE__*/function () {
   function Server() {
     var currentDir = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
@@ -232,15 +216,11 @@ var Server = /*#__PURE__*/function () {
               responseGuard = [].concat(_toConsumableArray(guard), ['__v', '_id', 'created_at', 'created_id', 'modified_at', 'modified_id', 'deleted_at', 'deleted_id', 'restored_id', 'resource', 'is_processing', 'priority']);
             }
             if (resType === RES_TYPE.DOCS) {
-              guardData.docs = _lodash["default"].map(data.docs, function (item) {
-                return omitItem(item, responseGuard, responseAllows);
-              });
+              guardData.docs = (0, _util.omitArrayItem)(data.docs, responseGuard, responseAllows);
             } else if (resType === RES_TYPE.ARRAY) {
-              guardData = _lodash["default"].map(data, function (item) {
-                return omitItem(item, responseGuard, responseAllows);
-              });
+              guardData = (0, _util.omitArrayItem)(data, responseGuard, responseAllows);
             } else if (resType === RES_TYPE.OBJECT) {
-              guardData = omitItem(data, responseGuard, responseAllows);
+              guardData = (0, _util.omitItem)(data, responseGuard, responseAllows);
             }
           }
           var resData = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.301",
+    "version": "1.2.303",
     "main": "./lib/index.js",
     "module": "./src/index.js",
     "scripts": {
@@ -13,6 +13,7 @@
         "@azteam/crypto": "1.0.29",
         "@azteam/error": "1.0.31",
         "@azteam/http-client": "1.0.105",
+        "@azteam/util": "1.0.25",
         "@azteam/validator": "1.0.7",
         "@grpc/grpc-js": "1.6.7",
         "@grpc/proto-loader": "0.6.12",

package/src/Server.js

@@ -13,6 +13,7 @@ import psl from 'psl';
 import ejs from 'ejs';
 import 'express-async-errors';
 import {CORS, errorCatch, ErrorException, NOT_FOUND, UNKNOWN} from '@azteam/error';
+import {omitItem, omitArrayItem} from '@azteam/util';
 
 const RES_TYPE = {
     ARRAY: 'ARRAY',
@@ -20,26 +21,6 @@ const RES_TYPE = {
     DOCS: 'DOCS',
 };
 
-function omitItem(item, guard, allow) {
-    let guardFields = guard;
-    let itemFields = item;
-
-    if (_.isArray(guardFields)) {
-        guardFields = _.difference(guardFields, allow);
-    }
-
-    if (itemFields.toJSON) {
-        itemFields = item.toJSON();
-    }
-    if (_.isObject(itemFields)) {
-        if (guardFields === '*') {
-            return _.pick(itemFields, allow);
-        }
-        return _.omit(itemFields, guardFields);
-    }
-    return itemFields;
-}
-
 class Server {
     constructor(currentDir = '', options = {}, errorCallback = null) {
         this.options = {
@@ -219,13 +200,9 @@ class Server {
                         ];
                     }
                     if (resType === RES_TYPE.DOCS) {
-                        guardData.docs = _.map(data.docs, (item) => {
-                            return omitItem(item, responseGuard, responseAllows);
-                        });
+                        guardData.docs = omitArrayItem(data.docs, responseGuard, responseAllows);
                     } else if (resType === RES_TYPE.ARRAY) {
-                        guardData = _.map(data, (item) => {
-                            return omitItem(item, responseGuard, responseAllows);
-                        });
+                        guardData = omitArrayItem(data, responseGuard, responseAllows);
                     } else if (resType === RES_TYPE.OBJECT) {
                         guardData = omitItem(data, responseGuard, responseAllows);
                     }