utiller 1.0.220 → 1.0.223

package/lib/utiller/nodeutiller.js

@@ -778,7 +778,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                 indexOfRunManager = _lodash["default"].findIndex(splited, function (line) {
                   return _this5.has(line, 'name="RunManager');
                 });
-                this.insertToArray(splited, indexOfRunManager, "<configuration name=\"".concat(packageName, "\"\ntype=\"NodeJSConfigurationType\"\npath-to-node=\"$USER_HOME$/.nvm/versions/node/v14.4.0/bin/node\"\nnode-parameters=\"--require @babel/register\"\npath-to-js-file=\"").concat(_path5["default"].resolve(dirPath), "/src/index.js\"\nworking-dir=\"").concat(_path5["default"].resolve(dirPath), "\" >"), "    <envs>", "        <env name=\"self_debug\" value=\"true\" />", "        <env name=\"is_node\" value=\"true\" />", "    </envs>", "    <method v=\"2\" />", "</configuration>");
+                this.insertToArray(splited, indexOfRunManager, "<configuration name=\"".concat(packageName, "\"\ntype=\"NodeJSConfigurationType\"\npath-to-node=\"$USER_HOME$/.nvm/versions/node/v18.19.1/bin/node\"\nnode-parameters=\"--require @babel/register\"\npath-to-js-file=\"").concat(_path5["default"].resolve(dirPath), "/src/index.js\"\nworking-dir=\"").concat(_path5["default"].resolve(dirPath), "\" >"), "    <envs>", "        <env name=\"self_debug\" value=\"true\" />", "        <env name=\"is_node\" value=\"true\" />", "    </envs>", "    <method v=\"2\" />", "</configuration>");
                 indexOfList = _lodash["default"].findIndex(splited, function (line) {
                   return _lodash["default"].isEqual(_lodash["default"].trim(line), "<list>");
                 }, indexOfRunManager);
@@ -1015,7 +1015,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
               _iterator8 = _createForOfIteratorHelper(packagejsons);
               _context12.prev = 8;
               _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
-                var path, tempFolderPath, release, pathOfPackageJson, indexFileName, templatePath;
+                var path, tempFolderPath, release, pathOfPackageJson, indexFileName, templatePath, _yield$_this7$upgrade, moduleName, version;
                 return _regenerator["default"].wrap(function _loop$(_context11) {
                   while (1) switch (_context11.prev = _context11.next) {
                     case 0:
@@ -1025,7 +1025,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                           return !_this7.has(path, projectName);
                         };
                       })))) {
-                        _context11.next = 37;
+                        _context11.next = 44;
                         break;
                       }
                       _context11.next = 4;
@@ -1049,60 +1049,65 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                       if (_this7.isPathExist(templatePath)) {
                         _this7.copyFromFolderToDestFolder(templatePath, _this7.persistByPath(_path5["default"].join(release, "template")));
                       }
