utiller 1.0.130 → 1.0.133

package/lib/pooller/index.js

@@ -355,7 +355,7 @@ var InfinitePool = /*#__PURE__*/function () {
               _this.setState(_configerer.configerer.POOLLER_STATE.RUN_INFINITE);
 
             case 14:
-              if (!_this.ruleOfInfiniteRun()) {
+              if (_this.ruleOfStopInfiniteRun()) {
                 _context2.next = 20;
                 break;
               }
@@ -376,8 +376,8 @@ var InfinitePool = /*#__PURE__*/function () {
         }
       }, _callee2);
     })));
-    (0, _defineProperty2["default"])(this, "ruleOfInfiniteRun", function () {
-      return _this.isRunning() || !_this.isExecutingTaskQueueEmpty();
+    (0, _defineProperty2["default"])(this, "ruleOfStopInfiniteRun", function () {
+      return !_this.isRunning() && _this.isExecutingTaskQueueEmpty();
     });
     (0, _defineProperty2["default"])(this, "isExecutingTaskQueueEmpty", function () {
       return _lodash["default"].size(_this.queueOfExecutingTask) === 0;
@@ -433,7 +433,7 @@ var InfinitePool = /*#__PURE__*/function () {
                 _this.setState(_configerer.configerer.POOLLER_STATE.RUN_BY_PARAMS);
 
               case 10:
-                if (!(_this.ruleOfInfiniteRun() && _lodash["default"].size(_this.queueOfWaitingParam) > 0)) {
+                if (!(!_this.ruleOfStopInfiniteRun() && _lodash["default"].size(_this.queueOfWaitingParam) > 0)) {
                   _context3.next = 15;
                   break;
                 }
@@ -459,12 +459,14 @@ var InfinitePool = /*#__PURE__*/function () {
     }());
     (0, _defineProperty2["default"])(this, "runByEachTask", /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
       var tasks,
+          self,
           _args4 = arguments;
       return _regenerator["default"].wrap(function _callee4$(_context4) {
         while (1) {
           switch (_context4.prev = _context4.next) {
             case 0:
               tasks = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : [];
+              self = _this;
               _this.id = _index2.utiller.getRandomHash(15);
 
               _this.beforeRun();
@@ -473,29 +475,29 @@ var InfinitePool = /*#__PURE__*/function () {
 
               _this.setState(_configerer.configerer.POOLLER_STATE.RUN_BY_EACH_TASK);
 
-            case 5:
-              if (!_this.ruleOfInfiniteRun()) {
+            case 6:
+              if (_this.ruleOfStopInfiniteRun()) {
                 _context4.next = 14;
                 break;
               }
 
-              _context4.next = 8;
+              _context4.next = 9;
               return (0, _classPrivateFieldGet2["default"])(_this, _run).call(_this, _this.id);
 
-            case 8:
-              if (!(_this.getCountOfAssignTaskInQueue() <= 0)) {
-                _context4.next = 12;
-                break;
-              }
+            case 9:
+              if (_this.getCountOfAssignTaskInQueue() <= 0) {
+                _this.terminate();
 
-              _this.terminate();
+                _this.printLogMessage("788121, runByEachTask() \u56E0\u70BA taskOfWaitingQueue \u6E05\u7A7A\u800C\u505C\u6B62");
+              }
+              /** 為了讓while不要停止運算 !this.ruleOfStopInfiniteRun(),不然 runByTask不會停止 */
 
-              _this.printLogMessage("788121, runByEachTask() \u56E0\u70BA taskOfWaitingQueue \u6E05\u7A7A\u800C\u505C\u6B62");
 
-              return _context4.abrupt("break", 14);
+              _context4.next = 12;
+              return _index2.utiller.syncDelay(10);
 
             case 12:
-              _context4.next = 5;
+              _context4.next = 6;
               break;
 
             case 14:
@@ -523,7 +525,7 @@ var InfinitePool = /*#__PURE__*/function () {
                 _this.setState(_configerer.configerer.POOLLER_STATE.RUN_BY_TIMES);
 
               case 5:
-                if (!(_this.ruleOfInfiniteRun() && _this.countsOfRunByTimes > 0)) {
+                if (!(!_this.ruleOfStopInfiniteRun() && _this.countsOfRunByTimes > 0)) {
                   _context5.next = 10;
                   break;
                 }

package/lib/utiller/index.js

@@ -553,13 +553,20 @@ var Utiller = /*#__PURE__*/function () {
     }()
     /** 如果是array,用 indexOf檢查each
      *  如果是object,看有沒有這個key
-     *  如果是string, 就檢查有沒有包含 */
+     *  如果是string, 就檢查有沒有包含
+     *  precisely 就是用findIndex,去比較value
+     *
+     *  */
 
   }, {
     key: "has",
     value: function has(collection, item) {
+      var precisely = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+
       if (_lodash["default"].isArray(collection)) {
-        return _lodash["default"].indexOf(collection, item) > -1;
+        if (precisely) return _lodash["default"].findIndex(collection, function (each) {
+          return _lodash["default"].isEqual(item, each);
+        }) > -1;else return _lodash["default"].indexOf(collection, item) > -1;
       }
 
       if (_lodash["default"].isObject(item)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utiller",
-  "version": "1.0.130",
+  "version": "1.0.133",
   "description": "",
   "main": "index.js",
   "scripts": {

package/template/sample.package.json

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