utiller 1.0.321 → 1.0.323

package/lib/utiller/index.js

@@ -17,8 +17,7 @@ var _lodash = _interopRequireDefault(require("lodash"));
 var _cryptoJs = _interopRequireDefault(require("crypto-js"));
 var _configerer = require("configerer");
 var _exceptioner = _interopRequireDefault(require("../exceptioner"));
-var _moment = _interopRequireDefault(require("moment"));
-require("moment-timezone");
+var _momentTimezone = _interopRequireDefault(require("moment-timezone"));
 var _uuid = require("uuid");
 var _words = require("../words");
 var _nodeHtmlParser = require("node-html-parser");
@@ -223,7 +222,7 @@ var Utiller = /*#__PURE__*/function () {
      * const date = '2024-07-25';
      * console.log(convertDateToTimestamp(date)); // Outputs the timestamp for 2024-07-25*/
     (0, _defineProperty2["default"])(this, "convertDateToTimestamp", function (date) {
-      return (0, _moment["default"])(date).valueOf(); // valueOf() returns the timestamp in milliseconds
+      return (0, _momentTimezone["default"])(date).valueOf(); // valueOf() returns the timestamp in milliseconds
     });
     /** // 示例函數來測試運行時間
     async function exampleFunction() {
@@ -263,7 +262,7 @@ var Utiller = /*#__PURE__*/function () {
               // 結束計時
               endTime = Date.now(); // 計算總運行時間（毫秒）
               durationInMilliseconds = endTime - startTime; // 使用 moment.duration 格式化為 hh:mm:ss.SSS
-              duration = _moment["default"].duration(durationInMilliseconds, "milliseconds");
+              duration = _momentTimezone["default"].duration(durationInMilliseconds, "milliseconds");
               hours = Math.floor(duration.asHours());
               minutes = duration.minutes();
               seconds = duration.seconds();
@@ -417,7 +416,7 @@ var Utiller = /*#__PURE__*/function () {
     key: "setLocaleOfMoment",
     value: function setLocaleOfMoment() {
       var locale = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "en";
-      _moment["default"].locale(locale);
+      _momentTimezone["default"].locale(locale);
     }
   }, {
     key: "getUuidOfV4",
@@ -1692,55 +1691,55 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "getTodayTimeFormat",
     value: function getTodayTimeFormat(ts) {
-      return (0, _moment["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY-MM-DD");
+      return (0, _momentTimezone["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY-MM-DD");
     }
   }, {
     key: "getCustomFormatOfDatePresent",
     value: function getCustomFormatOfDatePresent(ts) {
       var format = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "YY/MM";
-      return (0, _moment["default"])(ts ? ts : this.getCurrentTimeStamp()).format(format);
+      return (0, _momentTimezone["default"])(ts ? ts : this.getCurrentTimeStamp()).format(format);
     }
   }, {
     key: "getSimpleDateYYMMDDFormat",
     value: function getSimpleDateYYMMDDFormat(ts) {
-      return (0, _moment["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YY/MM/DD");
+      return (0, _momentTimezone["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YY/MM/DD");
     }
   }, {
     key: "getSimpleTimeYYMMDDHHmmFormat",
     value: function getSimpleTimeYYMMDDHHmmFormat(ts) {
-      return (0, _moment["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YY/MM/DD HH:mm");
+      return (0, _momentTimezone["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YY/MM/DD HH:mm");
     }
   }, {
     key: "getECPayCurrentTimeFormat",
     value: function getECPayCurrentTimeFormat(ts) {
-      return (0, _moment["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY/MM/DD HH:mm:ss");
+      return (0, _momentTimezone["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY/MM/DD HH:mm:ss");
     }
   }, {
     key: "getCurrentTimeFormatV2",
     value: function getCurrentTimeFormatV2(ts) {
-      return (0, _moment["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY/MM/DD HH:mm:ss");
+      return (0, _momentTimezone["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY/MM/DD HH:mm:ss");
     }
   }, {
     key: "getCurrentTimeFormatYMDHM",
     value: function getCurrentTimeFormatYMDHM(ts) {
-      return (0, _moment["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY/MM/DD HH:mm");
+      return (0, _momentTimezone["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY/MM/DD HH:mm");
     }
   }, {
     key: "getCurrentTimeFormatYMDHMS",
     value: function getCurrentTimeFormatYMDHMS(ts) {
-      return (0, _moment["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY/MM/DD HH:mm:ss");
+      return (0, _momentTimezone["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY/MM/DD HH:mm:ss");
     }
 
     /** 取得 YYY-MM-DD-HH-mm-ss */
   }, {
     key: "getCurrentTimeFormat",
     value: function getCurrentTimeFormat(ts) {
-      return (0, _moment["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY-MM-DD-HH-mm-ss");
+      return (0, _momentTimezone["default"])(ts ? ts : this.getCurrentTimeStamp()).format("YYYY-MM-DD-HH-mm-ss");
     }
   }, {
     key: "getCurrentMillionSecTimeFormat",
     value: function getCurrentMillionSecTimeFormat(ts) {
-      return (0, _moment["default"])(ts ? ts : undefined).format("YYYY-MM-DD-HH-mm-ss-SSS");
+      return (0, _momentTimezone["default"])(ts ? ts : undefined).format("YYYY-MM-DD-HH-mm-ss-SSS");
     }
   }, {
     key: "isBetweenTimeStamp",
@@ -1748,21 +1747,46 @@ var Utiller = /*#__PURE__*/function () {
       var target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getCurrentTimeStamp();
       var min = arguments.length > 1 ? arguments[1] : undefined;
       var max = arguments.length > 2 ? arguments[2] : undefined;
-      return (0, _moment["default"])(target).isBetween(min, max);
+      return (0, _momentTimezone["default"])(target).isBetween(min, max);
     }
   }, {
     key: "isBeforeTimeStamp",
     value: function isBeforeTimeStamp() {
       var target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getCurrentTimeStamp();
       var time = arguments.length > 1 ? arguments[1] : undefined;
-      return (0, _moment["default"])(target).isBefore(time);
+      return (0, _momentTimezone["default"])(target).isBefore(time);
     }
   }, {
     key: "isAfterTimeStamp",
     value: function isAfterTimeStamp() {
       var target = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.getCurrentTimeStamp();
       var time = arguments.length > 1 ? arguments[1] : undefined;
-      return (0, _moment["default"])(target).isAfter(time);
+      return (0, _momentTimezone["default"])(target).isAfter(time);
+    }
+
+    /**
+     * 根據地區語系與時區輸出 yyyy/MM/dd hh:mm 時間字串
+     * @param {Date | number | string} ts - 時間戳記、日期物件或字串
+     * @param {string} location - 語系地區代碼（如 'zh-TW'、'en-US'）
+     * @param {string} timezone - 時區（預設為 'Asia/Taipei'）
+     * @param {boolean} use24Hour - 是否使用 24 小時制（預設 true）
+     * @returns {string}
+     */
+  }, {
+    key: "formatTimeByLocale",
+    value: function formatTimeByLocale(ts) {
+      var location = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "zh-TW";
+      var timezone = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : "Asia/Taipei";
+      var use24Hour = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
+      // 設定 moment 語系
+      _momentTimezone["default"].locale(location);
+
+      // 轉換時區
+      var m = (0, _momentTimezone["default"])(ts).tz(timezone);
+
+      // 格式化字串
+      var formatStr = use24Hour ? "YYYY/MM/DD HH:mm" : "YYYY/MM/DD hh:mm A";
+      return m.format(formatStr);
     }
 
     /** 獲得 幾天後的timestamp 的概念 {months: 2,days:3} =>
@@ -1781,7 +1805,7 @@ var Utiller = /*#__PURE__*/function () {
         hours: 0
       };
       var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.getCurrentTimeStamp();
-      var base = (0, _moment["default"])(target);
+      var base = (0, _momentTimezone["default"])(target);
       for (var each in param) {
         var number = param[each];
         var unit = each;
@@ -1807,7 +1831,7 @@ var Utiller = /*#__PURE__*/function () {
     key: "getTimeStampFromSpecificFormat",
     value: function getTimeStampFromSpecificFormat(string) {
       var format = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : "YYYY/MM/DD HH:mm:ss";
-      return (0, _moment["default"])(string, format).valueOf();
+      return (0, _momentTimezone["default"])(string, format).valueOf();
     }
   }, {
     key: "getTimeStampFromECPayStringFormat",
@@ -1819,42 +1843,42 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "getTimeFormatOfDurationToMillionSecond",
     value: function getTimeFormatOfDurationToMillionSecond(duration) {
-      return _moment["default"].utc(duration).format("HH小時mm分鐘ss秒SSS");
+      return _momentTimezone["default"].utc(duration).format("HH小時mm分鐘ss秒SSS");
     }
 
     /** duration是兩個timestamp相減,把duration time-stamp 轉成 02:13,moment.utc 就是不會加八小時啦幹 */
   }, {
     key: "getTimeFormatOfDurationToSecond",
     value: function getTimeFormatOfDurationToSecond(duration) {
-      return _moment["default"].utc(duration).format("HH小時mm分鐘ss秒");
+      return _momentTimezone["default"].utc(duration).format("HH小時mm分鐘ss秒");
     }
 
     /** duration是兩個timestamp相減,把duration time-stamp 轉成 02:13,moment.utc 就是不會加八小時啦幹 , 為什麼對多1天 超怪 */
   }, {
     key: "getTimeFormatOfDurationToDay",
     value: function getTimeFormatOfDurationToDay(duration) {
-      return _moment["default"].utc(duration).format("DD天HH小時mm分鐘ss秒");
+      return _momentTimezone["default"].utc(duration).format("DD天HH小時mm分鐘ss秒");
     }
   }, {
     key: "getChineseTimeFormat",
     value: function getChineseTimeFormat(ts) {
-      _moment["default"].locale("zh-TW");
-      return (0, _moment["default"])(ts).format("LLLL");
+      _momentTimezone["default"].locale("zh-TW");
+      return (0, _momentTimezone["default"])(ts).format("LLLL");
     }
   }, {
     key: "getMinuteFormatOfDuration",
     value: function getMinuteFormatOfDuration(ds) {
-      return _moment["default"].duration(ds).asMinutes();
+      return _momentTimezone["default"].duration(ds).asMinutes();
     }
   }, {
     key: "getSecondFormatOfDuration",
     value: function getSecondFormatOfDuration(ds) {
-      return _moment["default"].duration(ds).asSeconds();
+      return _momentTimezone["default"].duration(ds).asSeconds();
     }
   }, {
     key: "getDayFormatOfDuration",
     value: function getDayFormatOfDuration(ds) {
-      return _moment["default"].duration(ds).asDays();
+      return _momentTimezone["default"].duration(ds).asDays();
     }
 
     /** param可以是timeStamp,也可是date,或是string
@@ -1867,7 +1891,7 @@ var Utiller = /*#__PURE__*/function () {
     key: "getDurationOfMillionSec",
     value: function getDurationOfMillionSec(dateOrTimeStamp) {
       var currentTimestamp = this.getCurrentTimeStamp();
-      var targetTimeStamp = (0, _moment["default"])(dateOrTimeStamp).valueOf();
+      var targetTimeStamp = (0, _momentTimezone["default"])(dateOrTimeStamp).valueOf();
       var queue = _lodash["default"].sortBy([{
         ts: currentTimestamp
       }, {
@@ -1877,16 +1901,16 @@ var Utiller = /*#__PURE__*/function () {
       }).map(function (each) {
         return each.ts;
       });
-      var after = (0, _moment["default"])(queue.pop());
-      var before = (0, _moment["default"])(queue.shift()); // another date
-      var duration = _moment["default"].duration(after.diff(before));
+      var after = (0, _momentTimezone["default"])(queue.pop());
+      var before = (0, _momentTimezone["default"])(queue.shift()); // another date
+      var duration = _momentTimezone["default"].duration(after.diff(before));
       var ms = duration.asMilliseconds();
       return ms;
     }
   }, {
     key: "getCurrentTimeStamp",
     value: function getCurrentTimeStamp() {
-      return (0, _moment["default"])().valueOf();
+      return (0, _momentTimezone["default"])().valueOf();
     }
   }, {
     key: "isStringContainInLines",
@@ -2067,7 +2091,7 @@ var Utiller = /*#__PURE__*/function () {
   }, {
     key: "enrichZhTw",
     value: function enrichZhTw() {
-      _moment["default"].locale("zh-tw", {
+      _momentTimezone["default"].locale("zh-tw", {
         months: "一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),
         monthsShort: "1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),
         weekdays: "星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),
@@ -2128,13 +2152,13 @@ var Utiller = /*#__PURE__*/function () {
           },
           nextWeek: function nextWeek() {
             var startOfWeek, prefix;
-            startOfWeek = (0, _moment["default"])().startOf("week");
+            startOfWeek = (0, _momentTimezone["default"])().startOf("week");
             prefix = this.diff(startOfWeek, "days") >= 7 ? "[下]" : "[本]";
             return this.minutes() === 0 ? prefix + "dddA點整" : prefix + "dddAh點mm";
           },
           lastWeek: function lastWeek() {
             var startOfWeek, prefix;
-            startOfWeek = (0, _moment["default"])().startOf("week");
+            startOfWeek = (0, _momentTimezone["default"])().startOf("week");
             prefix = this.unix() < startOfWeek.unix() ? "[上]" : "[本]";
             return this.minutes() === 0 ? prefix + "dddAh點整" : prefix + "dddAh點mm";
           },
@@ -2919,7 +2943,7 @@ var Utiller = /*#__PURE__*/function () {
     key: "isOverSpecificAge",
     value: function isOverSpecificAge(birthDate) {
       var target = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 18;
-      var age = (0, _moment["default"])().diff((0, _moment["default"])(birthDate, "YYYY-MM-DD"), "years");
+      var age = (0, _momentTimezone["default"])().diff((0, _momentTimezone["default"])(birthDate, "YYYY-MM-DD"), "years");
       return age >= target;
     }
   }, {
@@ -2993,7 +3017,7 @@ var Utiller = /*#__PURE__*/function () {
         valid: false,
         message: "\u51FA\u751F\u65E5\u671F\u683C\u5F0F\u4E0D\u6B63\u78BA"
       };
-      var now = (0, _moment["default"])();
+      var now = (0, _momentTimezone["default"])();
       var age = now.diff(birthday, "years");
       if (age < ageOfQualify) {
         return {
@@ -3027,8 +3051,8 @@ var Utiller = /*#__PURE__*/function () {
     key: "getStringOfFormatTimestampRange",
     value: function getStringOfFormatTimestampRange(startTimestamp, endTimestamp) {
       // 使用 moment 解析 timestamp
-      var startDate = (0, _moment["default"])(startTimestamp);
-      var endDate = (0, _moment["default"])(endTimestamp);
+      var startDate = (0, _momentTimezone["default"])(startTimestamp);
+      var endDate = (0, _momentTimezone["default"])(endTimestamp);
 
       // 格式化日期為 YY/MM/DD 格式
       var formatDate = function formatDate(date) {
@@ -3063,8 +3087,8 @@ var Utiller = /*#__PURE__*/function () {
     key: "getStringOfCalculateClassTime",
     value: function getStringOfCalculateClassTime(startTimestamp, endTimestamp, weeklyMinutes) {
       // 使用 moment 解析 timestamp
-      var startDate = (0, _moment["default"])(startTimestamp);
-      var endDate = (0, _moment["default"])(endTimestamp);
+      var startDate = (0, _momentTimezone["default"])(startTimestamp);
+      var endDate = (0, _momentTimezone["default"])(endTimestamp);
 
       // 計算時間範圍內的天數
       var totalDays = endDate.diff(startDate, "days") + 1; // 包含起始日
@@ -3096,15 +3120,15 @@ var Utiller = /*#__PURE__*/function () {
     value: function getNumberOfPeriodMinute(startTimestamp, endTimestamp) {
       // 使用 moment 解析 timestamp
       // 使用 moment 解析 timestamp 並只取時間的 hh:mm 部分
-      var startTime = (0, _moment["default"])(startTimestamp).format("HH:mm");
-      var endTime = (0, _moment["default"])(endTimestamp).format("HH:mm");
+      var startTime = (0, _momentTimezone["default"])(startTimestamp).format("HH:mm");
+      var endTime = (0, _momentTimezone["default"])(endTimestamp).format("HH:mm");
 
       // 使用 moment 重新將 hh:mm 轉換為完整的日期對象
-      var startDate = (0, _moment["default"])(startTime, "HH:mm");
-      var endDate = (0, _moment["default"])(endTime, "HH:mm");
+      var startDate = (0, _momentTimezone["default"])(startTime, "HH:mm");
+      var endDate = (0, _momentTimezone["default"])(endTime, "HH:mm");
 
       // 計算兩個時間之間的分鐘差距
-      var durationInMinutes = _moment["default"].duration(endDate.diff(startDate)).asMinutes();
+      var durationInMinutes = _momentTimezone["default"].duration(endDate.diff(startDate)).asMinutes();
       return durationInMinutes;
     }
   }, {
@@ -3133,8 +3157,8 @@ var Utiller = /*#__PURE__*/function () {
       }
 
       // 使用 moment 將 timestamp 轉換為只保留 hh:mm 的格式
-      var startTime = (0, _moment["default"])(startTimestamp).format("HH:mm");
-      var endTime = (0, _moment["default"])(endTimestamp).format("HH:mm");
+      var startTime = (0, _momentTimezone["default"])(startTimestamp).format("HH:mm");
+      var endTime = (0, _momentTimezone["default"])(endTimestamp).format("HH:mm");
 
       // 組合結果並返回
       return "".concat(daysOfWeek[day], " ").concat(startTime, "-").concat(endTime);
@@ -3596,6 +3620,41 @@ var Utiller = /*#__PURE__*/function () {
         return predict(value);
       }));
     }
+
+    /**
+    *
+    const array = [
+    { serial: 'A023' },
+    { serial: 'Z001' },
+    { serial: 'C002' },
+    { serial: 'G123' },
+    { serial: 'A001' },
+    { serial: 'A999' }
+    ];
+    mutateBy(array, (item) => {
+    const serial = item.serial;
+    const match = serial.match(/^([A-Z]+)(\d+)$/i);
+    const [letter, number] = match ? [match[1], parseInt(match[2], 10)] : [serial, 0];
+    return [letter, number]; // 多層排序：先字母，再數字
+    });
+    *
+    * [ { serial: 'A001' }, { serial: 'A023' }, { serial: 'A999' }, { serial: 'C002' }, { serial: 'G123' }, { serial: 'Z001' } ]
+    *
+    *
+    * 通用的排序變異工具：依照 predict 提供的排序 key 對 array 進行原地排序(mutated)
+    *
+    * @param {Array} array - 要排序的陣列（會就地變異）
+    * @param {Function} predict - 回傳排序 key（可以是陣列以支援多層排序）
+    */
+  }, {
+    key: "mutateBy",
+    value: function mutateBy(array) {
+      var predict = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (item) {
+        return item;
+      };
+      var sorted = _lodash["default"].sortBy(array, predict);
+      array.splice.apply(array, [0, array.length].concat((0, _toConsumableArray2["default"])(sorted)));
+    }
   }]);
 }();
 var _default = exports["default"] = Utiller;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utiller",
-  "version": "1.0.321",
+  "version": "1.0.323",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -23,7 +23,7 @@
     "fs-extra": "^9.1.0",
     "lodash": "^4.17.20",
     "moment": "^2.29.1",
-    "moment-timezone": "^0.5.34",
+    "moment-timezone": "^0.5.48",
     "node-html-parser": "^7.0.1",
     "pdf-parse": "^1.1.1",
     "prompt": "^1.1.0",

package/template/sample.package.json

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