-                      if (deployToNPMServer) {
-                        /** 升級package.json的版號 */
-                        // const {moduleName, version} = await this.upgradePackageJsonVersion(pathOfPackageJson);
-                        //
-                        // /** 把所有樣板的版號都提升 */
-                        // await this.updateVersionOfTemplate(moduleName, version);
+                      if (!deployToNPMServer) {
+                        _context11.next = 22;
+                        break;
                       }
-
+                      _context11.next = 17;
+                      return _this7.upgradePackageJsonVersion(pathOfPackageJson);
+                    case 17:
+                      _yield$_this7$upgrade = _context11.sent;
+                      moduleName = _yield$_this7$upgrade.moduleName;
+                      version = _yield$_this7$upgrade.version;
+                      _context11.next = 22;
+                      return _this7.updateVersionOfTemplate(moduleName, version);
+                    case 22:
                       /** 把package.json release放進去 */
                       _this7.copySingleFile(pathOfPackageJson, _path5["default"].join(release, "package.json"), undefined, true);
 
                       /** 安裝一個沒有devDependency 的node_module */
                       if (!(forceInstallNodeModule || !_this7.isPathExist(_path5["default"].join(release, "node_module")))) {
-                        _context11.next = 21;
+                        _context11.next = 28;
                         break;
                       }
-                      _context11.next = 19;
+                      _context11.next = 26;
                       return _this7.executeCommandLine("cd ".concat(release, " && yarn install --production"));
-                    case 19:
-                      _context11.next = 22;
+                    case 26:
+                      _context11.next = 29;
                       break;
-                    case 21:
+                    case 28:
                       _this7.appendInfo("ignore node-module install behavior");
-                    case 22:
+                    case 29:
                       _this7.appendInfo("build ".concat(path, " succeed"));
 
                       /** 部署到 local server*/
                       if (!deployToNPMServer) {
-                        _context11.next = 26;
+                        _context11.next = 33;
                         break;
                       }
-                      _context11.next = 26;
-                      return _this7.executeCommandLine("cd ".concat(release, " &&  npm publish"));
-                    case 26:
                       _context11.next = 33;
+                      return _this7.executeCommandLine("cd ".concat(release, " &&  npm publish"));
+                    case 33:
+                      _context11.next = 40;
                       break;
-                    case 28:
-                      _context11.prev = 28;
+                    case 35:
+                      _context11.prev = 35;
                       _context11.t0 = _context11["catch"](9);
-                      _context11.next = 32;
+                      _context11.next = 39;
                       return _this7.deleteSelfByPath(release, true);
-                    case 32:
+                    case 39:
                       throw new _index2["default"](9999, "generatePackage \u5831\u932F, ".concat(_context11.t0.message));
-                    case 33:
-                      _context11.prev = 33;
-                      _context11.next = 36;
+                    case 40:
+                      _context11.prev = 40;
+                      _context11.next = 43;
                       return _this7.deleteSelfByPath(tempFolderPath, true);
-                    case 36:
-                      return _context11.finish(33);
-                    case 37:
+                    case 43:
+                      return _context11.finish(40);
+                    case 44:
                     case "end":
                       return _context11.stop();
                   }
-                }, _loop, null, [[9, 28, 33, 37]]);
+                }, _loop, null, [[9, 35, 40, 44]]);
               });
               _iterator8.s();
             case 11:
@@ -1140,7 +1145,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     key: "updateVersionOfTemplate",
     value: (function () {
       var _updateVersionOfTemplate = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee12(dependency, newVersion) {
-        var paths, _i, _paths, path, json;
+        var paths, _i, _paths, path, succeedOfPersistFile, json;
         return _regenerator["default"].wrap(function _callee12$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
@@ -1148,41 +1153,54 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
               _i = 0, _paths = paths;
             case 2:
               if (!(_i < _paths.length)) {
-                _context13.next = 17;
+                _context13.next = 24;
                 break;
               }
               path = _paths[_i];
               if (!this.isPathExist(path)) {
-                _context13.next = 14;
+                _context13.next = 21;
                 break;
               }
+              succeedOfPersistFile = false;
               json = this.getJsonObjByFilePath(path);
               if (!(json && json.dependencies && json.dependencies[dependency])) {
-                _context13.next = 12;
+                _context13.next = 18;
                 break;
               }
               json.dependencies[dependency] = "^".concat(newVersion);
-              _context13.next = 10;
+              _context13.prev = 9;
+              _context13.next = 12;
               return this.writeJsonThanPrettier(path, json);
-            case 10:
-              _context13.next = 14;
-              break;
             case 12:
-              _context13.next = 14;
-              return this.updateFileOfSpecificLine(path, "   \"".concat(dependency, "\":\"^").concat(newVersion, "\""), function (each) {
+              succeedOfPersistFile = true;
+              _context13.next = 18;
+              break;
+            case 15:
+              _context13.prev = 15;
+              _context13.t0 = _context13["catch"](9);
+              succeedOfPersistFile = true;
+            case 18:
+              if (succeedOfPersistFile) {
+                _context13.next = 21;
+                break;
+              }
+              _context13.next = 21;
+              return this.updateFileOfSpecificLine(path, function (line) {
+                return "   \"".concat(dependency, "\":\"^").concat(newVersion, "\"").concat(_lodash["default"].endsWith(_lodash["default"].trim(line), "," ? "," : ""));
+              }, function (each) {
                 return _lodash["default"].startsWith(_lodash["default"].trim(each), "\"".concat(dependency, "\""));
               });
-            case 14:
+            case 21:
               _i++;
               _context13.next = 2;
               break;
-            case 17:
+            case 24:
               this.copyFromFolderToDestFolder("/Users/davidtu/cross-achieve/high/idea-inventer/utiller/template/", "/Users/davidtu/cross-achieve/high/idea-inventer/newp/template/", true, true);
-            case 18:
+            case 25:
             case "end":
               return _context13.stop();
           }
-        }, _callee12, this);
+        }, _callee12, this, [[9, 15]]);
       }));
       function updateVersionOfTemplate(_x12, _x13) {
         return _updateVersionOfTemplate.apply(this, arguments);
@@ -1199,32 +1217,36 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
   }, {
     key: "updateFileOfSpecificLine",
     value: (function () {
-      var _updateFileOfSpecificLine = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(pathOfFile, contentOfUpdated) {
-        var predicate,
+      var _updateFileOfSpecificLine = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee13(pathOfFile) {
+        var contentOfUpdated,
+          predicate,
           context,
           split,
-          item,
+          line,
           _args14 = arguments;
         return _regenerator["default"].wrap(function _callee13$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
             case 0:
+              contentOfUpdated = _args14.length > 1 && _args14[1] !== undefined ? _args14[1] : function (line) {
+                return "updated";
+              };
               predicate = _args14.length > 2 && _args14[2] !== undefined ? _args14[2] : function (line) {
                 return true;
               };
               context = this.getFileContextInRaw(pathOfFile);
               split = context.split("\n");
-              item = _lodash["default"].find(split, function (each) {
+              line = _lodash["default"].find(split, function (each) {
                 return predicate(each);
               });
-              this.replaceArrayByContentIndex(split, item, contentOfUpdated);
+              this.replaceArrayByContentIndex(split, line, contentOfUpdated(line));
               this.appendFile(pathOfFile, split.join("\n"), true, true);
-            case 6:
+            case 7:
             case "end":
               return _context14.stop();
           }
         }, _callee13, this);
       }));
-      function updateFileOfSpecificLine(_x14, _x15) {
+      function updateFileOfSpecificLine(_x14) {
         return _updateFileOfSpecificLine.apply(this, arguments);
       }
       return updateFileOfSpecificLine;
@@ -1245,7 +1267,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
           }
         }, _callee14, this);
       }));
