@things-factory/figure-ui 10.1.57 → 10.1.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-ui",
-  "version": "10.1.57",
+  "version": "10.1.58",
   "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.67",
+    "@hatiolab/things-scene": "^10.1.44",
     "@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.58",
     "three": "^0.185.1"
   },
-  "gitHead": "b9ee95ca3900b88ec7d3aacc49049e9c3a855e2c"
+  "gitHead": "9410a421e67ef11035d1e13a68a1ae88ed91d18b"
 }

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')

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, rangeDiffers, rangeWith, turnsAboutAJoint, 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,25 @@ 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-24)', () => {
   let asset = sizedPair()
   assert.equal(turnsAboutAJoint(asset), false)