@fmsim/machine 2.0.0-beta.88 → 2.0.0-beta.89

package/dist/carrier-manager.js

@@ -1,4 +1,5 @@
 import { Model } from '@hatiolab/things-scene';
+import { normalizeCarrierData, MULTI_CARRIER_KEY } from './utils/carrier-data';
 // 사라진 carrier 의 dispose 지연. 같은 macrotask 안에서 holder A 의 사라짐
 // 보고와 holder B 의 등장 보고가 순차로 들어오는 reparent 시나리오 (= 같은
 // frame snapshot 의 여러 record 적용) 를 보호하기 위해 setTimeout(0) 의
@@ -32,6 +33,10 @@ export default class CarrierManager {
      *     holder 가 같은 이름을 보고하면 cancel 되어 reparent 로 전환.
      */
     update(holder, after, before) {
+        // 진입 경계 1회 정규화 — 키 대소문자 무관 + multiCarriers 통일 (idempotent).
+        // 이후 _buildStack / diffing 은 캐노니컬 키를 O(1) 직접 접근으로 읽는다.
+        after = normalizeCarrierData(after);
+        before = normalizeCarrierData(before);
         const afterStack = this._buildStack(after);
         const beforeStack = this._buildStack(before);
         const afterNames = new Set(afterStack.map(i => i.CARRIERNAME));
@@ -95,15 +100,16 @@ export default class CarrierManager {
         });
     }
     /**
-     * data.CARRIERNAME (대표) + data.ADDITIONS[] 를 하나의 stack list 로 정규화.
-     * 적층 순서: ADDITIONS[0..n-1] (bottom → up) + 대표 (top, 맨 마지막).
+     * data.CARRIERNAME (대표) + data.multiCarriers[] 를 하나의 stack list 로 정규화.
+     * 적층 순서: multiCarriers[0..n-1] (bottom → up) + 대표 (top, 맨 마지막).
+     * (data 는 update() 에서 이미 정규화되어 캐노니컬 키 + multiCarriers 로 통일된 상태)
      */
     _buildStack(data) {
         if (!data)
             return [];
         const stack = [];
-        if (Array.isArray(data.ADDITIONS)) {
-            for (const a of data.ADDITIONS) {
+        if (Array.isArray(data[MULTI_CARRIER_KEY])) {
+            for (const a of data[MULTI_CARRIER_KEY]) {
                 if (a && typeof a === 'object' && a.CARRIERNAME) {
                     // 항목 *원본 그대로* — 외부 시스템이 임의 키를 추가로 보낼 수 있고,
                     // 누락된 4 키는 default 없이 그대로 비워둔다 (carrier.data 에 흘리는

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\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"]}
+{"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'\nimport { normalizeCarrierData, MULTI_CARRIER_KEY } from './utils/carrier-data'\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    // 진입 경계 1회 정규화 — 키 대소문자 무관 + multiCarriers 통일 (idempotent).\n    // 이후 _buildStack / diffing 은 캐노니컬 키를 O(1) 직접 접근으로 읽는다.\n    after = normalizeCarrierData(after)\n    before = normalizeCarrierData(before)\n\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.multiCarriers[] 를 하나의 stack list 로 정규화.\n   * 적층 순서: multiCarriers[0..n-1] (bottom → up) + 대표 (top, 맨 마지막).\n   * (data 는 update() 에서 이미 정규화되어 캐노니컬 키 + multiCarriers 로 통일된 상태)\n   */\n  private _buildStack(data: any): CarrierStackItem[] {\n    if (!data) return []\n\n    const stack: CarrierStackItem[] = []\n\n    if (Array.isArray(data[MULTI_CARRIER_KEY])) {\n      for (const a of data[MULTI_CARRIER_KEY]) {\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/mcs-carrier-holder.js

@@ -1,15 +1,16 @@
 import { themesColorMap, themesAnimationMap } from '@fmsim/api';
 import MCSUnit from './mcs-unit.js';
+import { normalizeCarrierData, MULTI_CARRIER_KEY } from './utils/carrier-data';
 /**
- * Holder.data 변경 감지 시 carrierManager 에 전달할 4 키 묶음 + ADDITIONS 배열.
- * 비교 결과 단 하나라도 다르면 carrierManager.update 호출.
+ * Holder.data 변경 감지 시 carrierManager 에 전달할 4 키 묶음 + multiCarriers 배열.
+ * 비교 결과 단 하나라도 다르면 carrierManager.update 호출. (정규화된 캐노니컬 데이터로 비교)
  */
 const CARRIER_DATA_KEYS = ['CARRIERNAME', 'CARRIERTYPE', 'EMPTYTYPE', 'CARRIERSTATUS'];
-function additionsChanged(a, b) {
+function multiCarriersChanged(a, b) {
     var _a, _b;
     // shallow JSON 비교로 충분 — 각 항목이 4 키 primitive 만 가짐. 깊은 ref 비교
     // 보다 빠르고 정확. 빈/누락은 같은 '[]' 직렬화로 동치 취급.
-    return JSON.stringify((_a = a === null || a === void 0 ? void 0 : a.ADDITIONS) !== null && _a !== void 0 ? _a : []) !== JSON.stringify((_b = b === null || b === void 0 ? void 0 : b.ADDITIONS) !== null && _b !== void 0 ? _b : []);
+    return JSON.stringify((_a = a === null || a === void 0 ? void 0 : a[MULTI_CARRIER_KEY]) !== null && _a !== void 0 ? _a : []) !== JSON.stringify((_b = b === null || b === void 0 ? void 0 : b[MULTI_CARRIER_KEY]) !== null && _b !== void 0 ? _b : []);
 }
 export default class MCSCarrierHolder extends MCSUnit {
     static get properties() {
@@ -60,8 +61,9 @@ export default class MCSCarrierHolder extends MCSUnit {
         }
     }
     onchangeData(after, before) {
-        const afterData = after.data || {};
-        const beforeData = before.data || {};
+        // 진입 경계 1회 정규화 — 키 대소문자 무관 + multiCarriers 통일. 이후 비교/update 는 캐노니컬 O(1).
+        const afterData = normalizeCarrierData(after.data || {});
+        const beforeData = normalizeCarrierData(before.data || {});
         let changed = false;
         for (const k of CARRIER_DATA_KEYS) {
             if (afterData[k] !== beforeData[k]) {
@@ -70,7 +72,7 @@ export default class MCSCarrierHolder extends MCSUnit {
             }
         }
         if (!changed) {
-            changed = additionsChanged(afterData, beforeData);
+            changed = multiCarriersChanged(afterData, beforeData);
         }
         if (changed) {
             ;
@@ -78,13 +80,14 @@ export default class MCSCarrierHolder extends MCSUnit {
         }
         super.onchangeData(after, before);
     }
-    /** data 안에 carrier 정보 (대표 또는 ADDITIONS) 가 하나라도 있는지. */
-    _hasCarrierData(data) {
+    /** data 안에 carrier 정보 (대표 또는 multiCarriers) 가 하나라도 있는지. (정규화 후 판정) */
+    _hasCarrierData(raw) {
+        const data = normalizeCarrierData(raw);
         if (!data)
             return false;
         if (data.CARRIERNAME)
             return true;
-        if (Array.isArray(data.ADDITIONS) && data.ADDITIONS.some((a) => a === null || a === void 0 ? void 0 : a.CARRIERNAME))
+        if (Array.isArray(data[MULTI_CARRIER_KEY]) && data[MULTI_CARRIER_KEY].some((a) => a === null || a === void 0 ? void 0 : a.CARRIERNAME))
             return true;
         return false;
     }

package/dist/mcs-carrier-holder.js.map

@@ -1 +1 @@
-{"version":3,"file":"mcs-carrier-holder.js","sourceRoot":"","sources":["../src/mcs-carrier-holder.ts"],"names":[],"mappings":"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","sourcesContent":["import { themesColorMap, themesAnimationMap } from '@fmsim/api'\nimport MCSUnit from './mcs-unit.js'\n\n/**\n * Holder.data 변경 감지 시 carrierManager 에 전달할 4 키 묶음 + ADDITIONS 배열.\n * 비교 결과 단 하나라도 다르면 carrierManager.update 호출.\n */\nconst CARRIER_DATA_KEYS = ['CARRIERNAME', 'CARRIERTYPE', 'EMPTYTYPE', 'CARRIERSTATUS'] as const\n\nfunction additionsChanged(a: any, b: any): boolean {\n  // shallow JSON 비교로 충분 — 각 항목이 4 키 primitive 만 가짐. 깊은 ref 비교\n  // 보다 빠르고 정확. 빈/누락은 같은 '[]' 직렬화로 동치 취급.\n  return JSON.stringify(a?.ADDITIONS ?? []) !== JSON.stringify(b?.ADDITIONS ?? [])\n}\n\nexport default class MCSCarrierHolder extends MCSUnit {\n  static get properties(): any {\n    return [\n      ...MCSUnit.properties,\n      {\n        type: 'select',\n        label: 'carrier-legend-name',\n        name: 'carrierLegendName',\n        property: {\n          options: themesColorMap\n        }\n      },\n      {\n        type: 'select',\n        label: 'carrier-animation-name',\n        name: 'carrierAnimationName',\n        property: {\n          options: themesAnimationMap\n        }\n      },\n      {\n        type: 'boolean',\n        label: 'show-carrier-text',\n        name: 'showCarrierText'\n      }\n      // 적층 두께는 carrier 측 (Carrier.added) 에서 자기 default depth 를 결정.\n      // holder 측에는 별도 carrierDepth 속성을 두지 않는다.\n    ]\n  }\n\n  get showOverflow() {\n    return true\n  }\n\n  get hierarchy() {\n    return {\n      ...super.hierarchy,\n      components: []\n    }\n  }\n\n  dispose(): void {\n    ;(this.root as any)?.carrierManager?.update(this, {}, this.data)\n    super.dispose()\n  }\n\n  async ready() {\n    super.ready()\n\n    if (this._hasCarrierData(this.data)) {\n      ;(this.root as any).carrierManager.update(this, this.data || {}, undefined)\n    }\n  }\n\n  onchangeData(after: Record<string, any>, before: Record<string, any>): void {\n    const afterData = after.data || {}\n    const beforeData = before.data || {}\n\n    let changed = false\n    for (const k of CARRIER_DATA_KEYS) {\n      if (afterData[k] !== beforeData[k]) {\n        changed = true\n        break\n      }\n    }\n    if (!changed) {\n      changed = additionsChanged(afterData, beforeData)\n    }\n\n    if (changed) {\n      ;(this.root as any).carrierManager.update(this, afterData, beforeData)\n    }\n\n    super.onchangeData(after, before)\n  }\n\n  /** data 안에 carrier 정보 (대표 또는 ADDITIONS) 가 하나라도 있는지. */\n  private _hasCarrierData(data: any): boolean {\n    if (!data) return false\n    if (data.CARRIERNAME) return true\n    if (Array.isArray(data.ADDITIONS) && data.ADDITIONS.some((a: any) => a?.CARRIERNAME)) return true\n    return false\n  }\n}\n"]}
+{"version":3,"file":"mcs-carrier-holder.js","sourceRoot":"","sources":["../src/mcs-carrier-holder.ts"],"names":[],"mappings":"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","sourcesContent":["import { themesColorMap, themesAnimationMap } from '@fmsim/api'\nimport MCSUnit from './mcs-unit.js'\nimport { normalizeCarrierData, MULTI_CARRIER_KEY } from './utils/carrier-data'\n\n/**\n * Holder.data 변경 감지 시 carrierManager 에 전달할 4 키 묶음 + multiCarriers 배열.\n * 비교 결과 단 하나라도 다르면 carrierManager.update 호출. (정규화된 캐노니컬 데이터로 비교)\n */\nconst CARRIER_DATA_KEYS = ['CARRIERNAME', 'CARRIERTYPE', 'EMPTYTYPE', 'CARRIERSTATUS'] as const\n\nfunction multiCarriersChanged(a: any, b: any): boolean {\n  // shallow JSON 비교로 충분 — 각 항목이 4 키 primitive 만 가짐. 깊은 ref 비교\n  // 보다 빠르고 정확. 빈/누락은 같은 '[]' 직렬화로 동치 취급.\n  return JSON.stringify(a?.[MULTI_CARRIER_KEY] ?? []) !== JSON.stringify(b?.[MULTI_CARRIER_KEY] ?? [])\n}\n\nexport default class MCSCarrierHolder extends MCSUnit {\n  static get properties(): any {\n    return [\n      ...MCSUnit.properties,\n      {\n        type: 'select',\n        label: 'carrier-legend-name',\n        name: 'carrierLegendName',\n        property: {\n          options: themesColorMap\n        }\n      },\n      {\n        type: 'select',\n        label: 'carrier-animation-name',\n        name: 'carrierAnimationName',\n        property: {\n          options: themesAnimationMap\n        }\n      },\n      {\n        type: 'boolean',\n        label: 'show-carrier-text',\n        name: 'showCarrierText'\n      }\n      // 적층 두께는 carrier 측 (Carrier.added) 에서 자기 default depth 를 결정.\n      // holder 측에는 별도 carrierDepth 속성을 두지 않는다.\n    ]\n  }\n\n  get showOverflow() {\n    return true\n  }\n\n  get hierarchy() {\n    return {\n      ...super.hierarchy,\n      components: []\n    }\n  }\n\n  dispose(): void {\n    ;(this.root as any)?.carrierManager?.update(this, {}, this.data)\n    super.dispose()\n  }\n\n  async ready() {\n    super.ready()\n\n    if (this._hasCarrierData(this.data)) {\n      ;(this.root as any).carrierManager.update(this, this.data || {}, undefined)\n    }\n  }\n\n  onchangeData(after: Record<string, any>, before: Record<string, any>): void {\n    // 진입 경계 1회 정규화 — 키 대소문자 무관 + multiCarriers 통일. 이후 비교/update 는 캐노니컬 O(1).\n    const afterData = normalizeCarrierData(after.data || {})\n    const beforeData = normalizeCarrierData(before.data || {})\n\n    let changed = false\n    for (const k of CARRIER_DATA_KEYS) {\n      if (afterData[k] !== beforeData[k]) {\n        changed = true\n        break\n      }\n    }\n    if (!changed) {\n      changed = multiCarriersChanged(afterData, beforeData)\n    }\n\n    if (changed) {\n      ;(this.root as any).carrierManager.update(this, afterData, beforeData)\n    }\n\n    super.onchangeData(after, before)\n  }\n\n  /** data 안에 carrier 정보 (대표 또는 multiCarriers) 가 하나라도 있는지. (정규화 후 판정) */\n  private _hasCarrierData(raw: any): boolean {\n    const data = normalizeCarrierData(raw)\n    if (!data) return false\n    if (data.CARRIERNAME) return true\n    if (Array.isArray(data[MULTI_CARRIER_KEY]) && data[MULTI_CARRIER_KEY].some((a: any) => a?.CARRIERNAME)) return true\n    return false\n  }\n}\n"]}