utiller 1.0.49 → 1.0.52

package/lib/utiller/index.js

@@ -1695,6 +1695,30 @@ var Utiller = /*#__PURE__*/function () {
         return minor[key] === undefined;
       });
     }
+    /**
+    *
+    const obj1 = {b:4,c:2};
+    const obj2 = {b:4,c:3};
+    const obj3 = {a:1,b:4,c:3};
+    console.log(util.isObjectContainAndEqual(obj1,obj3)) false
+    console.log(util.isObjectContainAndEqual(obj1,obj3)) true
+    targetObject 是數量比較小那個
+    */
+
+  }, {
+    key: "isObjectContainAndEqual",
+    value: function isObjectContainAndEqual(targetObject, mainObject) {
+      var equal = true;
+
+      for (var key in targetObject) {
+        if (mainObject[key] === undefined || mainObject[key] !== targetObject[key]) {
+          equal = false;
+          break;
+        }
+      }
+
+      return equal;
+    }
   }]);
   return Utiller;
 }();

package/lib/utiller/nodeutiller.js

@@ -289,6 +289,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
         isFile: false,
         isDirectory: true,
         dirName: undefined,
+        dirPath: undefined,
         extension: undefined,
         fileName: undefined,
         fileNameExtension: undefined,
@@ -304,6 +305,7 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
         obj["fileName"] = fileNameStrings.join(".");
         obj["dirName"] = _lodash["default"].nth(absolute.split("/"), -2);
         obj["isFile"] = true;
+        obj["dirPath"] = this.getFolderPathOfSpecificPath(absolute);
         obj["isDirectory"] = false;
         obj["fileNameExtension"] = "".concat(obj.fileName, ".").concat(obj.extension);
         obj["lastModifiedTime"] = this.getFileLastModifiedTime(absolute);
@@ -449,98 +451,124 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
       return deleteSelfByPath;
     }()
-    /** absolute=> /acc/bbv/{target}/index.js 檢查有沒有在他下面 */
-
   }, {
-    key: "isUnderTargetPath",
-    value: function isUnderTargetPath(absolute, target) {
-      var segments = absolute.split("/");
-      return this.has(segments, target);
-    }
-    /** 取得folder底下的file counts*/
+    key: "deleteFileOrFolder",
+    value: function () {
+      var _deleteFileOrFolder = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(path) {
+        return _regenerator["default"].wrap(function _callee4$(_context4) {
+          while (1) {
+            switch (_context4.prev = _context4.next) {
+              case 0:
+                this.appendInfo("\u522A\u6389\u4E86 ".concat(path));
+                _context4.next = 3;
+                return (0, _del["default"])(path);
 
-  }, {
-    key: "getFileCountsOfFolder",
-    value: function getFileCountsOfFolder(path) {
-      if (this.isDirectory(path)) {
-        return _fs["default"].readdirSync(path).length;
+              case 3:
+              case "end":
+                return _context4.stop();
+            }
+          }
+        }, _callee4, this);
+      }));
+
+      function deleteFileOrFolder(_x5) {
+        return _deleteFileOrFolder.apply(this, arguments);
       }
 
-      return -1;
-    }
-    /** 刪掉自己目錄內的孩子, force能夠強制刪除 自己root_dir 以外的path */
+      return deleteFileOrFolder;
+    }()
+    /** 刪掉自己目錄內的孩子, force能夠強制刪除 自己root_dir 以外的path,保留folder的記體體位置 */
 
   }, {
     key: "deleteChildByPath",
     value: function () {
-      var _deleteChildByPath = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(path) {
+      var _deleteChildByPath = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(path) {
         var force,
             pathes,
             _iterator2,
             _step2,
             _path2,
-            _args4 = arguments;
+            _args5 = arguments;
 
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
+        return _regenerator["default"].wrap(function _callee5$(_context5) {
           while (1) {
-            switch (_context4.prev = _context4.next) {
+            switch (_context5.prev = _context5.next) {
               case 0:
-                force = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : false;
+                force = _args5.length > 1 && _args5[1] !== undefined ? _args5[1] : false;
                 pathes = this.getChildPathByPath(path);
                 _iterator2 = _createForOfIteratorHelper(pathes);
-                _context4.prev = 3;
+                _context5.prev = 3;
 
                 _iterator2.s();
 
               case 5:
                 if ((_step2 = _iterator2.n()).done) {
-                  _context4.next = 11;
+                  _context5.next = 11;
                   break;
                 }
 
                 _path2 = _step2.value;
-                _context4.next = 9;
+                _context5.next = 9;
                 return this.deleteSelfByPath(_path2.absolute, force);
 
               case 9:
-                _context4.next = 5;
+                _context5.next = 5;
                 break;
 
               case 11:
-                _context4.next = 16;
+                _context5.next = 16;
                 break;
 
               case 13:
-                _context4.prev = 13;
-                _context4.t0 = _context4["catch"](3);
+                _context5.prev = 13;
+                _context5.t0 = _context5["catch"](3);
 
-                _iterator2.e(_context4.t0);
+                _iterator2.e(_context5.t0);
 
               case 16:
-                _context4.prev = 16;
+                _context5.prev = 16;
 
                 _iterator2.f();
 
-                return _context4.finish(16);
+                return _context5.finish(16);
 
               case 19:
               case "end":
-                return _context4.stop();
+                return _context5.stop();
             }
           }
-        }, _callee4, this, [[3, 13, 16, 19]]);
+        }, _callee5, this, [[3, 13, 16, 19]]);
       }));
 
