utiller 1.0.124 → 1.0.127

package/lib/utiller/index.js

@@ -33,6 +33,8 @@ var _exceptioner = _interopRequireDefault(require("../exceptioner"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
+var _uuid = require("uuid");
+
 function _createForOfIteratorHelper(o, allowArrayLike) { var it; if (typeof Symbol === "undefined" || o[Symbol.iterator] == null) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = o[Symbol.iterator](); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -61,6 +63,12 @@ var Utiller = /*#__PURE__*/function () {
 
     (0, _classCallCheck2["default"])(this, Utiller);
     (0, _defineProperty2["default"])(this, "mapOfIdNTimeoutId", {});
+    (0, _defineProperty2["default"])(this, "getEnvironment", function () {
+      return _this.env;
+    });
+    (0, _defineProperty2["default"])(this, "isProductionEnvironment", function () {
+      return _lodash["default"].isEqual(_this.getEnvironment(), "prod");
+    });
     (0, _defineProperty2["default"])(this, "asyncUnitTaskFunction", function () {
       var millionSec = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 2000;
 
@@ -166,10 +174,6 @@ var Utiller = /*#__PURE__*/function () {
     this.init();
     this.env = "dev";
   }
-  /**
-   * 執行為了避免沒意義的任務重複執行, 像是search 輸入關鍵字後, 不應該每次onchange就呼叫一次建議列表, 應該等到打完後500ms後在去 執行搜尋任務
-   * */
-
 
   (0, _createClass2["default"])(Utiller, [{
     key: "isValidVersionOfString",
@@ -218,6 +222,26 @@ var Utiller = /*#__PURE__*/function () {
       numbers[last] = numbers[last] + delta;
       return numbers.join(".");
     }
+  }, {
+    key: "getUuidOfV4",
+    value: function getUuidOfV4() {
+      return (0, _uuid.v4)();
+    }
+  }, {
+    key: "performActionWithoutTimingIssue",
+    value: function performActionWithoutTimingIssue() {
+      var task = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function () {
+        return true;
+      };
+      var wait = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 10;
+      this.syncDelay(wait).then(function () {
+        return task();
+      });
+    }
+    /**
+     * 執行為了避免沒意義的任務重複執行, 像是search 輸入關鍵字後, 不應該每次onchange就呼叫一次建議列表, 應該等到打完後500ms後在去 執行搜尋任務
+     * */
+
   }, {
     key: "executeTimeoutTask",
     value: function executeTimeoutTask(functionOfAsyncTask) {
@@ -277,16 +301,6 @@ var Utiller = /*#__PURE__*/function () {
     value: function setEnvironment(env) {
       this.env = env;
     }
-  }, {
-    key: "getEnvironment",
-    value: function getEnvironment() {
-      return this.env;
-    }
-  }, {
-    key: "isProductionEnvironment",
-    value: function isProductionEnvironment() {
-      return _lodash["default"].isEqual(this.env, "prod");
-    }
   }, {
     key: "appendInfo",
     value: function appendInfo() {

package/lib/utiller/nodeutiller.js

@@ -1178,6 +1178,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
         var path,
             deployToNPMServer,
+            forceInstallNodeModule,
             packagejsons,
             _len8,
             exclude,
@@ -1193,6 +1194,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
               case 0:
                 path = _args11.length > 0 && _args11[0] !== undefined ? _args11[0] : "./";
                 deployToNPMServer = _args11.length > 1 && _args11[1] !== undefined ? _args11[1] : false;
+                forceInstallNodeModule = _args11.length > 2 && _args11[2] !== undefined ? _args11[2] : true;
                 packagejsons = this.findFilePathByExtension(path, ["json"], "node_modules", "release");
                 packagejsons = _lodash["default"].filter(packagejsons, function (each) {
                   return _lodash["default"].isEqual(each.fileName, "package");
@@ -1201,12 +1203,12 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                   return _this7.getFolderPathOfSpecificPath(each.absolute);
                 });
 
-                for (_len8 = _args11.length, exclude = new Array(_len8 > 2 ? _len8 - 2 : 0), _key8 = 2; _key8 < _len8; _key8++) {
-                  exclude[_key8 - 2] = _args11[_key8];
+                for (_len8 = _args11.length, exclude = new Array(_len8 > 3 ? _len8 - 3 : 0), _key8 = 3; _key8 < _len8; _key8++) {
+                  exclude[_key8 - 3] = _args11[_key8];
                 }
 
                 _iterator8 = _createForOfIteratorHelper(packagejsons);
-                _context11.prev = 7;
+                _context11.prev = 8;
                 _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
                   var path, tempFolderPath, release, pathOfPackageJson, indexFileName, templatePath, _yield$_this7$upgrade, moduleName, version;
 
@@ -1221,7 +1223,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                               return !_this7.has(path, projectName);
                             };
                           })))) {
-                            _context10.next = 40;
+                            _context10.next = 44;
                             break;
                           }
 
@@ -1275,88 +1277,100 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                           /** 安裝一個沒有devDependency 的node_module */
 
 
-                          _context10.next = 25;
-                          return _this7.executeCommandLine("\ncd ".concat(release, " && yarn install --production"));
+                          if (!(forceInstallNodeModule || !_this7.isPathExist(_path5["default"].join(release, "node_module")))) {
+                            _context10.next = 28;
+                            break;
+                          }
+
+                          _context10.next = 26;
+                          return _this7.executeCommandLine("cd ".concat(release, " && yarn install --production"));
+
+                        case 26:
+                          _context10.next = 29;
+                          break;
 
-                        case 25:
+                        case 28:
+                          _this7.appendInfo("ignore node-module install behavior");
+
+                        case 29:
                           _this7.appendInfo("build ".concat(path, " succeed"));
                           /** 部署到 local server*/
 
 
                           if (!deployToNPMServer) {
-                            _context10.next = 29;
+                            _context10.next = 33;
                             break;
                           }
 
-                          _context10.next = 29;
+                          _context10.next = 33;
                           return _this7.executeCommandLine("cd ".concat(release, " &&  npm publish"));
 
-                        case 29:
-                          _context10.next = 36;
+                        case 33:
+                          _context10.next = 40;
                           break;
 
-                        case 31:
-                          _context10.prev = 31;
+                        case 35:
+                          _context10.prev = 35;
                           _context10.t0 = _context10["catch"](9);
-                          _context10.next = 35;
+                          _context10.next = 39;
                           return _this7.deleteSelfByPath(release, true);
 
-                        case 35:
+                        case 39:
                           throw new _index2["default"](9999, "generatePackage \u5831\u932F, ".concat(_context10.t0.message));
 
-                        case 36:
-                          _context10.prev = 36;
-                          _context10.next = 39;
+                        case 40:
+                          _context10.prev = 40;
+                          _context10.next = 43;
                           return _this7.deleteSelfByPath(tempFolderPath, true);
 
-                        case 39:
-                          return _context10.finish(36);
+                        case 43:
+                          return _context10.finish(40);
 
-                        case 40:
+                        case 44:
                         case "end":
                           return _context10.stop();
                       }
                     }
-                  }, _loop, null, [[9, 31, 36, 40]]);
+                  }, _loop, null, [[9, 35, 40, 44]]);
                 });
 
                 _iterator8.s();
 
