@fmsim/machine 2.0.0-beta.85 → 2.0.0-beta.87

package/src/mcs-carrier-holder.ts

@@ -1,6 +1,18 @@
 import { themesColorMap, themesAnimationMap } from '@fmsim/api'
 import MCSUnit from './mcs-unit.js'
 
+/**
+ * Holder.data 변경 감지 시 carrierManager 에 전달할 4 키 묶음 + ADDITIONS 배열.
+ * 비교 결과 단 하나라도 다르면 carrierManager.update 호출.
+ */
+const CARRIER_DATA_KEYS = ['CARRIERNAME', 'CARRIERTYPE', 'EMPTYTYPE', 'CARRIERSTATUS'] as const
+
+function additionsChanged(a: any, b: any): boolean {
+  // shallow JSON 비교로 충분 — 각 항목이 4 키 primitive 만 가짐. 깊은 ref 비교
+  // 보다 빠르고 정확. 빈/누락은 같은 '[]' 직렬화로 동치 취급.
+  return JSON.stringify(a?.ADDITIONS ?? []) !== JSON.stringify(b?.ADDITIONS ?? [])
+}
+
 export default class MCSCarrierHolder extends MCSUnit {
   static get properties(): any {
     return [
@@ -26,6 +38,8 @@ export default class MCSCarrierHolder extends MCSUnit {
         label: 'show-carrier-text',
         name: 'showCarrierText'
       }
+      // 적층 두께는 carrier 측 (Carrier.added) 에서 자기 default depth 를 결정.
+      // holder 측에는 별도 carrierDepth 속성을 두지 않는다.
     ]
   }
 
@@ -48,39 +62,38 @@ export default class MCSCarrierHolder extends MCSUnit {
   async ready() {
     super.ready()
 
-    const { CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS } = this.data || {}
-    
-    if(CARRIERNAME) {
-      ;(this.root as any).carrierManager.update(this, {
-        CARRIERNAME,
-        CARRIERTYPE,
-        EMPTYTYPE,
-        CARRIERSTATUS
-      }, undefined)
+    if (this._hasCarrierData(this.data)) {
+      ;(this.root as any).carrierManager.update(this, this.data || {}, undefined)
     }
   }
 
   onchangeData(after: Record<string, any>, before: Record<string, any>): void {
-    // CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS 이 변경되었을 때만 캐리어 관리자에게 알린다.
-    const { CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS } = after.data || {}
-    const { CARRIERNAME: beforeCARRIERNAME, CARRIERTYPE: beforeCARRIERTYPE = '', EMPTYTYPE: beforeEMPTYTYPE, CARRIERSTATUS: beforeCARRIERSTATUS } = before.data || {}
-    if(CARRIERNAME !== beforeCARRIERNAME ||
-      CARRIERTYPE !== beforeCARRIERTYPE ||
-      EMPTYTYPE !== beforeEMPTYTYPE ||
-      CARRIERSTATUS !== beforeCARRIERSTATUS) {
-      ;(this.root as any).carrierManager.update(this, {
-        CARRIERNAME,
-        CARRIERTYPE,
-        EMPTYTYPE,
-        CARRIERSTATUS
-      }, {
-        CARRIERNAME: beforeCARRIERNAME,
-        CARRIERTYPE: beforeCARRIERTYPE,
-        EMPTYTYPE: beforeEMPTYTYPE,
-        CARRIERSTATUS: beforeCARRIERSTATUS
-      })
+    const afterData = after.data || {}
+    const beforeData = before.data || {}
+
+    let changed = false
+    for (const k of CARRIER_DATA_KEYS) {
+      if (afterData[k] !== beforeData[k]) {
+        changed = true
+        break
+      }
+    }
+    if (!changed) {
+      changed = additionsChanged(afterData, beforeData)
+    }
+
+    if (changed) {
+      ;(this.root as any).carrierManager.update(this, afterData, beforeData)
     }
 
     super.onchangeData(after, before)
   }
+
+  /** data 안에 carrier 정보 (대표 또는 ADDITIONS) 가 하나라도 있는지. */
+  private _hasCarrierData(data: any): boolean {
+    if (!data) return false
+    if (data.CARRIERNAME) return true
+    if (Array.isArray(data.ADDITIONS) && data.ADDITIONS.some((a: any) => a?.CARRIERNAME)) return true
+    return false
+  }
 }

package/src/scene/root-container-override.ts

@@ -249,124 +249,59 @@ ModelLayer.prototype.onchange = function (after: any) {
   return _origModelLayerOnchange.call(this, after)
 }
 
-Object.defineProperty(RootContainer.prototype, 'equipmentLegendTheme', {
-  get: function () {
-    const { equipmentLegendName } = this.rootModel.state
-    return equipmentLegendName && this.state.style[equipmentLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'bufferLegendTheme', {
-  get: function () {
-    const { bufferLegendName } = this.rootModel.state
-    return bufferLegendName && this.state.style[bufferLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'agvlineLegendTheme', {
-  get: function () {
-    const { agvlineLegendName } = this.rootModel.state
-    return agvlineLegendName && this.state.style[agvlineLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'ohtlineLegendTheme', {
-  get: function () {
-    const { ohtlineLegendName } = this.rootModel.state
-    return ohtlineLegendName && this.state.style[ohtlineLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'conveyorLegendTheme', {
-  get: function () {
-    const { conveyorLegendName } = this.rootModel.state
-    return conveyorLegendName && this.state.style[conveyorLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'stokerLegendTheme', {
-  get: function () {
-    const { stokerLegendName } = this.rootModel.state
-    return stokerLegendName && this.state.style[stokerLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'agvLegendTheme', {
-  get: function () {
-    const { agvLegendName } = this.rootModel.state
-    return agvLegendName && this.state.style[agvLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'ohtLegendTheme', {
-  get: function () {
-    const { ohtLegendName } = this.rootModel.state
-    return ohtLegendName && this.state.style[ohtLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'shuttleLegendTheme', {
-  get: function () {
-    const { shuttleLegendName } = this.rootModel.state
-    return shuttleLegendName && this.state.style[shuttleLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'craneLegendTheme', {
-  get: function () {
-    const { craneLegendName } = this.rootModel.state
-    return craneLegendName && this.state.style[craneLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'shelfLegendTheme', {
-  get: function () {
-    const { shelfLegendName } = this.rootModel.state
-    return shelfLegendName && this.state.style[shelfLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'portLegendTheme', {
-  get: function () {
-    const { portLegendName } = this.rootModel.state
-    return portLegendName && this.state.style[portLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'carrierLegendTheme', {
-  get: function () {
-    const { carrierLegendName } = this.rootModel.state
-    return carrierLegendName && this.state.style[carrierLegendName]
-  }
-})
-
-Object.defineProperty(RootContainer.prototype, 'carrierAnimationTheme', {
-  get: function () {
-    const { carrierAnimationName } = this.rootModel.state
-    return carrierAnimationName && this.state.style[carrierAnimationName]
-  }
-})
+// === LegendTheme / AnimationTheme value resolve ===
+//
+// rootModel.state.style[name] 에 저장된 legend/animation 값은 보드 직렬화
+// 형태에 따라 (a) 정상 object 또는 (b) JSON 문자열 둘 다로 나타난다 (2026-06-09
+// 진단 — consumer 인 carrier.ts:animationPreset 이 같은 이유로 typeof string
+// 분기 + JSON5.parse 처리하는 선례 존재). LegendTheme getter 들이 이 분기를
+// 두지 않아 string 통과 → getValueOnRanges 매칭 실패 → 3D gauge 의 색상이
+// fallback 으로만 결정되던 증상.
+//
+// fix 는 getter 한 곳에서 lazy parse. WeakMap<state, Map<rawString, parsed>>
+// 으로 *raw string 자체를 key* — 보드 편집으로 raw 가 바뀌면 자연 무효화,
+// 같은 raw 의 반복 lookup 은 O(1). root 가 GC 되면 cache 도 같이 GC.
+const _legendParseCache = new WeakMap<object, Map<string, any>>()
 
-Object.defineProperty(RootContainer.prototype, 'stockerCapacityLegendTheme', {
-  get: function () {
-    const { stockerCapacityLegendName } = this.rootModel.state
-    return stockerCapacityLegendName && this.state.style[stockerCapacityLegendName]
+function parseLegendIfString(state: any, raw: any): any {
+  if (typeof raw !== 'string') return raw
+  let cache = _legendParseCache.get(state)
+  if (!cache) {
+    cache = new Map()
+    _legendParseCache.set(state, cache)
   }
-})
+  if (cache.has(raw)) return cache.get(raw)
+  let parsed: any
+  try { parsed = JSON.parse(raw) } catch { parsed = raw } // parse 실패 시 raw 보존
+  cache.set(raw, parsed)
+  return parsed
+}
 
-Object.defineProperty(RootContainer.prototype, 'zoneCapacityLegendTheme', {
-  get: function () {
-    const { zoneCapacityLegendName } = this.rootModel.state
-    return zoneCapacityLegendName && this.state.style[zoneCapacityLegendName]
+function legendThemeGetter(stateKey: string) {
+  return function (this: any) {
+    const name = this.rootModel.state[stateKey]
+    const raw = name && this.state.style[name]
+    return parseLegendIfString(this.state, raw)
   }
-})
+}
 
-Object.defineProperty(RootContainer.prototype, 'batteryRateLegendTheme', {
-  get: function () {
-    const { batteryRateLegendName } = this.rootModel.state
-    return batteryRateLegendName && this.state.style[batteryRateLegendName]
-  }
-})
+Object.defineProperty(RootContainer.prototype, 'equipmentLegendTheme', { get: legendThemeGetter('equipmentLegendName') })
+Object.defineProperty(RootContainer.prototype, 'bufferLegendTheme', { get: legendThemeGetter('bufferLegendName') })
+Object.defineProperty(RootContainer.prototype, 'agvlineLegendTheme', { get: legendThemeGetter('agvlineLegendName') })
+Object.defineProperty(RootContainer.prototype, 'ohtlineLegendTheme', { get: legendThemeGetter('ohtlineLegendName') })
+Object.defineProperty(RootContainer.prototype, 'conveyorLegendTheme', { get: legendThemeGetter('conveyorLegendName') })
+Object.defineProperty(RootContainer.prototype, 'stokerLegendTheme', { get: legendThemeGetter('stokerLegendName') })
+Object.defineProperty(RootContainer.prototype, 'agvLegendTheme', { get: legendThemeGetter('agvLegendName') })
+Object.defineProperty(RootContainer.prototype, 'ohtLegendTheme', { get: legendThemeGetter('ohtLegendName') })
+Object.defineProperty(RootContainer.prototype, 'shuttleLegendTheme', { get: legendThemeGetter('shuttleLegendName') })
+Object.defineProperty(RootContainer.prototype, 'craneLegendTheme', { get: legendThemeGetter('craneLegendName') })
+Object.defineProperty(RootContainer.prototype, 'shelfLegendTheme', { get: legendThemeGetter('shelfLegendName') })
+Object.defineProperty(RootContainer.prototype, 'portLegendTheme', { get: legendThemeGetter('portLegendName') })
+Object.defineProperty(RootContainer.prototype, 'carrierLegendTheme', { get: legendThemeGetter('carrierLegendName') })
+Object.defineProperty(RootContainer.prototype, 'carrierAnimationTheme', { get: legendThemeGetter('carrierAnimationName') })
+Object.defineProperty(RootContainer.prototype, 'stockerCapacityLegendTheme', { get: legendThemeGetter('stockerCapacityLegendName') })
+Object.defineProperty(RootContainer.prototype, 'zoneCapacityLegendTheme', { get: legendThemeGetter('zoneCapacityLegendName') })
+Object.defineProperty(RootContainer.prototype, 'batteryRateLegendTheme', { get: legendThemeGetter('batteryRateLegendName') })
 
 Object.defineProperty(RootContainer.prototype, 'vehicleAnimation', {
   get: function () {