@things-factory/figure-ui 10.1.50 → 10.1.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-ui",
-  "version": "10.1.50",
+  "version": "10.1.52",
   "publishConfig": {
     "access": "public",
     "@things-factory:registry": "https://registry.npmjs.org"
@@ -27,8 +27,8 @@
     "clean": "npm run clean:server && npm run clean:client"
   },
   "dependencies": {
-    "@hatiolab/figure-model": "^0.1.57",
-    "@hatiolab/things-scene": "^10.1.34",
+    "@hatiolab/figure-model": "^0.1.60",
+    "@hatiolab/things-scene": "^10.1.37",
     "@material/web": "^2.0.0",
     "@operato/data-grist": "^10.0.0",
     "@operato/graphql": "^10.0.0",
@@ -39,8 +39,8 @@
     "@operato/shell": "^10.0.0",
     "@operato/styles": "^10.0.0",
     "@operato/utils": "^10.0.0",
-    "@things-factory/figure-service": "^10.1.50",
+    "@things-factory/figure-service": "^10.1.52",
     "three": "^0.185.1"
   },
-  "gitHead": "4700d39d70eb5fae4ad56cf47ea0b966c8516ae2"
+  "gitHead": "b3ec4f0a38f0759d396f49b1f47c547bff4657be"
 }

package/test/browser/modeller.check.mjs

@@ -329,6 +329,55 @@ describe('the V3 robot arm: a drag on a part edits its joint (ADR-0093)', () =>
   })
 })
 
+describe('the fastening form belongs to the part it is for', () => {
+  before(async () => {
+    await mount('arm')
+  })
+
+  /* The select whose label (the i18n key: the check loads no translations) is `label`, in the parts' links form. */
+  const alignSelect = label =>
+    page().evaluateHandle(label => {
+      const deep = (root = document) => [...root.querySelectorAll('select')].concat(...[...root.querySelectorAll('*')].filter(e => e.shadowRoot).map(e => deep(e.shadowRoot)))
+      return deep().find(s => s.previousElementSibling?.textContent?.trim() === label) ?? null
+    }, label)
+
+  test('a choice made for one part is not carried to the next part picked (셔터 커튼, 2026-09-25)', async () => {
+    await click(await read(() => probe.row('forearm')))
+    const select = await alignSelect('figure.label.align-x')
+    assert.ok(await select.evaluate(s => !!s), 'the form offers left-right placing for the forearm')
+    await select.select('max')
+    assert.equal(await select.evaluate(s => s.value), 'max', 'chosen for the forearm')
+    await click(await read(() => probe.row('elbow')))
+    const next = await alignSelect('figure.label.align-x')
+    assert.equal(await next.evaluate(s => s.value), 'centre', 'the elbow starts from the default')
+  })
+})
+
+describe('a figure made in the modeller is given its size from its parts (user 2026-09-25)', () => {
+  before(async () => {
+    await mount('box')
+  })
+
+  test('with nothing picked, the figure offers to declare its size; clicked, its size fields appear', async () => {
+    const button = await page().evaluateHandle(() => {
+      const deep = (root = document) => [...root.querySelectorAll('button')].concat(...[...root.querySelectorAll('*')].filter(e => e.shadowRoot).map(e => deep(e.shadowRoot)))
+      return deep().find(b => b.textContent.includes('figure.button.declare-instance-size')) ?? null
+    })
+    assert.ok(await button.evaluate(b => !!b), 'the button is offered on a figure with no size')
+    const box = await button.evaluate(b => {
+      b.scrollIntoView({ block: 'center' })
+      const r = b.getBoundingClientRect()
+      return { x: r.left + r.width / 2, y: r.top + r.height / 2 }
+    })
+    const start = await state()
+    await click(box)
+    const after = await state()
+    assert.equal(after.error, '', 'not refused')
+    assert.equal(after.revision, start.revision + 1, 'one step')
+    assert.deepEqual(await read(() => probe.fields('size.')), { 'size.x': 400, 'size.y': 400, 'size.z': 400 }, 'the size it is authored at: its parts now')
+  })
+})
+
 test('the page raised no error', () => {
   assert.deepEqual(opened.errors, [])
 })

package/test/v3-first-save.test.ts

@@ -73,3 +73,12 @@ test('저장 전에 적은 타입은 처음 저장의 물음에 실려 온다
   assert.match(rename, /if \(!id\) \{\s*this\.row = \{ \.\.\.this\.row, type: wanted \|\| undefined \}/, '저장 전에는 행 대신 화면이 타입을 쥔다')
   assert.match(page, /<figure-v3-first-save \.type=\$\{this\.row\.type \?\? ''\}/, '물음은 그 타입으로 열린다')
 })