-      function deleteChildByPath(_x5) {
+      function deleteChildByPath(_x6) {
         return _deleteChildByPath.apply(this, arguments);
       }
 
       return deleteChildByPath;
     }()
+    /** absolute=> /acc/bbv/{target}/index.js 檢查有沒有在他下面 */
+
+  }, {
+    key: "isUnderTargetPath",
+    value: function isUnderTargetPath(absolute, target) {
+      var segments = absolute.split("/");
+      return this.has(segments, target);
+    }
+    /** 取得folder底下的file counts*/
+
+  }, {
+    key: "getFileCountsOfFolder",
+    value: function getFileCountsOfFolder(path) {
+      if (this.isDirectory(path)) {
+        return _fs["default"].readdirSync(path).length;
+      }
+
+      return -1;
+    }
   }, {
     key: "reinstallNodeModules",
     value: function () {
-      var _reinstallNodeModules = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5() {
+      var _reinstallNodeModules = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
         var path,
             _len4,
             exclude,
@@ -558,16 +586,16 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
             _json2,
             _path_module_root,
             _path_gen_node_module,
-            _args5 = arguments;
+            _args6 = arguments;
 
-        return _regenerator["default"].wrap(function _callee5$(_context5) {
+        return _regenerator["default"].wrap(function _callee6$(_context6) {
           while (1) {
-            switch (_context5.prev = _context5.next) {
+            switch (_context6.prev = _context6.next) {
               case 0:
-                path = _args5.length > 0 && _args5[0] !== undefined ? _args5[0] : "../";
+                path = _args6.length > 0 && _args6[0] !== undefined ? _args6[0] : "../";
 
-                for (_len4 = _args5.length, exclude = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
-                  exclude[_key4 - 1] = _args5[_key4];
+                for (_len4 = _args6.length, exclude = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
+                  exclude[_key4 - 1] = _args6[_key4];
                 }
 
                 ex = [].concat(exclude, ["node_modules", "utiller", "configerer"]);
@@ -577,13 +605,13 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                   return _lodash["default"].isEqual(each.fileNameExtension, "package.json");
                 }].concat((0, _toConsumableArray2["default"])(ex)));
                 _iterator3 = _createForOfIteratorHelper(paths);
-                _context5.prev = 5;
+                _context6.prev = 5;
 
                 _iterator3.s();
 
               case 7:
                 if ((_step3 = _iterator3.n()).done) {
-                  _context5.next = 20;
+                  _context6.next = 20;
                   break;
                 }
 
@@ -591,47 +619,47 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                 path_module_root = this.getFileDirPath(_json.absolute);
                 path_gen_node_module = "".concat(path_module_root, "node_modules");
                 path_lock_json = "".concat(path_module_root, "package-lock.json");
-                _context5.next = 14;
+                _context6.next = 14;
                 return (0, _del["default"])(path_lock_json);
 
               case 14:
                 this.appendInfo("\u522A\u6389\u4E86 ".concat(path_lock_json));
-                _context5.next = 17;
+                _context6.next = 17;
                 return (0, _del["default"])(path_gen_node_module);
 
               case 17:
                 this.appendInfo("\u522A\u6389\u4E86 ".concat(path_gen_node_module));
 
               case 18:
-                _context5.next = 7;
+                _context6.next = 7;
                 break;
 
               case 20:
-                _context5.next = 25;
+                _context6.next = 25;
                 break;
 
               case 22:
-                _context5.prev = 22;
-                _context5.t0 = _context5["catch"](5);
+                _context6.prev = 22;
+                _context6.t0 = _context6["catch"](5);
 
-                _iterator3.e(_context5.t0);
+                _iterator3.e(_context6.t0);
 
               case 25:
-                _context5.prev = 25;
+                _context6.prev = 25;
 
                 _iterator3.f();
 
-                return _context5.finish(25);
+                return _context6.finish(25);
 
               case 28:
                 _iterator4 = _createForOfIteratorHelper(paths);
-                _context5.prev = 29;
+                _context6.prev = 29;
 
                 _iterator4.s();
 
               case 31:
                 if ((_step4 = _iterator4.n()).done) {
-                  _context5.next = 40;
+                  _context6.next = 40;
                   break;
                 }
 
@@ -640,40 +668,40 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
                 _path_gen_node_module = "".concat(_path_module_root, "node_modules");
 
                 if (_fs["default"].existsSync(_path_gen_node_module)) {
-                  _context5.next = 38;
+                  _context6.next = 38;
                   break;
                 }
 
-                _context5.next = 38;
+                _context6.next = 38;
                 return this.executeCommandLine("cd ".concat(_path_module_root, " && npm install"));
 
               case 38:
-                _context5.next = 31;
+                _context6.next = 31;
                 break;
 
               case 40:
-                _context5.next = 45;
+                _context6.next = 45;
                 break;
 
               case 42:
-                _context5.prev = 42;
-                _context5.t1 = _context5["catch"](29);
+                _context6.prev = 42;
+                _context6.t1 = _context6["catch"](29);
 
-                _iterator4.e(_context5.t1);
+                _iterator4.e(_context6.t1);
 
               case 45:
-                _context5.prev = 45;
+                _context6.prev = 45;
 
                 _iterator4.f();
 
-                return _context5.finish(45);
+                return _context6.finish(45);
 
               case 48:
               case "end":
-                return _context5.stop();
+                return _context6.stop();
             }
           }
-        }, _callee5, this, [[5, 22, 25, 28], [29, 42, 45, 48]]);
+        }, _callee6, this, [[5, 22, 25, 28], [29, 42, 45, 48]]);
       }));
 
       function reinstallNodeModules() {
@@ -682,32 +710,6 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
       return reinstallNodeModules;
     }()
-  }, {
-    key: "deleteFileOrFolder",
-    value: function () {
-      var _deleteFileOrFolder = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(path) {
-        return _regenerator["default"].wrap(function _callee6$(_context6) {
-          while (1) {
-            switch (_context6.prev = _context6.next) {
-              case 0:
-                this.appendInfo("\u522A\u6389\u4E86 ".concat(path));
-                _context6.next = 3;
-                return (0, _del["default"])(path);
-
-              case 3:
-              case "end":
-                return _context6.stop();
-            }
-          }
-        }, _callee6, this);
-      }));
-
-      function deleteFileOrFolder(_x6) {
-        return _deleteFileOrFolder.apply(this, arguments);
-      }
-
-      return deleteFileOrFolder;
-    }()
     /** 拿到目錄下的資料夾列表 */
 
   }, {

package/package.json

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

package/template/sample.package.json

@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "configerer": "^1.0.10",
-    "utiller": "^1.0.48",
+    "utiller": "^1.0.51",
     "linepayer": "^1.0.4",
     "databazer": "^1.0.7",
     "lodash": "^4.17.20",