@things-factory/figure-ui 10.1.84 → 10.1.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-ui",
-  "version": "10.1.84",
+  "version": "10.1.85",
   "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": "12df439ce09de2bc9aa87d4578766f46bfad48fd"
+  "gitHead": "cbca21a8021b950f558f5547d5df4d12c199a3ef"
 }

package/test/palette-icons.test.ts

@@ -17,6 +17,6 @@ test('every shape in the palette has an icon the font draws', () => {
   const parts = readFileSync(fileURLToPath(new URL('../client/modeller/figure-parts.ts', import.meta.url)), 'utf8')
   const recipes = parts.slice(parts.indexOf('const RECIPES'), parts.indexOf(']', parts.indexOf('const RECIPES')))
   const icons = [...recipes.matchAll(/icon: '([a-z_]+)'/g)].map(m => m[1]!)
-  assert.ok(icons.length >= 9)
+  assert.ok(icons.length >= 8, 'the eight starting shapes (ADR-0100 §2.1)')
   assert.deepEqual(icons.filter(icon => !RENDERS.has(icon)), [])
 })

package/test/parts-wiring.test.ts

@@ -57,8 +57,12 @@ test('좁은 칸에서도 고른 줄의 이름과 조작이 다 보인다 —
   assert.match(narrow, /li\[selected\] div\[ops\] \{\s*flex-basis: 100%;/)
 })
 
