utiller 1.0.161 → 1.0.165

package/lib/utiller/index.js

@@ -763,9 +763,26 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "getFolderPathOfSpecificPath",
     value: function getFolderPathOfSpecificPath(path) {
-      var splited = path.split("/");
-      splited.pop();
-      return splited.join("/");
+      var split = path.split("/");
+      split.pop();
+      return split.join("/");
+    }
+    /**
+     * 取得folderName
+     *
+     * console.log(utiller.getFolderNameOfFilePath(`das/asdiasjiosd/jif/d.js`)); // jif
+     *
+     * */
+
+  }, {
+    key: "getFolderNameOfFilePath",
+    value: function getFolderNameOfFilePath(path) {
+      if (this.isValidFilePath(path)) {
+        var splits = path.split("/");
+        return _lodash["default"].nth(splits, -2);
+      } else {
+        throw new _exceptioner["default"](9999, "64255615 path is not valid '".concat(path, "'"));
+      }
     }
     /** absolute=> /acc/bbv/{target}/index.js 檢查有沒有在他下面 */
 
@@ -847,15 +864,28 @@ var Utiller = /*#__PURE__*/function () {
 
   }, {
     key: "getMergedArrayBy",
-    value: function getMergedArrayBy(array1, array2, predicate) {
+    value: function getMergedArrayBy() {
+      var array1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      var array2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+      var predicate = arguments.length > 2 ? arguments[2] : undefined;
+
       /** predicate可以只帶入屬性質 */
-      predicate = _lodash["default"].isString(predicate) ? function (a, b) {
-        return _lodash["default"].isEqual(a[predicate], b[predicate]);
-      } : predicate;
-      return array1.map(function (itm) {
-        return _objectSpread(_objectSpread({}, array2.find(function (item) {
-          return predicate(itm, item) && item;
-        })), itm);
+      if (_lodash["default"].isString(predicate)) {
+        var attribute = predicate;
+
+        predicate = function predicate(item1, item2) {
+          return _lodash["default"].isEqual(item1[attribute], item2[attribute]);
+        };
+      } else {
+        predicate = _lodash["default"].isFunction(predicate) ? predicate : function () {
+          return true;
+        };
+      }
+
+      return array1.map(function (item1) {
+        return _objectSpread(_objectSpread({}, _lodash["default"].find(array2, function (item2) {
+          return predicate(item1, item2);
+        })), item1);
       });
     }
   }, {
@@ -1487,17 +1517,17 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "getMinuteFormatOfDuration",
     value: function getMinuteFormatOfDuration(ds) {
-      _moment["default"].duration(ds).asMinutes();
+      return _moment["default"].duration(ds).asMinutes();
     }
   }, {
     key: "getSecondFormatOfDuration",
     value: function getSecondFormatOfDuration(ds) {
-      _moment["default"].duration(ds).asSeconds();
+      return _moment["default"].duration(ds).asSeconds();
     }
   }, {
     key: "getDayFormatOfDuration",
     value: function getDayFormatOfDuration(ds) {
-      _moment["default"].duration(ds).asDays();
+      return _moment["default"].duration(ds).asDays();
     }
     /** param可以是timeStamp,也可是date,或是string
      * timestamp : 1231231279
@@ -2454,6 +2484,8 @@ var Utiller = /*#__PURE__*/function () {
       return true;
     }
     /**
+    * 做個總和
+    *
     const result = utiller.getArrayOfSummarizeBy([{name:'david',count:5},{name:'nina',count:3},{name:'david',count:3},{name:'joe',count:3},{name:'joe',count:4}]
     ,'name','count');
     console.log(result);

package/package.json

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

package/template/sample.package.json

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