@fmsim/machine 3.0.0-beta.5 → 3.0.0-beta.7

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fmsim/machine",
   "description": "Layout View를 구성하는 설비(machine)들과 유닛을 구현한 모듈입니다.",
   "author": "heartyoh",
-  "version": "3.0.0-beta.5",
+  "version": "3.0.0-beta.7",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "things-scene": true,
@@ -26,8 +26,8 @@
     "migration": "things-factory-migration"
   },
   "dependencies": {
-    "@fmsim/api": "^3.0.0-beta.2",
-    "@fmsim/figure-capabilities": "^3.0.0-beta.5",
+    "@fmsim/api": "^3.0.0-beta.7",
+    "@fmsim/figure-capabilities": "^3.0.0-beta.7",
     "@hatiolab/figure-model": "^0.12.0",
     "@hatiolab/things-scene": "^10.1.90",
     "@operato/slot-layout-editor": "^10.29.33",
@@ -59,5 +59,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "8a40b51a4db5f5b73a2f18dd4f7455eb5f9518fe"
+  "gitHead": "3d79ed4f842108b845268b5d4b229927ff77700f"
 }

package/src/features/lv-figures.ts

@@ -103,12 +103,19 @@ export function LVVehicle<T extends new (...args: any[]) => any>(Base: T) {
 }
 
 /**
- * `fmsim.CarrierHolder` on a figure: carriers change hands at the transport surface, so a holder that takes them on its
+ * `fmsim.CarrierHolder` on a figure: its carriers stand in its places -- a gripper, a lift plate, a fork's tiers -- and
+ * go with them; one without places keeps them in a pile on its top. Carriers change hands at the transport surface, so a
+ * holder that takes them on its
  * top stands that tall when nothing else says -- as fmsim's own AGV and shuttle do. A machine's height wins (whichever is
  * worn over the other); a holder that hangs them or hangs itself from the ceiling (an OHT) keeps its own.
  */
 export function FigureCarrierHolder<T extends new (...args: any[]) => any>(Base: T) {
   return class extends CarrierHolder(Base) {
+    /** Its carriers stand in its own places, which go with the parts that carry them (ADR-0167 decision 23) */
+    get fillsPlaces(): boolean {
+      return true
+    }
+
     get effectiveDepth(): number | undefined {
       const given = super.effectiveDepth
       if (given !== undefined) return given

package/src/mcs-carrier-holder.ts

@@ -6,6 +6,7 @@ import {
   ItemsDataBinding,
   Model,
   TRANSFER_SLOT_KEY,
+  drawingScaleFor,
   figureLegendSourcesChanged,
   itemTypeEntryOf,
   itemTypeTableOf,
@@ -16,7 +17,7 @@ import { colourAndEffect } from './features/legend-rows'
 import { HOLDER_ANCHOR, type ItemDims, type ResolvedSlot } from '@hatiolab/figure-model'
 import { carrierHolderProperties } from '@fmsim/figure-capabilities'
 import MCSUnit from './mcs-unit.js'
-import { incomingFromV2 } from './utils/load-address'
+import { incomingFromV2, resolveOccupancy, type IncomingCarrier, type LoadLayout, type OccupancyResult } from './utils/load-address'
 
 /**
  * A holder's slots outside its layout (common item contract 3.4): every carrier of a holder without a layout stands in
@@ -99,15 +100,67 @@ export function CarrierHolder<T extends new (...args: any[]) => any>(Base: T) {
     }
 
     /**
-     * One record per carrier the data names, bottom first: MULTICARRIERS in order, then the representative. Without a
-     * layout they all stand in the pile. A carrier is told its own keys and whether to show its text.
+     * Whether carriers stand in the holder's own places (ADR-0167 decision 23): a figure holder's places -- a gripper, a
+     * lift plate, the tiers on a fork -- carry what stands on them as the figure moves. fmsim's own holders keep theirs: a
+     * pile, or the layout their data addresses (LoadLayoutHolder).
+     */
+    get fillsPlaces(): boolean {
+      return false
+    }
+
+    /** The holder's places as the last records took them: an addressed carrier keeps its slot while it is still there */
+    _placeOccupancy?: OccupancyResult
+
+    /**
+     * One record per carrier the data names, bottom first: MULTICARRIERS in order, then the representative. A carrier is
+     * told its own keys and whether to show its text. They stand in the pile, unless the holder fills its places.
      */
     carrierRecords(data: Record<string, any> | undefined): CarrierRecord[] {
-      return incomingFromV2(data).map(c => ({
-        slotId: PILE_SLOT,
+      const incoming = incomingFromV2(data)
+      const record = (c: IncomingCarrier, slotId: string): CarrierRecord => ({
+        slotId,
         itemId: c.name,
         itemState: this.carrierStateOf(c.record, c.record === data)
-      }))
+      })
+      const places = this.fillsPlaces ? (((this as any).slots ?? []) as Array<{ id: string; maxCount?: number }>) : []
+      if (!places.length) return incoming.map(c => record(c, PILE_SLOT))
+
+      /* A carrier its data addresses (a layout's TIER/SLOT) stands at that address, as on a crane; a wrong address beside the holder. */
+      const layout = this._placeLayout
+      const occupancy = layout ? resolveOccupancy(layout, incoming, this._placeOccupancy) : undefined
+      this._placeOccupancy = occupancy
+      const slotOf = new Map<string, string>()
+      for (const [key, list] of occupancy?.slots ?? []) {
+        const [tier, slot] = key.split(':').map(Number)
+        for (const c of list) slotOf.set(c.name, `t${tier}_s${slot}`)
+      }
+      for (const c of occupancy?.addressError ?? []) slotOf.set(c.name, EXCEPTION_SLOT)
+
+      /* The others fill the places in their order, each up to what it takes; one still held keeps its place. What is left over stands beside the holder. */
+      const room = new Map(places.map(p => [p.id, p.maxCount ?? 1]))
+      for (const slotId of slotOf.values()) if (room.has(slotId)) room.set(slotId, room.get(slotId)! - 1)
+      const unplaced = incoming.filter(c => !slotOf.has(c.name))
+      const heldIn = new Map(((this as any)._items as any[]).map(item => [item.state?.id, item[TRANSFER_SLOT_KEY]] as const))
+      for (const c of unplaced) {
+        const kept = heldIn.get(c.name)
+        if (kept && (room.get(kept) ?? 0) > 0) {
+          slotOf.set(c.name, kept)
+          room.set(kept, room.get(kept)! - 1)
+        }
+      }
+      for (const c of unplaced) {
+        if (slotOf.has(c.name)) continue
+        const free = places.find(p => (room.get(p.id) ?? 0) > 0)
+        slotOf.set(c.name, free ? free.id : EXCEPTION_SLOT)
+        if (free) room.set(free.id, room.get(free.id)! - 1)
+      }
+      return incoming.map(c => record(c, slotOf.get(c.name)!))
+    }
+
+    /** The layout addresses are read by: the holder's, when it holds and the drawing's scale is known */
+    get _placeLayout(): LoadLayout | undefined {
+      const sel = (this as any).effectiveLayout
+      return sel?.status === 'valid' && drawingScaleFor(this as any).known ? (sel.layout as LoadLayout) : undefined
     }
 
     /** What a carrier is told: its own keys (the representative's are picked out of the holder data), and its text */
@@ -201,7 +254,9 @@ export function CarrierHolder<T extends new (...args: any[]) => any>(Base: T) {
      */
     itemShownDimsOf(_carrier: any, slot: ResolvedSlot, slotId: string): ItemDims | null {
       /* Elsewhere outside the layout, a holder that keeps carriers there says (the exception area: LoadLayoutHolder). */
-      if (slotId === PILE_SLOT) {
+      /* A place that says no size (a gripper): the carrier is shown at its own (ADR-0167 decision 23). */
+      if (slotId !== PILE_SLOT && slotId !== EXCEPTION_SLOT && !slot?.allowed) return null
+      if (slotId === PILE_SLOT || slotId === EXCEPTION_SLOT) {
         const k = (this as any).mmPerSceneUnit
         const { width = 0, height = 0 } = (this as any).state
         const w = Math.abs(width) * PILE_PLAN_RATIO