utiller 1.0.116 → 1.0.119

package/lib/utiller/index.js

@@ -696,6 +696,72 @@ var Utiller = /*#__PURE__*/function () {
 
       return result;
     }
+  }, {
+    key: "getFileNameFromPath",
+    value: function getFileNameFromPath(path) {
+      var extension = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+      var segments = path.split("/");
+      var target = segments.pop();
+      return extension ? target : target.split(".").shift();
+    }
+    /** http://wnj.cdji/david.mp3 => david.mp3 */
+
+  }, {
+    key: "getFileNameExtensionFromPath",
+    value: function getFileNameExtensionFromPath(path) {
+      var name = path.split("/").pop();
+      return name;
+    }
+    /** http://wnj.cdji/david.mp3 => mp3 */
+
+  }, {
+    key: "getExtensionFromPath",
+    value: function getExtensionFromPath(path) {
+      var name = path.split("/").pop();
+      var segments = name.split(".");
+      return _lodash["default"].size(segments) > 1 ? segments.pop() : "";
+    }
+    /** ../folderName/fileName.xxx  => ./folderName */
+
+  }, {
+    key: "getFolderPathOfSpecificPath",
+    value: function getFolderPathOfSpecificPath(path) {
+      var splited = path.split("/");
+      splited.pop();
+      return splited.join("/");
+    }
+    /** absolute=> /acc/bbv/{target}/index.js 檢查有沒有在他下面 */
+
+  }, {
+    key: "isUnderTargetPath",
+    value: function isUnderTargetPath(absolute, target) {
+      var segments = absolute.split("/");
+      return this.has(segments, target);
+    }
+    /** 取得檔案的目錄, path => c://folderName/fileName.js to c://folderName */
+
+  }, {
+    key: "getFileDirPath",
+    value: function getFileDirPath(path) {
+      var slash = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      return _lodash["default"].join(_lodash["default"].initial(_lodash["default"].split(path, "/")), "/") + (slash ? "/" : "");
+    }
+    /** path ==> /asd/cc/dfj/jei3.mp3 => */
+
+  }, {
+    key: "isPathEqualsFileType",
+    value: function isPathEqualsFileType(path, type) {
+      var extension = path.split(".").pop();
+      return _lodash["default"].isEqual(extension, type);
+    }
+    /** 是一個/a/b/c.js 的檔案路徑 */
+
+  }, {
+    key: "isValidFilePath",
+    value: function isValidFilePath(path) {
+      var extension = this.getExtensionFromPath(path);
+      return _lodash["default"].size(extension) > 0;
+    }
     /** 拿前面n個items */
 
   }, {
@@ -1116,6 +1182,20 @@ var Utiller = /*#__PURE__*/function () {
     value: function isUndefinedNullEmpty(obj) {
       return obj === undefined || _lodash["default"].isEmpty(obj) || obj === null;
     }
+  }, {
+    key: "isOrConditionOfUndefinedNullEmpty",
+    value: function isOrConditionOfUndefinedNullEmpty() {
+      for (var _len12 = arguments.length, objs = new Array(_len12), _key13 = 0; _key13 < _len12; _key13++) {
+        objs[_key13] = arguments[_key13];
+      }
+
+      for (var _i9 = 0, _objs = objs; _i9 < _objs.length; _i9++) {
+        var obj = _objs[_i9];
+        if (this.isUndefinedNullEmpty(obj)) return true;
+      }
+
+      return false;
+    }
     /** this method mutates segments */
 
   }, {
@@ -1168,8 +1248,8 @@ var Utiller = /*#__PURE__*/function () {
     value: function getNormalizedStringNotStartWith(string) {
       var _this2 = this;
 
-      for (var _len12 = arguments.length, predicate = new Array(_len12 > 1 ? _len12 - 1 : 0), _key13 = 1; _key13 < _len12; _key13++) {
-        predicate[_key13 - 1] = arguments[_key13];
+      for (var _len13 = arguments.length, predicate = new Array(_len13 > 1 ? _len13 - 1 : 0), _key14 = 1; _key14 < _len13; _key14++) {
+        predicate[_key14 - 1] = arguments[_key14];
       }
 
       string = this.toCDB(string);
@@ -1187,8 +1267,8 @@ var Utiller = /*#__PURE__*/function () {
     value: function getNormalizedStringNotEndWith(string) {
       var _this3 = this;
 
-      for (var _len13 = arguments.length, predicate = new Array(_len13 > 1 ? _len13 - 1 : 0), _key14 = 1; _key14 < _len13; _key14++) {
-        predicate[_key14 - 1] = arguments[_key14];
+      for (var _len14 = arguments.length, predicate = new Array(_len14 > 1 ? _len14 - 1 : 0), _key15 = 1; _key15 < _len14; _key15++) {
+        predicate[_key15 - 1] = arguments[_key15];
       }
 
       string = this.toCDB(string);
@@ -1370,8 +1450,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "camel",
     value: function camel() {
-      for (var _len14 = arguments.length, words = new Array(_len14), _key15 = 0; _key15 < _len14; _key15++) {
-        words[_key15] = arguments[_key15];
+      for (var _len15 = arguments.length, words = new Array(_len15), _key16 = 0; _key16 < _len15; _key16++) {
+        words[_key16] = arguments[_key16];
       }
 
       return _lodash["default"].camelCase(words.join("_"));
@@ -1766,8 +1846,8 @@ var Utiller = /*#__PURE__*/function () {
     value: function toObjectMap(array) {
       var newbies = [];
 
-      for (var _len15 = arguments.length, rules = new Array(_len15 > 1 ? _len15 - 1 : 0), _key16 = 1; _key16 < _len15; _key16++) {
-        rules[_key16 - 1] = arguments[_key16];
+      for (var _len16 = arguments.length, rules = new Array(_len16 > 1 ? _len16 - 1 : 0), _key17 = 1; _key17 < _len16; _key17++) {
+        rules[_key17 - 1] = arguments[_key17];
       }
 
       var _iterator10 = _createForOfIteratorHelper(array),
@@ -1818,8 +1898,8 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "exeAll",
     value: function exeAll(collection) {
-      for (var _len16 = arguments.length, funcs = new Array(_len16 > 1 ? _len16 - 1 : 0), _key17 = 1; _key17 < _len16; _key17++) {
-        funcs[_key17 - 1] = arguments[_key17];
+      for (var _len17 = arguments.length, funcs = new Array(_len17 > 1 ? _len17 - 1 : 0), _key18 = 1; _key18 < _len17; _key18++) {
+        funcs[_key18 - 1] = arguments[_key18];
       }
 
       if (_lodash["default"].isArray(collection)) {
@@ -2016,12 +2096,12 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "getStateOfStringContainsSign",
     value: function getStateOfStringContainsSign(string) {
-      for (var _len17 = arguments.length, signs = new Array(_len17 > 1 ? _len17 - 1 : 0), _key18 = 1; _key18 < _len17; _key18++) {
-        signs[_key18 - 1] = arguments[_key18];
+      for (var _len18 = arguments.length, signs = new Array(_len18 > 1 ? _len18 - 1 : 0), _key19 = 1; _key19 < _len18; _key19++) {
+        signs[_key19 - 1] = arguments[_key19];
       }
 
-      for (var _i9 = 0, _signs = signs; _i9 < _signs.length; _i9++) {
-        var sign = _signs[_i9];
+      for (var _i10 = 0, _signs = signs; _i10 < _signs.length; _i10++) {
+        var sign = _signs[_i10];
 
         if (this.has(string, sign)) {
           return {
@@ -2043,8 +2123,8 @@ var Utiller = /*#__PURE__*/function () {
     value: function constraintOfParam(collection, type) {
       var result = false;
 
-      for (var _len18 = arguments.length, others = new Array(_len18 > 2 ? _len18 - 2 : 0), _key19 = 2; _key19 < _len18; _key19++) {
-        others[_key19 - 2] = arguments[_key19];
+      for (var _len19 = arguments.length, others = new Array(_len19 > 2 ? _len19 - 2 : 0), _key20 = 2; _key20 < _len19; _key20++) {
+        others[_key20 - 2] = arguments[_key20];
       }
 
       var validOfOthersCondition = _lodash["default"].isEmpty(others) ? true : this.and.apply(this, (0, _toConsumableArray2["default"])(others.map(function (each) {
@@ -2096,6 +2176,43 @@ var Utiller = /*#__PURE__*/function () {
 
       return slice;
     }
+    /**
+    * 如果有paginate, 有可能讓功能錯亂
+    const array = [0,1,2,3,4,5,6,7];
+    console.log(util.moveIndexOfArray(array,1,0));const array = [0,1,2,3,4,5,6,7];
+    console.log(util.moveIndexOfArray(array,1,0));
+    [
+    1, 0, 2, 3,
+    4, 5, 6, 7
+    ]
+    */
+
+  }, {
+    key: "moveIndexOfArray",
+    value: function moveIndexOfArray(array, from, to) {
+      /* #move - Moves an array item from one position in an array to another.
+      Note: This is a pure function so a new array will be returned, instead
+      of altering the array argument.
+      Arguments:
+      1. array     (String) : Array in which to move an item.         (required)
+      2. moveIndex (Object) : The index of the item to move.          (required)
+      3. toIndex   (Object) : The index to move item at moveIndex to. (required)
+      */
+      var item = array[from];
+      var length = array.length;
+      var diff = from - to;
+
+      if (diff > 0) {
+        // move left
+        return [].concat((0, _toConsumableArray2["default"])(array.slice(0, to)), [item], (0, _toConsumableArray2["default"])(array.slice(to, from)), (0, _toConsumableArray2["default"])(array.slice(from + 1, length)));
+      } else if (diff < 0) {
+        // move right
+        var targetIndex = to + 1;
+        return [].concat((0, _toConsumableArray2["default"])(array.slice(0, from)), (0, _toConsumableArray2["default"])(array.slice(from + 1, targetIndex)), [item], (0, _toConsumableArray2["default"])(array.slice(targetIndex, length)));
+      }
+
+      return array;
+    }
   }]);
   return Utiller;
 }();

package/lib/utiller/nodeutiller.js

@@ -191,14 +191,6 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
       return "".concat(splited.join("/"), "/.idea");
     }
-    /** path ==> /asd/cc/dfj/jei3.mp3 => */
-
-  }, {
-    key: "isPathEqualsFileType",
-    value: function isPathEqualsFileType(path, type) {
-      var extension = path.split(".").pop();
-      return _lodash["default"].isEqual(extension, type);
-    }
     /** {numpages, numrender, info, text, version} */
 
   }, {
@@ -407,14 +399,6 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
         this.appendInfo("\u6210\u529F\u6E05\u9664\u5E95\u4E0B\u7684\u6240\u6709 ".concat(dir));
       }
     }
-    /** 取得檔案的目錄, path => c://folderName/fileName.js to c://folderName */
-
-  }, {
-    key: "getFileDirPath",
-    value: function getFileDirPath(path) {
-      var slash = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-      return _lodash["default"].join(_lodash["default"].initial(_lodash["default"].split(path, "/")), "/") + (slash ? "/" : "");
-    }
     /** 刪掉自己, force能夠強制刪除 自己root_dir 以外的path */
 
   }, {
@@ -548,14 +532,6 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
       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*/
 
   }, {
@@ -1190,15 +1166,6 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
 
       _fs["default"].writeFileSync(path, data);
     }
-    /** ../folderName/fileName.xxx  => ./folderName */
-
-  }, {
-    key: "getFolderPathOfSpecificPath",
-    value: function getFolderPathOfSpecificPath(path) {
-      var splited = path.split("/");
-      splited.pop();
-      return splited.join("/");
-    }
     /** 用來pack lib_project, 不然其他import lib_project的專案會無法讀懂es6
      * release folder 會被自動ignore到
      * exclude 裡面可以放專案名稱, 例如 free_marker,question_update */
@@ -1573,31 +1540,6 @@ var NodeUtiller = /*#__PURE__*/function (_Utiller) {
     value: function getAdminCredential() {
       return this.getJsonObjByFilePath("/Users/davidtu/cross-achieve/mimi/idea-inventer/firebaser/key/mimi19up-firebase-adminsdk.json");
     }
-    /** http://wnj.cdji/david.mp3 => david.mp3 */
-
-  }, {
-    key: "getFileNameExtensionFromPath",
-    value: function getFileNameExtensionFromPath(path) {
-      var name = path.split("/").pop();
-      return name;
-    }
-    /** http://wnj.cdji/david.mp3 => mp3 */
-
-  }, {
-    key: "getExtensionFromPath",
-    value: function getExtensionFromPath(path) {
-      var name = path.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",
     value: function isEmptyFile(path) {

package/package.json

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

package/template/sample.package.json

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