+
+test('처음 저장한 도형은 주소가 제 것이 된다 — 모델러를 다시 열면 새 도형이 열린다 (2026-09-25)', async () => {
+  const { readFileSync } = await import('node:fs')
+  const page = readFileSync(new URL('../client/pages/figure-v3-modeller-page.ts', import.meta.url), 'utf8')
+  const changed = page.slice(page.indexOf('private changed = () => {'), page.indexOf('private async readRow'))
+  assert.match(changed, /if \(view\.id && !this\.routeId && !view\.saving\) \{\s*this\.routeId = view\.id\s*navigate\(modellerPathOf\(\{ id: view\.id \}\), true\)/, '저장으로 id 를 얻으면 그 주소로 바꾼다(기록은 덮어쓴다)')
+  /* The early return that kept the old figure reads the route id; it now matches only the figure the address names. */
+  assert.match(page, /if \(this\.session\.read\(\)\.context && id === this\.routeId && !changes\.active\) return/)
+})

package/test/v3-links.test.ts

@@ -240,20 +240,24 @@ test('관절이 있는 도형에는 한 비율로 키우기를 권하고, 선언
 
 test('붙일 때 면 위 어디에 — 그 면을 가로지르는 두 축만, 바닥에는 모서리가 없다 (문을 틀 모서리에 달기, 09-25)', async () => {
   const { alignAxesOf, alignOf } = await import('../client/modeller/v3-links.ts')
-  assert.deepEqual(alignAxesOf('right'), [{ axis: 'y', edges: true }, { axis: 'z', edges: true }])
-  assert.deepEqual(alignAxesOf('plane'), [{ axis: 'x', edges: false }, { axis: 'z', edges: false }])
+  let two = createV3Asset('Two')
+  two = addV3Box(two, { id: 'jamb', size: { x: 100, y: 2100, z: 150 }, position: { x: 0, y: 1050, z: 0 } })
+  two = addV3Box(two, { id: 'leaf', size: { x: 900, y: 2000, z: 40 }, position: { x: 600, y: 1000, z: 0 } })
+  const right = { part: 'jamb', face: 'right' }
+  assert.deepEqual(alignAxesOf(two, 'leaf', right), [{ axis: 'y', edges: true }, { axis: 'z', edges: true }])
+  assert.deepEqual(alignAxesOf(two, 'leaf', 'plane'), [{ axis: 'x', edges: false }, { axis: 'z', edges: false }])
   /* A door on the jamb's right face: bottoms level, fronts level. The x choice is along the face and is not sent. */
-  assert.deepEqual(alignOf('right', { x: 'max', y: 'min', z: 'max' }, {}), { y: 'min', z: 'max' })
-  assert.deepEqual(alignOf('top', { x: 'mm', z: 'centre' }, { x: 120 }), { x: { mm: 120 } })
-  assert.equal(alignOf('plane', { x: 'min' }, {}), undefined, '바닥에는 맞출 모서리가 없다')
-  assert.equal(alignOf('top', {}, {}), undefined)
+  assert.deepEqual(alignOf(two, 'leaf', right, { x: 'max', y: 'min', z: 'max' }, {}), { y: 'min', z: 'max' })
+  assert.deepEqual(alignOf(two, 'leaf', { part: 'jamb', face: 'top' }, { x: 'mm', z: 'centre' }, { x: 120 }), { x: { mm: 120 } })
+  assert.equal(alignOf(two, 'leaf', 'plane', { x: 'min' }, {}), undefined, '바닥에는 맞출 모서리가 없다')
+  assert.equal(alignOf(two, 'leaf', { part: 'jamb', face: 'top' }, {}, {}), undefined)
 
   /* What the form sends is what hangs the part on the edge: the door's pivot is on the jamb's front edge line. */
   let asset = createV3Asset('Door')
   asset = addV3Box(asset, { id: 'jamb', size: { x: 100, y: 2100, z: 150 }, position: { x: 0, y: 1050, z: 0 } })
   asset = addV3Box(asset, { id: 'leaf', size: { x: 900, y: 2000, z: 40 }, position: { x: 600, y: 1000, z: 0 } })
   asset = applyV3Authoring(asset, { kind: 'attach', part: 'jamb', face: 'bottom', to: { plane: 'mounting-plane' } })
-  asset = applyV3Authoring(asset, { kind: 'attach', part: 'leaf', face: 'left', to: { part: 'jamb', face: 'right' }, align: alignOf('right', { y: 'min', z: 'max' }, {}) })
+  asset = applyV3Authoring(asset, { kind: 'attach', part: 'leaf', face: 'left', to: { part: 'jamb', face: 'right' }, align: alignOf(asset, 'leaf', { part: 'jamb', face: 'right' }, { y: 'min', z: 'max' }, {}) })
   const { compileV3Asset } = await import('@hatiolab/figure-model')
   const leaf = compileV3Asset(asset).evaluate().geometry.find(g => g.id === 'leaf')!
   assert.deepEqual(leaf.pose.t.map(Math.round), [500, 1000, 55], '문짝 아래가 문틀 아래에, 앞이 문틀 앞에')
@@ -292,3 +296,70 @@ test('따라 움직이는 관절 — 같은 방식으로 움직이고 제 조작
   const { motionOf } = await import('../client/modeller/v3-links.ts')
   assert.deepEqual(motionOf(asset, 'right')?.follows, { joint: 'left', multiplier: -1 }, '화면은 무엇을 따르는지 읽는다')
 })
+
+test('면은 도형이 정한다 — 문틀(portal)은 바깥 여섯에 개구부 셋, 공은 없음, 원뿔대는 위아래뿐 (2026-09-25)', async () => {
+  const { facesOf, faceAxisOf, canFasten, alignAxesOf } = await import('../client/modeller/v3-links.ts')
+  let asset = createV3Asset('Doorway')
+  asset = addV3Primitive(asset, {
+    id: 'frame',
+    kind: 'portal',
+    dimensions: { left: -550, right: 550, bottom: 0, top: 2200, openingLeft: -450, openingRight: 450, openingTop: 2100, depth: 150 },
+    position: { x: 0, y: 0, z: 0 }
+  })
+  asset = addV3Primitive(asset, { id: 'ball', kind: 'sphere', dimensions: { radiusX: 50, radiusY: 50, radiusZ: 50 }, position: { x: 0, y: 0, z: 0 } })
+  asset = addV3Primitive(asset, { id: 'cone', kind: 'frustum', dimensions: { radiusTop: 20, radiusBottom: 60, height: 100 }, position: { x: 0, y: 0, z: 0 } })
+  asset = addV3Box(asset, { id: 'leaf', size: { x: 890, y: 2095, z: 40 }, position: { x: 0, y: 0, z: 0 } })
+  assert.deepEqual(facesOf(asset, 'frame'), ['left', 'right', 'bottom', 'top', 'back', 'front', 'opening-left', 'opening-right', 'opening-top'])
+  assert.equal(faceAxisOf(asset, 'frame', 'opening-top'), 'y')
+  assert.deepEqual(facesOf(asset, 'ball'), [])
+  assert.equal(canFasten(asset, 'ball'), false, '공은 붙일 면이 없다')
+  assert.equal(canFasten(asset, 'frame'), true)
+  assert.deepEqual(facesOf(asset, 'cone'), ['bottom', 'top'])
+  assert.deepEqual(alignAxesOf(asset, 'leaf', { part: 'frame', face: 'opening-left' }), [{ axis: 'y', edges: true }, { axis: 'z', edges: true }])
+  assert.deepEqual(alignAxesOf(asset, 'leaf', { part: 'cone', face: 'top' }), [{ axis: 'x', edges: false }, { axis: 'z', edges: false }], '옆면이 평면이 아니면 모서리도 없다')
+})
+
+test('되풀이는 붙어 있고 움직이지 않고 아무것도 매달지 않은 부품에 — 붙인 면을 가로지르는 축으로 (빈틈 B, 2026-09-25)', async () => {
+  const { rowAxesOf, rowOf } = await import('../client/modeller/v3-links.ts')
+  let asset = createV3Asset('Conveyor')
+  asset = addV3Box(asset, { id: 'frame', size: { x: 2000, y: 100, z: 600 }, position: { x: 0, y: 0, z: 0 } })
+  asset = addV3Box(asset, { id: 'slat', size: { x: 60, y: 20, z: 560 }, position: { x: 0, y: 0, z: 0 } })
+  assert.deepEqual(rowAxesOf(asset, 'slat'), [], '붙지 않은 부품은 되풀이를 권하지 않는다')
+  asset = applyV3Authoring(asset, { kind: 'attach', part: 'frame', face: 'bottom', to: { plane: 'mounting-plane' } })
+  asset = applyV3Authoring(asset, { kind: 'attach', part: 'slat', face: 'bottom', to: { part: 'frame', face: 'top' } })
+  assert.deepEqual(rowAxesOf(asset, 'frame'), [], '바닥에 선 부품은 채울 길이가 없다')
+  assert.deepEqual(rowAxesOf(asset, 'slat'), ['x', 'z'], '윗면을 가로지르는 두 축')
+  asset = applyV3Authoring(asset, { kind: 'make-repeat', part: 'slat', axis: 'x', pitch: 100 })
+  assert.deepEqual(rowOf(asset, 'slat'), { axis: 'X', pitch: 100 })
+  assert.deepEqual(rowAxesOf(asset, 'slat'), [], '이미 되풀이면 다시 권하지 않는다')
+})
+
+test('비튼 부품에는 모서리 맞춤을 내놓지도 보내지도 않는다 — 가운데서 거리만 (빈틈 F, 2026-09-25)', async () => {
+  const { alignAxesOf, alignOf } = await import('../client/modeller/v3-links.ts')
+  let asset = createV3Asset('Fan')
+  asset = addV3Box(asset, { id: 'hub', size: { x: 120, y: 120, z: 80 }, position: { x: 0, y: 0, z: 0 } })
+  asset = addV3Box(asset, { id: 'blade', size: { x: 300, y: 60, z: 8 }, position: { x: 0, y: 0, z: 0 } })
+  const front = { part: 'hub', face: 'front' }
+  assert.deepEqual(alignAxesOf(asset, 'blade', front, true), [{ axis: 'x', edges: false }, { axis: 'y', edges: false }])
+  assert.deepEqual(alignOf(asset, 'blade', front, { x: 'max', y: 'mm' }, { y: 50 }, true), { y: { mm: 50 } }, '끝 맞춤은 빠지고 거리만 간다')
+  assert.deepEqual(alignOf(asset, 'blade', front, { x: 'max' }, {}), { x: 'max' }, '비틀지 않으면 그대로')
+})
+
+test('모델러에서 만든 도형은 부품에서 재어 도형 크기를 선언한다 — 그 뒤에야 부품이 도형 크기를 따를 수 있다 (사용자 09-25)', async () => {
+  const { instanceRangeToDeclare, instanceRangeOf, hasInstanceSize } = await import('../client/modeller/v3-links.ts')
+  const { compileV3Asset } = await import('@hatiolab/figure-model')
+  let asset = createV3Asset('Conveyor')
+  assert.equal(instanceRangeToDeclare(asset), undefined, '부품이 없으면 잴 것이 없다')
+  asset = addV3Box(asset, { id: 'frame', size: { x: 2000, y: 100, z: 600 }, position: { x: 0, y: 0, z: 0 } })
+  asset = applyV3Authoring(asset, { kind: 'attach', part: 'frame', face: 'bottom', to: { plane: 'mounting-plane' } })
+  assert.equal(hasInstanceSize(asset, 'x'), false, '새 도형에는 도형 크기가 없다')
+  const toDeclare = instanceRangeToDeclare(asset)!
+  assert.deepEqual(toDeclare.at, { x: 2000, y: 100, z: 600 }, '지금 부품의 크기가 선언할 크기')
+  asset = applyV3Authoring(asset, { kind: 'declare-instance-size', range: toDeclare.range, at: toDeclare.at })
+  assert.ok(instanceRangeOf(asset), '선언 뒤에는 놓일 수 있는 크기가 보인다')
+  assert.equal(instanceRangeToDeclare(asset), undefined, '이미 있으면 다시 권하지 않는다')
+  assert.equal(hasInstanceSize(asset, 'x'), true, '부품이 도형 크기를 따르는 선택이 열린다')
+  asset = applyV3Authoring(asset, { kind: 'link-dimension', part: 'frame', axis: 'x', source: { of: 'instance', axis: 'x' } } as never)
+  const at = (size: number) => (compileV3Asset({ ...asset, designInputs: { ...asset.designInputs, 'size.x': size } }).evaluate().geometry.find(g => g.id === 'frame')!.shape.dimensions as { width: number }).width
+  assert.equal(at(3000), 3000, '보드가 3000 으로 놓으면 틀도 3000')
+})

package/translations/en.json

@@ -701,5 +701,14 @@
   "figure.label.motion-own-control": "its own control",
   "figure.label.motion-multiplier": "multiplier",
   "figure.label.motion-offset": "offset",
-  "figure.label.motion-follows": "moves with {joint} × {multiplier} + {offset}"
+  "figure.label.motion-follows": "moves with {joint} × {multiplier} + {offset}",
+  "figure.label.face-opening-left": "opening left",
+  "figure.label.face-opening-right": "opening right",
+  "figure.label.face-opening-top": "opening top",
+  "figure.label.repeat-fills": "as many as fill the length",
+  "figure.button.make-repeat": "make a row",
+  "figure.button.remove-repeat": "remove the row",
+  "figure.label.twist": "twist (°)",
+  "figure.text.instance-size-undeclared": "the figure has no size, so a board cannot resize it.",
+  "figure.button.declare-instance-size": "declare the figure size"
 }

package/translations/ja.json

@@ -701,5 +701,14 @@
   "figure.label.motion-own-control": "自分の操作値",
   "figure.label.motion-multiplier": "倍率",
   "figure.label.motion-offset": "オフセット",
-  "figure.label.motion-follows": "{joint} に連動 × {multiplier} + {offset}"
+  "figure.label.motion-follows": "{joint} に連動 × {multiplier} + {offset}",
+  "figure.label.face-opening-left": "開口部 左",
+  "figure.label.face-opening-right": "開口部 右",
+  "figure.label.face-opening-top": "開口部 上",
+  "figure.label.repeat-fills": "長さを満たすだけ",
+  "figure.button.make-repeat": "繰り返しを作る",
+  "figure.button.remove-repeat": "繰り返しをなくす",
+  "figure.label.twist": "ひねり (°)",
+  "figure.text.instance-size-undeclared": "図形サイズがないため、ボードでサイズを変えられません。",
+  "figure.button.declare-instance-size": "図形サイズを宣言"
 }

package/translations/ko.json

@@ -701,5 +701,14 @@
   "figure.label.motion-own-control": "제 조작값으로",
   "figure.label.motion-multiplier": "배율",
   "figure.label.motion-offset": "더하기",
-  "figure.label.motion-follows": "따라 움직임: {joint} × {multiplier} + {offset}"
+  "figure.label.motion-follows": "따라 움직임: {joint} × {multiplier} + {offset}",
+  "figure.label.face-opening-left": "개구부 왼쪽",
+  "figure.label.face-opening-right": "개구부 오른쪽",
+  "figure.label.face-opening-top": "개구부 위",
+  "figure.label.repeat-fills": "길이를 채우는 만큼",
+  "figure.button.make-repeat": "되풀이 만들기",
+  "figure.button.remove-repeat": "되풀이 없애기",
+  "figure.label.twist": "비틀기 (°)",
+  "figure.text.instance-size-undeclared": "도형 크기가 없어 보드에서 크기를 바꿀 수 없습니다.",
+  "figure.button.declare-instance-size": "도형 크기 선언"
 }

