@fmsim/machine 1.0.88 → 2.0.0-beta.100

package/src/index.ts

@@ -1,16 +1,74 @@
-import './scene/root-container-override.js'
+// ── side-effect: scene override ──
+import './scene/root-container-override'
 
+// ── side-effect: 3D factories ──
+import './factories/machine-3d'
+import './factories/conveyor-3d'
+import './factories/agv-3d'
+import './factories/oht-3d'
+import './factories/shuttle-3d'
+import './factories/crane-3d'
+import './factories/crane-rail-3d'
+// 기본 factory (RealObjectDomTexture) 쓰는 컴포넌트들의 z-priority override
+import './factories/z-priority-defaults'
+
+// ── side-effect: @sceneComponent 등록 (tree-shaking 방지) ──
+// bars & overlays
+import './zone-capacity-bar'
+import './stocker-capacity-bar'
+import './stocker-carrier-bar'
+import './stocker-abnormal-bar'
+import './port-flow'
+
+// facilities
+import './agv-line'
+import './buffer'
+import './conveyor'
+import './conveyor-join'
+import './equipment'
+import './oht-line'
+import './stocker'
+import './crane-rail'
+import './scanner'
+
+// vehicles
+import './agv'
+import './oht'
+import './shuttle'
+
+// units
+import './port'
+import './crane'
+import './shelf'
+import './carrier'
+
+// topology
+import './node'
+import './node-path'
+
+// containers
+import './floating-container'
+import './static-container'
+import './clickable-popup'
+
+// ── groups ──
 export { default as MachineGroups } from './groups'
 
+// ── base classes ──
 export { default as MCSMachine } from './mcs-machine'
 export { default as MCSUnit } from './mcs-unit'
 export { default as MCSCarrierHolder } from './mcs-carrier-holder'
 export { default as MCSVehicle } from './mcs-vehicle'
 export { default as MCSTransport } from './mcs-transport'
+
+// ── bars & overlays ──
 export { default as ZoneCapacityBar } from './zone-capacity-bar'
 export { default as StockerCapacityBar } from './stocker-capacity-bar'
+export { default as StockerCarrierBar } from './stocker-carrier-bar'
+export { default as StockerAbnormalBar } from './stocker-abnormal-bar'
 export { default as PortFlow } from './port-flow'
 
+// ── facilities ──
 export { default as AGVLine } from './agv-line'
 export { default as Buffer } from './buffer'
 export { default as Conveyor } from './conveyor'
@@ -18,19 +76,25 @@ export { default as ConveyorJoin } from './conveyor-join'
 export { default as Equipment } from './equipment'
 export { default as OHTLine } from './oht-line'
 export { default as Stocker } from './stocker'
+export { default as CraneRail } from './crane-rail'
+export { default as Scanner } from './scanner'
 
+// ── vehicles ──
 export { default as AGV } from './agv'
 export { default as OHT } from './oht'
 export { default as Shuttle } from './shuttle'
 
+// ── units ──
 export { default as Port } from './port'
 export { default as Crane } from './crane'
 export { default as Shelf } from './shelf'
 export { default as Carrier } from './carrier'
 
+// ── topology ──
 export { default as Node } from './node'
 export { default as NodePath } from './node-path'
 
+// ── containers ──
 export { default as FloatingContainer } from './floating-container'
-export { default as StaticContainer } from './static-container.js'
+export { default as StaticContainer } from './static-container'
 export { default as ClickablePopup } from './clickable-popup'

package/src/mcs-carrier-holder.ts

@@ -1,7 +1,22 @@
-import { Model, Properties } from '@hatiolab/things-scene'
 import { themesColorMap, themesAnimationMap } from '@fmsim/api'
 import MCSUnit from './mcs-unit.js'
-import Carrier from './carrier.js'
+import { parseIfJsonString } from './utils/data-value'
+
+/**
+ * Holder.data 변경 감지 시 carrierManager 에 전달할 4 키 묶음 + multiCarriers 배열.
+ * 비교 결과 단 하나라도 다르면 carrierManager.update 호출.
+ * (데이터 키는 모두 대문자 전제 — 케이스 정규화 없이 직접 읽는다)
+ */
+const CARRIER_DATA_KEYS = ['CARRIERNAME', 'CARRIERTYPE', 'EMPTYTYPE', 'CARRIERSTATUS'] as const
+
+function multiCarriersChanged(a: any, b: any): boolean {
+  // MULTICARRIERS 값이 JSON 문자열로 올 수 있어 파싱 후 비교. shallow JSON 비교로 충분 —
+  // 각 항목이 4 키 primitive 만 가짐. 빈/누락은 같은 '[]' 직렬화로 동치 취급.
+  return (
+    JSON.stringify(parseIfJsonString(a?.MULTICARRIERS) ?? []) !==
+    JSON.stringify(parseIfJsonString(b?.MULTICARRIERS) ?? [])
+  )
+}
 
 export default class MCSCarrierHolder extends MCSUnit {
   static get properties(): any {
@@ -28,49 +43,63 @@ export default class MCSCarrierHolder extends MCSUnit {
         label: 'show-carrier-text',
         name: 'showCarrierText'
       }
+      // 적층 두께는 carrier 측 (Carrier.added) 에서 자기 default depth 를 결정.
+      // holder 측에는 별도 carrierDepth 속성을 두지 않는다.
     ]
   }
 
