@things-factory/figure-ui 10.1.88 → 10.1.89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-ui",
-  "version": "10.1.88",
+  "version": "10.1.89",
   "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.3",
+    "@hatiolab/figure-model": "^0.2.4",
     "@hatiolab/things-scene": "^10.1.63",
     "@material/web": "^2.0.0",
     "@operato/data-grist": "^10.0.0",
@@ -44,5 +44,5 @@
     "@things-factory/figure-service": "^10.1.84",
     "three": "^0.185.1"
   },
-  "gitHead": "11ece44d38c469f73aa28f4789f4baa244545097"
+  "gitHead": "ffffb5c90772ce88679be2f0192a6fddc4e48a1d"
 }

package/test/browser/acceptance-page.js

@@ -47,6 +47,15 @@ export const MODELS = {
     a = addFigurePrimitive(a, { id: 'wedge', kind: 'polygon', dimensions: { height: 200 }, points: [{ x: -300, z: -200 }, { x: 300, z: -200 }, { x: 0, z: 250 }], position: { x: 0, y: 100, z: 0 } })
     return serializeFigureAsset(a)
   },
+  /* The same triangle with a plate on its top: drawing its end to one point is refused while the plate stands there (A5-1). */
+  'capped-wedge': () => {
+    let a = createFigureAsset('Capped wedge')
+    a.palette = { ...a.palette, ...PALETTE }
+    a = addFigurePrimitive(a, { id: 'wedge', kind: 'polygon', dimensions: { height: 200 }, points: [{ x: -300, z: -200 }, { x: 300, z: -200 }, { x: 0, z: 250 }], position: { x: 0, y: 100, z: 0 } })
+    a = addFigureBox(a, { id: 'cap', size: { x: 100, y: 20, z: 100 }, position: { x: 0, y: 0, z: 0 } })
+    a = applyFigureAuthoring(a, { kind: 'attach', part: 'cap', face: 'bottom', to: { part: 'wedge', 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/palette-icons.test.ts

@@ -10,8 +10,11 @@ import assert from 'node:assert/strict'
 import { readFileSync } from 'node:fs'
 import { fileURLToPath } from 'node:url'
 
-/** Measured in the app's icon font on :3300, 2026-09-24: each draws one cell wide. `wall` drew 52px -- its letters. */
-const RENDERS = new Set(['deployed_code', 'database', 'crop_square', 'circle', 'change_history', 'hexagon', 'check_box_outline_blank', 'crop_portrait', 'door_front'])
+/**
+ * Measured in the app's icon font on :3300, 2026-09-24: each draws one cell wide. `wall` drew 52px -- its letters.
+ * 2026-09-30: `details` (the pyramid) 24px at 24px; `pyramid` is not in the font (168px).
+ */
+const RENDERS = new Set(['deployed_code', 'database', 'crop_square', 'circle', 'change_history', 'hexagon', 'details', 'check_box_outline_blank', 'crop_portrait', 'door_front'])
 
 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')

package/test/parts-wiring.test.ts

@@ -60,7 +60,7 @@ test('좁은 칸에서도 고른 줄의 이름과 조작이 다 보인다 —
 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'])
+  assert.deepEqual(kinds, ['box', 'cylinder', 'sphere', 'frustum', 'polygon', 'pyramid', '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'])

package/test/section-editor.test.ts

@@ -12,7 +12,7 @@ import { fileURLToPath } from 'node:url'
 import { addFigurePrimitive, applyFigureAuthoring, compileFigureAsset, createFigureAsset } from '@hatiolab/figure-model'
 import type { FigureAsset, FigureEvaluatedShape, FigureSectionPoint } from '@hatiolab/figure-model'
 
-import { extentOf, insertAfter, issueWords, issuesOf, markedBy, movePoint, nextPointId, pointLabel, removePoint } from '../client/modeller/section-drawing.ts'
+import { apexOver, extentOf, sectionOf as sectionOfWorking, workingIssuesOf as issuesOfWorking, workingOf as workingOfShape, insertAfter, issueWords, issuesOf, markedBy, movePoint, nextPointId, pointLabel, removePoint } from '../client/modeller/section-drawing.ts'
 import { livePartsOf } from '../client/modeller/live.ts'
 
 const read = (path: string) => readFileSync(fileURLToPath(new URL(path, import.meta.url)), 'utf8')
@@ -197,7 +197,7 @@ test('사각형·원도 같은 창에서 — 폭·지름·길이를 한 명령
   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(w, { points: [], across: { x: 400, z: 300 }, length: 200, apex: null })
   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. */
@@ -225,7 +225,7 @@ test('속 공간이 있으면 폭·길이가 그 벽과 막힌 끝을 남기는
 })
 
 test('길이를 바꿀 때 남는 면은 부품의 관계가 정한 것을 읽어 보여 준다 (§4.1) — 다른 값을 따르는 치수는 칸을 막는다', () => {
-  has(editor, /const kept = figureScaleAnchorOf\(asset, this\.selected\)\?\.\[part\.shape\.extrusion\.axis\]/)
+  has(editor, /const kept = figureScaleAnchorOf\(asset, this\.selected\)\?\.\[drawn\.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']! }), '아랫면 유지')
@@ -249,3 +249,57 @@ test('ADR-0100 A1: 상자·판·벽은 같은 돌출에 처음 치수만 다르
   assert.notDeepEqual(sizes.box, sizes.plate)
   assert.notDeepEqual(sizes.plate, sizes.wall)
 })
+
+test('ADR-0100 A5-1: 팔레트의 뿔은 삼각 단면과 꼭짓점 하나 — 사면체이고, 목록과 제목에서 「뿔」로 불린다', async () => {
+  const { paletteRecipe } = await import('../client/modeller/palette.ts')
+  const { startingShapeKindOf, startingShapeKindOfBody } = await import('../client/modeller/starting-shape.ts')
+  const asset = addFigurePrimitive(createFigureAsset('P'), paletteRecipe('pyramid', 'tip'))
+  const node = asset.document.model.nodes.find(n => n.id === 'tip.shape')!
+  assert.equal(node.op, 'loft@1')
+  const s = (compileFigureAsset(asset).evaluate().geometry.find(g => (g as { id: string }).id === 'tip') as unknown as { shape: FigureEvaluatedShape }).shape
+  assert.equal(s.loft!.section.points.length, 3)
+  assert.deepEqual(s.loft!.apex, { x: 0, z: 0 })
+  assert.equal(startingShapeKindOf(node as never), 'pyramid')
+  assert.equal(startingShapeKindOfBody(s as never), 'pyramid')
+  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.primitive-pyramid', 'figure.label.section-editor-apex', 'figure.label.section-editor-apex-at', 'figure.label.section-editor-apex-mark', 'figure.text.section-editor-apex-blocked', 'figure.label.section-editor-height'])
+      assert.ok(t[key], `${lang} ${key}`)
+  }
+  assert.equal(ko['figure.label.primitive-pyramid'], '뿔')
+})
+
+test('편집 창에서 끝을 한 점으로: 켜면 점들의 가운데 위에 꼭짓점, 끄면 돌출로 — 바뀐 것만 한 명령으로 보낸다', () => {
+  const wedge = triangle()
+  const shape = shapeOf(wedge)
+  const w = workingOfShape(shape)
+  assert.equal(w.apex, null)
+  const on = { ...w, apex: apexOver(w.points, 'y') }
+  assert.deepEqual(on.apex, { z: 0, x: 0 })
+  assert.deepEqual(issuesOfWorking(shape, on).words, [])
+  /* The editor sends apex only when it changed, null to go back to a push. */
+  has(editorPanel, /\.\.\.\(apexMoved \? \{ apex: w\.apex \? \{ \.\.\.w\.apex \} : null \} : \{\}\)/)
+  const pyramid = applyFigureAuthoring(wedge, { kind: 'set-section', part: 'wedge', apex: on.apex })
+  const p = shapeOf(pyramid)
+  assert.equal(p.provider, 'loft')
+  const again = workingOfShape(p)
+  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 })
+  assert.equal(shapeOf(back).provider, 'extrude')
+})
+
+test('끝면에 붙은 부품이 있으면 한 점으로 모으기를 막고 그 면을 말한다 — 커널의 거절로 판정한다', () => {
+  has(editor, /this\.session\.previewCommand\(\{ kind: 'set-section', part: this\.selected!, apex: apexOver\(drawn\.section\.points, drawn\.axis\) \}\)/)
+  has(editor, /\.code === 'FEATURE_MAPPING_REQUIRED'\)/)
+  has(editorPanel, /const blocked = !apex && !this\.opened\?\.apex \? this\.pointBlocked : ''/)
+  has(editorPanel, /\?disabled=\$\{!!blocked\}/)
+  assert.equal(say('figure.text.section-editor-apex-blocked', { face: ko['figure.label.face-top']! }), '윗면에 붙은 부품이 있어 한 점으로 모을 수 없습니다.')
+  /* 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/)
+})

package/translations/en.json

@@ -939,5 +939,11 @@
   "figure.text.release-state-released": "Released · v{version}",
   "figure.text.release-state-draft-over": "Draft · boards use v{version}",
   "figure.text.release-state-draft-new": "Draft · never released",
-  "figure.button.release": "Release"
+  "figure.button.release": "Release",
+  "figure.label.primitive-pyramid": "pyramid",
+  "figure.label.section-editor-apex": "draw the end to one point",
+  "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)"
 }

package/translations/ja.json

@@ -939,5 +939,11 @@
   "figure.text.release-state-released": "発行済み · v{version}",
   "figure.text.release-state-draft-over": "下書き · ボードは v{version} を使用",
   "figure.text.release-state-draft-new": "下書き · 未発行",
-  "figure.button.release": "発行"
+  "figure.button.release": "発行",
+  "figure.label.primitive-pyramid": "角錐",
+  "figure.label.section-editor-apex": "端を一点にまとめる",
+  "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)"
 }

package/translations/ko.json

@@ -939,5 +939,11 @@
   "figure.text.release-state-released": "발행됨 · v{version}",
   "figure.text.release-state-draft-over": "초안 · 보드는 v{version} 사용",
   "figure.text.release-state-draft-new": "초안 · 발행한 적 없음",
-  "figure.button.release": "발행"
+  "figure.button.release": "발행",
+  "figure.label.primitive-pyramid": "뿔",
+  "figure.label.section-editor-apex": "끝을 한 점으로 모으기",
+  "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)"
 }

package/translations/ms.json

@@ -939,5 +939,11 @@
   "figure.text.release-state-released": "Diterbitkan · v{version}",
   "figure.text.release-state-draft-over": "Draf · papan menggunakan v{version}",
   "figure.text.release-state-draft-new": "Draf · belum pernah diterbitkan",
-  "figure.button.release": "Terbitkan"
+  "figure.button.release": "Terbitkan",
+  "figure.label.primitive-pyramid": "piramid",
+  "figure.label.section-editor-apex": "himpunkan hujung ke satu titik",
+  "figure.label.section-editor-apex-at": "puncak {axis} (mm)",
+  "figure.label.section-editor-apex-mark": "puncak",
+  "figure.text.section-editor-apex-blocked": "Ada bahagian yang dipasang pada {face}, jadi ia tidak boleh dihimpunkan ke satu titik.",
+  "figure.label.section-editor-height": "tinggi (mm)"
 }

package/translations/zh.json

@@ -939,5 +939,11 @@
   "figure.text.release-state-released": "已发布 · v{version}",
   "figure.text.release-state-draft-over": "草稿 · 看板使用 v{version}",
   "figure.text.release-state-draft-new": "草稿 · 从未发布",
-  "figure.button.release": "发布"
+  "figure.button.release": "发布",
+  "figure.label.primitive-pyramid": "棱锥",
+  "figure.label.section-editor-apex": "将末端收为一点",
+  "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)"
 }