@things-factory/figure-ui 10.1.86 → 10.1.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-ui",
-  "version": "10.1.86",
+  "version": "10.1.87",
   "publishConfig": {
     "access": "public",
     "@things-factory:registry": "https://registry.npmjs.org"
@@ -27,7 +27,7 @@
     "clean": "npm run clean:server && npm run clean:client"
   },
   "dependencies": {
-    "@hatiolab/figure-model": "^0.2.2",
+    "@hatiolab/figure-model": "^0.2.3",
     "@hatiolab/things-scene": "^10.1.63",
     "@material/web": "^2.0.0",
     "@operato/data-grist": "^10.0.0",
@@ -40,9 +40,9 @@
     "@operato/shell": "^10.0.0",
     "@operato/styles": "^10.0.0",
     "@operato/utils": "^10.0.0",
-    "@things-factory/ai-assistant": "^10.1.81",
+    "@things-factory/ai-assistant": "^10.1.87",
     "@things-factory/figure-service": "^10.1.84",
     "three": "^0.185.1"
   },
-  "gitHead": "8e56ed31b1c81934257f2938b9b1a51f1852773f"
+  "gitHead": "dc552c2a7b7f97e3377a26c378ee15d3a1de612a"
 }

package/test/section-editor.test.ts

@@ -40,7 +40,7 @@ const pointsOf = (asset: FigureAsset) => {
   return s.kind === 'polygon' ? s.points : []
 }
 const apply = (asset: FigureAsset, points: readonly FigureSectionPoint[]) =>
