utiller 1.0.310 → 1.0.311

package/lib/utiller/index.js

@@ -3395,35 +3395,35 @@ var Utiller = /*#__PURE__*/function () {
     }
 
     /**
-     * ({key: 'color', label: '顏色', options: [  { value: 0, label: '紅' }, { value: 1, label: '白' }, { value: 2, label: '黑'}]},
-     *  {key: 'size', label: '尺寸', options: [ { value: 0, label: 'S' }, { value: 1, label: 'M' }, { value: 2, label: 'L' }]})
-     *
-     * [
-     *   { color: 0, size: 0, id: 'color_0_size_0', content: '顏色：紅 尺寸：S' },
-     *   { color: 0, size: 1, id: 'color_0_size_1', content: '顏色：紅 尺寸：M' },
-     *   { color: 0, size: 2, id: 'color_0_size_2', content: '顏色：紅 尺寸：L' },
-     *   { color: 1, size: 0, id: 'color_1_size_0', content: '顏色：白 尺寸：S' },
-     *   { color: 1, size: 1, id: 'color_1_size_1', content: '顏色：白 尺寸：M' },
-     *   { color: 1, size: 2, id: 'color_1_size_2', content: '顏色：白 尺寸：L' },
-     *   { color: 2, size: 0, id: 'color_2_size_0', content: '顏色：黑 尺寸：S' },
-     *   { color: 2, size: 1, id: 'color_2_size_1', content: '顏色：黑 尺寸：M' },
-     *   { color: 2, size: 2, id: 'color_2_size_2', content: '顏色：黑 尺寸：L' }
-     * ]
-     *
-     * 生成所有組合並依照 value 做數字遞增排序
-     * @param {Array} attributes - 屬性陣列
-     * @returns {Array} - 所有組合
-     */
+    * ({key: 'color', label: '顏色', options: [  { value: 0, label: '紅' }, { value: 1, label: '白' }, { value: 2, label: '黑'}]},
+    *  {key: 'size', label: '尺寸', options: [ { value: 0, label: 'S' }, { value: 1, label: 'M' }, { value: 2, label: 'L' }]})
+    *
+    * [
+    *   { trait: {color: 0, size: 0}, id: 'color_0_size_0', content: '顏色：紅 尺寸：S' },
+    *   { trait: {color: 0, size: 1}, id: 'color_0_size_1', content: '顏色：紅 尺寸：M' },
+    *   { trait: {color: 0, size: 2}, id: 'color_0_size_2', content: '顏色：紅 尺寸：L' },
+    *   { trait: {color: 1, size: 0}, id: 'color_1_size_0', content: '顏色：白 尺寸：S' },
+    *   { trait: {color: 1, size: 1}, id: 'color_1_size_1', content: '顏色：白 尺寸：M' },
+    *   { trait: {color: 1, size: 2}, id: 'color_1_size_2', content: '顏色：白 尺寸：L' },
+    *   { trait: {color: 2, size: 0}, id: 'color_2_size_0', content: '顏色：黑 尺寸：S' },
+    *   { trait: {color: 2, size: 1}, id: 'color_2_size_1', content: '顏色：黑 尺寸：M' },
+    *   { trait: {color: 2, size: 2}, id: 'color_2_size_2', content: '顏色：黑 尺寸：L' }
+    * ]
+    *
+    /**
+    * 生成所有組合並依照 value 遞增排序，並回傳指定格式
+    * @param {Array} attributes - 屬性陣列
+    * @returns {Array} - 格式化組合
+    */
   }, {
     key: "generateCombinations",
-    value: function generateCombinations() {
-      for (var _len29 = arguments.length, attributes = new Array(_len29), _key39 = 0; _key39 < _len29; _key39++) {
-        attributes[_key39] = arguments[_key39];
-      }
+    value: function generateCombinations(attributes) {
       var keys = attributes.map(function (attr) {
         return attr.key;
-      });
-      var labelMap = _lodash["default"].keyBy(attributes, "key");
+      }); // 屬性順序
+      var labelMap = _lodash["default"].keyBy(attributes, "key"); // 用於 content 查 label
+
+      // 把每個屬性的 options 提取成格式化陣列
       var optionArrays = attributes.map(function (attr) {
         return attr.options.map(function (option) {
           return {
@@ -3433,6 +3433,8 @@ var Utiller = /*#__PURE__*/function () {
           };
         });
       });
+
+      // 計算笛卡兒積
       var cartesianProduct = _lodash["default"].reduce(optionArrays, function (acc, curr) {
         return _lodash["default"].flatMap(acc, function (a) {
           return curr.map(function (b) {
@@ -3440,8 +3442,10 @@ var Utiller = /*#__PURE__*/function () {
           });
         });
       }, [[]]);
+
+      // 格式化每一筆組合
       var results = cartesianProduct.map(function (combination) {
-        var item = {};
+        var trait = {};
         var idParts = [];
         var contentParts = [];
         var _iterator19 = _createForOfIteratorHelper(combination),
@@ -3449,27 +3453,29 @@ var Utiller = /*#__PURE__*/function () {
         try {
           for (_iterator19.s(); !(_step19 = _iterator19.n()).done;) {
             var _step19$value = _step19.value,
-              _key40 = _step19$value.key,
+              _key39 = _step19$value.key,
               value = _step19$value.value,
               label = _step19$value.label;
-            item[_key40] = value;
-            idParts.push("".concat(_key40, "_").concat(value));
-            contentParts.push("".concat(labelMap[_key40].label, "\uFF1A").concat(label));
+            trait[_key39] = value;
+            idParts.push("".concat(_key39, "_").concat(value));
+            contentParts.push("".concat(labelMap[_key39].label, "\uFF1A").concat(label));
           }
         } catch (err) {
           _iterator19.e(err);
         } finally {
           _iterator19.f();
         }
-        item.id = idParts.join("_");
-        item.content = contentParts.join(" ");
-        return item;
+        return {
+          trait: trait,
+          id: idParts.join("_"),
+          content: contentParts.join(" ")
+        };
       });
 
-      // 🔽 排序邏輯：從最後一個 key -> 第一個 key 做排序（變化最慢的排最前）
+      // 排序：依照屬性順序的 value 遞增（右邊 key 變化最快）
       return _lodash["default"].sortBy(results, function (item) {
         return keys.map(function (key) {
-          return item[key];
+          return item.trait[key];
         });
       });
     }

package/package.json

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

package/template/sample.package.json

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