kitchen-simulator 11.30.2 → 11.31.0

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

@@ -5,9 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ccdfMapper = ccdfMapper;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _utils = require("../../../components/viewer2d/utils");
 var _immutable = require("../../../shared/objects/immutable");
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function ccdfMapper(ccdf_list, layer) {
   // This function make cabinet definition using ccdf, layer's item information and catalog
   // console.log(ccdf_list, catalog);
@@ -33,7 +36,7 @@ function ccdfMapper(ccdf_list, layer) {
     }
     var cd = layerJS.items[correctItemId];
     if (cd && !!(ccdf !== null && ccdf !== void 0 && ccdf.scene_cabinet_id) && (cd === null || cd === void 0 ? void 0 : cd.id) === ccdf.scene_cabinet_id) {
-      var _ccdf$cabinet_id, _ccdf$long_name, _ccdf$sizeinfo, _ccdf$shape_svg, _ccdf$is_corner;
+      var _ccdf$cabinet_id, _ccdf$long_name, _ccdf$sizeinfo, _ccdf$shape_svg;
       if (!(0, _utils.isEmpty)(ccdf === null || ccdf === void 0 ? void 0 : ccdf.id)) {
         cdfId = ccdf.id;
       }
@@ -81,27 +84,18 @@ function ccdfMapper(ccdf_list, layer) {
         tempPlaceholders: tempPlaceholders
       };else structure_json = structure;
       // make cabinet definition using structure_json and catalog
-      cabinetDefinition = {
+      cabinetDefinition = _objectSpread(_objectSpread({}, cd), {}, {
         type: cd.category,
         itemID: (_ccdf$cabinet_id = ccdf === null || ccdf === void 0 ? void 0 : ccdf.cabinet_id) !== null && _ccdf$cabinet_id !== void 0 ? _ccdf$cabinet_id : cd.itemID,
         // cd.itemID may be legacy from legacy project, so ccdf.cabinet_id is preferred if exists
-        name: cd.name,
         long_name: (_ccdf$long_name = ccdf === null || ccdf === void 0 ? void 0 : ccdf.long_name) !== null && _ccdf$long_name !== void 0 ? _ccdf$long_name : cd.long_name,
         sizeinfo: (_ccdf$sizeinfo = ccdf === null || ccdf === void 0 ? void 0 : ccdf.sizeinfo) !== null && _ccdf$sizeinfo !== void 0 ? _ccdf$sizeinfo : cd.sizeinfo,
-        description: cd.description,
-        prototype: cd.prototype,
-        base: cd.base,
-        ccdf: cd.ccdf,
         shape_svg: (_ccdf$shape_svg = ccdf === null || ccdf === void 0 ? void 0 : ccdf.shape_svg) !== null && _ccdf$shape_svg !== void 0 ? _ccdf$shape_svg : cd.shape_svg,
         // If host provides cabinet base gltf/bin at CCDF top-level, prefer it.
         gltf: (ccdf === null || ccdf === void 0 ? void 0 : ccdf.gltf) || cd.gltf,
         bin: (ccdf === null || ccdf === void 0 ? void 0 : ccdf.bin) || (cd === null || cd === void 0 ? void 0 : cd.bin),
-        structure_json: structure_json,
-        layoutpos: cd.layoutpos,
-        is_corner: (_ccdf$is_corner = ccdf === null || ccdf === void 0 ? void 0 : ccdf.is_corner) !== null && _ccdf$is_corner !== void 0 ? _ccdf$is_corner : cd.is_corner,
-        obj_property: cd.obj_property,
-        outline: cd.outline
-      };
+        structure_json: structure_json
+      });
     }
     // make cabinet definition list using cabinetDefinition
     cabinetDefinitionList.push(cabinetDefinition);

package/lib/shared/concurrency/async-pool.js

@@ -0,0 +1,78 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.asyncPool = asyncPool;
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+/**
+ * Run async work over a list with a concurrency limit.
+ *
+ * @template T,R
+ * @param {number} limit number of concurrently executing promises
+ * @param {T[]} items input items
+ * @param {(item: T, index: number) => Promise<R>} iteratorFn async function
+ * @returns {Promise<R[]>} results in input order
+ */
+function asyncPool(_x, _x2, _x3) {
+  return _asyncPool.apply(this, arguments);
+}
+function _asyncPool() {
+  _asyncPool = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee(limit, items, iteratorFn) {
+    var safeLimit, ret, executing, _loop, i, _items$length;
+    return _regenerator["default"].wrap(function (_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          safeLimit = Math.max(1, Number(limit) || 1);
+          ret = [];
+          executing = new Set();
+          _loop = /*#__PURE__*/_regenerator["default"].mark(function _loop(i) {
+            var item, p, cleanup;
+            return _regenerator["default"].wrap(function (_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  item = items[i];
+                  p = Promise.resolve().then(function () {
+                    return iteratorFn(item, i);
+                  });
+                  ret.push(p);
+                  executing.add(p);
+                  cleanup = function cleanup() {
+                    return executing["delete"](p);
+                  };
+                  p.then(cleanup)["catch"](cleanup);
+                  if (!(executing.size >= safeLimit)) {
+                    _context.next = 1;
+                    break;
+                  }
+                  _context.next = 1;
+                  return Promise.race(executing);
+                case 1:
+                case "end":
+                  return _context.stop();
+              }
+            }, _loop);
+          });
+          i = 0;
+        case 1:
+          if (!(i < ((_items$length = items === null || items === void 0 ? void 0 : items.length) !== null && _items$length !== void 0 ? _items$length : 0))) {
+            _context2.next = 3;
+            break;
+          }
+          return _context2.delegateYield(_loop(i), "t0", 2);
+        case 2:
+          i++;
+          _context2.next = 1;
+          break;
+        case 3:
+          return _context2.abrupt("return", Promise.all(ret));
+        case 4:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee);
+  }));
+  return _asyncPool.apply(this, arguments);
+}

