utiller 1.0.86 → 1.0.89

package/lib/utiller/nodeutiller.js

@@ -251,7 +251,9 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
   }, {
     key: "isPathExist",
-    value: function isPathExist(path) {
+    value:
+    /** 是一個存在的檔案 */
+    function isPathExist(path) {
       return _fs["default"].existsSync(path);
     }
     /** path = a/b/c/file.js , newName = 'two'
@@ -748,7 +750,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     key: "copySingleFile",
     value: function copySingleFile(from, dest, fileName) {
       var force = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-      var destination = !_lodash["default"].isString(fileName) ? dest : _path5["default"].join(dest, fileName);
+      var destination = _lodash["default"].isString(fileName) && !_lodash["default"].isEmpty(fileName) ? _path5["default"].join(dest, fileName) : dest;
       if (_fs["default"].existsSync(destination) && !force) throw new _index2["default"](8006, destination);
 
       _fs["default"].copyFileSync(from, destination);
@@ -783,8 +785,6 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     key: "cleanChildFiles",
     value: function () {
       var _cleanChildFiles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(path) {
-        var _this5 = this;
-
         var predicate,
             _len5,
             exclude,
@@ -804,7 +804,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                 };
 
                 if (!_fs["default"].existsSync(path)) {
-                  _context7.next = 26;
+                  _context7.next = 25;
                   break;
                 }
 
@@ -820,7 +820,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
               case 7:
                 if ((_step5 = _iterator5.n()).done) {
-                  _context7.next = 15;
+                  _context7.next = 14;
                   break;
                 }
 
@@ -831,52 +831,48 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                   break;
                 }
 
-                return _context7.abrupt("continue", 13);
+                return _context7.abrupt("continue", 12);
 
               case 11:
-                _fs["default"].truncate(file.absolute, 0, function (result) {
-                  if (!_lodash["default"].isUndefined(result) && !_lodash["default"].isNull(result)) _this5.appendInfo(result);
-                });
-
-                this.appendInfo("".concat(file.absolute, " \u88AB\u6E05\u7684\u4E7E\u4E7E\u6DE8\u6DE8\uFF01"));
+                this.cleanFileContent(file.absolute);
 
-              case 13:
+              case 12:
                 _context7.next = 7;
                 break;
 
-              case 15:
-                _context7.next = 20;
+              case 14:
+                _context7.next = 19;
                 break;
 
-              case 17:
-                _context7.prev = 17;
+              case 16:
+                _context7.prev = 16;
                 _context7.t0 = _context7["catch"](5);
 
                 _iterator5.e(_context7.t0);
 
-              case 20:
-                _context7.prev = 20;
+              case 19:
+                _context7.prev = 19;
 
                 _iterator5.f();
 
-                return _context7.finish(20);
+                return _context7.finish(19);
 
-              case 23:
-                _context7.next = 25;
-                return this.syncDelay(500);
+              case 22:
+                _context7.next = 24;
+                return this.syncDelay(10);
 
-              case 25:
+              case 24:
                 return _context7.abrupt("return", files);
 
-              case 26:
+              case 25:
                 return _context7.abrupt("return", false);
 
-              case 27:
+              case 26:
               case "end":
                 return _context7.stop();
             }
           }
-        }, _callee7, this, [[5, 17, 20, 23]]);
+        }, _callee7, this, [[5, 16, 19, 22]]);
       }));
 
       function cleanChildFiles(_x7) {
@@ -885,6 +881,15 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
       return cleanChildFiles;
     }()
+    /** 將檔案清除乾淨, 但不刪掉檔案, 這樣hot reload的監聽才不會遺失*/
+
+  }, {
+    key: "cleanFileContent",
+    value: function cleanFileContent(path) {
+      _fs["default"].truncateSync(path, 0);
+
+      this.appendInfo("".concat(path, " \u5167\u5BB9\u88AB\u6E05\u9664\uFF01"));
+    }
   }, {
     key: "syncWithExistPackage",
     value: function () {
@@ -942,7 +947,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     key: "packageTemplatify",
     value: function () {
       var _packageTemplatify = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(path, packageName) {
-        var _this6 = this;
+        var _this5 = this;
 
         var existFolders, dirPath, packagejson, classBase, ideaWorkspacePath, workspace, splited, indexOfRunManager, indexOfList;
         return _regenerator["default"].wrap(function _callee9$(_context9) {
@@ -993,7 +998,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                   workspace = this.getFileContextInRaw(ideaWorkspacePath);
                   splited = workspace.split("\n");
                   indexOfRunManager = _lodash["default"].findIndex(splited, function (line) {
-                    return _this6.has(line, 'name="RunManager');
+                    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>");
                   indexOfList = _lodash["default"].findIndex(splited, function (line) {
@@ -1061,10 +1066,10 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
   }, {
     key: "getLogString",
     value: function getLogString(datas) {
-      var _this7 = this;
+      var _this6 = this;
 
       return datas.map(function (data) {
-        return _this7.isJson(data) || _lodash["default"].isObject(data) || _lodash["default"].isArray(data) ? _this7.deepFlat(data) : data;
+        return _this6.isJson(data) || _lodash["default"].isObject(data) || _lodash["default"].isArray(data) ? _this6.deepFlat(data) : data;
       }).join(" ,");
     }
     /** 如果file不存在,就會產生file,force_delete 可以強制刪除cache file*/
@@ -1072,20 +1077,22 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
   }, {
     key: "appendFile",
     value: function appendFile(path, data) {
-      var newLine = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-      var force_delete = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+      var newlineOnceFileNotEmpty = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+      var forceDelete = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
 
       var options = function options(err) {
         throw new _index2["default"](8001, err);
       };
 
-      if (force_delete) this.syncDeleteFile(path);
-
-      if (!_fs["default"].existsSync(path)) {
-        _fs["default"].writeFileSync(path, data, options);
-      } else {
-        _fs["default"].appendFileSync(path, "".concat(newLine ? "\n" : "").concat(data), options);
+      if (!this.isValidFilePath(path)) {
+        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;
+
+      _fs["default"].appendFileSync(path, "".concat(newlineOnceFileNotEmpty ? "\n" : "").concat(data), options);
     }
     /** 快速把資料結構印出來看 */
 
@@ -1194,7 +1201,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     key: "generatePackage",
     value: function () {
       var _generatePackage = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10() {
-        var _this8 = this;
+        var _this7 = this;
 
         var path,
             deployToNPMServer,
@@ -1218,7 +1225,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                   return _lodash["default"].isEqual(each.fileName, "package");
                 });
                 packagejsons = packagejsons.map(function (each) {
-                  return _this8.getFolderPathOfSpecificPath(each.absolute);
+                  return _this7.getFolderPathOfSpecificPath(each.absolute);
                 });
 
                 for (_len8 = _args11.length, exclude = new Array(_len8 > 2 ? _len8 - 2 : 0), _key8 = 2; _key8 < _len8; _key8++) {
@@ -1228,7 +1235,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                 _iterator8 = _createForOfIteratorHelper(packagejsons);
                 _context11.prev = 7;
                 _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop() {
-                  var path, tempFolderPath, release, pathOfPackageJson, indexFileName, templatePath, _yield$_this8$upgrade, moduleName, version;
+                  var path, tempFolderPath, release, pathOfPackageJson, indexFileName, templatePath, _yield$_this7$upgrade, moduleName, version;
 
                   return _regenerator["default"].wrap(function _loop$(_context10) {
                     while (1) {
@@ -1236,9 +1243,9 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                         case 0:
                           path = _step8.value;
 
-                          if (!_this8.isAndEquals.apply(_this8, (0, _toConsumableArray2["default"])(exclude.map(function (projectName) {
+                          if (!_this7.isAndEquals.apply(_this7, (0, _toConsumableArray2["default"])(exclude.map(function (projectName) {
                             return function () {
-                              return !_this8.has(path, projectName);
+                              return !_this7.has(path, projectName);
                             };
                           })))) {
                             _context10.next = 40;
@@ -1246,17 +1253,17 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                           }
 
                           _context10.next = 4;
-                          return _this8.generateTempFolderWithCleanSrc(path);
+                          return _this7.generateTempFolderWithCleanSrc(path);
 
                         case 4:
                           tempFolderPath = _context10.sent;
 
                           /** 產生release資料夾 */
-                          release = _this8.persistByPath(_path5["default"].join(path, "release"));
+                          release = _this7.persistByPath(_path5["default"].join(path, "release"));
                           /** 利用babel 產生出 es5相容性高的src file */
 
                           _context10.next = 8;
-                          return _this8.executeCommandLine("cd ".concat(path, " && npx babel ./temp --out-dir ./release/lib"));
+                          return _this7.executeCommandLine("cd ".concat(path, " && npx babel ./temp --out-dir ./release/lib"));
 
                         case 8:
                           pathOfPackageJson = _path5["default"].join(path, "package.json");
@@ -1264,14 +1271,14 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                           indexFileName = "sample.npm.module.index.js";
                           /** 複製公版的index.js */
 
-                          _this8.copySingleFile("/Users/davidtu/cross-achieve/high/idea-inventer/utiller/template/".concat(indexFileName), release, "index.js", true);
+                          _this7.copySingleFile("/Users/davidtu/cross-achieve/high/idea-inventer/utiller/template/".concat(indexFileName), release, "index.js", true);
                           /** template就是樣板的概念 */
 
 
                           templatePath = _path5["default"].join(path, "template");
 
-                          if (_this8.isPathExist(templatePath)) {
-                            _this8.copyFromFolderToDestFolder(templatePath, _this8.persistByPath(_path5["default"].join(release, "template")));
+                          if (_this7.isPathExist(templatePath)) {
+                            _this7.copyFromFolderToDestFolder(templatePath, _this7.persistByPath(_path5["default"].join(release, "template")));
                           }
 
                           if (!deployToNPMServer) {
@@ -1280,26 +1287,26 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                           }
 
                           _context10.next = 17;
-                          return _this8.upgradePackageJsonVersion(pathOfPackageJson);
+                          return _this7.upgradePackageJsonVersion(pathOfPackageJson);
 
                         case 17:
-                          _yield$_this8$upgrade = _context10.sent;
-                          moduleName = _yield$_this8$upgrade.moduleName;
-                          version = _yield$_this8$upgrade.version;
+                          _yield$_this7$upgrade = _context10.sent;
+                          moduleName = _yield$_this7$upgrade.moduleName;
+                          version = _yield$_this7$upgrade.version;
                           _context10.next = 22;
-                          return _this8.updateVersionOfTemplate(moduleName, version);
+                          return _this7.updateVersionOfTemplate(moduleName, version);
 
                         case 22:
                           /** 把package.json release放進去 */
-                          _this8.copySingleFile(pathOfPackageJson, _path5["default"].join(release, "package.json"), undefined, true);
+                          _this7.copySingleFile(pathOfPackageJson, _path5["default"].join(release, "package.json"), undefined, true);
                           /** 安裝一個沒有devDependency 的node_module */
 
 
                           _context10.next = 25;
-                          return _this8.executeCommandLine("\ncd ".concat(release, " && yarn install --production"));
+                          return _this7.executeCommandLine("\ncd ".concat(release, " && yarn install --production"));
 
                         case 25:
-                          _this8.appendInfo("build ".concat(path, " succeed"));
+                          _this7.appendInfo("build ".concat(path, " succeed"));
                           /** 部署到 local server*/
 
 
@@ -1309,7 +1316,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                           }
 
                           _context10.next = 29;
-                          return _this8.executeCommandLine("cd ".concat(release, " &&  npm publish"));
+                          return _this7.executeCommandLine("cd ".concat(release, " &&  npm publish"));
 
                         case 29:
                           _context10.next = 36;
@@ -1319,7 +1326,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                           _context10.prev = 31;
                           _context10.t0 = _context10["catch"](9);
                           _context10.next = 35;
-                          return _this8.deleteSelfByPath(release, true);
+                          return _this7.deleteSelfByPath(release, true);
 
                         case 35:
                           throw new _index2["default"](9999, "generatePackage \u5831\u932F, ".concat(_context10.t0.message));
@@ -1327,7 +1334,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                         case 36:
                           _context10.prev = 36;
                           _context10.next = 39;
-                          return _this8.deleteSelfByPath(tempFolderPath, true);
+                          return _this7.deleteSelfByPath(tempFolderPath, true);
 
                         case 39:
                           return _context10.finish(36);
@@ -1574,7 +1581,16 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     key: "getExtensionFromPath",
     value: function getExtensionFromPath(path) {
       var name = path.split("/").pop();
-      return name.split(".").pop();
+      var segments = name.split(".");
+      return _lodash["default"].size(segments) > 1 ? segments.pop() : "";
+    }
+    /** 是一個/a/b/c.js 的檔案路徑 */
+
+  }, {
+    key: "isValidFilePath",
+    value: function isValidFilePath(path) {
+      var extension = this.getExtensionFromPath(path);
+      return _lodash["default"].size(extension) > 0;
     }
   }, {
     key: "isEmptyFile",
@@ -1812,6 +1828,19 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
       return generateTempFolderWithCleanSrc;
     }()
+    /**
+     * from, destination
+     *
+     * 讓file content清除後,在寫入資料, 避免destined file address改變*/
+
+  }, {
+    key: "rewriteFile2File",
+    value: function rewriteFile2File(from, destination) {
+      var content = this.getFileContextInRaw(from);
+      if (_lodash["default"].isEmpty(content)) throw new _index2["default"](9999, "rewrite 功能會避免空值覆蓋, 這是一個設計");
+      this.appendFile(destination, content, true, true);
+      this.appendInfo("rewrite from:".concat(from, " => dest:").concat(destination, " succeed"));
+    }
   }]);
   return NodeUtiller;
 }(_index["default"]);

package/package.json

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

package/template/sample.package.json

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