utiller 1.0.157 → 1.0.160

package/lib/utiller/index.js

@@ -33,6 +33,8 @@ var _exceptioner = _interopRequireDefault(require("../exceptioner"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
+require("moment-timezone");
+
 var _uuid = require("uuid");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
@@ -830,7 +832,7 @@ var Utiller = /*#__PURE__*/function () {
       return item.length > 0 ? item[0] : undefined;
     }
     /**
-    * util.getMergedArray(
+    * util.getMergedArrayBy(
     [{id: 123, name: 'david'}, {id: 321, name: 'Joe'}],
     [{id: 321, age: 13}, {id: 123, age: 30}],
     'id')
@@ -844,12 +846,15 @@ var Utiller = /*#__PURE__*/function () {
     */
 
   }, {
-    key: "getMergedArray",
-    value: function getMergedArray(array1, array2) {
-      var attribute = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "id";
+    key: "getMergedArrayBy",
+    value: function getMergedArrayBy(array1, array2, predicate) {
+      /** predicate可以只帶入屬性質 */
+      predicate = _lodash["default"].isString(predicate) ? function (a, b) {
+        return _lodash["default"].isEqual(a[predicate], b[predicate]);
+      } : predicate;
       return array1.map(function (itm) {
         return _objectSpread(_objectSpread({}, array2.find(function (item) {
-          return item[attribute] === itm[attribute] && item;
+          return predicate(itm, item) && item;
         })), itm);
       });
     }
@@ -1037,6 +1042,22 @@ var Utiller = /*#__PURE__*/function () {
         return 0;
       }
     }
+    /** 如果有優先順序的值,需要檢查是否isUndefinedEmpty,這樣程式邏輯就不用一直 if else switch */
+
+  }, {
+    key: "getValueOfPriority",
+    value: function getValueOfPriority() {
+      for (var _len12 = arguments.length, compares = new Array(_len12), _key13 = 0; _key13 < _len12; _key13++) {
+        compares[_key13] = arguments[_key13];
+      }
+
+      for (var _i8 = 0, _compares = compares; _i8 < _compares.length; _i8++) {
+        var compare = _compares[_i8];
+        if (!this.isUndefinedNullEmpty(compare)) return compare;
+      }
+
+      return undefined;
+    }
   }, {
     key: "asyncPool",
     value: function () {
@@ -1140,12 +1161,12 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "getAttrValueInSequence",
     value: function getAttrValueInSequence(info) {
-      for (var _len12 = arguments.length, attrs = new Array(_len12 > 1 ? _len12 - 1 : 0), _key13 = 1; _key13 < _len12; _key13++) {
-        attrs[_key13 - 1] = arguments[_key13];
+      for (var _len13 = arguments.length, attrs = new Array(_len13 > 1 ? _len13 - 1 : 0), _key14 = 1; _key14 < _len13; _key14++) {
+        attrs[_key14 - 1] = arguments[_key14];
       }
 
-      for (var _i8 = 0, _attrs = attrs; _i8 < _attrs.length; _i8++) {
-        var attr = _attrs[_i8];
+      for (var _i9 = 0, _attrs = attrs; _i9 < _attrs.length; _i9++) {
+        var attr = _attrs[_i9];
 
         if (!_lodash["default"].isEmpty(info[attr])) {
           return info[attr];
@@ -1256,12 +1277,12 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "isOrConditionOfUndefinedNullEmpty",
     value: function isOrConditionOfUndefinedNullEmpty() {
-      for (var _len13 = arguments.length, objs = new Array(_len13), _key14 = 0; _key14 < _len13; _key14++) {
-        objs[_key14] = arguments[_key14];
+      for (var _len14 = arguments.length, objs = new Array(_len14), _key15 = 0; _key15 < _len14; _key15++) {
+        objs[_key15] = arguments[_key15];
       }
 
-      for (var _i9 = 0, _objs = objs; _i9 < _objs.length; _i9++) {
-        var obj = _objs[_i9];
+      for (var _i10 = 0, _objs = objs; _i10 < _objs.length; _i10++) {
+        var obj = _objs[_i10];
         if (this.isUndefinedNullEmpty(obj)) return true;
       }
 
@@ -1320,8 +1341,8 @@ var Utiller = /*#__PURE__*/function () {
     value: function getNormalizedStringNotStartWith(string) {
       var _this2 = this;
 
-      for (var _len14 = arguments.length, predicate = new Array(_len14 > 1 ? _len14 - 1 : 0), _key15 = 1; _key15 < _len14; _key15++) {
-        predicate[_key15 - 1] = arguments[_key15];
+      for (var _len15 = arguments.length, predicate = new Array(_len15 > 1 ? _len15 - 1 : 0), _key16 = 1; _key16 < _len15; _key16++) {
+        predicate[_key16 - 1] = arguments[_key16];
       }
 
       string = this.toCDB(string);
@@ -1339,8 +1360,8 @@ var Utiller = /*#__PURE__*/function () {
     value: function getNormalizedStringNotEndWith(string) {
       var _this3 = this;
 
-      for (var _len15 = arguments.length, predicate = new Array(_len15 > 1 ? _len15 - 1 : 0), _key16 = 1; _key16 < _len15; _key16++) {
-        predicate[_key16 - 1] = arguments[_key16];
+      for (var _len16 = arguments.length, predicate = new Array(_len16 > 1 ? _len16 - 1 : 0), _key17 = 1; _key17 < _len16; _key17++) {
+        predicate[_key17 - 1] = arguments[_key17];
       }
 
       string = this.toCDB(string);
@@ -1433,7 +1454,7 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "getTimeStampByStringFormat",
     value: function getTimeStampByStringFormat(string) {
-      return (0, _moment["default"])(string, "YYYY/MM/DD HH:mm:ss").valueOf();
+      return (0, _moment["default"])(string, "YYYY/MM/DD HH:mm:ss").tz("UTC").valueOf();
     }
     /** 要記住timestamp 可以轉換成西元時間(timestamp),或是期間(duration) 把duration time-stamp 轉成 02:13.445 */
 
@@ -1536,8 +1557,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "camel",
     value: function camel() {
-      for (var _len16 = arguments.length, words = new Array(_len16), _key17 = 0; _key17 < _len16; _key17++) {
-        words[_key17] = arguments[_key17];
+      for (var _len17 = arguments.length, words = new Array(_len17), _key18 = 0; _key18 < _len17; _key18++) {
+        words[_key18] = arguments[_key18];
       }
 
       return _lodash["default"].camelCase(words.join("_"));
@@ -1932,8 +1953,8 @@ var Utiller = /*#__PURE__*/function () {
     value: function toObjectMap(array) {
       var newbies = [];
 
-      for (var _len17 = arguments.length, rules = new Array(_len17 > 1 ? _len17 - 1 : 0), _key18 = 1; _key18 < _len17; _key18++) {
-        rules[_key18 - 1] = arguments[_key18];
+      for (var _len18 = arguments.length, rules = new Array(_len18 > 1 ? _len18 - 1 : 0), _key19 = 1; _key19 < _len18; _key19++) {
+        rules[_key19 - 1] = arguments[_key19];
       }
 
       var _iterator10 = _createForOfIteratorHelper(array),
@@ -1984,8 +2005,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "exeAll",
     value: function exeAll(collection) {
-      for (var _len18 = arguments.length, funcs = new Array(_len18 > 1 ? _len18 - 1 : 0), _key19 = 1; _key19 < _len18; _key19++) {
-        funcs[_key19 - 1] = arguments[_key19];
+      for (var _len19 = arguments.length, funcs = new Array(_len19 > 1 ? _len19 - 1 : 0), _key20 = 1; _key20 < _len19; _key20++) {
+        funcs[_key20 - 1] = arguments[_key20];
       }
 
       if (_lodash["default"].isArray(collection)) {
@@ -2182,12 +2203,12 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "getStateOfStringContainsSign",
     value: function getStateOfStringContainsSign(string) {
-      for (var _len19 = arguments.length, signs = new Array(_len19 > 1 ? _len19 - 1 : 0), _key20 = 1; _key20 < _len19; _key20++) {
-        signs[_key20 - 1] = arguments[_key20];
+      for (var _len20 = arguments.length, signs = new Array(_len20 > 1 ? _len20 - 1 : 0), _key21 = 1; _key21 < _len20; _key21++) {
+        signs[_key21 - 1] = arguments[_key21];
       }
 
-      for (var _i10 = 0, _signs = signs; _i10 < _signs.length; _i10++) {
-        var sign = _signs[_i10];
+      for (var _i11 = 0, _signs = signs; _i11 < _signs.length; _i11++) {
+        var sign = _signs[_i11];
 
         if (this.has(string, sign)) {
           return {
@@ -2209,8 +2230,8 @@ var Utiller = /*#__PURE__*/function () {
     value: function constraintOfParam(collection, type) {
       var result = false;
 
-      for (var _len20 = arguments.length, others = new Array(_len20 > 2 ? _len20 - 2 : 0), _key21 = 2; _key21 < _len20; _key21++) {
-        others[_key21 - 2] = arguments[_key21];
+      for (var _len21 = arguments.length, others = new Array(_len21 > 2 ? _len21 - 2 : 0), _key22 = 2; _key22 < _len21; _key22++) {
+        others[_key22 - 2] = arguments[_key22];
       }
 
       var validOfOthersCondition = _lodash["default"].isEmpty(others) ? true : this.and.apply(this, (0, _toConsumableArray2["default"])(others.map(function (each) {
@@ -2390,13 +2411,13 @@ var Utiller = /*#__PURE__*/function () {
      * @param idOfError 用在每個呼叫的method, 有個stack trace的概念
      *
      *
-     *   console.log(utiller.isPayloadObjectValid({a: 3, b: 4}, ['a',{b:(value) => value > 5}]));
+     *   console.log(utiller.validatePayloadObjectValid({a: 3, b: 4}, ['a',{b:(value) => value > 5}]));
      *   //ATTRIBUTE:'b' is not valid of custom rule
      */
 
   }, {
-    key: "isPayloadObjectValid",
-    value: function isPayloadObjectValid(content) {
+    key: "validatePayloadObjectValid",
+    value: function validatePayloadObjectValid(content) {
       var rules = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
       var idOfError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this.getRandomHash(10);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utiller",
-  "version": "1.0.157",
+  "version": "1.0.160",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -19,6 +19,7 @@
     "fs-extra": "^9.1.0",
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
+    "moment-timezone": "^0.5.34",
     "node-html-parser": "^5.3.3",
     "pdf-parse": "^1.1.1",
     "prompt": "^1.1.0",

package/template/sample.package.json

@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "configerer": "^1.0.11",
-    "utiller": "^1.0.156",
+    "utiller": "^1.0.159",
     "linepayer": "^1.0.4",
     "databazer": "^1.0.11",
     "lodash": "^4.17.20",