kitchen-simulator 10.0.6 → 10.0.7

package/es/class/item.js

@@ -272,7 +272,7 @@ var Item = /*#__PURE__*/function () {
         var should = applyScope === DOORSTYLE_SCOPE_ALL ? true : (_idSet = idSet) === null || _idSet === void 0 ? void 0 : _idSet.has(it.id);
         if (!should) return;
         var picked = ccdf_list.find(function (c) {
-          return (c === null || c === void 0 ? void 0 : c.cabinet_id) == null || (c === null || c === void 0 ? void 0 : c.cabinet_id) === it.itemID;
+          return (c === null || c === void 0 ? void 0 : c.cabinet_id) === it.itemID;
         });
         if (!picked) return;
         state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'ccdf'], _objectSpread(_objectSpread({}, picked), {}, {

package/es/constants.js

@@ -317,7 +317,8 @@ export var ITEMS_ACTIONS = {
   END_LOADING: END_LOADING,
   STORE_DIST_ARRAY: STORE_DIST_ARRAY,
   VALIDATE_ITEM_POSTIONS: VALIDATE_ITEM_POSTIONS,
-  REPLACE_ITEM: REPLACE_ITEM
+  REPLACE_ITEM: REPLACE_ITEM,
+  SET_ITEMS_CCDF: SET_ITEMS_CCDF
 };
 export var HOLE_ACTIONS = {
   SELECT_HOLE: SELECT_HOLE,

package/es/events/external/handlers.changeDoorStyle.js

@@ -51,15 +51,7 @@ function _handleChangeDoorStyleEvent() {
                   if (!ccdf_list.some(function (v) {
                     return item.itemID === v.itemID && item.name === v.name && doorStyle.id === v.doorFinishId;
                   })) {
-                    ccdf_list.push(_objectSpread(_objectSpread({}, item), {}, {
-                      itemID: item.itemID,
-                      prototype: item.prototype,
-                      category: item.category,
-                      name: item.name,
-                      type: item.type,
-                      sku_number: item.sku_number,
-                      doorFinishId: doorStyle.id
-                    }));
+                    ccdf_list.push(_objectSpread({}, item));
                   }
                 case 1:
                 case "end":
@@ -90,7 +82,8 @@ function _handleChangeDoorStyleEvent() {
             // result is ccdf_list
             function () {
               var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(result) {
-                var mappedCabinetDefinitionList, rt, _i, _result$ccdf_list, _doorStyle$id;
+                var _result$ccdf_list, _doorStyle$id;
+                var mappedCabinetDefinitionList, rt, _i;
                 return _regeneratorRuntime.wrap(function (_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -110,14 +103,10 @@ function _handleChangeDoorStyleEvent() {
                       _context.next = 1;
                       break;
                     case 3:
-                      // Persist ccdf on affected instances so SYNC includes ccdf.id for each item.
+                      // Persist ccdf on affected instances so SYNC includes the latest ccdf.id for each item.
                       // IMPORTANT: host response `ccdf_list[]` may not include `door_finish_id`.
-                      // Use request doorFinishId (doorStyle.id) as source of truth.
-                      try {
-                        props.itemsActions.setItemsCCDF((_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [], applyScope, itemIds, (_doorStyle$id = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id !== void 0 ? _doorStyle$id : null);
-                      } catch (e) {
-                        // best-effort only
-                      }
+                      // Use request doorFinishId (doorStyle.id) as the source of truth for door_finish_id.
+                      props.itemsActions.setItemsCCDF((_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [], applyScope, itemIds, (_doorStyle$id = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id !== void 0 ? _doorStyle$id : null);
                       props.itemsActions.setDoorStyle(doorStyle, itemCDS, applyScope, itemIds);
                     case 4:
                     case "end":

package/es/events/external/handlers.loadProject.js

@@ -55,7 +55,7 @@ function _handleLoadProjectEvent() {
               }, /*#__PURE__*/function () {
                 var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(result) {
                   var _evt$payload2;
-                  var cdsList, _result$ccdf_list, ccdfList, doorFinishIdByCabinetId, cabinetDefinitionList, rt, i;
+                  var cdsList, _result$ccdf_list, resp, cabinetDefinitionList, rt, i;
                   return _regeneratorRuntime.wrap(function (_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
@@ -67,23 +67,19 @@ function _handleLoadProjectEvent() {
                         // IMPORTANT: host response `ccdf_list[]` may not include `door_finish_id`.
                         // Use request payload (`ccdf_list[].doorFinishId`) as door_finish_id source.
                         try {
-                          ccdfList = (_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [];
-                          doorFinishIdByCabinetId = new Map(ccdf_list.filter(function (x) {
-                            return (x === null || x === void 0 ? void 0 : x.itemID) != null && (x === null || x === void 0 ? void 0 : x.doorFinishId) != null;
-                          }).map(function (x) {
-                            return [x.itemID, x.doorFinishId];
-                          }));
+                          resp = (_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [];
                           Object.keys(items).forEach(function (k) {
-                            var _ref2, _it$doorStyle$id, _it$doorStyle3;
+                            var _it$doorStyle$id, _it$doorStyle3;
                             var it = items[k];
-                            var desiredDoorFinishId = (_ref2 = (_it$doorStyle$id = it === null || it === void 0 || (_it$doorStyle3 = it.doorStyle) === null || _it$doorStyle3 === void 0 ? void 0 : _it$doorStyle3.id) !== null && _it$doorStyle$id !== void 0 ? _it$doorStyle$id : doorFinishIdByCabinetId.get(it.itemID)) !== null && _ref2 !== void 0 ? _ref2 : null; // door_finish_id
+                            var desiredDoorFinishId = (_it$doorStyle$id = it === null || it === void 0 || (_it$doorStyle3 = it.doorStyle) === null || _it$doorStyle3 === void 0 ? void 0 : _it$doorStyle3.id) !== null && _it$doorStyle$id !== void 0 ? _it$doorStyle$id : null;
                             if (!desiredDoorFinishId) return;
-                            var matched = ccdfList.find(function (c) {
+                            var picked = resp.find(function (c) {
                               return (c === null || c === void 0 ? void 0 : c.cabinet_id) === it.itemID;
                             });
-                            if (matched) {
-                              it.ccdf = _objectSpread(_objectSpread({}, matched), {}, {
-                                door_finish_id: desiredDoorFinishId
+                            if (picked) {
+                              var _picked$door_finish_i;
+                              it.ccdf = _objectSpread(_objectSpread({}, picked), {}, {
+                                door_finish_id: (_picked$door_finish_i = picked === null || picked === void 0 ? void 0 : picked.door_finish_id) !== null && _picked$door_finish_i !== void 0 ? _picked$door_finish_i : desiredDoorFinishId
                               });
                             }
                           });

package/es/mappings/external-events/mappers/ccdfMapper.js

@@ -6,13 +6,17 @@ export function ccdfMapper(ccdf_list, layer) {
   // console.log(ccdf_list, catalog);
   // make structure_json list using ccdf-list
   var cabinetDefinitionList = [];
-  var tempPlaceholders = [];
-  var structure = {};
-  var cdfId;
-  var structure_json = {};
-  var cabinetDefinition = {};
   var layerJS = toJSIfNeeded(layer);
   ccdf_list === null || ccdf_list === void 0 || ccdf_list.forEach(function (ccdf) {
+    // IMPORTANT: DIY-834-43
+    // Each CCDF row must produce its own independent structure/tempPlaceholders objects.
+    // Reusing the same object across iterations causes cross-cabinet mutation bugs
+    // (e.g. B12's `structure.base` being overwritten by W1218's gltf).
+    var tempPlaceholders = [];
+    var structure = {};
+    var cdfId;
+    var structure_json = {};
+    var cabinetDefinition = {};
     var itemKeys = Object.keys(layerJS.items);
     var correctItemId = '';
     for (var i = 0; i < itemKeys.length; i++) {

package/es/mappings/external-events/mappers/ccdfToCDSMapper.js

@@ -2,9 +2,12 @@ import { isEmpty } from "../../../components/viewer2d/utils";
 export function mapFromCCDFToCDS(ccdf_list) {
   // This function make CDS from CCDF_List
   var itemCDSList = [];
-  var itemCDSData = {};
-  var cabitnetDoorStyleId;
   ccdf_list === null || ccdf_list === void 0 || ccdf_list.forEach(function (asItem) {
+    // IMPORTANT: DIY-834-43
+    // `itemCDSData` must be recreated per asItem. Reusing it across iterations
+    // can leak one cabinet's door/drawer mappings into another.
+    var itemCDSData = {};
+    var cabitnetDoorStyleId;
     if (!isEmpty(asItem === null || asItem === void 0 ? void 0 : asItem.id)) {
       cabitnetDoorStyleId = asItem.id;
     }

package/lib/class/item.js

@@ -279,7 +279,7 @@ var Item = exports["default"] = /*#__PURE__*/function () {
         var should = applyScope === _constants.DOORSTYLE_SCOPE_ALL ? true : (_idSet = idSet) === null || _idSet === void 0 ? void 0 : _idSet.has(it.id);
         if (!should) return;
         var picked = ccdf_list.find(function (c) {
-          return (c === null || c === void 0 ? void 0 : c.cabinet_id) == null || (c === null || c === void 0 ? void 0 : c.cabinet_id) === it.itemID;
+          return (c === null || c === void 0 ? void 0 : c.cabinet_id) === it.itemID;
         });
         if (!picked) return;
         state = state.setIn(['scene', 'layers', layerID, 'items', it.id, 'ccdf'], _objectSpread(_objectSpread({}, picked), {}, {

package/lib/constants.js

@@ -327,7 +327,8 @@ var ITEMS_ACTIONS = exports.ITEMS_ACTIONS = {
   END_LOADING: END_LOADING,
   STORE_DIST_ARRAY: STORE_DIST_ARRAY,
   VALIDATE_ITEM_POSTIONS: VALIDATE_ITEM_POSTIONS,
-  REPLACE_ITEM: REPLACE_ITEM
+  REPLACE_ITEM: REPLACE_ITEM,
+  SET_ITEMS_CCDF: SET_ITEMS_CCDF
 };
 var HOLE_ACTIONS = exports.HOLE_ACTIONS = {
   SELECT_HOLE: SELECT_HOLE,

package/lib/events/external/handlers.changeDoorStyle.js

@@ -58,15 +58,7 @@ function _handleChangeDoorStyleEvent() {
                   if (!ccdf_list.some(function (v) {
                     return item.itemID === v.itemID && item.name === v.name && doorStyle.id === v.doorFinishId;
                   })) {
-                    ccdf_list.push(_objectSpread(_objectSpread({}, item), {}, {
-                      itemID: item.itemID,
-                      prototype: item.prototype,
-                      category: item.category,
-                      name: item.name,
-                      type: item.type,
-                      sku_number: item.sku_number,
-                      doorFinishId: doorStyle.id
-                    }));
+                    ccdf_list.push(_objectSpread({}, item));
                   }
                 case 1:
                 case "end":
@@ -97,7 +89,8 @@ function _handleChangeDoorStyleEvent() {
             // result is ccdf_list
             function () {
               var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(result) {
-                var mappedCabinetDefinitionList, rt, _i, _result$ccdf_list, _doorStyle$id;
+                var _result$ccdf_list, _doorStyle$id;
+                var mappedCabinetDefinitionList, rt, _i;
                 return _regenerator["default"].wrap(function (_context) {
                   while (1) switch (_context.prev = _context.next) {
                     case 0:
@@ -117,14 +110,10 @@ function _handleChangeDoorStyleEvent() {
                       _context.next = 1;
                       break;
                     case 3:
-                      // Persist ccdf on affected instances so SYNC includes ccdf.id for each item.
+                      // Persist ccdf on affected instances so SYNC includes the latest ccdf.id for each item.
                       // IMPORTANT: host response `ccdf_list[]` may not include `door_finish_id`.
-                      // Use request doorFinishId (doorStyle.id) as source of truth.
-                      try {
-                        props.itemsActions.setItemsCCDF((_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [], applyScope, itemIds, (_doorStyle$id = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id !== void 0 ? _doorStyle$id : null);
-                      } catch (e) {
-                        // best-effort only
-                      }
+                      // Use request doorFinishId (doorStyle.id) as the source of truth for door_finish_id.
+                      props.itemsActions.setItemsCCDF((_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [], applyScope, itemIds, (_doorStyle$id = doorStyle === null || doorStyle === void 0 ? void 0 : doorStyle.id) !== null && _doorStyle$id !== void 0 ? _doorStyle$id : null);
                       props.itemsActions.setDoorStyle(doorStyle, itemCDS, applyScope, itemIds);
                     case 4:
                     case "end":

package/lib/events/external/handlers.loadProject.js

@@ -62,7 +62,7 @@ function _handleLoadProjectEvent() {
               }, /*#__PURE__*/function () {
                 var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(result) {
                   var _evt$payload2;
-                  var cdsList, _result$ccdf_list, ccdfList, doorFinishIdByCabinetId, cabinetDefinitionList, rt, i;
+                  var cdsList, _result$ccdf_list, resp, cabinetDefinitionList, rt, i;
                   return _regenerator["default"].wrap(function (_context) {
                     while (1) switch (_context.prev = _context.next) {
                       case 0:
@@ -74,23 +74,19 @@ function _handleLoadProjectEvent() {
                         // IMPORTANT: host response `ccdf_list[]` may not include `door_finish_id`.
                         // Use request payload (`ccdf_list[].doorFinishId`) as door_finish_id source.
                         try {
-                          ccdfList = (_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [];
-                          doorFinishIdByCabinetId = new Map(ccdf_list.filter(function (x) {
-                            return (x === null || x === void 0 ? void 0 : x.itemID) != null && (x === null || x === void 0 ? void 0 : x.doorFinishId) != null;
-                          }).map(function (x) {
-                            return [x.itemID, x.doorFinishId];
-                          }));
+                          resp = (_result$ccdf_list = result === null || result === void 0 ? void 0 : result.ccdf_list) !== null && _result$ccdf_list !== void 0 ? _result$ccdf_list : [];
                           Object.keys(items).forEach(function (k) {
-                            var _ref2, _it$doorStyle$id, _it$doorStyle3;
+                            var _it$doorStyle$id, _it$doorStyle3;
                             var it = items[k];
-                            var desiredDoorFinishId = (_ref2 = (_it$doorStyle$id = it === null || it === void 0 || (_it$doorStyle3 = it.doorStyle) === null || _it$doorStyle3 === void 0 ? void 0 : _it$doorStyle3.id) !== null && _it$doorStyle$id !== void 0 ? _it$doorStyle$id : doorFinishIdByCabinetId.get(it.itemID)) !== null && _ref2 !== void 0 ? _ref2 : null; // door_finish_id
+                            var desiredDoorFinishId = (_it$doorStyle$id = it === null || it === void 0 || (_it$doorStyle3 = it.doorStyle) === null || _it$doorStyle3 === void 0 ? void 0 : _it$doorStyle3.id) !== null && _it$doorStyle$id !== void 0 ? _it$doorStyle$id : null;
                             if (!desiredDoorFinishId) return;
-                            var matched = ccdfList.find(function (c) {
+                            var picked = resp.find(function (c) {
                               return (c === null || c === void 0 ? void 0 : c.cabinet_id) === it.itemID;
                             });
-                            if (matched) {
-                              it.ccdf = _objectSpread(_objectSpread({}, matched), {}, {
-                                door_finish_id: desiredDoorFinishId
+                            if (picked) {
+                              var _picked$door_finish_i;
+                              it.ccdf = _objectSpread(_objectSpread({}, picked), {}, {
+                                door_finish_id: (_picked$door_finish_i = picked === null || picked === void 0 ? void 0 : picked.door_finish_id) !== null && _picked$door_finish_i !== void 0 ? _picked$door_finish_i : desiredDoorFinishId
                               });
                             }
                           });

package/lib/mappings/external-events/mappers/ccdfMapper.js

@@ -13,13 +13,17 @@ function ccdfMapper(ccdf_list, layer) {
   // console.log(ccdf_list, catalog);
   // make structure_json list using ccdf-list
   var cabinetDefinitionList = [];
-  var tempPlaceholders = [];
-  var structure = {};
-  var cdfId;
-  var structure_json = {};
-  var cabinetDefinition = {};
   var layerJS = (0, _immutable.toJSIfNeeded)(layer);
   ccdf_list === null || ccdf_list === void 0 || ccdf_list.forEach(function (ccdf) {
+    // IMPORTANT: DIY-834-43
+    // Each CCDF row must produce its own independent structure/tempPlaceholders objects.
+    // Reusing the same object across iterations causes cross-cabinet mutation bugs
+    // (e.g. B12's `structure.base` being overwritten by W1218's gltf).
+    var tempPlaceholders = [];
+    var structure = {};
+    var cdfId;
+    var structure_json = {};
+    var cabinetDefinition = {};
     var itemKeys = Object.keys(layerJS.items);
     var correctItemId = '';
     for (var i = 0; i < itemKeys.length; i++) {

package/lib/mappings/external-events/mappers/ccdfToCDSMapper.js

@@ -8,9 +8,12 @@ var _utils = require("../../../components/viewer2d/utils");
 function mapFromCCDFToCDS(ccdf_list) {
   // This function make CDS from CCDF_List
   var itemCDSList = [];
-  var itemCDSData = {};
-  var cabitnetDoorStyleId;
   ccdf_list === null || ccdf_list === void 0 || ccdf_list.forEach(function (asItem) {
+    // IMPORTANT: DIY-834-43
+    // `itemCDSData` must be recreated per asItem. Reusing it across iterations
+    // can leak one cabinet's door/drawer mappings into another.
+    var itemCDSData = {};
+    var cabitnetDoorStyleId;
     if (!(0, _utils.isEmpty)(asItem === null || asItem === void 0 ? void 0 : asItem.id)) {
       cabitnetDoorStyleId = asItem.id;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitchen-simulator",
-  "version": "10.0.6",
+  "version": "10.0.7",
   "description": "It is a kitchen simulator (self-contained micro-frontend).",
   "license": "MIT",
   "main": "lib/index.js",