-      function writeJsonThanPrettier(_x16, _x17) {
+      function writeJsonThanPrettier(_x15, _x16) {
         return _writeJsonThanPrettier.apply(this, arguments);
       }
       return writeJsonThanPrettier;
@@ -1296,7 +1318,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
           }
         }, _callee15, this, [[3, 16, 19, 22]]);
       }));
-      function enrichEachPackageJson(_x18) {
+      function enrichEachPackageJson(_x17) {
         return _enrichEachPackageJson.apply(this, arguments);
       }
       return enrichEachPackageJson;
@@ -1352,7 +1374,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
           }
         }, _callee16, this);
       }));
-      function prettier(_x19) {
+      function prettier(_x18) {
         return _prettier.apply(this, arguments);
       }
       return prettier;
@@ -1411,7 +1433,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
           }
         }, _callee17, this);
       }));
-      function upgradePackageJsonVersion(_x20) {
+      function upgradePackageJsonVersion(_x19) {
         return _upgradePackageJsonVersion.apply(this, arguments);
       }
       return upgradePackageJsonVersion;
@@ -1478,7 +1500,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
           }
         }, _callee18, this);
       }));
-      function reWriteJsonAttribute(_x21) {
+      function reWriteJsonAttribute(_x20) {
         return _reWriteJsonAttribute.apply(this, arguments);
       }
       return reWriteJsonAttribute;
@@ -1598,7 +1620,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
           }
         }, _callee19, this);
       }));
-      function rewriteAttributeOfSourceJs(_x22) {
+      function rewriteAttributeOfSourceJs(_x21) {
         return _rewriteAttributeOfSourceJs.apply(this, arguments);
       }
       return rewriteAttributeOfSourceJs;
@@ -1746,7 +1768,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
           }
         }, _callee22, this, [[8, 25, 28, 31]]);
       }));
-      function generateTempFolderWithCleanSrc(_x23) {
+      function generateTempFolderWithCleanSrc(_x22) {
         return _generateTempFolderWithCleanSrc.apply(this, arguments);
       }
       return generateTempFolderWithCleanSrc;

package/package.json

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

package/template/sample.package.json

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