-  applyFigureAuthoring(asset, { kind: 'set-section-points', part: 'wedge', points: [...points] })
+  applyFigureAuthoring(asset, { kind: 'set-section', part: 'wedge', points: [...points] })
 
 test('삼각형 → 사다리꼴: 선을 눌러 점을 더하고 옮기면, 한 명령으로 들어가고 옛 점은 제 번호를 지킨다', () => {
   const t = triangle()
@@ -107,7 +107,7 @@ test('치는 동안 입체는 그 점으로 그려지고, 잘못된 동안은
     { id: 'p3', x: 50, z: 40 },
     { id: 'p4', x: -50, z: 40 }
   ]
-  const drawn = livePartsOf(t, { values: {}, action: { kind: 'set-section-points', part: 'wedge', points: square } })!
+  const drawn = livePartsOf(t, { values: {}, action: { kind: 'set-section', part: 'wedge', points: square } })!
   const body = drawn.find(p => p.id === 'wedge') as unknown as { shape: FigureEvaluatedShape }
   assert.equal((body.shape.extrusion!.section as { points: unknown[] }).points.length, 4)
   assert.equal(pointsOf(t).length, 3, 'the figure itself is not changed')
@@ -116,7 +116,7 @@ test('치는 동안 입체는 그 점으로 그려지고, 잘못된 동안은
 })
 
 test('적용은 한 명령, 취소·Esc 는 아무것도 보내지 않는다 — 창을 연 뒤 도형이 바뀌면 적용을 막는다', () => {
-  has(editorPanel, /private apply\(\) \{\s*if \(this\.stale \|\| issuesOf\(this\.working, this\.axis\)\.length\) return/)
+  has(editorPanel, /private apply\(\) \{\s*if \(this\.stale \|\| !this\.valid\(this\.working\)\) return/)
   has(editorPanel, /private cancel\(\) \{\s*this\.dispatchEvent\(new CustomEvent\('command-live', \{ detail: \{ action: null \}/)
     has(editorPanel, /return this\.revision !== this\.openedAt/)
   has(editor, /<figure-section-editor[\s\S]*?\.revision=\$\{this\.session\?\.read\(\)\.revision \?\? 0\}[\s\S]*?@command=\$\{\(e: CustomEvent\) => this\.linkCommand\(e\.detail\.action\)\}/)
@@ -160,7 +160,7 @@ test('치는 동안의 명령이 쓴 입력은 명령의 값으로 그린다 —
   const { liveOverSession } = await import('../client/modeller/live.ts')
   const t = triangle()
   const moved = pointsOf(t).map(p => (p.id === 'p3' ? { ...p, x: -30 } : p))
-  const drawn = liveOverSession(t, { ...t.designInputs }, { values: {}, action: { kind: 'set-section-points', part: 'wedge', points: moved } })!
+  const drawn = liveOverSession(t, { ...t.designInputs }, { values: {}, action: { kind: 'set-section', part: 'wedge', points: moved } })!
   const wedge = drawn.find(p => p.id === 'wedge') as unknown as { shape: FigureEvaluatedShape }
   assert.equal((wedge.shape.extrusion!.section as { points: FigureSectionPoint[] }).points.find(p => p.id === 'p3')!.x, -30)
   /* Stage 1's corner, typed a second time: the radius drawn is the one typed, not the one applied before. */
@@ -190,3 +190,43 @@ test('편집 창 옆에 입체를 볼 자리가 없으면 윤곽과 입체 결
   has(editorPanel, /:host\(\[narrow\]\[show='solid'\]\) div\[body\] \{\s*display: none;/)
   has(editorPanel, /this\.room\.observe\(this\.parentElement\)/)
 })
+
+test('사각형·원도 같은 창에서 — 폭·지름·길이를 한 명령으로, 바꾸지 않은 치수는 보내지 않는다', async () => {
+  const { addFigureBox, figureSectionMeasuresOf } = await import('@hatiolab/figure-model')
+  const { workingOf, workingIssuesOf, sectionOf } = await import('../client/modeller/section-drawing.ts')
+  const box = applyFigureAuthoring(addFigureBox(createFigureAsset('B'), { id: 'b', size: { x: 400, y: 200, z: 300 }, position: { x: 0, y: 100, z: 0 } }), { kind: 'set-placement', placement: 'floor' })
+  const shape = (compileFigureAsset(box).evaluate().geometry.find(g => (g as { id: string }).id === 'b') as unknown as { shape: FigureEvaluatedShape }).shape
+  const w = workingOf(shape)
+  assert.deepEqual(w, { points: [], across: { x: 400, z: 300 }, length: 200 })
+  assert.deepEqual(sectionOf(shape, { ...w, across: { x: 500, z: 300 } }), { kind: 'rectangle', size: { x: 500, z: 300 } })
+  assert.deepEqual(figureSectionMeasuresOf(box, 'b')!.measures, { y: 'editable', x: 'editable', z: 'editable' })
+  /* The editor sends only what changed: a measure left alone may follow another value and must not be written. */
+  has(editorPanel, /const across = Object\.fromEntries\(Object\.entries\(w\.across\)\.filter\(\(\[k, v\]\) => changed\(v, o\.across\[k as Axis\]\)\)\)/)
+  const next = applyFigureAuthoring(box, { kind: 'set-section', part: 'b', across: { x: 500 }, length: 260 })
+  const b = (compileFigureAsset(next).evaluate().geometry.find(g => (g as { id: string }).id === 'b') as unknown as { shape: FigureEvaluatedShape; pose: { t: number[] } })
+  assert.deepEqual(b.shape.extrusion!.section, { kind: 'rectangle', size: { x: 500, z: 300 } })
+  assert.equal(b.pose.t[1]! + b.shape.extrusion!.start, 0, 'a floor figure keeps its bottom')
+  /* A corner that no longer fits, and a length of 0, are said before anything is sent. */
+  const rounded = applyFigureAuthoring(box, { kind: 'set-section-corner', part: 'b', corner: 100 })
+  const r = (compileFigureAsset(rounded).evaluate().geometry.find(g => (g as { id: string }).id === 'b') as unknown as { shape: FigureEvaluatedShape }).shape
+  const narrow = workingIssuesOf(r, { ...workingOf(r), across: { x: 150, z: 300 } }).words
+  assert.equal(say(narrow[0]!.key, narrow[0]!.params), '이 폭에서는 모서리 반지름이 75 mm 까지입니다. 폭을 넓히거나 모서리를 줄입니다.')
+  assert.equal(workingIssuesOf(r, { ...workingOf(r), length: 0 }).words[0]!.key, 'figure.text.section-issue-length')
+})
+
+test('속 공간이 있으면 폭·길이가 그 벽과 막힌 끝을 남기는지도 커널로 묻는다', async () => {
+  const { addFigureBox } = await import('@hatiolab/figure-model')
+  const { workingOf, workingIssuesOf } = await import('../client/modeller/section-drawing.ts')
+  const tray = applyFigureAuthoring(addFigureBox(createFigureAsset('T'), { id: 't', size: { x: 400, y: 200, z: 300 }, position: { x: 0, y: 100, z: 0 } }), { kind: 'set-cavity', part: 't', cavity: { wall: 40, start: { closed: 30 }, end: 'open' } })
+  const shape = (compileFigureAsset(tray).evaluate().geometry.find(g => (g as { id: string }).id === 't') as unknown as { shape: FigureEvaluatedShape }).shape
+  assert.equal(workingIssuesOf(shape, { ...workingOf(shape), across: { x: 70, z: 300 } }).words[0]!.key, 'figure.text.section-issue-cavity-walls')
+  assert.equal(workingIssuesOf(shape, { ...workingOf(shape), length: 25 }).words[0]!.key, 'figure.text.section-issue-cavity-length')
+  assert.deepEqual(workingIssuesOf(shape, { ...workingOf(shape), across: { x: 90, z: 300 } }).words, [])
+})
+
+test('길이를 바꿀 때 남는 면은 부품의 관계가 정한 것을 읽어 보여 준다 (§4.1) — 다른 값을 따르는 치수는 칸을 막는다', () => {
+  has(editor, /const kept = figureScaleAnchorOf\(asset, this\.selected\)\?\.\[part\.shape\.extrusion\.axis\]/)
+  has(editorPanel, /m\?\.\[this\.axis\] === 'linked' \? linked : this\.keptWords\(\)/)
+  has(editorPanel, /m\?\.\[this\.axis\] !== 'editable'/)
+  assert.equal(say('figure.text.section-editor-keeps', { face: ko['figure.label.face-bottom']! }), '아랫면 유지')
+})

package/translations/en.json

@@ -188,9 +188,19 @@
   "figure.label.palette-token": "palette token",
   "figure.label.part": "part",
   "figure.label.part-material": "material",
+  "figure.text.section-editor-hint-sized": "Drag a handle or type the measures.",
+  "figure.label.section-editor-length": "push length (mm)",
+  "figure.label.section-editor-across": "{axis} width (mm)",
+  "figure.label.section-editor-diameter": "diameter (mm)",
+  "figure.text.section-editor-linked": "Follows another value.",
+  "figure.text.section-editor-keeps": "keeps {face}",
+  "figure.text.section-editor-keeps-centre": "keeps the centre",
+  "figure.text.section-issue-corner": "At this width the corner radius can be at most {max} mm. Widen it or make the corner smaller.",
+  "figure.text.section-issue-length": "The push length must be more than 0.",
+  "figure.text.section-issue-cavity-walls": "The inside walls take the whole width. Widen it or make the walls thinner.",
+  "figure.text.section-issue-cavity-length": "The closed ends take the whole length. Lengthen it or make the ends thinner.",
   "figure.button.section-editor-open": "edit section",
   "figure.label.section-editor": "edit section",
-  "figure.text.section-editor-length": "pushed {length} mm",
   "figure.label.section-editor-outline": "outline",
   "figure.label.section-editor-solid": "solid",
   "figure.button.section-editor-back": "undo",

package/translations/ja.json

@@ -188,9 +188,19 @@
   "figure.label.palette-token": "palette token",
   "figure.label.part": "part",
   "figure.label.part-material": "material",
+  "figure.text.section-editor-hint-sized": "ハンドルをドラッグするか寸法を入力します。",
+  "figure.label.section-editor-length": "押し出し長さ (mm)",
+  "figure.label.section-editor-across": "{axis} 幅 (mm)",
+  "figure.label.section-editor-diameter": "直径 (mm)",
+  "figure.text.section-editor-linked": "他の値に従います。",
+  "figure.text.section-editor-keeps": "{face}を保持",
+  "figure.text.section-editor-keeps-centre": "中心を保持",
+  "figure.text.section-issue-corner": "この幅では角の半径は {max} mm までです。幅を広げるか角を小さくしてください。",
+  "figure.text.section-issue-length": "押し出し長さは 0 より大きくしてください。",
+  "figure.text.section-issue-cavity-walls": "内部の壁が幅全体を占めています。幅を広げるか壁を薄くしてください。",
+  "figure.text.section-issue-cavity-length": "閉じた端が長さ全体を占めています。長さを伸ばすか端を薄くしてください。",
   "figure.button.section-editor-open": "断面を編集",
   "figure.label.section-editor": "断面を編集",
-  "figure.text.section-editor-length": "押し出し {length} mm",
   "figure.label.section-editor-outline": "輪郭",
   "figure.label.section-editor-solid": "立体",
   "figure.button.section-editor-back": "元に戻す",

package/translations/ko.json

@@ -188,9 +188,19 @@
   "figure.label.palette-token": "팔레트 토큰",
   "figure.label.part": "부품",
   "figure.label.part-material": "재질",
+  "figure.text.section-editor-hint-sized": "손잡이를 끌거나 치수를 입력합니다.",
+  "figure.label.section-editor-length": "돌출 길이 (mm)",
+  "figure.label.section-editor-across": "{axis} 폭 (mm)",
+  "figure.label.section-editor-diameter": "지름 (mm)",
+  "figure.text.section-editor-linked": "다른 값을 따릅니다.",
+  "figure.text.section-editor-keeps": "{face} 유지",
+  "figure.text.section-editor-keeps-centre": "가운데 유지",
+  "figure.text.section-issue-corner": "이 폭에서는 모서리 반지름이 {max} mm 까지입니다. 폭을 넓히거나 모서리를 줄입니다.",
+  "figure.text.section-issue-length": "돌출 길이는 0 보다 커야 합니다.",
+  "figure.text.section-issue-cavity-walls": "속 공간의 벽이 폭을 다 차지합니다. 폭을 넓히거나 벽을 얇게 합니다.",
+  "figure.text.section-issue-cavity-length": "막힌 끝이 길이를 다 차지합니다. 길이를 늘리거나 끝을 얇게 합니다.",
   "figure.button.section-editor-open": "단면 편집",
   "figure.label.section-editor": "단면 편집",
-  "figure.text.section-editor-length": "돌출 길이 {length} mm",
   "figure.label.section-editor-outline": "윤곽",
   "figure.label.section-editor-solid": "입체 결과",
   "figure.button.section-editor-back": "되돌리기",

package/translations/ms.json

@@ -188,9 +188,19 @@
   "figure.label.palette-token": "palette token",
   "figure.label.part": "part",
   "figure.label.part-material": "material",
+  "figure.text.section-editor-hint-sized": "Seret pemegang atau taip ukurannya.",
+  "figure.label.section-editor-length": "panjang tolakan (mm)",
+  "figure.label.section-editor-across": "lebar {axis} (mm)",
+  "figure.label.section-editor-diameter": "diameter (mm)",
+  "figure.text.section-editor-linked": "Mengikut nilai lain.",
+  "figure.text.section-editor-keeps": "kekalkan {face}",
+  "figure.text.section-editor-keeps-centre": "kekalkan tengah",
+  "figure.text.section-issue-corner": "Pada lebar ini jejari sudut paling banyak {max} mm. Lebarkan atau kecilkan sudut.",
+  "figure.text.section-issue-length": "Panjang tolakan mesti lebih daripada 0.",
+  "figure.text.section-issue-cavity-walls": "Dinding dalam memenuhi seluruh lebar. Lebarkan atau nipiskan dinding.",
+  "figure.text.section-issue-cavity-length": "Hujung tertutup memenuhi seluruh panjang. Panjangkan atau nipiskan hujung.",
   "figure.button.section-editor-open": "sunting keratan",
   "figure.label.section-editor": "sunting keratan",
-  "figure.text.section-editor-length": "tolakan {length} mm",
   "figure.label.section-editor-outline": "garis luar",
   "figure.label.section-editor-solid": "pepejal",
   "figure.button.section-editor-back": "buat asal",

package/translations/zh.json

@@ -188,9 +188,19 @@
   "figure.label.palette-token": "palette token",
   "figure.label.part": "part",
   "figure.label.part-material": "material",
+  "figure.text.section-editor-hint-sized": "拖动手柄或输入尺寸。",
+  "figure.label.section-editor-length": "拉伸长度 (mm)",
+  "figure.label.section-editor-across": "{axis} 宽度 (mm)",
+  "figure.label.section-editor-diameter": "直径 (mm)",
+  "figure.text.section-editor-linked": "跟随其他值。",
+  "figure.text.section-editor-keeps": "保持{face}",
+  "figure.text.section-editor-keeps-centre": "保持中心",
+  "figure.text.section-issue-corner": "此宽度下圆角半径最大为 {max} mm。请加宽或减小圆角。",
+  "figure.text.section-issue-length": "拉伸长度必须大于 0。",
+  "figure.text.section-issue-cavity-walls": "内壁占满了整个宽度。请加宽或减薄壁。",
+  "figure.text.section-issue-cavity-length": "封闭端占满了整个长度。请加长或减薄端部。",
   "figure.button.section-editor-open": "编辑截面",
   "figure.label.section-editor": "编辑截面",
-  "figure.text.section-editor-length": "拉伸 {length} mm",
   "figure.label.section-editor-outline": "轮廓",
   "figure.label.section-editor-solid": "立体",
   "figure.button.section-editor-back": "撤销",