-              case 10:
+              case 11:
                 if ((_step8 = _iterator8.n()).done) {
-                  _context11.next = 14;
+                  _context11.next = 15;
                   break;
                 }
 
-                return _context11.delegateYield(_loop(), "t0", 12);
+                return _context11.delegateYield(_loop(), "t0", 13);
 
-              case 12:
-                _context11.next = 10;
+              case 13:
+                _context11.next = 11;
                 break;
 
-              case 14:
-                _context11.next = 19;
+              case 15:
+                _context11.next = 20;
                 break;
 
-              case 16:
-                _context11.prev = 16;
-                _context11.t1 = _context11["catch"](7);
+              case 17:
+                _context11.prev = 17;
+                _context11.t1 = _context11["catch"](8);
 
                 _iterator8.e(_context11.t1);
 
-              case 19:
-                _context11.prev = 19;
+              case 20:
+                _context11.prev = 20;
 
                 _iterator8.f();
 
-                return _context11.finish(19);
+                return _context11.finish(20);
 
-              case 22:
+              case 23:
               case "end":
                 return _context11.stop();
             }
           }
-        }, _callee10, this, [[7, 16, 19, 22]]);
+        }, _callee10, this, [[8, 17, 20, 23]]);
       }));
 
       function generatePackage() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utiller",
-  "version": "1.0.124",
+  "version": "1.0.127",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -20,7 +20,8 @@
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
     "pdf-parse": "^1.1.1",
-    "prompt": "^1.1.0"
+    "prompt": "^1.1.0",
+    "uuid": "^8.3.2"
   },
   "devDependencies": {
     "@babel/cli": "^7.12.8",

package/template/sample.package.json

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