package/translations/ms.json

@@ -701,5 +701,14 @@
   "figure.label.motion-own-control": "kawalan sendiri",
   "figure.label.motion-multiplier": "pendarab",
   "figure.label.motion-offset": "ofset",
-  "figure.label.motion-follows": "bergerak bersama {joint} × {multiplier} + {offset}"
+  "figure.label.motion-follows": "bergerak bersama {joint} × {multiplier} + {offset}",
+  "figure.label.face-opening-left": "bukaan kiri",
+  "figure.label.face-opening-right": "bukaan kanan",
+  "figure.label.face-opening-top": "bukaan atas",
+  "figure.label.repeat-fills": "sebanyak yang memenuhi panjang",
+  "figure.button.make-repeat": "buat baris",
+  "figure.button.remove-repeat": "buang baris",
+  "figure.label.twist": "pusingan (°)",
+  "figure.text.instance-size-undeclared": "rajah tiada saiz, jadi papan tidak boleh mengubah saiznya.",
+  "figure.button.declare-instance-size": "isytihar saiz rajah"
 }

package/translations/zh.json

@@ -701,5 +701,14 @@
   "figure.label.motion-own-control": "自身控制值",
   "figure.label.motion-multiplier": "倍率",
   "figure.label.motion-offset": "偏移",
-  "figure.label.motion-follows": "跟随 {joint} × {multiplier} + {offset}"
+  "figure.label.motion-follows": "跟随 {joint} × {multiplier} + {offset}",
+  "figure.label.face-opening-left": "开口 左侧",
+  "figure.label.face-opening-right": "开口 右侧",
+  "figure.label.face-opening-top": "开口 顶部",
+  "figure.label.repeat-fills": "填满长度的数量",
+  "figure.button.make-repeat": "生成重复",
+  "figure.button.remove-repeat": "取消重复",
+  "figure.label.twist": "扭转 (°)",
+  "figure.text.instance-size-undeclared": "图形没有尺寸，看板上无法调整大小。",
+  "figure.button.declare-instance-size": "声明图形尺寸"
 }