utiller 1.0.290 → 1.0.291

package/lib/utiller/nodeutiller.js

@@ -28,7 +28,6 @@ var _pdfParse = _interopRequireDefault(require("pdf-parse"));
 var _del = _interopRequireWildcard(require("del"));
 var _fsExtra = _interopRequireDefault(require("fs-extra"));
 var _prompt = _interopRequireDefault(require("prompt"));
-var _nodeHtmlParser = require("node-html-parser");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof3(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
@@ -179,10 +178,10 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
         return true;
       };
       if (!_fs["default"].existsSync(path)) return [];
+      var result = [];
       var entries = _fs["default"].readdirSync(path, {
         withFileTypes: true
       });
-      var files = [];
       for (var _len3 = arguments.length, excludes = new Array(_len3 > 2 ? _len3 - 2 : 0), _key3 = 2; _key3 < _len3; _key3++) {
         excludes[_key3 - 2] = arguments[_key3];
       }
@@ -194,10 +193,10 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
           if (excludes.includes(entry.name)) continue;
           var fullPath = _path5["default"].join(path, entry.name);
           if (entry.isDirectory()) {
-            files.push.apply(files, (0, _toConsumableArray2["default"])(this.findFilePathBy.apply(this, [fullPath, predicate].concat(excludes))));
+            result.push.apply(result, (0, _toConsumableArray2["default"])(this.findFilePathBy.apply(this, [fullPath, predicate].concat(excludes))));
           } else if (entry.isFile()) {
             var info = this.getPathInfo(fullPath);
-            if (predicate(info)) files.push(info);
+            if (predicate(info)) result.push(info);
           }
         }
       } catch (err) {
@@ -205,7 +204,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
       } finally {
         _iterator.f();
       }
-      return files;
+      return result;
     }
 
     /** 是一個存在的檔案 */
@@ -222,16 +221,14 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     key: "renameFile",
     value: function renameFile(path) {
       var newName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "fileName";
-      if (!this.isPathExist(path) || !this.isFile(path)) {
-        this.appendError("984521 path not exist or not a file path:".concat(path));
+      if (!this.isFile(path) || !newName) {
+        this.appendError("renameFile \u932F\u8AA4, path: ".concat(path, ", newName: ").concat(newName));
         return;
       }
-      if (_lodash["default"].isEmpty(newName)) {
-        this.appendError("984522,new name is empty");
-        return;
-      }
-      var next = _path5["default"].join(this.getFileDirPath(path), "".concat(newName, ".").concat(this.getExtensionFromPath(path)));
-      _fs["default"].renameSync(path, next);
+      var dir = _path5["default"].dirname(path);
+      var ext = _path5["default"].extname(path);
+      var newPath = _path5["default"].join(dir, "".concat(newName).concat(ext));
+      _fs["default"].renameSync(path, newPath);
     }
 
     //todo 應該要改成class

package/package.json

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

package/template/sample.package.json

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