-test('둥근 상자는 제 이름으로 부른다 — 「사각 단면」이 아니다', () => {
-  assert.match(panel, /kind: 'rounded-box', icon: 'crop_square', label: 'figure\.label\.primitive-rounded-box'/)
+test('팔레트는 시작 모양만 낸다 — 둥근 상자와 통은 상자의 모서리·속 공간으로 만든다 (ADR-0100 §2.1·§3.3)', () => {
+  const recipes = panel.slice(panel.indexOf('const RECIPES'), panel.indexOf(']', panel.indexOf('const RECIPES')))
+  const kinds = [...recipes.matchAll(/kind: '([\w-]+)'/g)].map(m => m[1])
+  assert.deepEqual(kinds, ['box', 'cylinder', 'sphere', 'frustum', 'polygon', 'plate', 'wall', 'portal'])
+  /* A part made so is still called by what it is: its icon in the parts list, its name over the properties (links.ts). */
+  assert.match(panel, /'rounded-box': 'crop_square'/)
   for (const lang of ['ko', 'en', 'ja', 'zh', 'ms'])
     assert.ok(JSON.parse(read(`../translations/${lang}.json`))['figure.label.primitive-rounded-box'], lang)
 })

package/test/section-panel.test.ts

@@ -12,7 +12,17 @@ import { fileURLToPath } from 'node:url'
 import { addFigureBox, applyFigureAuthoring, compileFigureAsset, createFigureAsset } from '@hatiolab/figure-model'
 import type { FigureAsset, FigureEvaluatedShape } from '@hatiolab/figure-model'
 
-import { cavityRequestOf, defaultWallOf } from '../client/modeller/section-controls.ts'
+import {
+  cavityDepthOf,
+  cavityRefusalOf,
+  cavityRequestOf,
+  cavityResultOf,
+  cornerLimitOf,
+  cornerRefusalOf,
+  defaultWallOf,
+  wallLimitOf
+} from '../client/modeller/section-controls.ts'
+import { livePartsOf } from '../client/modeller/live.ts'
 import { editRefusalOf } from '../client/modeller/refusals.ts'
 
 const read = (path: string) => readFileSync(fileURLToPath(new URL(path, import.meta.url)), 'utf8')
@@ -73,17 +83,73 @@ test('벽이 단면을 다 채우거나 모서리가 변의 절반을 넘으면,
   assert.equal(refusal(() => applyFigureAuthoring(probe(), { kind: 'set-section-corner', part: 'body', corner: 160 })), ko['figure.text.section-corner-too-large'])
 })
 
-test('편집기는 단면 칸의 명령을 세션의 이력 하나로 돌리고, 칸은 둥글린 사각·타원 단면에만 선다', () => {
+test('편집기는 단면 칸의 명령을 세션의 이력 하나로 돌리고, 치는 동안의 값은 그리기만 한다', () => {
   assert.match(editor, /<figure-section-panel[\s\S]*?@command=\$\{\(e: CustomEvent\) => this\.linkCommand\(e\.detail\.action\)\}/)
-  assert.match(panel, /if \(kind !== 'rectangle' && kind !== 'ellipse'\) return nothing/)
+  assert.match(editor, /@command-live=\$\{\(e: CustomEvent\) => this\.holdAction\(e\.detail\.action\)\}/)
+  assert.match(editor, /private linkCommand\(action: FigureAuthoringAction\) \{\s*\/\*[^*]*\*\/\s*this\.holdAction\(null\)/, 'a command sent lets go of the one in hand')
   for (const lang of ['ko', 'en', 'ja', 'zh', 'ms']) {
     const words = JSON.parse(read(`../translations/${lang}.json`)) as Record<string, string>
     const used = [...new Set([...panel.matchAll(/'(figure\.(?:label|text)\.section-[\w-]+|figure\.label\.group-section)'/g)].map(m => m[1]!))]
-    assert.ok(used.length >= 8)
+    /* The keys the panel builds: each result, and the wall's and the ends' over-limit words. */
+    used.push(...['pipe', 'container', 'sealed'].map(r => `figure.label.section-result-${r}`), 'figure.text.section-wall-over', 'figure.text.section-ends-over')
+    assert.ok(used.length >= 16)
     for (const key of used) assert.ok(words[key], `${lang} has ${key}`)
   }
 })
 
+test('화면에 커널 말을 쓰지 않는다 — 「속 비우기」·「중공」·「공동」이 아니라 「속 공간」 (ADR-0100 §2.1)', () => {
+  const words = Object.entries(ko).filter(([k]) => k.startsWith('figure.label.section-') || k.startsWith('figure.text.section-'))
+  for (const [key, text] of words) assert.doesNotMatch(text, /속\s*비우|속을 비움|중공|공동/, key)
+  assert.equal(ko['figure.label.section-cavity'], '속 공간 만들기')
+})
+
+test('모서리 반지름의 허용값은 커널이 정한 그대로다 — 짧은 변의 절반까지', () => {
+  const shape = shapeOf(probe())
+  assert.equal(cornerLimitOf(shape), 150)
+  assert.equal(cornerRefusalOf(shape, 150), null)
+  assert.deepEqual(cornerRefusalOf(shape, 151), { max: 150 })
+  /* The screen's limit is the kernel's: the command takes 150 and refuses 151. */
+  assert.doesNotThrow(() => shapeOf(applyFigureAuthoring(probe(), { kind: 'set-section-corner', part: 'body', corner: 150 })))
+  assert.throws(() => applyFigureAuthoring(probe(), { kind: 'set-section-corner', part: 'body', corner: 151 }))
+})
+
+test('벽과 막힌 끝의 허용값도 커널이 정한 그대로다 — 칸은 고칠 값을 말하고 보내지 않는다', () => {
+  const tray = applyFigureAuthoring(probe(), { kind: 'set-cavity', part: 'body', cavity: cavityRequestOf(shapeOf(probe())) })
+  const shape = shapeOf(tray)
+  assert.equal(wallLimitOf(shape), 150)
+  assert.deepEqual(cavityRefusalOf(shape, cavityRequestOf(shape, { wall: 150 })), { code: 'wall-too-thick', max: 150 })
+  assert.equal(cavityRefusalOf(shape, cavityRequestOf(shape, { wall: 149 })), null)
+  assert.doesNotThrow(() => applyFigureAuthoring(tray, { kind: 'set-cavity', part: 'body', cavity: cavityRequestOf(shape, { wall: 149 }) }))
+  assert.throws(() => applyFigureAuthoring(tray, { kind: 'set-cavity', part: 'body', cavity: cavityRequestOf(shape, { wall: 150 }) }))
+  assert.deepEqual(cavityRefusalOf(shape, cavityRequestOf(shape, { start: { closed: 120 }, end: { closed: 80 } })), { code: 'ends-too-thick', max: 200 })
+  /* One side thicker than the rest: the kernel still says whether the inside has room. */
+  assert.equal(cavityRefusalOf(shape, cavityRequestOf(shape, { wall: { 'x-': 396, 'x+': 5, 'z-': 5, 'z+': 5 } })).code, 'wall-too-thick')
+  assert.equal(cavityRefusalOf(shape, cavityRequestOf(shape, { wall: { 'x-': 100, 'x+': 5, 'z-': 5, 'z+': 5 } })), null)
+})
+
+test('속 공간은 무엇이 되었는지와 깊이로 보인다 — 한쪽이 열리면 용기, 양쪽이면 관, 양쪽이 막히면 닫힌 속 공간', () => {
+  const tray = shapeOf(applyFigureAuthoring(probe(), { kind: 'set-cavity', part: 'body', cavity: cavityRequestOf(shapeOf(probe())) }))
+  assert.equal(cavityResultOf(tray.cavity!), 'container')
+  assert.equal(cavityDepthOf(tray), 170, 'the 200 mm push less its 30 mm floor')
+  assert.equal(cavityResultOf({ ...tray.cavity!, start: 'open' }), 'pipe')
+  assert.equal(cavityResultOf({ ...tray.cavity!, end: { closed: 5 } }), 'sealed')
+  assert.match(panel, /figure\.text\.section-depth/)
+})
+
+test('치는 동안의 값은 사본에 그려지고 원본은 그대로다 — 받을 수 없는 값은 그리지 않는다', () => {
+  const asset = probe()
+  const drawn = livePartsOf(asset, { values: {}, action: { kind: 'set-section-corner', part: 'body', corner: 40 } })!
+  const body = drawn.find(p => p.id === 'body')! as unknown as { shape: FigureEvaluatedShape }
+  assert.deepEqual(body.shape.extrusion!.section, { kind: 'rectangle', size: { x: 400, z: 300 }, corner: { x: 40, z: 40 } })
+  assert.equal('corner' in shapeOf(asset).extrusion!.section, false, 'the asset itself is not changed')
+  assert.equal(livePartsOf(asset, { values: {}, action: { kind: 'set-section-corner', part: 'body', corner: 999 } }), null)
+})
+
+test('다각 단면에는 속 공간을 만들 수 없다고 그 자리에서 말한다', () => {
+  assert.match(panel, /kind === 'rectangle' \|\| kind === 'ellipse'\s*\? this\.renderCavity\(body, e\.axis\)\s*: html`[\s\S]*?figure\.text\.section-cavity-unavailable/)
+  assert.match(ko['figure.text.section-cavity-unavailable']!, /이 윤곽에는 속 공간을 만들 수 없습니다/)
+})
+
 test('붙어 있는 것이 기대는 면을 없애는 편집은 거절되고, 그 면을 사람의 말로 부른다', () => {
   let asset = applyFigureAuthoring(probe(), { kind: 'set-cavity', part: 'body', cavity: { wall: 10, start: { closed: 15 }, end: 'open' } })
   asset = addFigureBox(asset, { id: 'divider', size: { x: 10, y: 100, z: 200 }, position: { x: 0, y: 0, z: 0 } })
@@ -91,3 +157,36 @@ test('붙어 있는 것이 기대는 면을 없애는 편집은 거절되고,
   const said = refusal(() => applyFigureAuthoring(asset, { kind: 'set-cavity', part: 'body', cavity: { wall: 10, start: 'open', end: 'open' } }))
   assert.equal(said, say('figure.text.section-face-in-use', { faces: ko['figure.label.face-inside-bottom']! }))
 })
+
+test('치는 동안 그려진 도형이 칸의 글자를 덮어쓰지 않는다 — 친 것은 보낼 때까지 칸이 든다', () => {
+  assert.match(panel, /\.value=\$\{live\(this\.typed\[key\] \?\? shown\)\}/)
+  assert.match(panel, /this\.typed = \{ \.\.\.this\.typed, \[key\]: \(ev\.target as HTMLInputElement\)\.value \}/)
+})
+
+test('면마다 벽 두께를 치는 동안에도 그려진다 — 명령이 없앤 입력(한 벽 두께)의 지금 값은 미리보기를 막지 않는다', async () => {
+  const { liveOverSession } = await import('../client/modeller/live.ts')
+  const tray = applyFigureAuthoring(probe(), { kind: 'set-cavity', part: 'body', cavity: { wall: 30, start: { closed: 30 }, end: 'open' } })
+  /* The editor draws over every value as it stands: the one wall is among them. */
+  const current = { ...tray.designInputs }
+  assert.ok('body.dimension.wall' in current)
+  const drawn = liveOverSession(tray, current, {
+    values: {},
+    action: { kind: 'set-cavity', part: 'body', cavity: { wall: { 'x-': 100, 'x+': 30, 'z-': 30, 'z+': 30 }, start: { closed: 30 }, end: 'open' } }
+  })
+  assert.ok(drawn, 'the preview is drawn')
+  const body = drawn!.find(p => p.id === 'body') as unknown as { shape: FigureEvaluatedShape }
+  assert.equal(body.shape.cavity!.wall['x-'], 100)
+})
+
+test('한 면의 벽 한도는 그 방향의 너비에서 맞은편 벽을 뺀 값이다 — 네 면이 같을 때의 한도가 아니다', async () => {
+  const { sideWallLimitOf } = await import('../client/modeller/section-controls.ts')
+  const tray = applyFigureAuthoring(probe(), { kind: 'set-cavity', part: 'body', cavity: { wall: 30, start: { closed: 30 }, end: 'open' } })
+  const shape = shapeOf(tray)
+  const walls = { 'x-': 30, 'x+': 40, 'z-': 30, 'z+': 30 }
+  assert.equal(sideWallLimitOf(shape, walls, 'x-'), 360, 'the 400 mm width less the 40 mm wall opposite')
+  assert.equal(sideWallLimitOf(shape, walls, 'z+'), 270)
+  /* The kernel agrees: just under takes, the limit refuses. */
+  assert.equal(cavityRefusalOf(shape, cavityRequestOf(shape, { wall: { ...walls, 'x-': 359 } })), null)
+  assert.equal(cavityRefusalOf(shape, cavityRequestOf(shape, { wall: { ...walls, 'x-': 360 } }))!.code, 'wall-too-thick')
+  assert.match(panel, /sideWallLimitOf\(body\.shape, cavity\.wall, side\)/)
+})

package/translations/en.json

@@ -188,12 +188,23 @@
   "figure.label.palette-token": "palette token",
   "figure.label.part": "part",
   "figure.label.part-material": "material",
+  "figure.text.section-cavity-unavailable": "This outline cannot have an inside. An inside is made in a rectangle or circle section.",
+  "figure.text.section-corner-over": "The corner radius can be at most {max} mm.",
+  "figure.text.section-at-most": "at most {max} mm",
+  "figure.text.section-not-positive": "The thickness must be more than 0.",
+  "figure.text.section-wall-over": "The wall must be thinner than {max} mm.",
+  "figure.text.section-ends-over": "The two closed ends together must be thinner than {max} mm.",
+  "figure.text.section-depth": "{result} · {depth} mm deep",
+  "figure.label.section-result-pipe": "pipe",
+  "figure.label.section-result-container": "container",
+  "figure.label.section-result-sealed": "closed inside",
+  "figure.text.section-wall-at-most": "thinner than {max} mm",
+  "figure.label.section-wall-per-side": "per side",
   "figure.label.group-section": "section",
   "figure.label.section-corner": "corner radius",
   "figure.text.section-corner-differs": "differs by axis",
-  "figure.label.section-cavity": "hollow",
+  "figure.label.section-cavity": "make an inside",
   "figure.label.section-wall": "wall thickness",
-  "figure.text.section-wall-differs": "differs by side",
   "figure.label.section-end-closed": "closed",
   "figure.label.section-end-open": "open",
   "figure.text.section-face-in-use": "Not changed: something is attached to {faces}. Detach it first.",

package/translations/ja.json

@@ -188,12 +188,23 @@
   "figure.label.palette-token": "palette token",
   "figure.label.part": "part",
   "figure.label.part-material": "material",
+  "figure.text.section-cavity-unavailable": "この輪郭には内部の空間をつくれません。内部の空間は四角形と円の断面につくります。",
+  "figure.text.section-corner-over": "角の半径は {max} mm までです。",
+  "figure.text.section-at-most": "最大 {max} mm",
+  "figure.text.section-not-positive": "厚さは 0 より大きくしてください。",
+  "figure.text.section-wall-over": "壁の厚さは {max} mm より薄くしてください。",
+  "figure.text.section-ends-over": "閉じた両端の厚さの合計は {max} mm より薄くしてください。",
+  "figure.text.section-depth": "{result} · 深さ {depth} mm",
+  "figure.label.section-result-pipe": "管",
+  "figure.label.section-result-container": "容器",
+  "figure.label.section-result-sealed": "閉じた内部",
+  "figure.text.section-wall-at-most": "{max} mm より薄く",
+  "figure.label.section-wall-per-side": "面ごとに",
   "figure.label.group-section": "断面",
   "figure.label.section-corner": "角の半径",
   "figure.text.section-corner-differs": "軸ごとに異なる",
-  "figure.label.section-cavity": "中空",
+  "figure.label.section-cavity": "内部の空間をつくる",
   "figure.label.section-wall": "壁の厚さ",
-  "figure.text.section-wall-differs": "面ごとに異なる",
   "figure.label.section-end-closed": "閉じる",
   "figure.label.section-end-open": "開く",
   "figure.text.section-face-in-use": "変更しませんでした: {faces} に取り付けられたものがあります。先に外してください。",

package/translations/ko.json

@@ -188,12 +188,23 @@
   "figure.label.palette-token": "팔레트 토큰",
   "figure.label.part": "부품",
   "figure.label.part-material": "재질",
+  "figure.text.section-cavity-unavailable": "이 윤곽에는 속 공간을 만들 수 없습니다. 속 공간은 사각형과 원 단면에 만듭니다.",
+  "figure.text.section-corner-over": "모서리 반지름은 {max} mm 까지입니다.",
+  "figure.text.section-at-most": "최대 {max} mm",
+  "figure.text.section-not-positive": "두께는 0 보다 커야 합니다.",
+  "figure.text.section-wall-over": "벽 두께는 {max} mm 보다 얇아야 합니다.",
+  "figure.text.section-ends-over": "막힌 두 끝의 두께를 더해 {max} mm 보다 얇아야 합니다.",
+  "figure.text.section-depth": "{result} · 깊이 {depth} mm",
+  "figure.label.section-result-pipe": "관",
+  "figure.label.section-result-container": "용기",
+  "figure.label.section-result-sealed": "닫힌 속 공간",
+  "figure.text.section-wall-at-most": "{max} mm 보다 얇게",
+  "figure.label.section-wall-per-side": "면마다 따로",
   "figure.label.group-section": "단면",
   "figure.label.section-corner": "모서리 반지름",
   "figure.text.section-corner-differs": "축마다 다름",
-  "figure.label.section-cavity": "속을 비움",
+  "figure.label.section-cavity": "속 공간 만들기",
   "figure.label.section-wall": "벽 두께",
-  "figure.text.section-wall-differs": "면마다 다름",
   "figure.label.section-end-closed": "막힘",
   "figure.label.section-end-open": "열림",
   "figure.text.section-face-in-use": "이 면에 붙어 있는 것이 있어 바꾸지 않았습니다: {faces}. 먼저 떼어 냅니다.",

package/translations/ms.json

@@ -188,12 +188,23 @@
   "figure.label.palette-token": "palette token",
   "figure.label.part": "part",
   "figure.label.part-material": "material",
+  "figure.text.section-cavity-unavailable": "Garis luar ini tidak boleh mempunyai ruang dalam. Ruang dalam dibuat dalam keratan segi empat atau bulatan.",
+  "figure.text.section-corner-over": "Jejari sudut paling banyak {max} mm.",
+  "figure.text.section-at-most": "paling banyak {max} mm",
+  "figure.text.section-not-positive": "Ketebalan mesti lebih daripada 0.",
+  "figure.text.section-wall-over": "Dinding mesti lebih nipis daripada {max} mm.",
+  "figure.text.section-ends-over": "Jumlah ketebalan dua hujung tertutup mesti kurang daripada {max} mm.",
+  "figure.text.section-depth": "{result} · dalam {depth} mm",
+  "figure.label.section-result-pipe": "paip",
+  "figure.label.section-result-container": "bekas",
+  "figure.label.section-result-sealed": "ruang dalam tertutup",
+  "figure.text.section-wall-at-most": "lebih nipis daripada {max} mm",
+  "figure.label.section-wall-per-side": "setiap sisi",
   "figure.label.group-section": "keratan",
   "figure.label.section-corner": "jejari sudut",
   "figure.text.section-corner-differs": "berbeza mengikut paksi",
-  "figure.label.section-cavity": "berongga",
+  "figure.label.section-cavity": "buat ruang dalam",
   "figure.label.section-wall": "ketebalan dinding",
-  "figure.text.section-wall-differs": "berbeza mengikut sisi",
   "figure.label.section-end-closed": "tertutup",
   "figure.label.section-end-open": "terbuka",
   "figure.text.section-face-in-use": "Tidak diubah: ada sesuatu dipasang pada {faces}. Tanggalkannya dahulu.",

package/translations/zh.json

@@ -188,12 +188,23 @@
   "figure.label.palette-token": "palette token",
   "figure.label.part": "part",
   "figure.label.part-material": "material",
+  "figure.text.section-cavity-unavailable": "此轮廓不能创建内部空间。内部空间只能在矩形和圆形截面中创建。",
+  "figure.text.section-corner-over": "圆角半径最大为 {max} mm。",
+  "figure.text.section-at-most": "最大 {max} mm",
+  "figure.text.section-not-positive": "厚度必须大于 0。",
+  "figure.text.section-wall-over": "壁厚必须小于 {max} mm。",
+  "figure.text.section-ends-over": "两个封闭端的厚度之和必须小于 {max} mm。",
+  "figure.text.section-depth": "{result} · 深 {depth} mm",
+  "figure.label.section-result-pipe": "管",
+  "figure.label.section-result-container": "容器",
+  "figure.label.section-result-sealed": "封闭内部",
+  "figure.text.section-wall-at-most": "小于 {max} mm",
+  "figure.label.section-wall-per-side": "逐面设置",
   "figure.label.group-section": "截面",
   "figure.label.section-corner": "圆角半径",
   "figure.text.section-corner-differs": "各轴不同",
-  "figure.label.section-cavity": "中空",
+  "figure.label.section-cavity": "创建内部空间",
   "figure.label.section-wall": "壁厚",
-  "figure.text.section-wall-differs": "各面不同",
   "figure.label.section-end-closed": "封闭",
   "figure.label.section-end-open": "开口",
   "figure.text.section-face-in-use": "未更改：{faces} 上附着有其他部件。请先拆下。",