@things-factory/figure-ui 10.1.57 → 10.1.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-ui",
-  "version": "10.1.57",
+  "version": "10.1.59",
   "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.66",
-    "@hatiolab/things-scene": "^10.1.43",
+    "@hatiolab/figure-model": "^0.1.69",
+    "@hatiolab/things-scene": "^10.1.46",
     "@material/web": "^2.0.0",
     "@operato/data-grist": "^10.0.0",
     "@operato/graphql": "^10.0.0",
@@ -39,9 +39,9 @@
     "@operato/shell": "^10.0.0",
     "@operato/styles": "^10.0.0",
     "@operato/utils": "^10.0.0",
-    "@things-factory/ai-assistant": "^10.1.53",
-    "@things-factory/figure-service": "^10.1.57",
+    "@things-factory/ai-assistant": "^10.1.58",
+    "@things-factory/figure-service": "^10.1.59",
     "three": "^0.185.1"
   },
-  "gitHead": "b9ee95ca3900b88ec7d3aacc49049e9c3a855e2c"
+  "gitHead": "d3306f7f30f7824b9febbc51d6f8f05266fd22e3"
 }

package/test/browser/modeller.check.mjs

@@ -377,6 +377,39 @@ describe('a figure made in the modeller is given its size from its parts (user 2
     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 sizes it may be placed at are typed: the largest width, one step, and a smallest past its size refused', async () => {
+    const field = id =>
+      page().evaluateHandle(id => {
+        const deep = (root = document) => [...root.querySelectorAll('input')].concat(...[...root.querySelectorAll('*')].filter(e => e.shadowRoot).map(e => deep(e.shadowRoot)))
+        return deep().find(i => i.getAttribute('aria-label') === id) ?? null
+      }, id)
+    const declared = () =>
+      page().evaluate(() => {
+        const deep = (root = document) => [...root.querySelectorAll('figure-v3-editor')].concat(...[...root.querySelectorAll('*')].filter(e => e.shadowRoot).map(e => deep(e.shadowRoot)))
+        const inputs = JSON.parse(deep()[0].session.source()).document.model.inputs
+        return Object.fromEntries(inputs.filter(i => i.id.startsWith('size.')).map(i => [i.id, [i.min, i.max]]))
+      })
+    const type = async (id, text) => {
+      const input = await field(id)
+      assert.ok(await input.evaluate(i => !!i), `${id} is a field`)
+      await input.evaluate(i => i.scrollIntoView({ block: 'center' }))
+      await input.click({ clickCount: 3 })
+      await page().keyboard.type(text)
+      await page().keyboard.press('Tab')
+      await sleep(600)
+    }
+    const start = await state()
+    await type('size.x.max', '3000')
+    const after = await state()
+    assert.equal(after.error, '', 'not refused')
+    assert.equal(after.revision, start.revision + 1, 'one step')
+    assert.equal((await declared())['size.x'][1], 3000, 'the largest width is what was typed')
+    await type('size.x.min', '500')
+    assert.match((await state()).error, /500|400/, 'the figure is 400 wide: a smallest of 500 is refused, and said')
+    assert.equal((await declared())['size.x'][0] < 400, true, 'and the range is as it was')
+    assert.equal(await (await field('size.x.min')).evaluate(i => Number(i.value) < 400), true, 'the field shows the range it still has')
+  })
+
   test('a part follows the figure\'s width less a difference: chosen and typed, the width is the size less it', async () => {
     await click(await read(() => probe.partOnPage('box')))
     assert.equal((await state()).selected, 'box')
@@ -415,6 +448,42 @@ describe('a figure made in the modeller is given its size from its parts (user 2
     assert.equal((await state()).error, '', 'taken')
     assert.equal((await body('box')).dimensions.width, 350, 'the figure\'s 400 less 50')
   })
+
+  test('grown by one ratio, every part is made to follow it in one step, and the offer goes', async () => {
+    const button = key =>
+      page().evaluateHandle(key => {
+        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(key)) ?? null
+      }, key)
+    const press = async key => {
+      const b = await button(key)
+      assert.ok(await b.evaluate(b => !!b), `${key} is offered`)
+      await click(await b.evaluate(b => {
+        b.scrollIntoView({ block: 'center' })
+        const r = b.getBoundingClientRect()
+        return { x: r.left + r.width / 2, y: r.top + r.height / 2 }
+      }))
+    }
+    await page().keyboard.press('Escape')
+    await sleep(300)
+    await press('figure.button.scale-uniformly')
+    assert.equal((await state()).error, '', 'grows by one ratio')
+    const start = await state()
+    await press('figure.button.follow-size-in-proportion')
+    const after = await state()
+    assert.equal(after.error, '', 'not refused')
+    assert.equal(after.revision, start.revision + 1, 'one step')
+    const follows = await page().evaluate(() => {
+      const deep = (root = document) => [...root.querySelectorAll('figure-v3-editor')].concat(...[...root.querySelectorAll('*')].filter(e => e.shadowRoot).map(e => deep(e.shadowRoot)))
+      const model = JSON.parse(deep()[0].session.source()).document.model
+      return ['x', 'y', 'z'].map(axis => {
+        const ref = String(model.nodes.find(n => n.id === `box.dimension.${axis}`)?.args[0] ?? '')
+        return { ref, own: model.inputs.some(i => i.id === ref) }
+      })
+    })
+    assert.deepEqual(follows.filter(f => !f.ref || f.own), [], `no side of the box keeps its own number: ${follows.map(f => f.ref).join(', ')}`)
+    assert.equal(await (await button('figure.button.follow-size-in-proportion')).evaluate(b => !!b), false, 'nothing is left to offer')
+  })
 })
 
 describe('a motion is changed where it is (2026-09-25)', () => {

package/test/v3-links.test.ts

@@ -10,7 +10,7 @@ import assert from 'node:assert/strict'
 import { addV3Box, addV3Primitive, applyV3Authoring, createV3Asset } from '@hatiolab/figure-model'
 import type { V3Asset } from '@hatiolab/figure-model'
 
-import { acceptsOf, canFasten, canFollow, dimensionNow, instanceRangeOf, rangeDiffers, turnsAboutAJoint, fastenedTo, followableAxes, followOf, hasInstanceSize, positionIsShare, holdsThings, motionOf, placeFacesOf, placeIdFor, placesOn, positionsWorkedOut } from '../client/modeller/v3-links.ts'
+import { acceptsOf, canFasten, canFollow, dimensionNow, instanceRangeOf, proportionToFollow, rangeDiffers, rangeWith, turnsAboutAJoint, valueNow, fastenedTo, followableAxes, followOf, hasInstanceSize, positionIsShare, holdsThings, motionOf, placeFacesOf, placeIdFor, placesOn, positionsWorkedOut } from '../client/modeller/v3-links.ts'
 
 const pair = (): V3Asset => {
   let asset = createV3Asset('Pair')
@@ -226,6 +226,45 @@ test('놓일 수 있는 크기 — 남은 만큼 채우던 부품을 비례로
   assert.ok(editor.includes("this.linkCommand({ kind: 'declare-instance-size', range: range.measured, replace: true })"))
 })
 
+test('놓일 수 있는 크기 — 저작자가 끝을 적어 좁힌다(갠트리, 09-25)', () => {
+  let asset = sizedPair()
+  for (const axis of ['x', 'z'] as const) {
+    asset.document.model.inputs.push({ id: `size.${axis}`, unit: 'mm', min: 1, max: 20000, role: 'design' } as never)
+    asset.designInputs[`size.${axis}`] = 200
+  }
+  const declared = instanceRangeOf(asset)!.declared
+  assert.equal(rangeWith(declared, 'x', 'min', Number.NaN), undefined, '숫자가 아니면 명령이 없다')
+  const next = rangeWith(declared, 'x', 'min', 150)!
+  assert.deepEqual(next.x, { min: 150, max: 20000 })
+  assert.deepEqual(declared.x, { min: 1, max: 20000 }, '선언된 범위는 그대로')
+  asset = applyV3Authoring(asset, { kind: 'declare-instance-size', range: next, replace: true })
+  assert.deepEqual(instanceRangeOf(asset)!.declared.x, { min: 150, max: 20000 })
+  assert.throws(() => applyV3Authoring(asset, { kind: 'declare-instance-size', range: rangeWith(next, 'x', 'min', 300)!, replace: true }), (e: { code?: string }) => e.code === 'INSTANCE_SIZE_RANGE', '저작한 크기(200)를 벗어나면 거절')
+  const editor = read('../client/modeller/v3-editor.ts')
+  assert.ok(editor.includes("const next = rangeWith(range.declared, axis, bound, (e.target as HTMLInputElement).valueAsNumber)"))
+  assert.ok(editor.includes("if (next) this.linkCommand({ kind: 'declare-instance-size', range: next, replace: true })"))
+})
+
+test('한 비율로 커지는 도형 — 자기 숫자인 길이를 세고, 한 번에 따라가게 하며, 무엇이 남는지 이름을 댄다(아키텍트 판정 09-25)', () => {
+  let asset = createV3Asset('Probe')
+  asset = addV3Box(asset, { id: 'base', size: { x: 400, y: 100, z: 400 }, position: { x: 0, y: 0, z: 0 } })
+  asset = addV3Box(asset, { id: 'lamp', size: { x: 60, y: 60, z: 60 }, position: { x: 0, y: 0, z: 0 } })
+  asset = applyV3Authoring(asset, { kind: 'attach', part: 'base', face: 'bottom', to: { plane: 'mounting-plane' } })
+  asset = applyV3Authoring(asset, { kind: 'attach', part: 'lamp', face: 'bottom', to: { part: 'base', face: 'top' }, align: { x: { mm: 120 } } })
+  asset = applyV3Authoring(asset, { kind: 'declare-instance-size', range: { x: { min: 40, max: 4000 }, y: { min: 16, max: 1600 }, z: { min: 40, max: 4000 } } })
+  assert.equal(proportionToFollow(asset), undefined, '한 비율이 아니면 권하지 않는다')
+  asset = applyV3Authoring(asset, { kind: 'scale-uniformly' })
+  assert.deepEqual(proportionToFollow(asset), { count: 3 + 3 + 1, kept: [] }, '치수 여섯과 자리 하나')
+  const lamp = asset.joints!.find(j => j.id === 'lamp')!
+  asset = applyV3Authoring(asset, { kind: 'set-joint', joint: { ...lamp, type: 'prismatic', axis: 'Y', lowerLimit: 0, upperLimit: 50, state: { id: 'rise' } } })
+  asset = applyV3Authoring(asset, { kind: 'follow-size-in-proportion' })
+  assert.deepEqual(proportionToFollow(asset), { count: 0, kept: ['lamp.motion'] }, '다 따르고, mm 로 움직이는 것만 남는다')
+  assert.equal(Math.round(valueNow(asset, 'lamp.dimension.x.value')! * 1e6) / 1e6, 60, '따르게 해도 지금 크기는 그대로')
+  const editor = read('../client/modeller/v3-editor.ts')
+  assert.ok(editor.includes("this.linkCommand({ kind: 'follow-size-in-proportion' })"))
+  assert.ok(editor.includes("?? valueNow(asset, layout?.args[4])"), '길이를 따르는 간격도 숫자로 보인다')
+})
+
 test('관절이 있는 도형에는 한 비율로 키우기를 권하고, 선언하면 규칙으로 보인다(수석 아키텍트 판정 09-24)', () => {
   let asset = sizedPair()
   assert.equal(turnsAboutAJoint(asset), false)

package/translations/en.json

@@ -728,5 +728,8 @@
   "figure.button.change-motion": "change the motion",
   "figure.button.apply-motion-change": "apply the change",
   "figure.button.cancel-motion-change": "leave it",
-  "figure.label.mounting-plane": "the mounting plane"
+  "figure.label.mounting-plane": "the mounting plane",
+  "figure.text.proportion-to-follow": "{count} lengths still have their own number. made to follow, they grow by the figure's ratio.",
+  "figure.button.follow-size-in-proportion": "make every part follow",
+  "figure.text.proportion-kept": "keeps its own number: {what}"
 }

package/translations/ja.json

@@ -728,5 +728,8 @@
   "figure.button.change-motion": "動きを直す",
   "figure.button.apply-motion-change": "動きを変える",
   "figure.button.cancel-motion-change": "直さない",
-  "figure.label.mounting-plane": "取付面"
+  "figure.label.mounting-plane": "取付面",
+  "figure.text.proportion-to-follow": "長さ {count} 個がまだ固有の数値です。追従させると図形と同じ比率で大きくなります。",
+  "figure.button.follow-size-in-proportion": "すべての部品を追従させる",
+  "figure.text.proportion-kept": "固有の数値のまま: {what}"
 }

package/translations/ko.json

@@ -728,5 +728,8 @@
   "figure.button.change-motion": "움직임 고치기",
   "figure.button.apply-motion-change": "움직임 바꾸기",
   "figure.button.cancel-motion-change": "고치지 않음",
-  "figure.label.mounting-plane": "장착 평면"
+  "figure.label.mounting-plane": "장착 평면",
+  "figure.text.proportion-to-follow": "길이 {count}개가 아직 자기 숫자입니다. 따라가게 하면 도형과 같은 비율로 커집니다.",
+  "figure.button.follow-size-in-proportion": "모든 부품이 따라가게",
+  "figure.text.proportion-kept": "자기 숫자로 남는 것: {what}"
 }

package/translations/ms.json

@@ -728,5 +728,8 @@
   "figure.button.change-motion": "ubah gerakan",
   "figure.button.apply-motion-change": "guna perubahan",
   "figure.button.cancel-motion-change": "biarkan",
-  "figure.label.mounting-plane": "satah pemasangan"
+  "figure.label.mounting-plane": "satah pemasangan",
+  "figure.text.proportion-to-follow": "{count} panjang masih mempunyai nombor sendiri. apabila dijadikan mengikut, ia membesar mengikut nisbah rajah.",
+  "figure.button.follow-size-in-proportion": "jadikan semua bahagian mengikut",
+  "figure.text.proportion-kept": "kekal dengan nombor sendiri: {what}"
 }

package/translations/zh.json

@@ -728,5 +728,8 @@
   "figure.button.change-motion": "修改运动",
   "figure.button.apply-motion-change": "应用修改",
   "figure.button.cancel-motion-change": "不修改",
-  "figure.label.mounting-plane": "安装平面"
+  "figure.label.mounting-plane": "安装平面",
+  "figure.text.proportion-to-follow": "还有 {count} 个长度是自身数值。设为跟随后，将按图形的同一比例变大。",
+  "figure.button.follow-size-in-proportion": "让所有部件跟随",
+  "figure.text.proportion-kept": "保留自身数值: {what}"
 }