@things-factory/figure-ui 10.1.91 → 10.1.93

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-ui",
-  "version": "10.1.91",
+  "version": "10.1.93",
   "publishConfig": {
     "access": "public",
     "@things-factory:registry": "https://registry.npmjs.org"
@@ -44,5 +44,5 @@
     "@things-factory/figure-service": "^10.1.84",
     "three": "^0.185.1"
   },
-  "gitHead": "e9a052f7faaeb5884db1ff8b862b8f05567a31f9"
+  "gitHead": "cec4765a5a0c3e7540a822c852110bec7f27250c"
 }

package/test/browser/acceptance-page.js

@@ -56,6 +56,16 @@ export const MODELS = {
     a = applyFigureAuthoring(a, { kind: 'attach', part: 'cap', face: 'bottom', to: { part: 'wedge', face: 'top' } })
     return serializeFigureAsset(a)
   },
+  /* A lid fastened to the top of a bin standing on the floor: the fastening drawn and dragged (user 2026-10-01). */
+  'lid-on-bin': () => {
+    let a = createFigureAsset('Lid on bin')
+    a.palette = { ...a.palette, ...PALETTE }
+    a = addFigureBox(a, { id: 'bin', size: { x: 600, y: 300, z: 400 }, position: { x: 0, y: 150, z: 0 } })
+    a = applyFigureAuthoring(a, { kind: 'attach', part: 'bin', face: 'bottom', to: { plane: 'mounting-plane' } })
+    a = addFigureBox(a, { id: 'lid', size: { x: 300, y: 20, z: 200 }, position: { x: 0, y: 0, z: 0 } })
+    a = applyFigureAuthoring(a, { kind: 'attach', part: 'lid', face: 'bottom', to: { part: 'bin', face: 'top' } })
+    return serializeFigureAsset(a)
+  },
   /* A box and a drum: rounded corners and an inside from the properties tab (ADR-0100 stage 1). */
   shapes: () => {
     let a = createFigureAsset('Box and drum')

package/test/cavity-drawing.test.ts

@@ -0,0 +1,69 @@
+/*
+ * **속 공간 그림** (사용자 2026-10-01: 「속공간 만들기도 시각적으로 편집할 수 있도록」).
+ *
+ * 벽 손잡이를 끄는 것, 끝을 눌러 여닫는 것이 figure-model 의 set-cavity 한 명령으로 받아들여지는지, 커널이 거절할 모양은
+ * 보내지 않고 그 까닭을 말하는지, 끄는 동안은 미리보기만 하고 놓을 때 한 번 보내는지를 잰다.
+ */
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+
+import { addFigureBox, applyFigureAuthoring, compileFigureAsset, createFigureAsset } from '@hatiolab/figure-model'
+import type { FigureAsset, FigureEvaluatedShape } from '@hatiolab/figure-model'
+
+import { cavityRefusalOf, cavityResultOf, cavityWorkingOf, endToggled, wallDragged } from '../client/modeller/section-controls.ts'
+
+const read = (path: string) => readFileSync(fileURLToPath(new URL(path, import.meta.url)), 'utf8')
+const has = (source: string, re: RegExp, message?: string) => assert.ok(re.test(source), message ?? `missing: ${re}`)
+const drawing = read('../client/modeller/figure-cavity-drawing.ts')
+const panel = read('../client/modeller/figure-section-panel.ts')
+
+const tote = (): FigureAsset => {
+  const box = addFigureBox(createFigureAsset('Tote'), { id: 'bin', size: { x: 600, y: 300, z: 400 }, position: { x: 0, y: 150, z: 0 } })
+  return applyFigureAuthoring(box, { kind: 'set-cavity', part: 'bin', cavity: { wall: 10, start: { closed: 15 }, end: 'open' } })
+}
+const shapeOf = (asset: FigureAsset) =>
+  (compileFigureAsset(asset).evaluate().geometry.find(g => (g as { id: string }).id === 'bin') as unknown as { shape: FigureEvaluatedShape }).shape
+const send = (asset: FigureAsset, w: NonNullable<ReturnType<typeof cavityWorkingOf>>) =>
+  applyFigureAuthoring(asset, { kind: 'set-cavity', part: 'bin', cavity: { wall: w.wall, start: w.start, end: w.end } })
+
+test('벽 손잡이: 한 벽을 끌면 네 벽이 같이, 면마다 벽이면 그 벽만 — 한 명령으로 들어간다', () => {
+  const a = tote()
+  const w = cavityWorkingOf(shapeOf(a))!
+  assert.deepEqual(w.wall, { 'x-': 10, 'x+': 10, 'z-': 10, 'z+': 10 })
+  const together = send(a, { ...w, wall: wallDragged(w.wall, 'x-', 24.6, false) })
+  assert.deepEqual(shapeOf(together).cavity!.wall, { 'x-': 25, 'x+': 25, 'z-': 25, 'z+': 25 })
+  const one = send(a, { ...w, wall: wallDragged(w.wall, 'z+', 40, true) })
+  assert.deepEqual(shapeOf(one).cavity!.wall, { 'x-': 10, 'x+': 10, 'z-': 10, 'z+': 40 })
+  assert.deepEqual(wallDragged(w.wall, 'x-', -5, false)['x-'], 1, 'never below 1 mm')
+})
+
+test('끝을 누르면 여닫힌다: 위도 아래도 열면 관, 닫으면 기본 두께로', () => {
+  const a = tote()
+  const s = shapeOf(a)
+  const w = cavityWorkingOf(s)!
+  const pipe = send(a, { ...w, start: endToggled(s, w.start) })
+  assert.equal(cavityResultOf(shapeOf(pipe).cavity!), 'pipe')
+  const sealed = send(a, { ...w, end: endToggled(s, w.end) })
+  assert.equal(cavityResultOf(shapeOf(sealed).cavity!), 'sealed')
+  assert.deepEqual(shapeOf(sealed).cavity!.end, { closed: 40 }, 'the default wall: a tenth of the narrower side')
+})
+
+test('커널이 거절할 모양은 보내지 않고 까닭을 말한다 — 끄는 동안은 미리보기, 놓을 때 한 번', () => {
+  const s = shapeOf(tote())
+  const w = cavityWorkingOf(s)!
+  assert.equal(cavityRefusalOf(s, { ...w, wall: wallDragged(w.wall, 'x-', 250, false) })?.code, 'wall-too-thick')
+  assert.equal(cavityRefusalOf(s, { ...w, start: { closed: 200 }, end: { closed: 150 } })?.code, 'ends-too-thick')
+  has(drawing, /this\.emit\('command-live', this\.refusal \? null : this\.action\(w\)\)/, 'a refused shape is not previewed')
+  has(drawing, /if \(this\.refusal\) \{\s*this\.emit\('command-live', null\)\s*return\s*\}\s*this\.emit\('command', this\.action\(w\)\)/, 'let go: one command, or nothing -- and the reason stays said')
+  has(drawing, /this\.refusal = this\.judge\(next\)\s*if \(!this\.refusal\) this\.emit\('command', this\.action\(next\)\)/, 'a press toggles by one command')
+})
+
+test('단면 칸에 그림이 들어간다: 속 공간이 있을 때, 면마다 벽 토글을 따른다', () => {
+  has(panel, /cavity \? html`<figure-cavity-drawing \.body=\$\{body\} \.perSide=\$\{this\.perSide\} \?locked=\$\{this\.locked\}><\/figure-cavity-drawing>` : nothing/)
+  for (const lang of ['ko', 'en', 'ja', 'zh', 'ms']) {
+    const t = JSON.parse(read(`../translations/${lang}.json`)) as Record<string, string>
+    for (const key of ['figure.label.section-cavity-top', 'figure.label.section-cavity-side']) assert.ok(t[key], `${lang} ${key}`)
+  }
+})

package/test/fasten-drawing.test.ts

@@ -0,0 +1,45 @@
+/*
+ * **붙이기 그림이 폼에 들어간 모습** (사용자 2026-10-01).
+ *
+ * 부품의 면은 고르지 않는다. 상대(부품 또는 배치 기준의 면)와 그 면, 방식만 그림으로 고른다. 이미 붙은 부품은 끌기를 놓으면
+ * 그 자리로 한 번 고쳐지고, 새로 붙이는 부품은 「붙이기」를 기다린다. 화면에 풀이 문구를 두지 않는다.
+ */
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+
+const read = (path: string) => readFileSync(fileURLToPath(new URL(path, import.meta.url)), 'utf8')
+const has = (source: string, re: RegExp, message?: string) => assert.ok(re.test(source), message ?? `missing: ${re}`)
+const form = read('../client/modeller/figure-links.ts')
+const drawing = read('../client/modeller/figure-fasten-drawing.ts')
+const ko = JSON.parse(read('../translations/ko.json')) as Record<string, string>
+const say = (key: string, params: Record<string, string>) => Object.entries(params).reduce((s, [k, v]) => s.replace(`{${k}}`, v), ko[key] ?? key)
+
+test('부품의 면·맞닿기 고르기 칸이 없고, 그 자리에 그림이 있다', () => {
+  assert.ok(!form.includes("i18next.t('figure.label.my-face')"), 'no list of the part\'s own faces')
+  assert.ok(!form.includes("i18next.t('figure.label.facing')"), 'no facing list')
+  has(form, /<figure-fasten-drawing[\s\S]*?\.modes=\$\{f\.toPlane \? \(\['meet'\] as FastenMode\[\]\)/, 'the plane is set on only')
+  has(form, /turnsInPlace\(asset, this\.partId\) \? \(\['centre'\] as FastenMode\[\]\) : \[\]/, 'centre on it only for a part that turns')
+  has(form, /const derived = f\.toPlane \|\| f\.target \? myFaceFor\(asset, this\.partId, aim, mode\) : undefined/, 'the part\'s face follows the target and how')
+})
+
+test('상대 목록에 배치 기준의 면이 이름으로 있다: 바닥 · 천장 · 벽 · 중심', () => {
+  has(form, /const planeWord = i18next\.t\('figure\.label\.resize-place-' \+ \(asset\.placement \?\? 'floor'\)\)/)
+  has(form, /<option value=\$\{PLANE\} \?selected=\$\{f\.toPlane\}>\$\{planeWord\}<\/option>/)
+})
+
+test('놓으면: 이미 붙은 부품은 한 번 고쳐지고, 새 부품은 붙이기를 기다린다', () => {
+  has(form, /private async onFastenRelease\(held: boolean\) \{\s*if \(!held\) return\s*await this\.updateComplete\s*if \(this\.fastenCandidate\) this\.command\(this\.fastenCandidate\.action\)/)
+  has(drawing, /private drop\(\) \{[\s\S]*?this\.released\(\)\s*\}/, 'a drag ends in one release')
+  has(drawing, /this\.change\(\{ targetFace: f \}\)\s*this\.released\(\)/, 'a face pressed is one change')
+  has(drawing, /this\.change\(\{ mode: m \}\)\s*this\.released\(\)/, 'a way pressed is one change')
+})
+
+test('화면 문구는 결과와 예외만 — 한 줄 요약, 가장자리 밖, 닿지 않음', () => {
+  assert.equal(say('figure.text.fasten-sentence-meet', { part: 'lid', face: '아랫면', to: 'bin의 윗면' }), 'lid의 아랫면을 bin의 윗면에 맞닿게')
+  assert.equal(say('figure.text.fasten-sentence-centre', { part: 'roller', face: '', to: 'frame의 앞면' }), 'roller의 가운데를 frame의 앞면 위에')
+  for (const key of ['figure.text.fasten-off-face', 'figure.text.fasten-past-edges', 'figure.label.fasten-mode-meet', 'figure.label.fasten-mode-flush', 'figure.label.fasten-mode-centre'])
+    for (const lang of ['ko', 'en', 'ja', 'zh', 'ms']) assert.ok((JSON.parse(read(`../translations/${lang}.json`)) as Record<string, string>)[key], `${lang} ${key}`)
+  assert.ok(!/끌어 옮깁니다|면 밖으로도/.test(JSON.stringify(ko)), 'no instructions on the screen')
+})

package/test/fasten-geometry.test.ts

@@ -0,0 +1,79 @@
+/*
+ * **붙이기 그림이 읽는 것** (사용자 2026-10-01: 「면을 선택하는 것이 복잡해보인다」).
+ *
+ * 붙이기는 상대 면과 방식(올려놓기 · 같은 면 · 가운데를 면에)만 고른다. 부품의 면은 거기서 정해진다 — 돌려 놓인 부품이면
+ * 지금 그 방향을 보는 면이다. 면 위에 놓은 자리는 가운데·안쪽 끝·바깥 끝에 붙고, 그 밖은 mm 다. figure-model 이 그 명령을
+ * 받아 부품을 정말 그 자리에 두는지까지 잰다.
+ */
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+
+import { addFigureBox, applyFigureAuthoring, compileFigureAsset, createFigureAsset, figurePartFaceOf } from '@hatiolab/figure-model'
+import type { FigureAsset, FigureAuthoringAction } from '@hatiolab/figure-model'
+
+import { alignmentAt, faceViewOf, myFaceFor, offsetOf, overhangOf, screenOf } from '../client/modeller/fasten-geometry.ts'
+
+const scene = (lidRotation?: { x: number; y: number; z: number }): FigureAsset => {
+  let a = addFigureBox(createFigureAsset('Box'), { id: 'bin', size: { x: 600, y: 300, z: 400 }, position: { x: 0, y: 150, z: 0 } })
+  a = applyFigureAuthoring(a, { kind: 'attach', part: 'bin', face: 'bottom', to: { plane: 'mounting-plane' } })
+  return addFigureBox(a, { id: 'lid', size: { x: 300, y: 20, z: 200 }, position: { x: 0, y: 400, z: 0 }, ...(lidRotation ? { rotation: lidRotation } : {}) })
+}
+const at = (a: FigureAsset, id: string) => (compileFigureAsset(a).evaluate().geometry.find(g => (g as { id: string }).id === id) as unknown as { pose: { t: number[] } }).pose.t
+
+test('부품의 면은 상대 면과 방식으로 정해진다: 올려놓기는 마주 보는 면, 같은 면은 같은 면, 가운데는 가운데', () => {
+  const a = scene()
+  assert.equal(myFaceFor(a, 'lid', { part: 'bin', face: 'top' }, 'meet'), 'bottom')
+  assert.equal(myFaceFor(a, 'lid', { part: 'bin', face: 'top' }, 'flush'), 'top')
+  assert.equal(myFaceFor(a, 'lid', { part: 'bin', face: 'front' }, 'meet'), 'back')
+  assert.equal(myFaceFor(a, 'lid', { part: 'bin', face: 'top' }, 'centre'), 'centre')
+  assert.equal(myFaceFor(a, 'lid', 'plane', 'meet'), 'bottom', 'on a floor: the face looking down')
+  assert.equal(myFaceFor(a, 'lid', 'plane', 'centre'), undefined, 'the plane takes a face, never a centre')
+})
+
+test('돌려 놓인 부품이면 지금 아래를 보는 면이다 — 이름이 아니라 방향으로', () => {
+  const a = scene({ x: 90, y: 0, z: 0 })
+  const face = myFaceFor(a, 'lid', { part: 'bin', face: 'top' }, 'meet')!
+  assert.notEqual(face, 'bottom', 'turned a quarter about X, its bottom no longer looks down')
+  const n = figurePartFaceOf(a, 'lid', face)!.normal
+  assert.ok(Math.abs(n[1]! + 1) < 1e-6, `${face} looks down: ${n}`)
+})
+
+test('면 그림: 상대 면의 크기와 부품 발자국, 가장자리 맞춤이 되는 축', () => {
+  const v = faceViewOf(scene(), 'lid', { part: 'bin', face: 'top' })!
+  assert.deepEqual(v.axes, ['x', 'z'])
+  assert.deepEqual([v.face.x, v.face.z], [600, 400])
+  assert.deepEqual([v.part.x, v.part.z], [300, 200])
+  assert.deepEqual(v.edges, { x: true, z: true })
+})
+
+test('놓은 자리: 가운데, 안쪽 끝(가장자리와 나란히), 바깥 끝(가장자리에 닿게), 그 밖은 mm', () => {
+  assert.deepEqual(alignmentAt(4, 600, 300, true, 10), { how: 'centre', caught: 'centre' })
+  assert.deepEqual(alignmentAt(146, 600, 300, true, 10), { how: 'max', caught: 'inside' })
+  assert.deepEqual(alignmentAt(-150, 600, 300, false, 10), { how: 'mm', mm: -150, caught: 'inside' }, 'no edges to line up: a distance that sits there')
+  assert.deepEqual(alignmentAt(452, 600, 300, true, 10), { how: 'mm', mm: 450, caught: 'outside' })
+  assert.deepEqual(alignmentAt(212.4, 600, 300, true, 10), { how: 'mm', mm: 212 })
+  assert.equal(offsetOf('max', undefined, 600, 300), 150)
+  assert.equal(offsetOf('mm', 212, 600, 300), 212)
+})
+
+test('면 밖으로 나온 곳과 닿지 않는 것을 말한다', () => {
+  const v = faceViewOf(scene(), 'lid', { part: 'bin', face: 'top' })!
+  assert.deepEqual(overhangOf(v, { x: 0, y: 0, z: 0 }), { touching: true, sides: [] })
+  assert.deepEqual(overhangOf(v, { x: 200, y: 0, z: 0 }), { touching: true, sides: [{ axis: 'x', side: 'high', mm: 50 }] })
+  assert.equal(overhangOf(v, { x: 460, y: 0, z: 0 }).touching, false)
+})
+
+test('그 자리가 명령이 되면 figure-model 이 부품을 정말 거기 둔다: 오른쪽 끝, 같은 면, 바깥 끝', () => {
+  const a = scene()
+  const attach = (extra: Partial<Extract<FigureAuthoringAction, { kind: 'attach' }>>) =>
+    applyFigureAuthoring(a, { kind: 'attach', part: 'lid', face: 'bottom', to: { part: 'bin', face: 'top' }, ...extra } as FigureAuthoringAction)
+  assert.deepEqual(at(attach({ align: { x: 'max' } }), 'lid').map(Math.round), [150, 310, 0])
+  assert.deepEqual(at(attach({ face: 'top', facing: 'flush' }), 'lid').map(Math.round), [0, 290, 0])
+  assert.deepEqual(at(attach({ align: { x: { mm: 450 } } }), 'lid').map(Math.round), [450, 310, 0], 'past the edge: fastened all the same')
+})
+
+test('면은 서 있는 대로 보인다: 앞면은 X 가로·Y 위로, 옆면은 Z 가로·Y 위로, 윗면은 X 가로·Z 아래로', () => {
+  assert.deepEqual(screenOf(['x', 'y']), { h: 'x', v: 'y', sign: { x: 1, y: -1, z: 1 } })
+  assert.deepEqual(screenOf(['y', 'z']), { h: 'z', v: 'y', sign: { x: 1, y: -1, z: 1 } })
+  assert.deepEqual(screenOf(['x', 'z']), { h: 'x', v: 'z', sign: { x: 1, y: 1, z: 1 } })
+})

package/test/layout.test.ts

@@ -37,12 +37,12 @@ test('부품을 고르면 — 도형 전체의 탭(판정 · 이력)은 그 부
     assert.ok(renderBody.includes(from), from)
 })
 
-/* B.1 (designer 2026-09-27): the path -- model name › part -- on every tab; the model name is the one way back, the same move as the list's root. */
-test('모델명 › 부품 경로가 탭마다 있고, 모델명은 목록 루트와 같은 한 동작으로 모델 설정을 연다', () => {
+/* B.1 (designer 2026-09-27), amended by the user 2026-10-01: no path -- the list and the canvas show the choice; the list's root goes back. */
+test('패널 머리에는 경로가 없고 부품의 세 줄만 — 모델 설정은 목록 루트의 한 동작으로 연다', () => {
   assert.ok((renderBody.match(/\$\{this\.renderSubject\(\)\}/g) ?? []).length >= 3)
   const subject = editor.slice(editor.indexOf('  private renderSubject()'), editor.indexOf('  private showModelSettings()'))
-  assert.ok(subject.includes('@click=${() => this.showModelSettings()}'))
-  assert.ok(!subject.includes('whole-figure'), 'no separate "whole figure" link')
+  assert.ok(!subject.includes('<nav path'), 'no path')
+  assert.ok(subject.includes('if (!summary) return nothing'), 'nothing chosen: no head')
   const show = editor.slice(editor.indexOf('  private showModelSettings()'), editor.indexOf('  render() {'))
   assert.ok(show.includes("this.selected = ''") && show.includes("this.tab = 'properties'"), 'the model settings, on the properties tab')
   assert.ok(!/session!?\.(command|apply|edit|undo)/.test(show), 'moving changes no data and no history')
@@ -82,3 +82,18 @@ test('탭 아이콘은 오른쪽 칸 맨 위 — 타입 칸은 속성 탭 안의
   const page = read('../client/pages/figure-modeller-page.ts')
   assert.ok(page.includes('<label slot="type" type-field>'))
 })
+
+/* User 2026-10-01: 「맞추기 아이콘 … 무엇을 하는 것인지 모르겠다」 -- words, and what moves the part apart from what makes one. */
+test('맞추기는 글자 단추로 — 옮기는 넷(가운데 X·Z, 면에 대기, 눈금)과 새 부품을 만드는 대칭 복사를 다른 줄에 둔다', () => {
+  const tools = editor.slice(editor.indexOf('  private renderTools('), editor.indexOf("  /**\n   * A part's name."))
+  assert.ok(!tools.includes('<md-icon>'), 'no icon-only buttons')
+  assert.ok(tools.includes("i18next.t('figure.label.tools')") && tools.includes("i18next.t('figure.label.mirror-copy')"), 'two rows, each named')
+  const plane = editor.slice(editor.indexOf('  private renderPlaneAlign('), editor.indexOf('  private alignToPlane()'))
+  assert.ok(!plane.includes('<md-icon>') && plane.includes('figure.button.align-to-${placement}'))
+  const ko = JSON.parse(readFileSync(fileURLToPath(new URL('../translations/ko.json', import.meta.url)), 'utf8')) as Record<string, string>
+  assert.deepEqual(
+    ['center-x', 'center-z', 'align-to-floor', 'snap', 'mirror-x'].map(k => ko[`figure.button.${k}`]),
+    ['X 가운데로', 'Z 가운데로', '바닥에 내려놓기', '눈금에 맞추기', 'X 반대편에']
+  )
+  assert.ok(!ko['figure.text.center-on-x']!.includes('기준 상자'), 'says what the centre is')
+})

package/test/links.test.ts

@@ -331,7 +331,9 @@ test('붙여도 제자리 — 폼은 지금 서 있는 자리를 가운데서
   row = applyFigureAuthoring(row, { kind: 'attach', part: 'cap', face: 'bottom', to: { part: 'roller', face: 'top' } })
   assert.deepEqual([hangsFrom(row, 'roller', 'plate'), hangsFrom(row, 'cap', 'plate'), hangsFrom(row, 'plate', 'roller')], [true, true, false])
   const form = read('../client/modeller/figure-links.ts')
-  assert.equal(form.match(/this\.aimAt\(asset, \{ \.\.\.f, (target|targetFace):/g)?.length, 2, '상대 부품 · 상대 면을 바꿀 때마다')
+  /* The target (a part or the plane, user 2026-10-01) and its face: the form is filled in whenever either changes. */
+  assert.ok(form.includes("this.aimAt(asset, value === PLANE ? { ...f, toPlane: true, target: '' } : { ...f, toPlane: false, target: value })"), '상대를 바꿀 때마다')
+  assert.ok(form.includes("this.aimAt(asset, { ...f, targetFace: c.targetFace as FigureFace })"), '상대 면을 바꿀 때마다')
   assert.ok(!form.includes("figure.label.stands-on-plane"), '부품 붙이기 폼에 모델 설치 기준을 섞지 않는다')
   /* Kept in the list, not choosable, with the reason (ADR-0097 §5.5). */
   assert.ok(form.includes('const loops = (one: string) => hangsFrom(asset, one, this.partId)'))

package/test/section-editor.test.ts

@@ -121,9 +121,10 @@ test('적용은 한 명령, 취소·Esc 는 아무것도 보내지 않는다 —
     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\)\}/)
   has(editor,
-    /protected willUpdate[\s\S]*?if \(this\.sectionEditing && this\.sectionEditing !== this\.selected\) this\.closeSectionEditor\(\)\s*\}/,
+    /protected willUpdate[\s\S]*?if \(this\.sectionEditing && this\.sectionEditing !== this\.selected\) this\.leaveSectionEditor\(this\.selected\)\s*\}/,
     'the selection moved off the part by any way closes it and lets go of the preview'
   )
+  has(editor, /if \(!editor\?\.dirty \|\| !stillThere\) \{\s*this\.closeSectionEditor\(\)/, 'nothing changed, or nothing to go back to: it just closes')
   has(editor, /private closeSectionEditor\(\) \{\s*this\.sectionEditing = null\s*this\.holdAction\(null\)/)
   has(sectionPanel, /section-editor-open/)
 })
@@ -133,7 +134,7 @@ test('Delete 키는 칸 안에서는 글자를, 밖에서는 고른 점을 지
   /* The scene listens on its own element and stops the key there: heard later, Esc selected nothing and Delete took the part. */
   has(editorPanel, /window\.addEventListener\('keydown', this\.keys, true\)/)
   has(editorPanel, /const take = \(\) => \(e\.preventDefault\(\), e\.stopImmediatePropagation\(\)\)/)
-  has(editorPanel, /if \(e\.key === 'Escape'\) \{\s*take\(\)\s*this\.cancel\(\)/)
+  has(editorPanel, /if \(e\.key === 'Escape'\) \{\s*take\(\)\s*this\.requestClose\(\)/)
 })
 
 test('그림은 점을 다 담고 여유를 둔다 — 50 mm 단위로', () => {
@@ -177,10 +178,14 @@ test('편집 창이 열린 동안 모델러의 키는 비켜선다 — Esc 가
   assert.ok(onKey.indexOf('if (this.sectionEditing) return') < onKey.indexOf('keyActionOf('), 'before any key is taken')
 })
 
-test('속성 칸의 점 좌표도 커널 이름이 아니라 「점 1 Z」로 부른다 — 편집 창과 같은 말', () => {
-  has(editor, /const point = \/\^point\\\.p\(\\d\+\)\\\.\(\[xyz\]\)\$\/\.exec\(name\)/)
-  has(editor, /i18next\.t\('figure\.label\.section-editor-coordinate', \{ point: point\[1\]!, axis: point\[2\]!\.toUpperCase\(\) \}\)/)
-  assert.equal(say('figure.label.section-editor-coordinate', { point: '1', axis: 'Z' }), '점 1 Z')
+test('속성의 형상 치수에는 점·꼭짓점 칸이 없다 (사용자 10-01) — 높이만 남고, 단면 칸이 점 개수를 말한다', async () => {
+  const { groupFields } = await import('../client/modeller/fields.ts')
+  const f = (id: string) => ({ id, value: 0, unit: 'mm' })
+  const ids = ['tip.dimension.height', 'tip.point.p1.x', 'tip.point.p1.z', 'tip.point.p12.x', 'tip.apex.x', 'tip.apex.z', 'tip.position.x']
+  const { singles } = groupFields(ids.map(f) as never, 'tip')
+  assert.deepEqual(singles.map(g => (g as { field: { id: string } }).field.id), ['tip.dimension.height'])
+  has(sectionPanel, /e\.apex \? 'figure\.text\.section-points-apex' : 'figure\.text\.section-points', \{ points: String\(e\.section\.points\.length\) \}/)
+  assert.equal(say('figure.text.section-points-apex', { points: '3' }), '점 3개 · 꼭짓점 하나')
 })
 
 test('편집 창 옆에 입체를 볼 자리가 없으면 윤곽과 입체 결과를 번갈아 본다 (§7)', async () => {
@@ -286,8 +291,6 @@ test('편집 창에서 끝을 한 점으로: 켜면 점들의 가운데 위에
   assert.deepEqual(again.apex, { x: 0, z: 0 })
   assert.deepEqual(sectionOfWorking(p, again), { kind: 'polygon', points: again.points })
   assert.equal(issuesOfWorking(p, { ...again, apex: { x: Number.NaN, z: 0 } }).words[0]!.key, 'figure.text.section-issue-number')
-  /* In the properties its apex is called as the editor calls it: 꼭짓점 X. */
-  has(editor, /\? \[`\$\{i18next\.t\('figure\.label\.section-editor-apex-mark'\)\} \$\{apex\[1\]!\.toUpperCase\(\)\}`\]/)
   /* Its length is its height: the same field, called so. */
   has(editorPanel, /this\.working\.apex \? 'figure\.label\.section-editor-height' : 'figure\.label\.section-editor-length'/)
   const back = applyFigureAuthoring(pyramid, { kind: 'set-section', part: 'wedge', apex: null })
@@ -303,3 +306,23 @@ test('끝면에 붙은 부품이 있으면 한 점으로 모으기를 막고 그
   /* A pyramid in the section panel: its editor opens, and it has no corners and no inside. */
   has(sectionPanel, /const e = body\?\.shape \? drawnOf\(body\.shape\) : undefined/)
 })
+
+test('닫기 전에 묻는다 (사용자 10-01): 바꾼 것이 있으면 적용·버리기·계속 편집 — 바꾼 것이 없으면 그냥 닫는다', () => {
+  const choice = read('../client/modeller/figure-section-close-choice.ts')
+  /* Esc and 취소 both ask; while it asks, the question has the keys. */
+  has(editorPanel, /if \(e\.key === 'Escape'\) \{\s*take\(\)\s*this\.requestClose\(\)/)
+  has(editorPanel, /<button @click=\$\{\(\) => this\.requestClose\(\)\}>\$\{i18next\.t\('figure\.button\.section-editor-cancel'\)\}/)
+  has(editorPanel, /if \(this\.asking\) return\n/)
+  has(editorPanel, /if \(!this\.dirty\) \{\s*this\.cancel\(\)\s*return true/)
+  /* Apply is only offered when it would be taken: not for a refused shape, not after the figure changed. */
+  has(editorPanel, /if \(choice === 'apply' && !held\)/)
+  has(choice, /\$\{this\.held\s*\? nothing/)
+  /* Picking another part while changes wait keeps the part selected until the editor closed. */
+  has(editor, /this\.selected = editing\s*editor\.requestClose\(\)\.then\(closed => \{\s*if \(closed && this\.selected === editing\) this\.selected = next/)
+  for (const lang of ['ko', 'en', 'ja', 'zh', 'ms']) {
+    const t = JSON.parse(read(`../translations/${lang}.json`)) as Record<string, string>
+    for (const key of ['figure.text.section-editor-close-changed', 'figure.text.section-editor-close-invalid', 'figure.button.section-editor-apply-and-close', 'figure.button.section-editor-discard', 'figure.button.keep-editing'])
+      assert.ok(t[key], `${lang} ${key}`)
+  }
+  assert.equal(ko['figure.button.section-editor-apply-and-close'], '적용하고 닫기')
+})

package/translations/en.json

@@ -5,8 +5,8 @@
   "figure.button.add-parameter": "add parameter",
   "figure.button.ask": "ask",
   "figure.button.cancel": "cancel",
-  "figure.button.center-x": "centre X",
-  "figure.button.center-z": "centre Z",
+  "figure.button.center-x": "to X centre",
+  "figure.button.center-z": "to Z centre",
   "figure.button.close": "close",
   "figure.button.delete-figure": "delete",
   "figure.button.discard": "discard",
@@ -20,8 +20,8 @@
   "figure.button.scale-uniformly": "grow by one ratio",
   "figure.text.sizing-uniform-proposed": "this figure has joints. growing it by one ratio keeps the joints together at any size.",
   "figure.text.sizing-uniform-explained": "grows the whole figure by the geometric mean of the three sizes a board gives it. the feet stay on the floor; room left above the figure stays empty.",
-  "figure.button.mirror-x": "mirror X",
-  "figure.button.mirror-z": "mirror Z",
+  "figure.button.mirror-x": "across X",
+  "figure.button.mirror-z": "across Z",
   "figure.button.move-part-down": "move down",
   "figure.button.move-part-up": "move up",
   "figure.button.new-figure": "new figure",
@@ -33,7 +33,7 @@
   "figure.button.revert": "revert",
   "figure.button.save": "save",
   "figure.button.see-the-trend-chart": "see the trend chart",
-  "figure.button.snap": "snap",
+  "figure.button.snap": "snap to grid",
   "figure.label.declared-space": "declared space",
   "figure.label.follows-expression": "set by an expression",
   "figure.label.gizmo-rotate": "turn",
@@ -388,8 +388,8 @@
   "figure.text.category-explained": "how the palette groups figures. one per figure.",
   "figure.text.category-placeholder": "e.g. conveyor",
   "figure.text.ceiling-height-explained": "the height a ceiling figure hangs from in the preview.",
-  "figure.text.center-on-x": "move to the centre of the base box on X.",
-  "figure.text.center-on-z": "move to the centre of the base box on Z.",
+  "figure.text.center-on-x": "moves it to the figure's X centre (X=0).",
+  "figure.text.center-on-z": "moves it to the figure's Z centre (Z=0).",
   "figure.text.clip-is-time-running": "plays over time. the value an instance gives is the playback speed.",
   "figure.text.clip-name-is-how-it-is-driven": "an instance gives a speed by this name.",
   "figure.text.clip-name-taken": "another clip already has this name. enter a different name.",
@@ -502,7 +502,6 @@
   "figure.text.tags-explained": "tags used for search. separate several with commas.",
   "figure.text.tags-placeholder": "e.g. outbound, automatic, level 2",
   "figure.text.thumbnail-not-made-yet": "no thumbnail yet",
-  "figure.text.tools-explained": "from left: centre X, centre Z, to floor, mirror X, mirror Z, snap to grid.",
   "figure.text.triangle-count": "{count} triangles",
   "figure.text.type-name-already-taken": "the type name {type} is already in use. pick another one.",
   "figure.text.type-name-cannot-change": "the type name cannot be changed after creation.",
@@ -884,8 +883,6 @@
   "figure.text.placement-is-intent": "What the figure is authored from. You can choose it before any part; it does not change the declared space.",
   "figure.button.show-model-settings": "Show model settings",
   "figure.text.new-figure-name": "New figure",
-  "figure.label.panel-path": "What the panel shows",
-  "figure.label.model-settings": "Model settings",
   "figure.text.fasten-editing": "Editing the current attachment: its {face} on {target}",
   "figure.text.fasten-new": "Attach anew",
   "figure.text.fasten-start": "Attach this part to a face on another part so they keep their relationship when either changes.",
@@ -894,10 +891,10 @@
   "figure.text.fasten-target-first": "Choose the part to attach to first.",
   "figure.text.fasten-edit-on-plane": "This part is connected to the model's placement reference. Detach it before attaching it to another part.",
   "figure.button.fasten-update": "Update this attachment",
-  "figure.button.align-to-floor": "Align to the floor",
-  "figure.button.align-to-ceiling": "Align to the ceiling",
-  "figure.button.align-to-wall": "Align to the wall",
-  "figure.button.align-to-center": "Align to the centre height",
+  "figure.button.align-to-floor": "set on the floor",
+  "figure.button.align-to-ceiling": "up to the ceiling",
+  "figure.button.align-to-wall": "back to the wall",
+  "figure.button.align-to-center": "to centre height",
   "figure.text.align-to-floor": "Moves it once so its bottom is on the floor (Y=0). It is not attached.",
   "figure.text.align-to-ceiling": "Moves it once so its top is on the ceiling (Y=0). It is not attached.",
   "figure.text.align-to-wall": "Moves it once so its back is on the wall (Z=0). It is not attached.",
@@ -945,5 +942,22 @@
   "figure.label.section-editor-apex-at": "apex {axis} (mm)",
   "figure.label.section-editor-apex-mark": "apex",
   "figure.text.section-editor-apex-blocked": "A part is fastened to its {face}, so it cannot be drawn to one point.",
-  "figure.label.section-editor-height": "height (mm)"
+  "figure.label.section-editor-height": "height (mm)",
+  "figure.text.section-editor-close-changed": "The section has changes not applied yet. What should happen to them?",
+  "figure.text.section-editor-close-invalid": "The shape as it is cannot be applied. Fix it and apply, or let it go.",
+  "figure.button.section-editor-apply-and-close": "apply and close",
+  "figure.button.section-editor-discard": "discard and close",
+  "figure.text.section-points": "{points} points",
+  "figure.text.section-points-apex": "{points} points · one apex",
+  "figure.label.mirror-copy": "mirror copy",
+  "figure.label.section-cavity-top": "the inside seen along the push",
+  "figure.label.section-cavity-side": "cut along the push",
+  "figure.label.fasten-mode-meet": "set on it",
+  "figure.label.fasten-mode-flush": "flush with it",
+  "figure.label.fasten-mode-centre": "centre on it",
+  "figure.text.fasten-off-face": "It does not touch {face}.",
+  "figure.text.fasten-past-edges": "It comes past the edges: {sides}",
+  "figure.text.fasten-sentence-meet": "{part}'s {face} set on {to}",
+  "figure.text.fasten-sentence-flush": "{part}'s {face} flush with {to}",
+  "figure.text.fasten-sentence-centre": "{part}'s centre on {to}"
 }

package/translations/ja.json

@@ -5,8 +5,8 @@
   "figure.button.add-parameter": "パラメーターを追加",
   "figure.button.ask": "ask",
   "figure.button.cancel": "キャンセル",
-  "figure.button.center-x": "centre X",
-  "figure.button.center-z": "centre Z",
+  "figure.button.center-x": "X 中央へ",
+  "figure.button.center-z": "Z 中央へ",
   "figure.button.close": "close",
   "figure.button.delete-figure": "delete",
   "figure.button.discard": "discard",
@@ -20,8 +20,8 @@
   "figure.button.scale-uniformly": "一つの比率で拡大",
   "figure.text.sizing-uniform-proposed": "関節のある図形です。一つの比率で拡大すると、どのサイズでも関節が離れません。",
   "figure.text.sizing-uniform-explained": "ボードが与えた 3 軸サイズの幾何平均の比率で図形全体を拡大します。足は床に置き、箱の上の余りは空けたままにします。",
-  "figure.button.mirror-x": "mirror X",
-  "figure.button.mirror-z": "mirror Z",
+  "figure.button.mirror-x": "X 反対側に",
+  "figure.button.mirror-z": "Z 反対側に",
   "figure.button.move-part-down": "move down",
   "figure.button.move-part-up": "move up",
   "figure.button.new-figure": "new figure",
@@ -33,7 +33,7 @@
   "figure.button.revert": "戻す",
   "figure.button.save": "save",
   "figure.button.see-the-trend-chart": "see the trend chart",
-  "figure.button.snap": "snap",
+  "figure.button.snap": "グリッドに合わせる",
   "figure.label.declared-space": "空間宣言",
   "figure.label.follows-expression": "式で決まる",
   "figure.label.gizmo-rotate": "回転",
@@ -388,8 +388,8 @@
   "figure.text.category-explained": "パレットでまとめて表示する基準です。Figure ごとに 1 つだけ決めます。",
   "figure.text.category-placeholder": "例: コンベヤ",
   "figure.text.ceiling-height-explained": "天井基準の Figure をプレビューで吊り下げる高さです。",
-  "figure.text.center-on-x": "move to the centre of the base box on X.",
-  "figure.text.center-on-z": "move to the centre of the base box on Z.",
+  "figure.text.center-on-x": "図形の X 中央 (X=0) へ移動します。",
+  "figure.text.center-on-z": "図形の Z 中央 (Z=0) へ移動します。",
   "figure.text.clip-is-time-running": "時間に沿って再生されます。インスタンスが渡す値は再生速度です。",
   "figure.text.clip-name-is-how-it-is-driven": "インスタンスはこの名前で再生速度を渡します。",
   "figure.text.clip-name-taken": "同じ名前の clip がすでにあります。別の名前を入力してください。",
@@ -502,7 +502,6 @@
   "figure.text.tags-explained": "検索に使うタグです。カンマで区切って複数入力できます。",
   "figure.text.tags-placeholder": "例: 搬出, 自動, 2 階",
   "figure.text.thumbnail-not-made-yet": "no thumbnail yet",
-  "figure.text.tools-explained": "左から X 中央、Z 中央、床に付ける、X 対称、Z 対称、目盛りに合わせるです。",
   "figure.text.triangle-count": "{count} triangles",
   "figure.text.type-name-already-taken": "the type name {type} is already in use. pick another one — it cannot be changed later.",
   "figure.text.type-name-cannot-change": "タイプ名は作成後に変更できません。",
@@ -884,8 +883,6 @@
   "figure.text.placement-is-intent": "作成の基準です。部品がなくても決められ、空間の宣言は変えません。",
   "figure.button.show-model-settings": "モデル設定を表示",
   "figure.text.new-figure-name": "新しい Figure",
-  "figure.label.panel-path": "表示中の対象",
-  "figure.label.model-settings": "モデル設定",
   "figure.text.fasten-editing": "現在の取り付けを編集: {face}を{target}に",
   "figure.text.fasten-new": "新しく取り付ける",
   "figure.text.fasten-start": "別の部品の面に取り付けると、相手の部品が変わっても関係を保ちます。",
@@ -945,5 +942,22 @@
   "figure.label.section-editor-apex-at": "頂点 {axis} (mm)",
   "figure.label.section-editor-apex-mark": "頂点",
   "figure.text.section-editor-apex-blocked": "{face}に部品が付いているため、一点にまとめられません。",
-  "figure.label.section-editor-height": "高さ (mm)"
+  "figure.label.section-editor-height": "高さ (mm)",
+  "figure.text.section-editor-close-changed": "適用していない断面の変更があります。どうしますか？",
+  "figure.text.section-editor-close-invalid": "今の形は適用できません。直してから適用するか、破棄してください。",
+  "figure.button.section-editor-apply-and-close": "適用して閉じる",
+  "figure.button.section-editor-discard": "破棄して閉じる",
+  "figure.text.section-points": "点 {points} 個",
+  "figure.text.section-points-apex": "点 {points} 個 · 頂点 1 つ",
+  "figure.label.mirror-copy": "対称コピー",
+  "figure.label.section-cavity-top": "押し出し方向から見た内部",
+  "figure.label.section-cavity-side": "押し出し方向の断面",
+  "figure.label.fasten-mode-meet": "載せる",
+  "figure.label.fasten-mode-flush": "同じ面に合わせる",
+  "figure.label.fasten-mode-centre": "中心を面に",
+  "figure.text.fasten-off-face": "{face}に接していません。",
+  "figure.text.fasten-past-edges": "縁からはみ出しています: {sides}",
+  "figure.text.fasten-sentence-meet": "{part}の{face}を{to}に接して",
+  "figure.text.fasten-sentence-flush": "{part}の{face}を{to}と同じ面に",
+  "figure.text.fasten-sentence-centre": "{part}の中心を{to}の上に"
 }