utiller 1.0.112 → 1.0.115

package/lib/utiller/index.js

@@ -56,7 +56,6 @@ String.format = function () {
 };
 
 var Utiller = /*#__PURE__*/function () {
-  /**   Key : idOfSetTimout */
   function Utiller() {
     var _this = this;
 
@@ -173,6 +172,40 @@ var Utiller = /*#__PURE__*/function () {
 
 
   (0, _createClass2["default"])(Utiller, [{
+    key: "isValidVersionOfString",
+    value:
+    /**   Key : idOfSetTimout */
+
+    /** '1.九.1' => false
+     *  '1.2.3' => true
+     * */
+    function isValidVersionOfString(versionName) {
+      if (this.isUndefinedNullEmpty(versionName)) {
+        return false;
+      }
+
+      var numbers = versionName.split(".");
+
+      var _iterator = _createForOfIteratorHelper(numbers),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var number = _step.value;
+
+          var toNum = _lodash["default"].toNumber(number);
+
+          if (!_lodash["default"].isNumber(toNum) || isNaN(toNum)) return false;
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      return true;
+    }
+  }, {
     key: "executeTimeoutTask",
     value: function executeTimeoutTask(functionOfAsyncTask) {
       var ms = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1000;
@@ -317,21 +350,21 @@ var Utiller = /*#__PURE__*/function () {
     function accumulate(target, conditions) {
       var beginning = target;
 
-      var _iterator = _createForOfIteratorHelper(conditions),
-          _step;
+      var _iterator2 = _createForOfIteratorHelper(conditions),
+          _step2;
 
       try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var condition = _step.value;
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var condition = _step2.value;
 
           if (condition !== undefined && _lodash["default"].isFunction(condition)) {
             beginning = condition(beginning);
           }
         }
       } catch (err) {
-        _iterator.e(err);
+        _iterator2.e(err);
       } finally {
-        _iterator.f();
+        _iterator2.f();
       }
 
       return beginning;
@@ -745,21 +778,21 @@ var Utiller = /*#__PURE__*/function () {
     value: function startWiths(string) {
       var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
 
-      var _iterator2 = _createForOfIteratorHelper(key),
-          _step2;
+      var _iterator3 = _createForOfIteratorHelper(key),
+          _step3;
 
       try {
-        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-          var _key = _step2.value;
+        for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+          var _key = _step3.value;
 
           if (_lodash["default"].startsWith(string, _key)) {
             return true;
           }
         }
       } catch (err) {
-        _iterator2.e(err);
+        _iterator3.e(err);
       } finally {
-        _iterator2.f();
+        _iterator3.f();
       }
 
       return false;
@@ -816,18 +849,18 @@ var Utiller = /*#__PURE__*/function () {
       var _self = "";
 
       if (_lodash["default"].isArray(collection)) {
-        var _iterator3 = _createForOfIteratorHelper(collection),
-            _step3;
+        var _iterator4 = _createForOfIteratorHelper(collection),
+            _step4;
 
         try {
-          for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-            var o = _step3.value;
+          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+            var o = _step4.value;
             _self += (_lodash["default"].isEmpty(_self) ? "" : sign) + this.deepFlat(o);
           }
         } catch (err) {
-          _iterator3.e(err);
+          _iterator4.e(err);
         } finally {
-          _iterator3.f();
+          _iterator4.f();
         }
 
         return _self;
@@ -860,7 +893,7 @@ var Utiller = /*#__PURE__*/function () {
     key: "asyncPool",
     value: function () {
       var _asyncPool = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(poolLimit, array, iteratorFn) {
-        var ret, executing, _iterator4, _step4, _loop;
+        var ret, executing, _iterator5, _step5, _loop;
 
         return _regenerator["default"].wrap(function _callee5$(_context6) {
           while (1) {
@@ -868,7 +901,7 @@ var Utiller = /*#__PURE__*/function () {
               case 0:
                 ret = [];
                 executing = [];
-                _iterator4 = _createForOfIteratorHelper(array);
+                _iterator5 = _createForOfIteratorHelper(array);
                 _context6.prev = 3;
                 _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
                   var item, p, e;
@@ -876,7 +909,7 @@ var Utiller = /*#__PURE__*/function () {
                     while (1) {
                       switch (_context5.prev = _context5.next) {
                         case 0:
-                          item = _step4.value;
+                          item = _step5.value;
                           p = Promise.resolve().then(function () {
                             return iteratorFn(item, array);
                           });
@@ -908,10 +941,10 @@ var Utiller = /*#__PURE__*/function () {
                   }, _loop);
                 });
 
-                _iterator4.s();
+                _iterator5.s();
 
               case 6:
-                if ((_step4 = _iterator4.n()).done) {
+                if ((_step5 = _iterator5.n()).done) {
                   _context6.next = 10;
                   break;
                 }
@@ -930,12 +963,12 @@ var Utiller = /*#__PURE__*/function () {
                 _context6.prev = 12;
                 _context6.t1 = _context6["catch"](3);
 
-                _iterator4.e(_context6.t1);
+                _iterator5.e(_context6.t1);
 
               case 15:
                 _context6.prev = 15;
 
-                _iterator4.f();
+                _iterator5.f();
 
                 return _context6.finish(15);
 
@@ -1080,18 +1113,18 @@ var Utiller = /*#__PURE__*/function () {
       };
       var segments = string.split("\n");
 
-      var _iterator5 = _createForOfIteratorHelper(segments),
-          _step5;
+      var _iterator6 = _createForOfIteratorHelper(segments),
+          _step6;
 
       try {
-        for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-          var segment = _step5.value;
+        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+          var segment = _step6.value;
           predict(segment, _lodash["default"].indexOf(segments, segment), segments);
         }
       } catch (err) {
-        _iterator5.e(err);
+        _iterator6.e(err);
       } finally {
-        _iterator5.f();
+        _iterator6.f();
       }
 
       return segments.join("\n");
@@ -1305,18 +1338,18 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "isStringContainInLines",
     value: function isStringContainInLines(context, key) {
-      var _iterator6 = _createForOfIteratorHelper(_lodash["default"].split(context, "\n")),
-          _step6;
+      var _iterator7 = _createForOfIteratorHelper(_lodash["default"].split(context, "\n")),
+          _step7;
 
       try {
-        for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
-          var each = _step6.value;
+        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
+          var each = _step7.value;
           if (this.has(each, key)) return true;
         }
       } catch (err) {
-        _iterator6.e(err);
+        _iterator7.e(err);
       } finally {
-        _iterator6.f();
+        _iterator7.f();
       }
 
       return false;
@@ -1347,18 +1380,18 @@ var Utiller = /*#__PURE__*/function () {
     value: function array2Obj(array) {
       var obj = {};
 
-      var _iterator7 = _createForOfIteratorHelper(array),
-          _step7;
+      var _iterator8 = _createForOfIteratorHelper(array),
+          _step8;
 
       try {
-        for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-          var each = _step7.value;
+        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
+          var each = _step8.value;
           obj["".concat(this.getObjectKey(each))] = this.getObjectValue(each);
         }
       } catch (err) {
-        _iterator7.e(err);
+        _iterator8.e(err);
       } finally {
-        _iterator7.f();
+        _iterator8.f();
       }
 
       return obj;
@@ -1374,12 +1407,12 @@ var Utiller = /*#__PURE__*/function () {
     value: function arrayToObjWith(array, predicate) {
       var obj = {};
 
-      var _iterator8 = _createForOfIteratorHelper(array),
-          _step8;
+      var _iterator9 = _createForOfIteratorHelper(array),
+          _step9;
 
       try {
-        for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-          var item = _step8.value;
+        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
+          var item = _step9.value;
           var key = predicate(item);
           var content = obj[key];
 
@@ -1390,9 +1423,9 @@ var Utiller = /*#__PURE__*/function () {
           }
         }
       } catch (err) {
-        _iterator8.e(err);
+        _iterator9.e(err);
       } finally {
-        _iterator8.f();
+        _iterator9.f();
       }
 
       return obj;
@@ -1598,7 +1631,7 @@ var Utiller = /*#__PURE__*/function () {
     key: "getVisibleOrNone",
     value: function getVisibleOrNone(judgement) {
       return {
-        display: judgement ? "visible" : "none"
+        display: judgement ? "inherit" : "none"
       };
     }
   }, {
@@ -1724,37 +1757,37 @@ var Utiller = /*#__PURE__*/function () {
         rules[_key16 - 1] = arguments[_key16];
       }
 
-      var _iterator9 = _createForOfIteratorHelper(array),
-          _step9;
+      var _iterator10 = _createForOfIteratorHelper(array),
+          _step10;
 
       try {
-        for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-          var each = _step9.value;
+        for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
+          var each = _step10.value;
           var object = {};
 
-          var _iterator10 = _createForOfIteratorHelper(rules),
-              _step10;
+          var _iterator11 = _createForOfIteratorHelper(rules),
+              _step11;
 
           try {
-            for (_iterator10.s(); !(_step10 = _iterator10.n()).done;) {
-              var rule = _step10.value;
+            for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+              var rule = _step11.value;
               var func = rule.func ? rule.func : function (stmt) {
                 return stmt;
               };
               object[rule.to] = this.isUndefinedNullEmpty(rule.from) || !_lodash["default"].isObject(each) ? func(each) : func(each[rule.from]);
             }
           } catch (err) {
-            _iterator10.e(err);
+            _iterator11.e(err);
           } finally {
-            _iterator10.f();
+            _iterator11.f();
           }
 
           newbies.push(object);
         }
       } catch (err) {
-        _iterator9.e(err);
+        _iterator10.e(err);
       } finally {
-        _iterator9.f();
+        _iterator10.f();
       }
 
       return newbies;
@@ -1777,48 +1810,48 @@ var Utiller = /*#__PURE__*/function () {
       }
 
       if (_lodash["default"].isArray(collection)) {
-        var _iterator11 = _createForOfIteratorHelper(collection),
-            _step11;
+        var _iterator12 = _createForOfIteratorHelper(collection),
+            _step12;
 
         try {
-          for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
-            var each = _step11.value;
+          for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+            var each = _step12.value;
 
-            var _iterator12 = _createForOfIteratorHelper(funcs),
-                _step12;
+            var _iterator13 = _createForOfIteratorHelper(funcs),
+                _step13;
 
             try {
-              for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
-                var func = _step12.value;
+              for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
+                var func = _step13.value;
                 func(each);
               }
             } catch (err) {
-              _iterator12.e(err);
+              _iterator13.e(err);
             } finally {
-              _iterator12.f();
+              _iterator13.f();
             }
           }
           /** 陣列專屬邏輯 */
 
         } catch (err) {
-          _iterator11.e(err);
+          _iterator12.e(err);
         } finally {
-          _iterator11.f();
+          _iterator12.f();
         }
       } else if (_lodash["default"].isObject(collection)) {
         for (var _each in collection) {
-          var _iterator13 = _createForOfIteratorHelper(funcs),
-              _step13;
+          var _iterator14 = _createForOfIteratorHelper(funcs),
+              _step14;
 
           try {
-            for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
-              var _func = _step13.value;
+            for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
+              var _func = _step14.value;
               collection[_each] = _func(collection[_each]);
             }
           } catch (err) {
-            _iterator13.e(err);
+            _iterator14.e(err);
           } finally {
-            _iterator13.f();
+            _iterator14.f();
           }
         }
         /** 物件專屬邏輯 */
@@ -1934,12 +1967,12 @@ var Utiller = /*#__PURE__*/function () {
     value: function toObjectWithAttributeKey(array, attrKeyOfPK) {
       var object = {};
 
-      var _iterator14 = _createForOfIteratorHelper(array),
-          _step14;
+      var _iterator15 = _createForOfIteratorHelper(array),
+          _step15;
 
       try {
-        for (_iterator14.s(); !(_step14 = _iterator14.n()).done;) {
-          var each = _step14.value;
+        for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
+          var each = _step15.value;
           var pk = each[attrKeyOfPK];
 
           if (this.isUndefinedNullEmpty(pk)) {
@@ -1949,9 +1982,9 @@ var Utiller = /*#__PURE__*/function () {
           object[pk] = each;
         }
       } catch (err) {
-        _iterator14.e(err);
+        _iterator15.e(err);
       } finally {
-        _iterator14.f();
+        _iterator15.f();
       }
 
       return object;

package/lib/utiller/nodeutiller.js

@@ -886,9 +886,11 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
   }, {
     key: "cleanFileContent",
     value: function cleanFileContent(path) {
-      _fs["default"].truncateSync(path, 0);
-
-      this.appendInfo("".concat(path, " \u5167\u5BB9\u88AB\u6E05\u9664\uFF01"));
+      this.syncDeleteFile(path);
+      /** 太浪費時間了
+      * fs.truncateSync(path, 0);
+      this.appendInfo(`${path} 內容被清除！`);
+      * */
     }
   }, {
     key: "syncWithExistPackage",
@@ -1088,9 +1090,13 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
         throw new _index2["default"](9999, "\u4E0D\u662F\u500B\u5408\u6CD5\u7684file\u8DEF\u5F91 ==> '' ".concat(path, " ''"));
       }
 
-      this.persistByPath(path);
-      if (forceDelete) this.cleanFileContent(path);
-      if (this.isEmptyFile(path)) newlineOnceFileNotEmpty = false;
+      if (forceDelete) {
+        this.cleanFileContent(path);
+        newlineOnceFileNotEmpty = false;
+        this.persistByPath(path);
+      } else if (this.isEmptyFile(path)) {
+        newlineOnceFileNotEmpty = false;
+      }
 
       _fs["default"].appendFileSync(path, "".concat(newlineOnceFileNotEmpty ? "\n" : "").concat(data), options);
     }
@@ -1647,36 +1653,31 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     key: "upgradePackageJsonVersion",
     value: function () {
       var _upgradePackageJsonVersion = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee15(path) {
-        var json, numbers, last;
+        var json;
         return _regenerator["default"].wrap(function _callee15$(_context16) {
           while (1) {
             switch (_context16.prev = _context16.next) {
               case 0:
                 if (!_lodash["default"].isEqual("package.json", this.getPathInfo(path).fileNameExtension)) {
-                  _context16.next = 11;
+                  _context16.next = 8;
                   break;
                 }
 
                 json = this.getJsonObjByFilePath(path);
-                numbers = json.version.split(".").map(function (each) {
-                  return _lodash["default"].toNumber(each);
-                });
-                last = numbers.length - 1;
-                numbers[last] = numbers[last] + 1;
-                json.version = numbers.join(".");
-                _context16.next = 8;
+                json.version = this.getStringOfVersionIncrement(json.version);
+                _context16.next = 5;
                 return this.writeJsonThanPrettier(path, json);
 
-              case 8:
+              case 5:
                 return _context16.abrupt("return", {
                   version: json.version,
                   moduleName: json.name
                 });
 
-              case 11:
+              case 8:
                 throw new _index2["default"](8020, "path is not package.json, which is ".concat(path));
 
-              case 12:
+              case 9:
               case "end":
                 return _context16.stop();
             }
@@ -1690,6 +1691,17 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
       return upgradePackageJsonVersion;
     }()
+  }, {
+    key: "getStringOfVersionIncrement",
+    value: function getStringOfVersionIncrement(stringOfVersion) {
+      var delta = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+      var numbers = stringOfVersion.split(".").map(function (each) {
+        return _lodash["default"].toNumber(each);
+      });
+      var last = numbers.length - 1;
+      numbers[last] = numbers[last] + delta;
+      return numbers.join(".");
+    }
   }, {
     key: "getAnswerFromPromptQ",
     value: function () {

package/package.json

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

package/template/sample.package.json

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