-  carrier?: Carrier | null
-
-  ready() {
-    super.ready()
+  get showOverflow() {
+    return true
+  }
 
-    for (let component of this.components) {
-      this.removeComponent(component)
+  get hierarchy() {
+    return {
+      ...super.hierarchy,
+      components: []
     }
-
-    this.carrier = Model.compile(
-      {
-        type: 'Carrier',
-        showText: this.getState('showCarrierText') || false
-      },
-      this.root.app
-    ) as any
-
-    this.addComponent(this.carrier!)
-
-    this.carrier!.data = this.data
   }
 
   dispose(): void {
-    this.carrier = null
-
+    ;(this.root as any)?.carrierManager?.update(this, {}, this.data)
     super.dispose()
   }
 
-  get hierarchy() {
-    return {
-      ...super.hierarchy,
-      components: []
+  async ready() {
+    super.ready()
+
+    if (this._hasCarrierData(this.data)) {
+      ;(this.root as any).carrierManager.update(this, this.data || {}, undefined)
     }
   }
 
-  onchangeData(after: Properties, before: Properties): void {
-    if (this.carrier) {
-      this.carrier.data = this.data
+  onchangeData(after: Record<string, any>, before: Record<string, any>): void {
+    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 = multiCarriersChanged(afterData, beforeData)
+    }
+
+    if (changed) {
+      ;(this.root as any).carrierManager.update(this, afterData, beforeData)
     }
 
     super.onchangeData(after, before)
   }
+
+  /** data 안에 carrier 정보 (대표 또는 multiCarriers) 가 하나라도 있는지. */
+  private _hasCarrierData(data: any): boolean {
+    if (!data) return false
+    if (data.CARRIERNAME) return true
+    const list = parseIfJsonString(data.MULTICARRIERS)
+    if (Array.isArray(list) && list.some((a: any) => a?.CARRIERNAME)) return true
+    return false
+  }
 }

package/src/mcs-machine.ts

@@ -26,6 +26,19 @@ export default class MCSMachine extends MCSStatusMixin(ContainerAbstract) {
     return false
   }
 
+  /**
+   * id 후보를 조회할 때 백엔드에 보낼 타입명. 값이 있으면 검색(lookup) 대상.
+   * 기본은 자기 타입. 자기 타입과 다른 타입으로 조회해야 하는 특수 케이스는 override.
+   */
+  get idLookupType(): string | undefined {
+    return this.state.type
+  }
+
+  /** MCS 머신 — parentObject(부모 머신) 후보 수집 시 머신으로 식별. */
+  get isMcsMachine(): boolean {
+    return true
+  }
+
   containable(component: Component) {
     return ['rect', 'ellipse'].includes(component.state.type)
   }
@@ -38,7 +51,7 @@ export default class MCSMachine extends MCSStatusMixin(ContainerAbstract) {
     const { legendName } = this.state
 
     if (legendName) {
-      return this.root?.style?.[legendName]
+      return (this.root as any)?.style?.[legendName]
     }
   }
 
@@ -70,6 +83,35 @@ export default class MCSMachine extends MCSStatusMixin(ContainerAbstract) {
     return LEGEND_MACHINE
   }
 
+  /**
+   * In 2D, ignore `state.alpha`; preserve everything else.
+   *
+   * things-scene's base prerender (component-drawing.ts:31, 44) does:
+   *   const fade = (alpha || 1) - this._delta.fade
+   *   if (fade) context.globalAlpha = fade
+   *
+   * It *overwrites* `globalAlpha` (not multiplies), so the inherited
+   * parent alpha is also lost — that's a base-layer quirk we match the
+   * recovery for. Then at line 48 it applies editMode+hidden dimming
+   * with a *= 0.5.
+   *
+   * Our recovery:
+   *   1. Capture the inherited `globalAlpha` *before* super runs.
+   *   2. Let super do its work (transforms / shadow / dim flags).
+   *   3. Restore globalAlpha to inherited × editMode-hidden dim factor —
+   *      i.e., what super would have produced if our state.alpha were 1.
+   *
+   * 3D path is unaffected: 3D factories read `state.alpha` directly via
+   * their `updateAlpha()` implementations and continue to honor it (with
+   * per-config opacity fallback).
+   */
+  prerender(ctx: any) {
+    const inherited = ctx.globalAlpha
+    super.prerender(ctx)
+    const dim = this.app.isEditMode && this.hidden ? 0.5 : 1
+    ctx.globalAlpha = inherited * dim
+  }
+
   render(ctx) {
     var { round = 0, lineWidth } = this.state
     var { left, top, width, height } = this.bounds

package/src/mcs-unit.ts

@@ -1,4 +1,4 @@
-import { Component, ContainerAbstract } from '@hatiolab/things-scene'
+import { ContainerAbstract } from '@hatiolab/things-scene'
 import { getPopupData } from '@fmsim/api'
 
 import { MCSStatusMixin, MCSStatusMixinProperties } from './features/mcs-status-mixin'
@@ -13,6 +13,18 @@ export default class MCSUnit extends MCSStatusMixin(ParentObjectMixin(ContainerA
     return [...MCSStatusMixinProperties, ...ParentObjectMixinProperties]
   }
 
+  get showMoveHandle() {
+    return false
+  }
+
+  /**
+   * id 후보를 조회할 때 백엔드에 보낼 타입명. 값이 있으면 검색(lookup) 대상.
+   * 기본은 자기 타입. 특수 케이스는 override.
+   */
+  get idLookupType(): string | undefined {
+    return this.state.type
+  }
+
   get hasTextProperty() {
     return true
   }
@@ -25,7 +37,7 @@ export default class MCSUnit extends MCSStatusMixin(ParentObjectMixin(ContainerA
     const { legendName } = this.state
 
     if (legendName) {
-      return this.root?.style?.[legendName]
+      return (this.root as any)?.style?.[legendName]
     }
   }
 
@@ -49,6 +61,17 @@ export default class MCSUnit extends MCSStatusMixin(ParentObjectMixin(ContainerA
     return LEGEND_UNIT
   }
 
+  /**
+   * In 2D, ignore `state.alpha`; preserve inherited alpha + editMode-hidden dim.
+   * See MCSMachine.prerender for the full rationale.
+   */
+  prerender(ctx: any) {
+    const inherited = ctx.globalAlpha
+    super.prerender(ctx)
+    const dim = this.app.isEditMode && this.hidden ? 0.5 : 1
+    ctx.globalAlpha = inherited * dim
+  }
+
   contains(x, y) {
     var { left, top, width, height, lineWidth = 0 } = this.state
     var extend = lineWidth / 2

package/src/mcs-vehicle.ts

@@ -1,4 +1,3 @@
-import { Properties } from '@hatiolab/things-scene'
 import { LEGEND_VEHICLE, Legend } from './features/mcs-status-default'
 import MCSCarrierHolder from './mcs-carrier-holder'
 import Node from './node'
@@ -10,7 +9,7 @@ function findNode(vehicle: MCSVehicle, nodeId: string, nodeMachine: string) {
     return null
   }
 
-  const nodes = vehicle.root.findAllById(nodeId).filter(node => node.state.type == 'Node') as Node[]
+  const nodes = (vehicle.root.findAllById?.(nodeId) || []).filter(node => node.state.type == 'Node') as Node[]
 
   return nodes.find((node: Node) => {
     return node.nodeMachine === nodeMachine
@@ -94,7 +93,7 @@ export default class MCSVehicle extends MCSCarrierHolder {
     // this.renderDirection(ctx)
   }
 
-  onchangeData(after: Properties, before: Properties): void {
+  onchangeData(after: Record<string, any>, before: Record<string, any>): void {
     super.onchangeData(after, before)
 
     const { NODEID: beforeNodeId, NODEMACHINE: beforeNodeMachine } = before.data || {}
@@ -122,24 +121,28 @@ export default class MCSVehicle extends MCSCarrierHolder {
     // 실제 존재하는 노드 중 가장 최근에 이동한 노드
     this.lastWaypoint = { NodeId, NodeMachine }
 
-    if (this.root.vehicleAnimation) {
+    if ((this.root as any).vehicleAnimation) {
       this.trigger('waypoint', {
-        from: beforeNode,
+        from: beforeNode || afterNode,
         to: afterNode,
         duration: 5000
       })
-    } else {
-      const fromCenter = beforeNode!.center
+    } else if (beforeNode) {
+      const fromCenter = beforeNode.center
       const toCenter = afterNode.center
 
-      const { x: startX, y: startY } = beforeNode!.transcoordS2T(fromCenter.x, fromCenter.y)
+      const { x: startX, y: startY } = beforeNode.transcoordS2T(fromCenter.x, fromCenter.y)
       const { x: endX, y: endY } = afterNode.transcoordS2T(toCenter.x, toCenter.y)
 
       const theta = Math.atan2(endY - startY, endX - startX) + Math.PI / 2
 
-      // 위치 설정
       this.location = { x: endX, y: endY }
       this.setState('rotation', theta)
+    } else {
+      // beforeNode 없음: afterNode 위치로 즉시 이동
+      const toCenter = afterNode.center
+      const { x, y } = afterNode.transcoordS2T(toCenter.x, toCenter.y)
+      this.location = { x, y }
     }
   }
 }

package/src/node.ts

@@ -28,11 +28,17 @@ export default class Node extends Shape {
   static RADIUS = 8
 
   is3dish() {
-    return false
+    return true
   }
 
-  isDescendible() {
-    return false
+  /**
+   * Node 는 기본적으로 컨테이너 드롭 입양 불가 — 라인 머신(AGVLine/OHTLine/CraneRail)만
+   * 자기 containable 화이트리스트로 Node 를 받는다. 단 FloorPlate 에는 들어갈 수 있게 허용.
+   * FloorPlate 는 things-scene 코어 컨테이너라 거기에 'Node' 를 명시할 수 없으므로
+   * Node 측에서 해결한다 (FloorPlate 의 기본 containable = component.isDescendible(this)).
+   */
+  isDescendible(container?: any) {
+    return container?.state?.type === 'floor-plate'
   }
 
   render(context) {

package/src/oht-line.ts

@@ -19,7 +19,7 @@ export default class OHTLine extends MCSTransport {
   }
 
   getLegendFallback() {
-    return this.root.ohtlineLegendTheme || super.getLegendFallback()
+    return (this.root as any).ohtlineLegendTheme || super.getLegendFallback()
   }
 
   containable(component: Component) {

package/src/oht.ts

@@ -1,4 +1,4 @@
-import { Component, ComponentNature, Properties, sceneComponent } from '@hatiolab/things-scene'
+import { Component, ComponentNature, sceneComponent } from '@hatiolab/things-scene'
 import MCSVehicle from './mcs-vehicle'
 
 const NATURE: ComponentNature = {
@@ -20,8 +20,13 @@ export default class OHT extends MCSVehicle {
     return 'black'
   }
 
+  /** OHT 의 parentObject 는 OHTLine. */
+  get parentObjectTypes(): string[] {
+    return ['OHTLine']
+  }
+
   getLegendFallback() {
-    return this.root.ohtLegendTheme || super.getLegendFallback()
+    return (this.root as any).ohtLegendTheme || super.getLegendFallback()
   }
 
   render(ctx: CanvasRenderingContext2D) {

package/src/port-flow.ts

@@ -45,6 +45,11 @@ export default class PortFlow extends ParentObjectMixin(RectPath(Shape)) {
     return NATURE
   }
 
+  /** PortFlow 의 parentObject 는 Port (유닛). */
+  get parentObjectTypes(): string[] {
+    return ['Port']
+  }
+
   get hasTextProperty() {
     return this.getState('showText') || false
   }
@@ -232,7 +237,7 @@ export default class PortFlow extends ParentObjectMixin(RectPath(Shape)) {
     this.drawStroke(ctx)
   }
 
-  onchangeData(after: Properties, before: Properties): void {
+  onchangeData(after: Record<string, any>, before: Record<string, any>): void {
     const { INOUTTYPE } = after.data
 
     this.setState('direction', INOUTTYPE)

package/src/port.ts

@@ -20,7 +20,12 @@ export default class Port extends MCSZoneMixin(MCSCarrierHolder) {
   }
 
   getLegendFallback() {
-    return this.root.portLegendTheme || super.getLegendFallback()
+    return (this.root as any).portLegendTheme || super.getLegendFallback()
+  }
+
+  /** Port 는 후보가 매우 많아 부모 머신 없이는 id 리스트를 조회하지 않는다 (machine 필수). */
+  get idLookupRequiresMachine() {
+    return true
   }
 
   render(ctx: CanvasRenderingContext2D) {

package/src/scanner.ts

@@ -0,0 +1,29 @@
+import { Component, ComponentNature, Triangle, sceneComponent } from '@hatiolab/things-scene'
+import { MCSStatusMixin } from './features/mcs-status-mixin'
+
+const NATURE: ComponentNature = {
+  mutable: true,
+  resizable: false,
+  rotatable: true,
+  properties: [
+    {
+      type: 'number',
+      label: 'round',
+      name: 'round',
+      property: { min: 0, max: 100, step: 1 }
+    }
+  ]
+}
+
+@sceneComponent('Scanner')
+export default class Scanner extends MCSStatusMixin(Triangle) {
+  static get nature() {
+    return NATURE
+  }
+
+  is3dish() {
+    return true
+  }
+}
+
+Component.memoize(Scanner.prototype, 'path', false)