utiller 1.0.333 → 1.0.334

package/lib/utiller/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
@@ -3787,28 +3788,8 @@ var Utiller = /*#__PURE__*/function () {
       .value();
     }
   }, {
-    key: "generateGenericCombinations",
+    key: "generateUidCombinations",
     value:
-    /**
-    * const array1 = ['黑色', '綠色', '金色']
-    * const array2 = ['S', 'M', 'L']
-    * const array3 = ['短袖', '長袖']
-    * const result = generateGenericCombinations([array1, array2, array3])
-    * console.log(result)
-    * ['黑色 | S | 短袖', '黑色 | S | 長袖', '黑色 | M | 短袖', '黑色 | M | 長袖', '黑色 | L | 短袖',
-    '綠色 | S | 短袖', '綠色 | S | 長袖', '金色 | L | 長袖' '黑色 | L | 長袖' ]
-    * */
-    function generateGenericCombinations(arrays) {
-      var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : " | ";
-      return arrays.reduce(function (acc, curr) {
-        return _lodash["default"].flatMap(acc, function (a) {
-          return curr.map(function (b) {
-            return (Array.isArray(a) ? a.join(separator) : a) + separator + b;
-          });
-        });
-      }, arrays[0]);
-    }
-
     /** ------------------------------------------------------------------------------------- 起始UID-COMBINATION
      * 建立組合清單及 UID 映射清單
      *
@@ -3832,18 +3813,42 @@ var Utiller = /*#__PURE__*/function () {
      * console.log('✅ 還原結果:', getOriginalFromUid(sampleUid, lookupTable))
      *
      */
-  }, {
-    key: "generateUidCombinations",
-    value: function generateUidCombinations(arrays) {
+    /**
+     * 產生所有排列組合並轉成 Firestore-safe UID
+     * @param {string[][]} arrays - 字串陣列的陣列，例如 [['黑色', '綠色'], ['S', 'M']]
+     * @param {string} separator - 分隔符號，預設為 ' | '
+     * @returns {Array<{[uid: string]: string}>} - 每個 UID 對應一組原始組合的對照表陣列
+     */
+    function generateUidCombinations(arrays) {
       var _this4 = this;
       var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : " | ";
-      var combinations = arrays.reduce(function (acc, curr) {
+      if (!arrays.length) return [];
+
+      // 過濾每個子陣列中的 null、undefined、空字串
+      var sanitizedArrays = arrays.map(function (group) {
+        return group.filter(function (item) {
+          return item !== null && item !== undefined && item !== "";
+        });
+      });
+
+      // 若有空陣列，代表某一層無可用資料，無法生成組合
+      if (sanitizedArrays.some(function (group) {
+        return group.length === 0;
+      })) return [];
+
+      // 把第一組當作初始值，從第二組開始遞迴產生所有組合
+      var _sanitizedArrays = (0, _toArray2["default"])(sanitizedArrays),
+        first = _sanitizedArrays[0],
+        rest = _sanitizedArrays.slice(1);
+      var combinations = rest.reduce(function (acc, curr) {
         return _lodash["default"].flatMap(acc, function (a) {
           return curr.map(function (b) {
             return (Array.isArray(a) ? a.join(separator) : a) + separator + b;
           });
         });
-      }, arrays[0]);
+      }, first);
+
+      // 每組組合轉成 UID 對照物件
       return combinations.map(function (str) {
         var uid = _this4.encodeToUid(str);
         return (0, _defineProperty2["default"])({}, uid, str);
@@ -3866,7 +3871,7 @@ var Utiller = /*#__PURE__*/function () {
     }
 
     /**
-     * 根據 UID 還原原始組合
+     * 根據 UID 還原原始組合（透過對照表或解碼備援）
      */
   }, {
     key: "getOriginalFromUid",

package/package.json

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

package/template/sample.package.json

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