package/lib/shared/domain/asset/sanitize-asset-url.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.sanitizeAssetUrl = void 0;
-/**
- * Strip stray dots from the **path portion** of a GLTF/BIN URL.
- * e.g. `…/B36_36x34.5x24.gltf` → `…/B36_36x345x24.gltf`
- *
- * Leaves the protocol/domain and the final file extension untouched.
+/**
+ * Strip stray dots from the **path portion** of a GLTF/BIN URL.
+ * e.g. `…/B36_36x34.5x24.gltf` → `…/B36_36x345x24.gltf`
+ *
+ * Leaves the protocol/domain and the final file extension untouched.
  */
 var sanitizeAssetUrl = exports.sanitizeAssetUrl = function sanitizeAssetUrl(url) {
   if (!url) return url;

package/lib/shared/math/line-metrics.js

@@ -14,17 +14,17 @@ function getVertex(vertices, vertexId) {
   return typeof vertices.get === 'function' ? vertices.get(vertexId) : vertices[vertexId];
 }
 
-/**
- * Computes a line length using its 2 vertices.
- *
- * Assumptions (matches existing DRAG logic):
- * - vertex coordinates are stored in centimeters
- * - result is converted to the provided unit
- *
- * @param {object} line - line object/record with `vertices` (array or immutable List)
- * @param {object} vertices - vertices collection (plain object map or immutable Map)
- * @param {string} unit - target unit (e.g. 'in', 'cm')
- * @returns {number|null}
+/**
+ * Computes a line length using its 2 vertices.
+ *
+ * Assumptions (matches existing DRAG logic):
+ * - vertex coordinates are stored in centimeters
+ * - result is converted to the provided unit
+ *
+ * @param {object} line - line object/record with `vertices` (array or immutable List)
+ * @param {object} vertices - vertices collection (plain object map or immutable Map)
+ * @param {string} unit - target unit (e.g. 'in', 'cm')
+ * @returns {number|null}
  */
 function getLineLength(line, vertices) {
   var _v0$x, _v1$x, _v0$y, _v1$y;

package/lib/utils/geometry.js

@@ -107,6 +107,8 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _math = require("./math.js");
 var _constants = require("../constants");
+var _applianceCategories = require("../constants/applianceCategories");
+var _viewerUtils = require("../engine/2d/viewer-utils.js");
 var _convertUnitsLite = require("./convert-units-lite");
 var Three = _interopRequireWildcard(require("three"));
 var _utils = require("../components/viewer2d/utils.js");
@@ -248,8 +250,8 @@ function _twoLineSegmentsIntersection(p1, p2, p3, p4) {
   var denom = (y4 - y3) * (x2 - x1) - (x4 - x3) * (y2 - y1);
   var numA = (x4 - x3) * (y1 - y3) - (y4 - y3) * (x1 - x3);
   var numB = (x2 - x1) * (y1 - y3) - (y2 - y1) * (x1 - x3);
-  if ((0, _math.fAbs)(denom) <= _constants.EPSILON) {
-    if ((0, _math.fAbs)(numA) <= _constants.EPSILON && (0, _math.fAbs)(numB) <= _constants.EPSILON) {
+  if ((0, _math.fAbs)(denom) <= _constants.LINE_EPSILON) {
+    if ((0, _math.fAbs)(numA) <= _constants.LINE_EPSILON && (0, _math.fAbs)(numB) <= _constants.LINE_EPSILON) {
       var comparator = function comparator(pa, pb) {
         return pa.x === pb.x ? pa.y - pb.y : pa.x - pb.x;
       };
@@ -278,7 +280,7 @@ function _twoLineSegmentsIntersection(p1, p2, p3, p4) {
   }
   var uA = numA / denom;
   var uB = numB / denom;
-  if (uA >= 0 - _constants.EPSILON && uA <= 1 + _constants.EPSILON && uB >= 0 - _constants.EPSILON && uB <= 1 + _constants.EPSILON) {
+  if (uA >= 0 - _constants.LINE_EPSILON && uA <= 1 + _constants.LINE_EPSILON && uB >= 0 - _constants.LINE_EPSILON && uB <= 1 + _constants.LINE_EPSILON) {
     var _point = {
       x: x1 + uA * (x2 - x1),
       y: y1 + uA * (y2 - y1)
@@ -833,8 +835,9 @@ function getAllItemSpecified(scene, catalog, filter) {
   };
   var curiteminfo;
   var iteminfo = [];
+  var excludedApplianceCategories = new Set(_applianceCategories.EXCLUDED_APPLIANCE_CATEGORIES);
   layer.items.forEach(function (item) {
-    var _cat$obj;
+    var _cat$obj, _cat$obj2;
     if (!item) return;
     var val = {
       pos: {
@@ -860,11 +863,9 @@ function getAllItemSpecified(scene, catalog, filter) {
     val.item = item;
 
     // Filter check
-    if (Array.isArray(filter)) {
-      if (!val.layoutpos || !filter.includes(val.layoutpos)) return;
-    } else if (val.layoutpos !== filter || (0, _helper.isEmpty)(cat) || (cat === null || cat === void 0 ? void 0 : cat.type) === 'appliance' && ['Cook Top', 'Microwave'].includes(cat === null || cat === void 0 || (_cat$obj = cat.obj) === null || _cat$obj === void 0 ? void 0 : _cat$obj.category)) {
-      return;
-    }
+    var isExcludedItem = (0, _helper.isEmpty)(cat) || (cat === null || cat === void 0 ? void 0 : cat.type) === 'appliance' && excludedApplianceCategories.has(cat === null || cat === void 0 || (_cat$obj = cat.obj) === null || _cat$obj === void 0 ? void 0 : _cat$obj.category) || excludedApplianceCategories.has(cat === null || cat === void 0 || (_cat$obj2 = cat.obj) === null || _cat$obj2 === void 0 ? void 0 : _cat$obj2.cabinet_category);
+    var layoutMatches = Array.isArray(filter) ? !!val.layoutpos && filter.includes(val.layoutpos) : val.layoutpos === filter;
+    if (!layoutMatches || isExcludedItem) return;
 
     // Current vs others
     var rect = getCalcRectFromItem3D(val);
@@ -1737,7 +1738,7 @@ function calcSnap2(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect,
             rotRad = snap.rotRad;
           }
         });
-        if (allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+        if (allItemRect.cur.itemInfo.name.includes(_applianceCategories.APPLIANCE_CATEGORY_COOK_TOP)) {
           var intersects = allItemRect.others.filter(function (others) {
             return intersectRect(others.rect, curitem.rect);
           });
@@ -1749,12 +1750,12 @@ function calcSnap2(allItemRect, allItemSnap, allLineRects, allLineSnap, allRect,
             }
           });
         }
-        if (allItemRect.cur.itemInfo.name.includes('Hood') || allItemRect.cur.itemInfo.cabinet_category.toLowerCase().includes('hood') || allItemRect.cur.itemInfo.name.includes('Range') || allItemRect.cur.itemInfo.name.includes('Cook Top')) {
+        if ((0, _viewerUtils.shouldBypassItemIntersectionValidation)(allItemRect.cur)) {
           var _intersects = allItemRect.others.filter(function (others) {
             return intersectRect(others.rect, curitem.rect);
           });
           _intersects.forEach(function (rect) {
-            if (isPointInArea(allArea, rect.itemInfo) || !allArea.length) if (rect.itemInfo.name.includes('Hood') || rect.itemInfo.cabinet_category.toLowerCase().includes('hood') || rect.itemInfo.name.includes('Range') || rect.itemInfo.name.includes('Cook Top')) {
+            if ((isPointInArea(allArea, rect.itemInfo) || !allArea.length) && (0, _viewerUtils.shouldBypassItemIntersectionValidation)(rect)) {
               nx = rect.itemInfo.x;
               ny = rect.itemInfo.y;
               rotRad = rect.itemInfo.rotation * Math.PI / 180;
@@ -2143,9 +2144,9 @@ function needSnap(curItem, othItem) {
   var isBlsnapOth = othItem.item.category === 'cabinet' && othItem.item.layoutpos === _constants.BASE_CABINET_LAYOUTPOS && Math.abs(curFloor - otherFloor) >= delta;
   var isBlsnapCur = curItem.selectedItem.category === 'cabinet' && curItem.selectedItem.layoutpos === _constants.BASE_CABINET_LAYOUTPOS && Math.abs(curFloor - otherFloor) >= delta;
   if (curItem.cat.hasOwnProperty('long_name') || othItem.cat && othItem.cat.hasOwnProperty('long_name')) {
-    if (curItem.cat.long_name.includes('Hood') || othItem.cat && othItem.cat.long_name.includes('Hood')) blSnap = true;
-    if (curItem.cat.long_name.includes('Hood') && othItem.cat && isBlsnapOth || isBlsnapCur && othItem.cat.long_name.includes('Hood')) blSnap = false;
-    if (curItem.cat.long_name.includes('Cook Top') && othItem.cat && othItem.cat.long_name.includes('Cabinet') || curItem.cat.long_name.includes('Cabinet') && othItem.cat && othItem.cat.long_name.includes('Cook Top')) blSnap = true;
+    if (curItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_HOOD) || othItem.cat && othItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_HOOD)) blSnap = true;
+    if (curItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_HOOD) && othItem.cat && isBlsnapOth || isBlsnapCur && othItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_HOOD)) blSnap = false;
+    if (curItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_COOK_TOP) && othItem.cat && othItem.cat.long_name.includes('Cabinet') || curItem.cat.long_name.includes('Cabinet') && othItem.cat && othItem.cat.long_name.includes(_applianceCategories.APPLIANCE_CATEGORY_COOK_TOP)) blSnap = true;
   }
   return blSnap;
 }
@@ -3236,6 +3237,8 @@ function isOverlappedTwoItemsOnOneLine(layer, curLine, srcItem, desItem) {
     //      |      |__DI__|    |
     //      |_________SI_______|
     return true;
+  } else if (minDisV0S - minDisV0D > _constants.EPSILON && maxDisV0D - maxDisV0S > _constants.EPSILON) {
+    return true;
   } else if (minDisV0S < minDisV0D && maxDisV0S - minDisV0D > _constants.EPSILON) {
     //      s0     d0 s1  d1   ===>  maxDisV0S: v0s1, minDisV0S: v0s0, maxDisV0D: v0d1, minDisV0D: v0d0
     //  v0 __________________________ v1

package/lib/utils/skinPanelEngine.js

@@ -145,10 +145,10 @@ function isSnappedWithCornerCabient(srcItem, desItem) {
   } else return false;
 }
 
-/**
- * @param {*} faceSegs
- * @param {*} otherFaces
- * @returns
+/**
+ * @param {*} faceSegs
+ * @param {*} otherFaces
+ * @returns
  */
 function getTrimmedFaceSegs(faceSegs, otherFaces, cnt) {
   try {
@@ -309,8 +309,8 @@ function applyGroupingRules(faces) {
   };
 }
 
-/**
- * Horizontal Grouping (for base cabinets back-to-back : BSV48 48" x 34.5")
+/**
+ * Horizontal Grouping (for base cabinets back-to-back : BSV48 48" x 34.5")
  */
 function applyHorizontalGrouping(faces) {
   var removeIdxs = [];
@@ -352,8 +352,8 @@ function applyHorizontalGrouping(faces) {
   };
 }
 
-/**
- * Vertical Grouping (For CT3DR or CT2DR SKUs + stacked wall cabinets)
+/**
+ * Vertical Grouping (For CT3DR or CT2DR SKUs + stacked wall cabinets)
  */
 function applyVerticalGrouping(faces) {
   var removeIdxs = [];
@@ -444,8 +444,8 @@ function buildMP3SkinPanelArray(bottomHeight, topHeight, mp3SkinPanelArray) {
   return skinPanelTypeArray;
 }
 
-/**
- * Decide which skin panel pieces are needed for a tall cabinet.
+/**
+ * Decide which skin panel pieces are needed for a tall cabinet.
  */
 function resolveTallCabinetBundle(face) {
   var item = face.itemInfo;
@@ -465,8 +465,8 @@ function resolveTallCabinetBundle(face) {
   return face !== null && face !== void 0 && face.skinPanelSKU ? [face.skinPanelSKU] : [];
 }
 
-/**
- * Converts a face → list of SKUs
+/**
+ * Converts a face → list of SKUs
  */
 function resolveSkinPanelSKU(face) {
   var layout = face.itemInfo.layoutpos;
@@ -476,8 +476,8 @@ function resolveSkinPanelSKU(face) {
   return [face.skinPanelSKU];
 }
 
-/**
- * Make skin panel data with grouping skinPanelSKU & doorStyle
+/**
+ * Make skin panel data with grouping skinPanelSKU & doorStyle
  */
 function buildSkinPanelData(faces) {
   var tempResult = [];

package/package.json

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