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

package/dist/carrier-manager.js

@@ -1,5 +1,11 @@
 import { Model } from '@hatiolab/things-scene';
-const DYING_TIMEOUT = 1000;
+// 사라진 carrier 의 dispose 지연. 같은 macrotask 안에서 holder A 의 사라짐
+// 보고와 holder B 의 등장 보고가 순차로 들어오는 reparent 시나리오 (= 같은
+// frame snapshot 의 여러 record 적용) 를 보호하기 위해 setTimeout(0) 의
+// next-macrotask delay 만 둔다. 과거 1000ms grace 가 있었으나 seek 시 2단계
+// 갱신 (1초 후 carrier 사라짐) 부작용이 명확하고 frame 누락 bouncing 깜빡임
+// 보호 효용은 작다 판단되어 0 으로 단축 (2026-06-09).
+const DYING_TIMEOUT = 0;
 export default class CarrierManager {
     constructor(root) {
         this.carriers = new Map();
@@ -9,49 +15,129 @@ export default class CarrierManager {
     get(carrierName) {
         return this.carriers.get(carrierName);
     }
+    /**
+     * Holder 의 data 변경에 대응해 carrier pool 을 동기화.
+     *
+     * 정책:
+     *   - holder.data 가 *single source of truth*. 대표(CARRIERNAME) +
+     *     ADDITIONS[] 를 하나의 *stack list* 로 정규화한 뒤 before/after 의
+     *     이름 set diff 로 추가/제거/유지 분기.
+     *   - "대표" 와 "ADDITIONS" 는 *holder.data 안의 키 위치 차이일 뿐* 이고,
+     *     carrier 인스턴스끼리는 **종속/그룹 관계 없음 — 모두 독립 동등**.
+     *     stack 안의 위치 (stackIndex) 만 carrier.state 에 주입한다. 2D render
+     *     skip 등의 판정은 *위치 (= parent.components 의 마지막 여부)* 로 한다.
+     *   - 동일 CARRIERNAME 이 *다른 holder* 에 새로 등장하면 reparent (애니메이션).
+     *     *해당 carrier 만 이동* — 같은 stack 의 다른 carrier 는 따라가지 않는다.
+     *   - 사라진 carrier 는 next-macrotask 에 dispose. 같은 macrotask 안에서 다른
+     *     holder 가 같은 이름을 보고하면 cancel 되어 reparent 로 전환.
+     */
     update(holder, after, before) {
-        const afterName = after === null || after === void 0 ? void 0 : after.CARRIERNAME;
-        const beforeName = before === null || before === void 0 ? void 0 : before.CARRIERNAME;
-        // 이전에는 캐리어가 있었는데 새 데이터에는 없다 → dying 후보
-        if (beforeName && (beforeName !== afterName || !afterName)) {
-            const carrier = this.carriers.get(beforeName);
+        const afterStack = this._buildStack(after);
+        const beforeStack = this._buildStack(before);
+        const afterNames = new Set(afterStack.map(i => i.CARRIERNAME));
+        const beforeNames = new Set(beforeStack.map(i => i.CARRIERNAME));
+        // 1) 사라진 것 → dying schedule (자기 holder 의 자식인 carrier 만)
+        for (const name of beforeNames) {
+            if (afterNames.has(name))
+                continue;
+            const carrier = this.carriers.get(name);
             if (carrier && carrier.parent === holder) {
-                this.scheduleDying(beforeName);
+                this.scheduleDying(name);
             }
-            return;
         }
-        if (!afterName) {
-            return;
-        }
-        // dying 상태면 구출
-        const wasDying = this.dyingTimers.has(afterName);
-        this.cancelDying(afterName);
-        const { width, height } = holder.state;
-        let carrier = this.carriers.get(afterName);
-        if (!carrier) {
-            // 새로 생성
-            carrier = Model.compile({
-                id: afterName,
-                type: 'Carrier',
-                left: 0,
-                top: 0,
-                width,
-                height,
-                showText: holder.getState('showCarrierText') || false
-            }, this.root.app);
-            this.carriers.set(afterName, carrier);
-            carrier.data = after;
-            holder.addComponent(carrier, { silent: true });
-        }
-        else if (carrier.parent !== holder && (!beforeName && afterName)) {
-            // CARRIERNAME이 새로 나타남 (이전엔 없었음) → 다른 holder로 이동
-            ;
-            holder.reparent(carrier, { animated: true, duration: 2000, ease: 'inout' });
+        // 2) afterStack 의 *순서대로* 처리 — bottom (ADDITIONS[0]) 부터 top (대표)
+        //    그래야 parent.components 가 자연스럽게 같은 순서로 정렬되어 stack index
+        //    가 일관된다.
+        afterStack.forEach((item, idx) => {
+            const name = item.CARRIERNAME;
+            this.cancelDying(name);
+            let carrier = this.carriers.get(name);
+            const { width, height } = holder.state;
+            if (!carrier) {
+                carrier = Model.compile({
+                    id: name,
+                    type: 'Carrier',
+                    left: 0,
+                    top: 0,
+                    width,
+                    height,
+                    showText: holder.getState('showCarrierText') || false,
+                    stackIndex: idx
+                }, this.root.app);
+                this.carriers.set(name, carrier);
+                carrier.data = item;
+                holder.addComponent(carrier, { silent: true });
+            }
+            else if (carrier.parent !== holder && !beforeNames.has(name)) {
+                // 다른 holder 에 있던 carrier 가 이번 update 에서 *새로 등장* 한 경우만
+                // reparent. before 에도 같은 이름이 있었으면 ping-pong (옛 시점의
+                // 반복 보고) 이므로 trigger 하지 않는다. (F05 의 bouncing 방지)
+                ;
+                holder.reparent(carrier, { animated: true, duration: 2000, ease: 'inout' });
+            }
+            if (carrier.parent === holder) {
+                carrier.setState('stackIndex', idx);
+                carrier.data = item;
+            }
+        });
+        // *_모든 carrier 추가 완료 후* — 각자의 transform 강제 갱신. 한 줄로 처리
+        // 안 되는 이유: cz override 의 offset 계산이 *형제 carrier 의 _realObject.
+        // effectiveDepth 누적*에 의존하는데, 첫 iteration 시점엔 자기 뒤 carrier 의
+        // _realObject 가 아직 없어 offset 이 부족하게 평가될 수 있다. 모두 빌드된
+        // 뒤 한 번 더 갱신해야 적층 정확.
+        afterStack.forEach(item => {
+            var _a, _b;
+            const carrier = this.carriers.get(item.CARRIERNAME);
+            if (carrier && carrier.parent === holder) {
+                ;
+                (_b = (_a = carrier._realObject) === null || _a === void 0 ? void 0 : _a.updateTransform) === null || _b === void 0 ? void 0 : _b.call(_a);
+            }
+        });
+    }
+    /**
+     * data.CARRIERNAME (대표) + data.ADDITIONS[] 를 하나의 stack list 로 정규화.
+     * 적층 순서: ADDITIONS[0..n-1] (bottom → up) + 대표 (top, 맨 마지막).
+     */
+    _buildStack(data) {
+        if (!data)
+            return [];
+        const stack = [];
+        if (Array.isArray(data.ADDITIONS)) {
+            for (const a of data.ADDITIONS) {
+                if (a && typeof a === 'object' && a.CARRIERNAME) {
+                    // 항목 *원본 그대로* — 외부 시스템이 임의 키를 추가로 보낼 수 있고,
+                    // 누락된 4 키는 default 없이 그대로 비워둔다 (carrier.data 에 흘리는
+                    // 가공 최소화 — F03 같은 기존 테스트의 raw shape 기대와도 정합).
+                    stack.push(Object.assign({}, a));
+                }
+            }
         }
-        if (carrier.parent === holder) {
-            carrier.data = after;
+        if (data.CARRIERNAME) {
+            // 대표는 *holder.data 의 carrier 관련 키만 추출* — showText / carrierDepth
+            // 같은 holder 자체 속성은 carrier 로 흘리지 않는다. 명시되지 않은 키는
+            // 생략 (default 안 채움).
+            const repr = { CARRIERNAME: data.CARRIERNAME };
+            if ('CARRIERTYPE' in data)
+                repr.CARRIERTYPE = data.CARRIERTYPE;
+            if ('EMPTYTYPE' in data)
+                repr.EMPTYTYPE = data.EMPTYTYPE;
+            if ('CARRIERSTATUS' in data)
+                repr.CARRIERSTATUS = data.CARRIERSTATUS;
+            stack.push(repr);
         }
+        return stack;
     }
+    /**
+     * carrier dispose 를 *next macrotask* 로 미룬다. 동기 즉시 dispose 가 아닌
+     * 이유: 같은 macrotask 안에서 holder A 의 사라짐 보고가 step 1 에 들어오고
+     * holder B 의 등장 보고가 (별도 carrier-manager.update 호출의) step 2 에
+     * 들어오는 reparent 시나리오를 보호하기 위함. 즉시 dispose 면 step 1 에서
+     * carrier 인스턴스가 파괴돼 step 2 의 reparent 분기가 *새 인스턴스 생성*
+     * 으로 떨어지고, 3D mesh 재구축 + 이동 애니메이션 손실이 발생.
+     *
+     * 같은 macrotask 안에서 cancelDying 호출이 도달하면 clearTimeout 으로
+     * dispose 회수 → reparent 정상.
+     */
     scheduleDying(carrierName) {
         this.cancelDying(carrierName);
         const timer = setTimeout(() => {

package/dist/carrier-manager.js.map

@@ -1 +1 @@
-{"version":3,"file":"carrier-manager.js","sourceRoot":"","sources":["../src/carrier-manager.ts"],"names":[],"mappings":"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","sourcesContent":["import { Model } from '@hatiolab/things-scene'\nimport type Carrier from './carrier'\nimport type MCSCarrierHolder from './mcs-carrier-holder'\n\nconst DYING_TIMEOUT = 1000\n\nexport default class CarrierManager {\n  private carriers: Map<string, Carrier> = new Map()\n  private dyingTimers: Map<string, ReturnType<typeof setTimeout>> = new Map()\n  private root: any\n\n  constructor(root: any) {\n    this.root = root\n  }\n\n  get(carrierName: string): Carrier | undefined {\n    return this.carriers.get(carrierName)\n  }\n\n  update(holder: MCSCarrierHolder, after: Record<string, any>, before: Record<string, any>): void {\n    const afterName = after?.CARRIERNAME\n    const beforeName = before?.CARRIERNAME\n\n    // 이전에는 캐리어가 있었는데 새 데이터에는 없다 → dying 후보\n    if (beforeName && (beforeName !== afterName || !afterName)) {\n      const carrier = this.carriers.get(beforeName)\n      if (carrier && carrier.parent === holder) {\n        this.scheduleDying(beforeName)\n      }\n      return\n    }\n\n    if (!afterName) {\n      return\n    }\n\n    // dying 상태면 구출\n    const wasDying = this.dyingTimers.has(afterName)\n    this.cancelDying(afterName)\n\n    const { width, height } = holder.state\n    let carrier = this.carriers.get(afterName)\n\n    if (!carrier) {\n      // 새로 생성\n      carrier = Model.compile(\n        {\n          id: afterName,\n          type: 'Carrier',\n          left: 0,\n          top: 0,\n          width,\n          height,\n          showText: holder.getState('showCarrierText') || false\n        },\n        this.root.app\n      ) as unknown as Carrier\n\n      this.carriers.set(afterName, carrier)\n      carrier.data = after\n      holder.addComponent(carrier, { silent: true })\n    } else if (carrier.parent !== holder && (!beforeName && afterName)) {\n      // CARRIERNAME이 새로 나타남 (이전엔 없었음) → 다른 holder로 이동\n      ;(holder as any).reparent(carrier, { animated: true, duration: 2000, ease: 'inout' })\n    }\n\n    if (carrier.parent === holder) {\n      carrier.data = after\n    }\n  }\n\n  private scheduleDying(carrierName: string): void {\n    this.cancelDying(carrierName)\n\n    const timer = setTimeout(() => {\n      this.dyingTimers.delete(carrierName)\n\n      const carrier = this.carriers.get(carrierName)\n      if (carrier) {\n        this.carriers.delete(carrierName)\n        if (!carrier.disposed) {\n          carrier.removeSelf(true)\n        }\n      }\n    }, DYING_TIMEOUT)\n\n    this.dyingTimers.set(carrierName, timer)\n  }\n\n  private cancelDying(carrierName: string): void {\n    const timer = this.dyingTimers.get(carrierName)\n    if (timer) {\n      clearTimeout(timer)\n      this.dyingTimers.delete(carrierName)\n    }\n  }\n\n  onCarrierDisposed(carrierName: string): void {\n    this.cancelDying(carrierName)\n    this.carriers.delete(carrierName)\n  }\n\n  dispose(): void {\n    for (const timer of this.dyingTimers.values()) {\n      clearTimeout(timer)\n    }\n    this.dyingTimers.clear()\n\n    for (const carrier of this.carriers.values()) {\n      if (!carrier.disposed) {\n        carrier.removeSelf(true)\n      }\n    }\n\n    this.carriers.clear()\n  }\n}\n"]}
+{"version":3,"file":"carrier-manager.js","sourceRoot":"","sources":["../src/carrier-manager.ts"],"names":[],"mappings":"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","sourcesContent":["import { Model } from '@hatiolab/things-scene'\nimport type Carrier from './carrier'\nimport type MCSCarrierHolder from './mcs-carrier-holder'\n\n// 사라진 carrier 의 dispose 지연. 같은 macrotask 안에서 holder A 의 사라짐\n// 보고와 holder B 의 등장 보고가 순차로 들어오는 reparent 시나리오 (= 같은\n// frame snapshot 의 여러 record 적용) 를 보호하기 위해 setTimeout(0) 의\n// next-macrotask delay 만 둔다. 과거 1000ms grace 가 있었으나 seek 시 2단계\n// 갱신 (1초 후 carrier 사라짐) 부작용이 명확하고 frame 누락 bouncing 깜빡임\n// 보호 효용은 작다 판단되어 0 으로 단축 (2026-06-09).\nconst DYING_TIMEOUT = 0\n\n/**\n * Carrier 가 들고 있는 4 키 묶음. data.CARRIERNAME 의 형제 키 (CARRIERTYPE,\n * EMPTYTYPE, CARRIERSTATUS) 를 한 item 으로 묶는다. holder.data 의 *대표*\n * 와 ADDITIONS 의 *각 항목* 모두 동일 shape 으로 정규화돼 stack diff 에\n * 들어간다.\n *\n * 주의 — 외부 시스템이 ADDITIONS 의 각 항목 키를 다른 이름으로 (예:\n * NAME / TYPE / EMPTY / STATUS) 줄 가능성에 대비해 이 build 함수가 단일\n * 정규화 지점이 된다. 키 매핑 변경은 여기 한 곳만 손대면 된다.\n */\nexport interface CarrierStackItem {\n  CARRIERNAME: string\n  CARRIERTYPE?: string\n  EMPTYTYPE?: string\n  CARRIERSTATUS?: string\n}\n\nexport default class CarrierManager {\n  private carriers: Map<string, Carrier> = new Map()\n  private dyingTimers: Map<string, ReturnType<typeof setTimeout>> = new Map()\n  private root: any\n\n  constructor(root: any) {\n    this.root = root\n  }\n\n  get(carrierName: string): Carrier | undefined {\n    return this.carriers.get(carrierName)\n  }\n\n  /**\n   * Holder 의 data 변경에 대응해 carrier pool 을 동기화.\n   *\n   * 정책:\n   *   - holder.data 가 *single source of truth*. 대표(CARRIERNAME) +\n   *     ADDITIONS[] 를 하나의 *stack list* 로 정규화한 뒤 before/after 의\n   *     이름 set diff 로 추가/제거/유지 분기.\n   *   - \"대표\" 와 \"ADDITIONS\" 는 *holder.data 안의 키 위치 차이일 뿐* 이고,\n   *     carrier 인스턴스끼리는 **종속/그룹 관계 없음 — 모두 독립 동등**.\n   *     stack 안의 위치 (stackIndex) 만 carrier.state 에 주입한다. 2D render\n   *     skip 등의 판정은 *위치 (= parent.components 의 마지막 여부)* 로 한다.\n   *   - 동일 CARRIERNAME 이 *다른 holder* 에 새로 등장하면 reparent (애니메이션).\n   *     *해당 carrier 만 이동* — 같은 stack 의 다른 carrier 는 따라가지 않는다.\n   *   - 사라진 carrier 는 next-macrotask 에 dispose. 같은 macrotask 안에서 다른\n   *     holder 가 같은 이름을 보고하면 cancel 되어 reparent 로 전환.\n   */\n  update(holder: MCSCarrierHolder, after: Record<string, any>, before: Record<string, any>): void {\n    const afterStack = this._buildStack(after)\n    const beforeStack = this._buildStack(before)\n\n    const afterNames = new Set(afterStack.map(i => i.CARRIERNAME))\n    const beforeNames = new Set(beforeStack.map(i => i.CARRIERNAME))\n\n    // 1) 사라진 것 → dying schedule (자기 holder 의 자식인 carrier 만)\n    for (const name of beforeNames) {\n      if (afterNames.has(name)) continue\n      const carrier = this.carriers.get(name)\n      if (carrier && carrier.parent === holder) {\n        this.scheduleDying(name)\n      }\n    }\n\n    // 2) afterStack 의 *순서대로* 처리 — bottom (ADDITIONS[0]) 부터 top (대표)\n    //    그래야 parent.components 가 자연스럽게 같은 순서로 정렬되어 stack index\n    //    가 일관된다.\n    afterStack.forEach((item, idx) => {\n      const name = item.CARRIERNAME\n      this.cancelDying(name)\n\n      let carrier = this.carriers.get(name)\n      const { width, height } = holder.state\n\n      if (!carrier) {\n        carrier = Model.compile(\n          {\n            id: name,\n            type: 'Carrier',\n            left: 0,\n            top: 0,\n            width,\n            height,\n            showText: holder.getState('showCarrierText') || false,\n            stackIndex: idx\n          },\n          this.root.app\n        ) as unknown as Carrier\n\n        this.carriers.set(name, carrier)\n        carrier.data = item\n        holder.addComponent(carrier, { silent: true })\n      } else if (carrier.parent !== holder && !beforeNames.has(name)) {\n        // 다른 holder 에 있던 carrier 가 이번 update 에서 *새로 등장* 한 경우만\n        // reparent. before 에도 같은 이름이 있었으면 ping-pong (옛 시점의\n        // 반복 보고) 이므로 trigger 하지 않는다. (F05 의 bouncing 방지)\n        ;(holder as any).reparent(carrier, { animated: true, duration: 2000, ease: 'inout' })\n      }\n\n      if (carrier.parent === holder) {\n        carrier.setState('stackIndex', idx)\n        carrier.data = item\n      }\n    })\n\n    // *_모든 carrier 추가 완료 후* — 각자의 transform 강제 갱신. 한 줄로 처리\n    // 안 되는 이유: cz override 의 offset 계산이 *형제 carrier 의 _realObject.\n    // effectiveDepth 누적*에 의존하는데, 첫 iteration 시점엔 자기 뒤 carrier 의\n    // _realObject 가 아직 없어 offset 이 부족하게 평가될 수 있다. 모두 빌드된\n    // 뒤 한 번 더 갱신해야 적층 정확.\n    afterStack.forEach(item => {\n      const carrier = this.carriers.get(item.CARRIERNAME)\n      if (carrier && carrier.parent === holder) {\n        ;(carrier as any)._realObject?.updateTransform?.()\n      }\n    })\n  }\n\n  /**\n   * data.CARRIERNAME (대표) + data.ADDITIONS[] 를 하나의 stack list 로 정규화.\n   * 적층 순서: ADDITIONS[0..n-1] (bottom → up) + 대표 (top, 맨 마지막).\n   */\n  private _buildStack(data: any): CarrierStackItem[] {\n    if (!data) return []\n\n    const stack: CarrierStackItem[] = []\n\n    if (Array.isArray(data.ADDITIONS)) {\n      for (const a of data.ADDITIONS) {\n        if (a && typeof a === 'object' && a.CARRIERNAME) {\n          // 항목 *원본 그대로* — 외부 시스템이 임의 키를 추가로 보낼 수 있고,\n          // 누락된 4 키는 default 없이 그대로 비워둔다 (carrier.data 에 흘리는\n          // 가공 최소화 — F03 같은 기존 테스트의 raw shape 기대와도 정합).\n          stack.push({ ...a } as CarrierStackItem)\n        }\n      }\n    }\n\n    if (data.CARRIERNAME) {\n      // 대표는 *holder.data 의 carrier 관련 키만 추출* — showText / carrierDepth\n      // 같은 holder 자체 속성은 carrier 로 흘리지 않는다. 명시되지 않은 키는\n      // 생략 (default 안 채움).\n      const repr: any = { CARRIERNAME: data.CARRIERNAME }\n      if ('CARRIERTYPE' in data) repr.CARRIERTYPE = data.CARRIERTYPE\n      if ('EMPTYTYPE' in data) repr.EMPTYTYPE = data.EMPTYTYPE\n      if ('CARRIERSTATUS' in data) repr.CARRIERSTATUS = data.CARRIERSTATUS\n      stack.push(repr)\n    }\n\n    return stack\n  }\n\n  /**\n   * carrier dispose 를 *next macrotask* 로 미룬다. 동기 즉시 dispose 가 아닌\n   * 이유: 같은 macrotask 안에서 holder A 의 사라짐 보고가 step 1 에 들어오고\n   * holder B 의 등장 보고가 (별도 carrier-manager.update 호출의) step 2 에\n   * 들어오는 reparent 시나리오를 보호하기 위함. 즉시 dispose 면 step 1 에서\n   * carrier 인스턴스가 파괴돼 step 2 의 reparent 분기가 *새 인스턴스 생성*\n   * 으로 떨어지고, 3D mesh 재구축 + 이동 애니메이션 손실이 발생.\n   *\n   * 같은 macrotask 안에서 cancelDying 호출이 도달하면 clearTimeout 으로\n   * dispose 회수 → reparent 정상.\n   */\n  private scheduleDying(carrierName: string): void {\n    this.cancelDying(carrierName)\n\n    const timer = setTimeout(() => {\n      this.dyingTimers.delete(carrierName)\n\n      const carrier = this.carriers.get(carrierName)\n      if (carrier) {\n        this.carriers.delete(carrierName)\n        if (!carrier.disposed) {\n          carrier.removeSelf(true)\n        }\n      }\n    }, DYING_TIMEOUT)\n\n    this.dyingTimers.set(carrierName, timer)\n  }\n\n  private cancelDying(carrierName: string): void {\n    const timer = this.dyingTimers.get(carrierName)\n    if (timer) {\n      clearTimeout(timer)\n      this.dyingTimers.delete(carrierName)\n    }\n  }\n\n  onCarrierDisposed(carrierName: string): void {\n    this.cancelDying(carrierName)\n    this.carriers.delete(carrierName)\n  }\n\n  dispose(): void {\n    for (const timer of this.dyingTimers.values()) {\n      clearTimeout(timer)\n    }\n    this.dyingTimers.clear()\n\n    for (const carrier of this.carriers.values()) {\n      if (!carrier.disposed) {\n        carrier.removeSelf(true)\n      }\n    }\n\n    this.carriers.clear()\n  }\n}\n"]}

package/dist/carrier.js

@@ -48,7 +48,11 @@ let Carrier = class Carrier extends MCSStatusMixin(ParentObjectMixin(Shape)) {
     added(parent) {
         var _a, _b, _c;
         super.added(parent);
-        // 새 부모에 맞춰 크기 및 상태 갱신
+        // 새 부모에 맞춰 크기 및 상태 갱신 — width/height 만. depth 는 *절대로
+        // 건드리지 않는다*. machine-3d.ts 의 CARRIER_CONFIG + MCSRealObject3D.
+        // effectiveDepth 가 depthRatio(0.5) × min(w,h) 로 자동 결정한다.
+        // 여기서 state.depth 를 명시 set 하면 그 resolution chain 의 step 1 에
+        // 걸려 본래 두께가 덮어써진다 (= 사용자 호소 "두께가 줄어들었다" 의 원인).
         if (parent) {
             const { width, height } = parent.state || {};
             if (width && height) {
@@ -229,6 +233,17 @@ let Carrier = class Carrier extends MCSStatusMixin(ParentObjectMixin(Shape)) {
         if (!CARRIERNAME) {
             return;
         }
+        // 2D 에서는 stack 의 *맨 위 (= parent.components 의 마지막)* 1개만 그린다.
+        // ADDITIONS 의 carrier 들도 인스턴스로는 살아있어 조회/reparent 가 가능하지만
+        // 2D 시각에는 노출하지 않는다 — 정책: "2D 는 현행처럼" (대표 1개만).
+        // 판단 기준은 *위치* — carrier 간 그룹/종속 정보는 두지 않는다.
+        const parent = this.parent;
+        if (parent && parent.components && parent.components.length > 1) {
+            const siblings = parent.components;
+            if (siblings[siblings.length - 1] !== this) {
+                return;
+            }
+        }
         const { width, height } = this.bounds;
         const path = this.path;
         const round = Math.round(Math.min(width, height) * 0.1);

package/dist/carrier.js.map

@@ -1 +1 @@
-{"version":3,"file":"carrier.js","sourceRoot":"","sources":["../src/carrier.ts"],"names":[],"mappings":"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","sourcesContent":["import JSON5 from 'json5'\nimport { getPopupData } from '@fmsim/api'\n\nimport { BOUNDS, Component, ComponentNature, Properties, Shape, sceneComponent } from '@hatiolab/things-scene'\nimport { ANIMATION_DEFAULT, AnimationPreset, AnimationConfig } from './features/animation-default.js'\nimport { ParentObjectMixin } from './features/parent-object-mixin.js'\nimport { LEGEND_CARRIER, Legend } from './features/mcs-status-default.js'\nimport { MCSStatusMixin } from './features/mcs-status-mixin.js'\n\nconst NATURE: ComponentNature = {\n  mutable: false,\n  resizable: false,\n  rotatable: false\n}\n\n/**\n * Feature flag — keep status text (F / E / X) screen-axis-aligned even\n * when the carrier (or its parent holder, or an in-flight reparent\n * tween) is rotated. Counter-rotates ONLY the text; the polygon path\n * still rotates with the carrier as before.\n *\n * ROLLBACK procedure (if customer decides to revert):\n *   1. Flip this flag to `false`           — text rotates with carrier again.\n *   2. Or delete this constant and the     — fully strip the feature: keep\n *      `if (STATUS_TEXT_COUNTER_ROTATE)`     only the `else` branch in\n *      branch in `render()`.                 `render()` (the original code).\n */\nconst STATUS_TEXT_COUNTER_ROTATE = true\n\n@sceneComponent('Carrier')\nexport default class Carrier extends MCSStatusMixin(ParentObjectMixin(Shape)) {\n  static get nature() {\n    return NATURE\n  }\n\n  get decorators() {\n    return ['decotag']\n  }\n\n  get path() {\n    if (!this.parent) {\n      return []\n    }\n\n    const { left, top, width, height } = this.calculateShrunkRectangle(this.parent.bounds)\n\n    return [\n      { x: left, y: top },\n      { x: left + width / 2, y: top },\n      { x: left + width, y: top + height / 2 },\n      { x: left + width, y: top + height },\n      { x: left, y: top + height }\n    ]\n  }\n\n  set path(path) {}\n\n\n  added(parent: any) {\n    super.added(parent)\n\n    // 새 부모에 맞춰 크기 및 상태 갱신\n    if (parent) {\n      const { width, height } = parent.state || {}\n      if (width && height) {\n        this.set({ width, height })\n      }\n    }\n\n    this.syncStateFromData()\n\n    // 3D 오브젝트 최초 생성 (동기적 — reparent()에서 _realObject 필요)\n    if ((this.root as any)?.threed && !this._realObject) {\n      ;(this.root as any).model_layer?._threeCapability?.addObject(this)\n    }\n\n    // reparent 애니메이션은 things-scene의 reparent()가 처리\n  }\n\n  /**\n   * data로부터 carrier 상태를 동기화 (생성 시, 부모 변경 시 공통 사용)\n   */\n  private syncStateFromData(): void {\n    const { CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS } = this.data || {}\n\n    this.setState('id', CARRIERNAME)\n    this.setState('EMPTYTYPE', EMPTYTYPE)\n    this.setState('CARRIERTYPE', CARRIERTYPE)\n    this.setState('CARRIERSTATUS', CARRIERSTATUS)\n  }\n\n  onchangeData(after: Record<string, any>, before: Record<string, any>): void {\n    const { CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS } = this.data || {}\n\n    this.setState('id', CARRIERNAME)\n    this.setState('EMPTYTYPE', EMPTYTYPE)\n    this.setState('CARRIERTYPE', CARRIERTYPE)\n    this.setState('CARRIERSTATUS', CARRIERSTATUS)\n\n    // TODO carrierstatus에 따라서 매핑되는 애니메이션 테마 수행\n    if (after.data?.CARRIERSTATUS !== before.data?.CARRIERSTATUS) {\n      const { CARRIERSTATUS: lastCarrierStatus } = before.data || {}\n      const lastAnimationConfig = lastCarrierStatus && this.getAnimationConfig(lastCarrierStatus)\n\n      if (lastAnimationConfig) {\n        let { animation, decorator, border, arrow } = lastAnimationConfig\n        if (animation) {\n          this.resetAnimation()\n          this.setState('animation', {\n            oncreate: null\n          })\n        }\n\n        if (decorator || border || arrow) {\n          this.trigger('deco-off')\n        }\n      }\n\n      const animationConfig = this.getAnimationConfig(this.getState('CARRIERSTATUS'))\n\n      if (animationConfig) {\n        let { animation, decorator, border, arrow } = animationConfig\n        if (animation) {\n          this.resetAnimation()\n          this.setState('animation', {\n            oncreate: animation\n          })\n          this.started = true\n        }\n\n        if (decorator) {\n          this.trigger('deco-icon-off')\n          this.trigger('deco-icon', decorator)\n        }\n\n        if (border) {\n          this.trigger('deco-border-off')\n          this.trigger('deco-border', border)\n        }\n\n        if (arrow) {\n          this.trigger('deco-arrow-off')\n          this.trigger('deco-arrow', arrow)\n        }\n      }\n    }\n  }\n\n  get status() {\n    return this.getState('EMPTYTYPE')\n  }\n\n  get legend(): Legend {\n    const { carrierLegendName } = this.parent?.state || {}\n\n    if (carrierLegendName) {\n      return (this.root as any)?.style[carrierLegendName]\n    }\n\n    return (this.root as any)?.carrierLegendTheme || LEGEND_CARRIER\n  }\n\n  getAnimationConfig(carrierStatus): AnimationConfig | null {\n    const config = this.animationPreset[carrierStatus || 'default']\n    return (config as AnimationConfig) || null\n  }\n\n  get animationPreset(): AnimationPreset {\n    const carrierAnimationName = this.parent?.state.carrierAnimationName || \n                                this.root?.rootModel.state.carrierAnimationName || ''\n\n    if (carrierAnimationName) {\n      // 캐시에서 먼저 확인\n      if (!(this.root as any)._animationConfigCache) {\n        (this.root as any)._animationConfigCache = new Map<string, AnimationPreset>()\n      }\n\n      const cached = (this.root as any)._animationConfigCache.get(carrierAnimationName)\n      if (cached) {\n        return cached\n      }\n\n      // 캐시에 없으면 파싱하고 저장\n      let theme = (this.root as any)?.style?.[carrierAnimationName]\n      if (theme) {\n        // theme이 string이면 먼저 파싱\n        if (typeof theme === 'string') {\n          try { theme = JSON5.parse(theme) } catch { return ANIMATION_DEFAULT }\n        }\n        if (typeof theme !== 'object' || theme === null) return ANIMATION_DEFAULT\n\n        // 문자열 형태의 설정들을 미리 파싱\n        const parsedTheme = {}\n        for (const [status, config] of Object.entries(theme)) {\n          if (typeof config === 'string' && config.trim()) {\n            try {\n              parsedTheme[status] = JSON5.parse(config)\n            } catch (e) {\n              console.error('JSON5 parse error:', e, 'input:', JSON.stringify(config), 'status:', status, 'theme:', carrierAnimationName)\n              parsedTheme[status] = config\n            }\n          } else {\n            parsedTheme[status] = config\n          }\n        }\n        \n        ;(this.root as any)._animationConfigCache.set(carrierAnimationName, parsedTheme)\n        return parsedTheme\n      }\n      \n      return ANIMATION_DEFAULT\n    } else {\n      return ANIMATION_DEFAULT\n    }\n  }\n\n  get hasTextProperty() {\n    return this.getState('showText') || false\n  }\n\n  calculateShrunkRectangle(originalRect: BOUNDS): BOUNDS {\n    const shrunkRect: BOUNDS = { ...originalRect }\n\n    shrunkRect.left = originalRect.width * 0.1\n    shrunkRect.width *= 0.8\n\n    shrunkRect.top = originalRect.height * 0.1\n    shrunkRect.height *= 0.8\n\n    return shrunkRect\n  }\n\n  contains(x, y) {\n    const { id: CARRIERNAME } = this.state || {}\n\n    if (!CARRIERNAME) {\n      return false\n    }\n\n    const rect = this.bounds\n    x -= rect.left\n    y -= rect.top\n\n    if (x < 0 || y < 0 || x > rect.width || y > rect.height) {\n      return false\n    }\n\n    // 윗변 중앙 좌표\n    const topCenterX = rect.width / 2\n    const topCenterY = 0\n\n    // 오른쪽 변 중앙 좌표\n    const rightCenterX = rect.width\n    const rightCenterY = rect.height / 2\n\n    // 기울기 m = (y2 - y1) / (x2 - x1)\n    const m = (rightCenterY - topCenterY) / (rightCenterX - topCenterX)\n\n    // y 절편 b = y - mx\n    const b = topCenterY - m * topCenterX\n\n    // 점(px, py)이 선 아래(좌하부)에 있는지 확인\n    return y > m * x + b\n  }\n\n  render(ctx: CanvasRenderingContext2D) {\n    const { EMPTYTYPE, id: CARRIERNAME, showText } = this.state\n\n    if (!CARRIERNAME) {\n      return\n    }\n\n    const { width, height } = this.bounds\n    const path = this.path\n    const round = Math.round(Math.min(width, height) * 0.1)\n    const lineWidth = round > 5 ? 1 : 0.5\n\n    ctx.beginPath()\n    ctx.moveTo(path[0].x, path[0].y)\n\n    path.slice(1).forEach(({ x, y }) => {\n      ctx.lineTo(x, y)\n    })\n\n    ctx.closePath()\n\n    ctx.lineWidth = lineWidth\n    ctx.fillStyle = this.statusColor || 'transparent'\n    ctx.strokeStyle = this.auxColor || 'transparent'\n\n    ctx.fill()\n    ctx.stroke()\n\n    if (showText) {\n      const text = EMPTYTYPE == 'FULL' ? 'F' : EMPTYTYPE == 'EMPTY' ? 'E' : EMPTYTYPE == 'EMPTYEMPTY' ? 'X' : ''\n\n      if (text) {\n        const { x: cx, y: cy } = this.center\n\n        ctx.fillStyle = 'black'\n        ctx.font = `normal ${Math.round(round * 8)}px Arial`\n        ctx.textAlign = 'center'\n        ctx.textBaseline = 'middle'\n\n        if (STATUS_TEXT_COUNTER_ROTATE) {\n          // Counter-rotate so the status label stays screen-axis-aligned\n          // even when the carrier (or its parent holder, or an in-flight\n          // reparent transition) is rotated. Reading the current cumulative\n          // rotation from the canvas transform handles all sources of\n          // rotation uniformly (state.rotation, parent transforms,\n          // animation tweens) — no need to enumerate them.\n          const m = ctx.getTransform()\n          const cumulRotation = Math.atan2(m.b, m.a)\n          ctx.save()\n          ctx.translate(cx, cy)\n          ctx.rotate(-cumulRotation)\n          ctx.fillText(text, -width / 8, height / 8)\n          ctx.restore()\n        } else {\n          // Original — text rotates with the carrier.\n          ctx.fillText(text, cx - width / 8, cy + height / 8)\n        }\n      }\n    }\n  }\n\n  dispose(): void {\n    ;(this.root as any)?.carrierManager?.onCarrierDisposed(this.state.id)\n\n    super.dispose()\n  }\n\n  async detailInfo() {\n    const { type, id } = this.state\n\n    if (!id) {\n      return\n    }\n\n    return await getPopupData(type, id)\n  }\n}\n"]}
+{"version":3,"file":"carrier.js","sourceRoot":"","sources":["../src/carrier.ts"],"names":[],"mappings":"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","sourcesContent":["import JSON5 from 'json5'\nimport { getPopupData } from '@fmsim/api'\n\nimport { BOUNDS, Component, ComponentNature, Properties, Shape, sceneComponent } from '@hatiolab/things-scene'\nimport { ANIMATION_DEFAULT, AnimationPreset, AnimationConfig } from './features/animation-default.js'\nimport { ParentObjectMixin } from './features/parent-object-mixin.js'\nimport { LEGEND_CARRIER, Legend } from './features/mcs-status-default.js'\nimport { MCSStatusMixin } from './features/mcs-status-mixin.js'\n\nconst NATURE: ComponentNature = {\n  mutable: false,\n  resizable: false,\n  rotatable: false\n}\n\n\n/**\n * Feature flag — keep status text (F / E / X) screen-axis-aligned even\n * when the carrier (or its parent holder, or an in-flight reparent\n * tween) is rotated. Counter-rotates ONLY the text; the polygon path\n * still rotates with the carrier as before.\n *\n * ROLLBACK procedure (if customer decides to revert):\n *   1. Flip this flag to `false`           — text rotates with carrier again.\n *   2. Or delete this constant and the     — fully strip the feature: keep\n *      `if (STATUS_TEXT_COUNTER_ROTATE)`     only the `else` branch in\n *      branch in `render()`.                 `render()` (the original code).\n */\nconst STATUS_TEXT_COUNTER_ROTATE = true\n\n@sceneComponent('Carrier')\nexport default class Carrier extends MCSStatusMixin(ParentObjectMixin(Shape)) {\n  static get nature() {\n    return NATURE\n  }\n\n  get decorators() {\n    return ['decotag']\n  }\n\n  get path() {\n    if (!this.parent) {\n      return []\n    }\n\n    const { left, top, width, height } = this.calculateShrunkRectangle(this.parent.bounds)\n\n    return [\n      { x: left, y: top },\n      { x: left + width / 2, y: top },\n      { x: left + width, y: top + height / 2 },\n      { x: left + width, y: top + height },\n      { x: left, y: top + height }\n    ]\n  }\n\n  set path(path) {}\n\n\n  added(parent: any) {\n    super.added(parent)\n\n    // 새 부모에 맞춰 크기 및 상태 갱신 — width/height 만. depth 는 *절대로\n    // 건드리지 않는다*. machine-3d.ts 의 CARRIER_CONFIG + MCSRealObject3D.\n    // effectiveDepth 가 depthRatio(0.5) × min(w,h) 로 자동 결정한다.\n    // 여기서 state.depth 를 명시 set 하면 그 resolution chain 의 step 1 에\n    // 걸려 본래 두께가 덮어써진다 (= 사용자 호소 \"두께가 줄어들었다\" 의 원인).\n    if (parent) {\n      const { width, height } = parent.state || {}\n      if (width && height) {\n        this.set({ width, height })\n      }\n    }\n\n    this.syncStateFromData()\n\n    // 3D 오브젝트 최초 생성 (동기적 — reparent()에서 _realObject 필요)\n    if ((this.root as any)?.threed && !this._realObject) {\n      ;(this.root as any).model_layer?._threeCapability?.addObject(this)\n    }\n\n    // reparent 애니메이션은 things-scene의 reparent()가 처리\n  }\n\n  /**\n   * data로부터 carrier 상태를 동기화 (생성 시, 부모 변경 시 공통 사용)\n   */\n  private syncStateFromData(): void {\n    const { CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS } = this.data || {}\n\n    this.setState('id', CARRIERNAME)\n    this.setState('EMPTYTYPE', EMPTYTYPE)\n    this.setState('CARRIERTYPE', CARRIERTYPE)\n    this.setState('CARRIERSTATUS', CARRIERSTATUS)\n  }\n\n  onchangeData(after: Record<string, any>, before: Record<string, any>): void {\n    const { CARRIERNAME, CARRIERTYPE = '', EMPTYTYPE, CARRIERSTATUS } = this.data || {}\n\n    this.setState('id', CARRIERNAME)\n    this.setState('EMPTYTYPE', EMPTYTYPE)\n    this.setState('CARRIERTYPE', CARRIERTYPE)\n    this.setState('CARRIERSTATUS', CARRIERSTATUS)\n\n    // TODO carrierstatus에 따라서 매핑되는 애니메이션 테마 수행\n    if (after.data?.CARRIERSTATUS !== before.data?.CARRIERSTATUS) {\n      const { CARRIERSTATUS: lastCarrierStatus } = before.data || {}\n      const lastAnimationConfig = lastCarrierStatus && this.getAnimationConfig(lastCarrierStatus)\n\n      if (lastAnimationConfig) {\n        let { animation, decorator, border, arrow } = lastAnimationConfig\n        if (animation) {\n          this.resetAnimation()\n          this.setState('animation', {\n            oncreate: null\n          })\n        }\n\n        if (decorator || border || arrow) {\n          this.trigger('deco-off')\n        }\n      }\n\n      const animationConfig = this.getAnimationConfig(this.getState('CARRIERSTATUS'))\n\n      if (animationConfig) {\n        let { animation, decorator, border, arrow } = animationConfig\n        if (animation) {\n          this.resetAnimation()\n          this.setState('animation', {\n            oncreate: animation\n          })\n          this.started = true\n        }\n\n        if (decorator) {\n          this.trigger('deco-icon-off')\n          this.trigger('deco-icon', decorator)\n        }\n\n        if (border) {\n          this.trigger('deco-border-off')\n          this.trigger('deco-border', border)\n        }\n\n        if (arrow) {\n          this.trigger('deco-arrow-off')\n          this.trigger('deco-arrow', arrow)\n        }\n      }\n    }\n  }\n\n  get status() {\n    return this.getState('EMPTYTYPE')\n  }\n\n  get legend(): Legend {\n    const { carrierLegendName } = this.parent?.state || {}\n\n    if (carrierLegendName) {\n      return (this.root as any)?.style[carrierLegendName]\n    }\n\n    return (this.root as any)?.carrierLegendTheme || LEGEND_CARRIER\n  }\n\n  getAnimationConfig(carrierStatus): AnimationConfig | null {\n    const config = this.animationPreset[carrierStatus || 'default']\n    return (config as AnimationConfig) || null\n  }\n\n  get animationPreset(): AnimationPreset {\n    const carrierAnimationName = this.parent?.state.carrierAnimationName || \n                                this.root?.rootModel.state.carrierAnimationName || ''\n\n    if (carrierAnimationName) {\n      // 캐시에서 먼저 확인\n      if (!(this.root as any)._animationConfigCache) {\n        (this.root as any)._animationConfigCache = new Map<string, AnimationPreset>()\n      }\n\n      const cached = (this.root as any)._animationConfigCache.get(carrierAnimationName)\n      if (cached) {\n        return cached\n      }\n\n      // 캐시에 없으면 파싱하고 저장\n      let theme = (this.root as any)?.style?.[carrierAnimationName]\n      if (theme) {\n        // theme이 string이면 먼저 파싱\n        if (typeof theme === 'string') {\n          try { theme = JSON5.parse(theme) } catch { return ANIMATION_DEFAULT }\n        }\n        if (typeof theme !== 'object' || theme === null) return ANIMATION_DEFAULT\n\n        // 문자열 형태의 설정들을 미리 파싱\n        const parsedTheme = {}\n        for (const [status, config] of Object.entries(theme)) {\n          if (typeof config === 'string' && config.trim()) {\n            try {\n              parsedTheme[status] = JSON5.parse(config)\n            } catch (e) {\n              console.error('JSON5 parse error:', e, 'input:', JSON.stringify(config), 'status:', status, 'theme:', carrierAnimationName)\n              parsedTheme[status] = config\n            }\n          } else {\n            parsedTheme[status] = config\n          }\n        }\n        \n        ;(this.root as any)._animationConfigCache.set(carrierAnimationName, parsedTheme)\n        return parsedTheme\n      }\n      \n      return ANIMATION_DEFAULT\n    } else {\n      return ANIMATION_DEFAULT\n    }\n  }\n\n  get hasTextProperty() {\n    return this.getState('showText') || false\n  }\n\n  calculateShrunkRectangle(originalRect: BOUNDS): BOUNDS {\n    const shrunkRect: BOUNDS = { ...originalRect }\n\n    shrunkRect.left = originalRect.width * 0.1\n    shrunkRect.width *= 0.8\n\n    shrunkRect.top = originalRect.height * 0.1\n    shrunkRect.height *= 0.8\n\n    return shrunkRect\n  }\n\n  contains(x, y) {\n    const { id: CARRIERNAME } = this.state || {}\n\n    if (!CARRIERNAME) {\n      return false\n    }\n\n    const rect = this.bounds\n    x -= rect.left\n    y -= rect.top\n\n    if (x < 0 || y < 0 || x > rect.width || y > rect.height) {\n      return false\n    }\n\n    // 윗변 중앙 좌표\n    const topCenterX = rect.width / 2\n    const topCenterY = 0\n\n    // 오른쪽 변 중앙 좌표\n    const rightCenterX = rect.width\n    const rightCenterY = rect.height / 2\n\n    // 기울기 m = (y2 - y1) / (x2 - x1)\n    const m = (rightCenterY - topCenterY) / (rightCenterX - topCenterX)\n\n    // y 절편 b = y - mx\n    const b = topCenterY - m * topCenterX\n\n    // 점(px, py)이 선 아래(좌하부)에 있는지 확인\n    return y > m * x + b\n  }\n\n  render(ctx: CanvasRenderingContext2D) {\n    const { EMPTYTYPE, id: CARRIERNAME, showText } = this.state\n\n    if (!CARRIERNAME) {\n      return\n    }\n\n    // 2D 에서는 stack 의 *맨 위 (= parent.components 의 마지막)* 1개만 그린다.\n    // ADDITIONS 의 carrier 들도 인스턴스로는 살아있어 조회/reparent 가 가능하지만\n    // 2D 시각에는 노출하지 않는다 — 정책: \"2D 는 현행처럼\" (대표 1개만).\n    // 판단 기준은 *위치* — carrier 간 그룹/종속 정보는 두지 않는다.\n    const parent = this.parent\n    if (parent && parent.components && parent.components.length > 1) {\n      const siblings = parent.components\n      if (siblings[siblings.length - 1] !== this) {\n        return\n      }\n    }\n\n    const { width, height } = this.bounds\n    const path = this.path\n    const round = Math.round(Math.min(width, height) * 0.1)\n    const lineWidth = round > 5 ? 1 : 0.5\n\n    ctx.beginPath()\n    ctx.moveTo(path[0].x, path[0].y)\n\n    path.slice(1).forEach(({ x, y }) => {\n      ctx.lineTo(x, y)\n    })\n\n    ctx.closePath()\n\n    ctx.lineWidth = lineWidth\n    ctx.fillStyle = this.statusColor || 'transparent'\n    ctx.strokeStyle = this.auxColor || 'transparent'\n\n    ctx.fill()\n    ctx.stroke()\n\n    if (showText) {\n      const text = EMPTYTYPE == 'FULL' ? 'F' : EMPTYTYPE == 'EMPTY' ? 'E' : EMPTYTYPE == 'EMPTYEMPTY' ? 'X' : ''\n\n      if (text) {\n        const { x: cx, y: cy } = this.center\n\n        ctx.fillStyle = 'black'\n        ctx.font = `normal ${Math.round(round * 8)}px Arial`\n        ctx.textAlign = 'center'\n        ctx.textBaseline = 'middle'\n\n        if (STATUS_TEXT_COUNTER_ROTATE) {\n          // Counter-rotate so the status label stays screen-axis-aligned\n          // even when the carrier (or its parent holder, or an in-flight\n          // reparent transition) is rotated. Reading the current cumulative\n          // rotation from the canvas transform handles all sources of\n          // rotation uniformly (state.rotation, parent transforms,\n          // animation tweens) — no need to enumerate them.\n          const m = ctx.getTransform()\n          const cumulRotation = Math.atan2(m.b, m.a)\n          ctx.save()\n          ctx.translate(cx, cy)\n          ctx.rotate(-cumulRotation)\n          ctx.fillText(text, -width / 8, height / 8)\n          ctx.restore()\n        } else {\n          // Original — text rotates with the carrier.\n          ctx.fillText(text, cx - width / 8, cy + height / 8)\n        }\n      }\n    }\n  }\n\n  dispose(): void {\n    ;(this.root as any)?.carrierManager?.onCarrierDisposed(this.state.id)\n\n    super.dispose()\n  }\n\n  async detailInfo() {\n    const { type, id } = this.state\n\n    if (!id) {\n      return\n    }\n\n    return await getPopupData(type, id)\n  }\n}\n"]}

package/dist/factories/machine-3d.js

@@ -590,7 +590,7 @@ class StockerRealObject3D extends MCSRealObject3D {
         this.components3D.add(this.gaugeMesh);
     }
     resolveGauge(data, mode) {
-        var _a, _b;
+        var _a;
         switch (mode) {
             case 'carrier': {
                 const full = Number(data.FULL_CNT) || 0;
@@ -631,7 +631,7 @@ class StockerRealObject3D extends MCSRealObject3D {
                 const max = Number(data.MAXCAPACITY) || 100;
                 const fullup = data.FULLUP === 'T';
                 const usage = Math.round((cur / max) * 100);
-                const legend = ((_b = (_a = this.component.root) === null || _a === void 0 ? void 0 : _a.style) === null || _b === void 0 ? void 0 : _b.LEGEND_CAPACITY) || LEGEND_CAPACITY;
+                const legend = ((_a = this.component.root) === null || _a === void 0 ? void 0 : _a.stockerCapacityLegendTheme) || LEGEND_CAPACITY;
                 const color = fullup ? 'red' : (getValueOnRanges(usage, legend) || '#44aa44');
                 return {
                     segments: [{ ratio: usage / 100, color }],
@@ -684,10 +684,49 @@ register('Shelf', {
 });
 // Carrier: CARRIERSTATUS에 따른 3D 애니메이션 지원
 const CARRIER_CONFIG = Object.assign(Object.assign({}, DEFAULTS), { depthRatio: 0.5, metalness: 0, roughness: 1, defaultColor: 0xf0f0f0, isVisible: (c) => !!c.state.id, sizeRatio: 0.8, texturedTop: true });
+/**
+ * 적층 시 다음 carrier 의 z-position 이 *_이전 carrier 의 effectiveDepth × N*
+ * 만큼 위에 놓인다. N=1 이면 carrier 들이 맞붙어 적층 (기존), N<1 이면 부분
+ * overlap (3D box 들이 겹쳐서 적층). 사용자 의도 — carrier 두께는 두꺼워도
+ * 적층 시 *_compact 하게 보이도록* — N 을 작게.
+ */
+const CARRIER_STACK_STEP_RATIO = 0.9;
 class CarrierRealObject3D extends MCSRealObject3D {
     constructor(component) {
         super(component, CARRIER_CONFIG);
     }
+    /**
+     * cz override — *carrier 자기 결정* 의 적층 위치.
+     * parent.components 안 자기 index 까지의 형제 carrier 들의 effectiveDepth
+     * 누적합을 base cz 위에 더한다. holder 측에 별도 layout 책임을 두지 않고,
+     * carrier 가 자기 stack 위치를 알아서 결정.
+     */
+    get cz() {
+        var _a, _b;
+        const base = super.cz;
+        const parent = this.component.parent;
+        if (!(parent === null || parent === void 0 ? void 0 : parent.components))
+            return base;
+        const siblings = parent.components;
+        const idx = siblings.indexOf(this.component);
+        if (idx <= 0)
+            return base;
+        let offset = 0;
+        for (let i = 0; i < idx; i++) {
+            const ro = (_a = siblings[i]) === null || _a === void 0 ? void 0 : _a._realObject;
+            const eff = Number(ro === null || ro === void 0 ? void 0 : ro.effectiveDepth);
+            const d = Number.isFinite(eff) && eff > 0 ? eff : 1;
+            offset += d * CARRIER_STACK_STEP_RATIO;
+        }
+        // 적층 방향 — placement (= 부모 holder 타입) 에 따라 결정.
+        // OHT 처럼 그리퍼 아래에 매달리는 holder 는 carrier 가 *_아래로_* 누적,
+        // 그 외 (Port / Shelf / Shuttle / Vehicle) 는 위로 누적.
+        // MCSRealObject3D.syncZPosOffset 의 OHT 분기 (-effectiveDepth + halfD) 와
+        // 같은 방향성 일관 적용.
+        const parentType = (_b = parent === null || parent === void 0 ? void 0 : parent.state) === null || _b === void 0 ? void 0 : _b.type;
+        const dir = parentType === 'OHT' ? -1 : 1;
+        return base + dir * offset;
+    }
 }
 registerRealObjectFactory('Carrier', (component) => new CarrierRealObject3D(component));
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━