utiller 1.0.305 → 1.0.307

package/lib/utiller/nodeutiller.js

@@ -16,7 +16,7 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _path5 = _interopRequireDefault(require("path"));
+var _path4 = _interopRequireDefault(require("path"));
 var _fs = _interopRequireDefault(require("fs"));
 var _promises = _interopRequireDefault(require("fs/promises"));
 var _lodash = _interopRequireDefault(require("lodash"));
@@ -96,7 +96,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
      */
     (0, _defineProperty2["default"])(_this, "getPathAfterSpecificFolder", function (fullPath) {
       var folder = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "src";
-      var parts = fullPath.split(_path5["default"].sep);
+      var parts = fullPath.split(_path4["default"].sep);
       for (var i = parts.length - 1; i >= 0; i--) {
         if (parts[i] === folder) {
           return "/" + parts.slice(i + 1).join("/");
@@ -118,10 +118,10 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
   return (0, _createClass2["default"])(NodeUtiller, [{
     key: "findSpecificFolderByPath",
     value: function findSpecificFolderByPath(path, folderName) {
-      var absolute = _path5["default"].resolve(path);
-      var parts = absolute.split(_path5["default"].sep);
+      var absolute = _path4["default"].resolve(path);
+      var parts = absolute.split(_path4["default"].sep);
       while (parts.length) {
-        var joined = _path5["default"].join.apply(_path5["default"], (0, _toConsumableArray2["default"])(parts).concat([folderName]));
+        var joined = _path4["default"].join.apply(_path4["default"], (0, _toConsumableArray2["default"])(parts).concat([folderName]));
         if (_fs["default"].existsSync(joined)) return joined;
         parts.pop();
       }
@@ -192,7 +192,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
         for (_iterator.s(); !(_step = _iterator.n()).done;) {
           var entry = _step.value;
           if (excludes.includes(entry.name)) continue;
-          var fullPath = _path5["default"].join(path, entry.name);
+          var fullPath = _path4["default"].join(path, entry.name);
           if (entry.isDirectory()) {
             result.push.apply(result, (0, _toConsumableArray2["default"])(this.findFilePathBy.apply(this, [fullPath, predicate].concat(excludes))));
           } else if (entry.isFile()) {
@@ -226,9 +226,9 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
         this.appendError("renameFile \u932F\u8AA4, path: ".concat(path, ", newName: ").concat(newName));
         return;
       }
-      var dir = _path5["default"].dirname(path);
-      var ext = _path5["default"].extname(path);
-      var newPath = _path5["default"].join(dir, "".concat(newName).concat(ext));
+      var dir = _path4["default"].dirname(path);
+      var ext = _path4["default"].extname(path);
+      var newPath = _path4["default"].join(dir, "".concat(newName).concat(ext));
       _fs["default"].renameSync(path, newPath);
     }
 
@@ -236,7 +236,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
   }, {
     key: "getPathInfo",
     value: function getPathInfo(path) {
-      var absolute = _path5["default"].resolve(path);
+      var absolute = _path4["default"].resolve(path);
       var obj = {
         path: path,
         absolute: absolute,
@@ -290,14 +290,14 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     key: "persistByPath",
     value: /** '/a/b/c.js' 把它變成真的 */
     function persistByPath(targetPath) {
-      var isAbsolute = _path5["default"].isAbsolute(targetPath);
+      var isAbsolute = _path4["default"].isAbsolute(targetPath);
       var parts = targetPath.split("/").filter(Boolean);
       var lastPart = parts[parts.length - 1];
-      var isFile = _path5["default"].extname(lastPart) !== ""; // ← 正規判斷副檔名
+      var isFile = _path4["default"].extname(lastPart) !== ""; // ← 正規判斷副檔名
 
-      var current = isAbsolute ? path.sep : "";
+      var current = isAbsolute ? _path4["default"].sep : "";
       for (var i = 0; i < parts.length; i++) {
-        current = _path5["default"].join(current, parts[i]);
+        current = _path4["default"].join(current, parts[i]);
         if (!_fs["default"].existsSync(current)) {
           if (i === parts.length - 1 && isFile) {
             // 最後一個而且是檔案 → 建檔案
@@ -310,7 +310,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
           }
         }
       }
-      return _path5["default"].resolve(targetPath);
+      return _path4["default"].resolve(targetPath);
     }
 
     /**
@@ -607,7 +607,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
       try {
         var files = _fs["default"].readdirSync(_path);
         return files.map(function (file) {
-          return _this3.getPathInfo(_path5["default"].join(_path, file));
+          return _this3.getPathInfo(_path4["default"].join(_path, file));
         });
       } catch (error) {
         throw new _index2["default"](8002, error);
@@ -623,7 +623,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 = fileName && fileName.trim() ? _path5["default"].join(dest, fileName) : dest;
+      var destination = fileName && fileName.trim() ? _path4["default"].join(dest, fileName) : dest;
       if (_fs["default"].existsSync(destination) && !force) {
         throw new _index2["default"](8006, destination);
       }
@@ -632,7 +632,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
   }, {
     key: "ensureFolderExists",
     value: function ensureFolderExists(folderPath) {
-      var resolved = _path5["default"].resolve(folderPath);
+      var resolved = _path4["default"].resolve(folderPath);
       if (_fs["default"].existsSync(resolved)) return;
       _fs["default"].mkdirSync(resolved, {
         recursive: true
@@ -805,14 +805,14 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
               /** 6.要產生webstorm run case? */
               ideaWorkspacePath = "".concat(this.findSpecificFolderByPath(dirPath, ".idea"), "/workspace.xml");
               /** 7.要產生cd script 腳本 **/
-              this.insertShellCommand(_configerer.configerer.BASE_SHELL_SCRIPT, "cd_".concat(packageName), "cd ".concat(_path5["default"].resolve(dirPath)));
+              this.insertShellCommand(_configerer.configerer.BASE_SHELL_SCRIPT, "cd_".concat(packageName), "cd ".concat(_path4["default"].resolve(dirPath)));
               if (_fs["default"].existsSync(ideaWorkspacePath)) {
                 workspace = this.getFileContextInRaw(ideaWorkspacePath);
                 splited = workspace.split("\n");
                 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/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>");
+                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(_path4["default"].resolve(dirPath), "/src/index.js\"\nworking-dir=\"").concat(_path4["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);
@@ -822,7 +822,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                 this.appendError("".concat(ideaWorkspacePath, " not exist"));
               }
               _context10.next = 17;
-              return this.executeCommandLine("cd ".concat(_path5["default"].resolve(dirPath), " && npm install"));
+              return this.executeCommandLine("cd ".concat(_path4["default"].resolve(dirPath), " && npm install"));
             case 17:
               this.appendInfo("build ".concat(packageName, " succeed!"));
             case 18:
@@ -878,7 +878,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
       var newline = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
       var forceDelete = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
       try {
-        var resolvedPath = _path5["default"].resolve(filePath); // <<--- 正規化路徑
+        var resolvedPath = _path4["default"].resolve(filePath); // <<--- 正規化路徑
         if (forceDelete && _fs["default"].existsSync(resolvedPath)) _fs["default"].unlinkSync(resolvedPath);
         if (!_fs["default"].existsSync(resolvedPath)) this.persistByPath(resolvedPath);
         var content = "".concat(newline ? "\n" : "").concat(data);
@@ -912,7 +912,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
               ignoreP = _args11.length > 2 && _args11[2] !== undefined ? _args11[2] : false;
-              path = _path5["default"].resolve(path);
+              path = _path4["default"].resolve(path);
               this.appendFile(path, JSON.stringify(object), true, true);
               if (ignoreP) {
                 _context11.next = 6;
@@ -1028,7 +1028,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
       }
 
       // 確保目的路徑存在（遞迴建立）
-      this.ensureFolderExists(_path5["default"].dirname(destPath));
+      this.ensureFolderExists(_path4["default"].dirname(destPath));
 
       // 強制複製
       this.copySingleFile(absolute, destPath, undefined, true);
@@ -1121,25 +1121,25 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                     case 4:
                       tempFolderPath = _context13.sent;
                       /** 產生release資料夾 */
-                      release = _this7.persistByPath(_path5["default"].join(path, "release"));
+                      release = _this7.persistByPath(_path4["default"].join(path, "release"));
                       /** 利用babel 產生出 es5相容性高的src file */
                       _context13.next = 8;
                       return _this7.executeCommandLine("cd ".concat(path, " && npx babel ./temp --out-dir ./release/lib"));
                     case 8:
-                      pathOfPackageJson = _path5["default"].join(path, "package.json");
+                      pathOfPackageJson = _path4["default"].join(path, "package.json");
                       _context13.prev = 9;
                       indexFileName = "sample.npm.module.index.js";
                       /** 複製公版的index.js */
                       _this7.copySingleFile("/Users/davidtu/cross-achieve/high/idea-inventer/utiller/template/".concat(indexFileName), release, "index.js", true);
 
                       /** template就是樣板的概念 */
-                      templatePath = _path5["default"].join(path, "template");
+                      templatePath = _path4["default"].join(path, "template");
                       if (!_this7.isPathExist(templatePath)) {
                         _context13.next = 16;
                         break;
                       }
                       _context13.next = 16;
-                      return _this7.copyFromFolderToDestFolder(templatePath, _this7.persistByPath(_path5["default"].join(release, "template")));
+                      return _this7.copyFromFolderToDestFolder(templatePath, _this7.persistByPath(_path4["default"].join(release, "template")));
                     case 16:
                       if (!deployToNPMServer) {
                         _context13.next = 24;
@@ -1155,10 +1155,10 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                       return _this7.updateVersionOfTemplate(moduleName, version);
                     case 24:
                       /** 把package.json release放進去 */
-                      _this7.copySingleFile(pathOfPackageJson, _path5["default"].join(release, "package.json"), undefined, true);
+                      _this7.copySingleFile(pathOfPackageJson, _path4["default"].join(release, "package.json"), undefined, true);
 
                       /** 安裝一個沒有devDependency 的node_module */
-                      if (!(forceInstallNodeModule || !_this7.isPathExist(_path5["default"].join(release, "node_module")))) {
+                      if (!(forceInstallNodeModule || !_this7.isPathExist(_path4["default"].join(release, "node_module")))) {
                         _context13.next = 30;
                         break;
                       }
@@ -1237,7 +1237,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     key: "updateVersionOfTemplate",
     value: (function () {
       var _updateVersionOfTemplate = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee14(dependency, newVersion) {
-        var paths, _i, _paths, _path4, succeedOfPersistFile, json;
+        var paths, _i, _paths, path, succeedOfPersistFile, json;
         return _regenerator["default"].wrap(function _callee14$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {
             case 0:
@@ -1248,13 +1248,13 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                 _context15.next = 24;
                 break;
               }
-              _path4 = _paths[_i];
-              if (!this.isPathExist(_path4)) {
+              path = _paths[_i];
+              if (!this.isPathExist(path)) {
                 _context15.next = 21;
                 break;
               }
               succeedOfPersistFile = false;
-              json = this.getJsonObjByFilePath(_path4);
+              json = this.getJsonObjByFilePath(path);
               if (!(json && json.dependencies && json.dependencies[dependency])) {
                 _context15.next = 18;
                 break;
@@ -1262,7 +1262,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
               json.dependencies[dependency] = "^".concat(newVersion);
               _context15.prev = 9;
               _context15.next = 12;
-              return this.writeJsonThanPrettier(_path4, json);
+              return this.writeJsonThanPrettier(path, json);
             case 12:
               succeedOfPersistFile = true;
               _context15.next = 18;
@@ -1277,7 +1277,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                 break;
               }
               _context15.next = 21;
-              return this.updateFileOfSpecificLine(_path4, function (line) {
+              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, "\""));
@@ -1472,7 +1472,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
             case 0:
               width = _args19.length > 1 && _args19[1] !== undefined ? _args19[1] : 200;
               _context19.next = 3;
-              return this.executeCommandLine("cd ".concat(_path5["default"].resolve("."), " &&  npx prettier --write ").concat(_path5["default"].resolve(path), " --print-width ").concat(width));
+              return this.executeCommandLine("cd ".concat(_path4["default"].resolve("."), " &&  npx prettier --write ").concat(_path4["default"].resolve(path), " --print-width ").concat(width));
             case 3:
             case "end":
               return _context19.stop();
@@ -1642,7 +1642,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
       var defaultValue = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : undefined;
       if (_lodash["default"].isEqual(this.getExtensionFromPath(path), "js")) {
         var _source$key;
-        var source = require(_path5["default"].resolve(path))["default"];
+        var source = require(_path4["default"].resolve(path))["default"];
         return (_source$key = source[key]) !== null && _source$key !== void 0 ? _source$key : defaultValue;
       } else {
         throw new _index2["default"](8020, "path is not js file, which is ".concat(path));
@@ -1815,8 +1815,8 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
           while (1) switch (_context26.prev = _context26.next) {
             case 0:
               this.appendInfo("generateTempFolderWithCleanSrc", basePath);
-              sourceFile = _path5["default"].join(basePath, "src");
-              tempFolderPath = _path5["default"].join(basePath, "temp");
+              sourceFile = _path4["default"].join(basePath, "src");
+              tempFolderPath = _path4["default"].join(basePath, "temp");
               if (_fs["default"].existsSync(sourceFile)) {
                 _context26.next = 5;
                 break;
@@ -1857,7 +1857,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
               // 美化代碼
               _context26.next = 25;
-              return this.executeCommandLine("cd ".concat(_path5["default"].dirname(tempFilePath), " && npx prettier --write \"").concat(tempFilePath, "\""));
+              return this.executeCommandLine("cd ".concat(_path4["default"].dirname(tempFilePath), " && npx prettier --write \"").concat(tempFilePath, "\""));
             case 25:
               _context26.next = 13;
               break;
@@ -1924,8 +1924,14 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
       try {
         var firstLine = context.split("\n")[0];
 
-        // 偵測形如：const edit = true;
-        var match = firstLine.match(/const\s+edit\s*=\s*(true|false)\s*;?/);
+        /**
+         * const\s+：匹配 const 與其後至少一個空白。
+         * ([a-zA-Z_]\w*)：匹配合法變數名稱（第一個字為英文字母或底線，其後可為英文字母、數字、底線）。
+         * \s*=\s*：匹配等號兩邊的空白。
+         * (true|false)：匹配布林值。
+         * \s*;?：匹配可有可無的分號及其前空白。
+         */
+        var match = firstLine.match(/const\s+([a-zA-Z_]\w*)\s*=\s*(true|false)\s*;?/);
         if (!match) return false;
         var editValue = match[1] === "true";
         if (editValue === true) {
@@ -1959,8 +1965,8 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
       }
       var shouldHaveDotSlash = (_args$ = args[0]) === null || _args$ === void 0 ? void 0 : _args$.startsWith("./");
       var cleanArgs = (_args$2 = args[0]) !== null && _args$2 !== void 0 && _args$2.startsWith("./") ? [args[0].slice(2)].concat((0, _toConsumableArray2["default"])(args.slice(1))) : args;
-      var joined = _path5["default"].join.apply(_path5["default"], (0, _toConsumableArray2["default"])(cleanArgs));
-      return shouldHaveDotSlash && !_path5["default"].isAbsolute(joined) ? "./".concat(joined) : joined;
+      var joined = _path4["default"].join.apply(_path4["default"], (0, _toConsumableArray2["default"])(cleanArgs));
+      return shouldHaveDotSlash && !_path4["default"].isAbsolute(joined) ? "./".concat(joined) : joined;
     }
   }]);
 }(_index["default"]);

package/package.json

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

package/template/sample.package.json

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