@things-factory/figure-ui 10.1.113 → 10.1.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-ui",
-  "version": "10.1.113",
+  "version": "10.1.115",
   "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.2.10",
-    "@hatiolab/things-scene": "^10.1.65",
+    "@hatiolab/figure-model": "^0.2.15",
+    "@hatiolab/things-scene": "^10.1.69",
     "@material/web": "^2.0.0",
     "@operato/data-grist": "^10.0.0",
     "@operato/graphql": "^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.113",
-    "@things-factory/figure-service": "^10.1.113",
+    "@things-factory/ai-assistant": "^10.1.114",
+    "@things-factory/figure-service": "^10.1.115",
     "three": "^0.185.1"
   },
-  "gitHead": "9da1e467ddce23e600e64f08454289cb3b806212"
+  "gitHead": "3d1f480028b680a6da3d0ae6a73c3121d644b64a"
 }

package/test/browser/acceptance-page.js

@@ -66,6 +66,17 @@ export const MODELS = {
     a = applyFigureAuthoring(a, { kind: 'attach', part: 'lid', face: 'bottom', to: { part: 'bin', face: 'top' } })
     return serializeFigureAsset(a)
   },
+  /* A divider standing on a tote's inside floor: opening the bottom asks where the divider goes (ADR-0100 A8). */
+  'divider-in-tote': () => {
+    let a = createFigureAsset('Divider in tote')
+    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 = applyFigureAuthoring(a, { kind: 'set-cavity', part: 'bin', cavity: { wall: 10, start: { closed: 15 }, end: 'open' } })
+    a = addFigureBox(a, { id: 'divider', size: { x: 10, y: 200, z: 380 }, position: { x: 0, y: 0, z: 0 } })
+    a = applyFigureAuthoring(a, { kind: 'attach', part: 'divider', face: 'bottom', to: { part: 'bin', face: 'inside-bottom' } })
+    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/clip-consent.test.ts

@@ -76,7 +76,7 @@ test('a consent is used by one edit only, on the version and figure it was given
 
 test('the modeller asks on every path an edit can stop a clip, in every language', () => {
   const editor = read('../client/modeller/editor.ts')
-  for (const path of ['() => this.run(action)', '() => this.linkCommand(action)', '() => this.removePart(id, refitRoom)'])
+  for (const path of ['() => this.run(action)', '() => this.linkCommand(action, from)', '() => this.removePart(id, refitRoom)'])
     assert.ok(editor.includes(`if (this.askClipLoss(error, ${path})) return`), path)
   assert.ok(editor.includes('if (!now || now.context !== asked.context || now.revision !== asked.revision) {'), 'what was asked about is checked after the answer')
   assert.ok(editor.includes('asked.session.withConsent({ dropClips: clips.map(c => c.id), context: asked.context, revision: asked.revision }, again)'))

package/test/face-mapping.test.ts

@@ -0,0 +1,80 @@
+/*
+ * **붙은 면을 없애는 편집에서 옮길 곳 고르기** (ADR-0100 A8, 사용자 2026-10-02: 미리 고르지 않는다 · 떼어 두기는 붙이기
+ * 관계에만 · 편집한 그 자리에서 묻는다).
+ *
+ * 커널 거절이 실어 온 것으로 줄을 짓고, 다 고른 뒤에만 remap 을 내며, 그 remap 을 붙인 같은 명령을 커널이 받는지 잰다.
+ * 편집기·단면 편집 창·단면 칸이 거절을 그 자리에 붙들어 두는지는 소스로 잰다.
+ */
+import { test } from 'node:test'
+import assert from 'node:assert/strict'
+import { readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+
+import { addFigureBox, applyFigureAuthoring, createFigureAsset } from '@hatiolab/figure-model'
+import type { FigureAsset, FigureFaceMappingNeed } from '@hatiolab/figure-model'
+
+import { DETACH, faceMappingRowsOf, remapOf, rowKey } from '../client/modeller/face-mapping.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}`)
+
+/** A tote with a floor inside and a divider standing on it. */
+function tote(): FigureAsset {
+  let asset = addFigureBox(createFigureAsset('Tote'), { id: 'bin', size: { x: 600, y: 300, z: 400 }, position: { x: 0, y: 150, z: 0 } })
+  asset = applyFigureAuthoring(asset, { kind: 'attach', part: 'bin', face: 'bottom', to: { plane: 'mounting-plane' } })
+  asset = applyFigureAuthoring(asset, { kind: 'set-cavity', part: 'bin', cavity: { wall: 10, start: { closed: 15 }, end: 'open' } })
+  asset = addFigureBox(asset, { id: 'divider', size: { x: 10, y: 200, z: 380 }, position: { x: 0, y: 0, z: 0 } })
+  return applyFigureAuthoring(asset, { kind: 'attach', part: 'divider', face: 'bottom', to: { part: 'bin', face: 'inside-bottom' as never } })
+}
+const open = { kind: 'set-cavity', part: 'bin', cavity: { wall: 10, start: 'open', end: 'open' } } as const
+const needOf = (asset: FigureAsset): FigureFaceMappingNeed => {
+  try {
+    applyFigureAuthoring(asset, open)
+  } catch (e) {
+    return (e as { details: FigureFaceMappingNeed }).details
+  }
+  throw new Error('not refused')
+}
+
+test('one row per thing on a lost face, its choices the faces that remain looking the same way', () => {
+  const rows = faceMappingRowsOf(needOf(tote()))
+  assert.equal(rows.length, 1)
+  assert.equal(rows[0]!.lost, 'inside-bottom')
+  assert.ok(rows[0]!.faces.includes('top'), 'the rim looks up, as the floor did')
+  assert.ok(!rows[0]!.faces.includes('inside-left') && !rows[0]!.faces.includes('bottom'), 'not a face looking another way')
+  assert.ok(!rows[0]!.faces.includes('inside-bottom'), 'not the face the edit takes away')
+  assert.equal(rows[0]!.detach, true, 'a joint may be let go where it stands')
+})
+
+test('a named face may only move, never be let go', () => {
+  const need: FigureFaceMappingNeed = {
+    lost: [{ face: 'inside-bottom', axis: 'y', normal: 1, refs: [{ kind: 'feature', id: 'bin.tray' }] }],
+    remain: [{ face: 'top', axis: 'y', normal: 1 }]
+  }
+  assert.equal(faceMappingRowsOf(need)[0]!.detach, false)
+})
+
+test('nothing goes until every row is chosen, and the chosen remap is what the kernel takes', () => {
+  const asset = tote()
+  const rows = faceMappingRowsOf(needOf(asset))
+  assert.equal(remapOf(rows, {}), undefined, 'nothing chosen for the author')
+  const moved = applyFigureAuthoring(asset, { ...open, remap: remapOf(rows, { [rowKey(rows[0]!)]: 'top' })! })
+  assert.deepEqual(moved.joints!.find(j => j.id === 'divider')!.body0, { part: 'bin', face: 'top' })
+  const freed = applyFigureAuthoring(asset, { ...open, remap: remapOf(rows, { [rowKey(rows[0]!)]: DETACH })! })
+  assert.ok(!(freed.joints ?? []).some(j => j.id === 'divider'))
+})
+
+test('the choice is asked where the edit was made, and the same edit goes again with it', () => {
+  const editor = read('../client/modeller/editor.ts')
+  const sectionEditor = read('../client/modeller/figure-section-editor.ts')
+  const panel = read('../client/modeller/figure-section-panel.ts')
+  const mapping = read('../client/modeller/figure-face-mapping.ts')
+  has(editor, /code === 'FEATURE_MAPPING_REQUIRED' && need\?\.lost\?\.length\) \{\s*this\.faceMapping = \{ action, need, from \}/, 'the refusal is held, not only said')
+  has(editor, /linkCommand\(\{ \.\.\.held\.action, remap \}/, 'the same edit, with where things go')
+  has(editor, /if \(!this\.linkCommand\(e\.detail\.action, 'section-editor'\)\) e\.detail\.held = true/, 'the section editor stays open while held')
+  has(editor, /this\.selected = id \? ownerOf\(id\) : id\s*this\.faceMapping = undefined/, 'another part chosen lets the held edit go')
+  has(sectionEditor, /if \(!detail\.held\) this\.close\(\)/)
+  has(sectionEditor, /this\.faceMapping \? html`<figure-face-mapping/)
+  has(panel, /this\.faceMapping \? html`<figure-face-mapping/)
+  has(mapping, /\?disabled=\$\{!remap\}/, 'apply is off until every row is chosen')
+})

package/test/modeller-route.test.ts

@@ -36,3 +36,11 @@ test('reloading or closing the tab with unsaved work asks first — the shell do
   assert.match(page, /addEventListener\('beforeunload', this\.holdUnsaved\)/)
   assert.match(page, /removeEventListener\('beforeunload', this\.holdUnsaved\)/)
 })
+
+test('기존 도형을 열면 rail 은 카탈로그를 가리킨다 — 「새 Figure」를 가리키지 않는다(2026-10-03)', async () => {
+  const { readFileSync } = await import('node:fs')
+  const page = readFileSync(new URL('../client/pages/figure-modeller-page.ts', import.meta.url), 'utf8')
+  const context = page.slice(page.indexOf('get context()'), page.indexOf('render()', page.indexOf('get context()')))
+  /* The rail's rule (@operato/menu menu-active.ts): a page that names its menu wins over a menu with the same page name. */
+  assert.ok(context.includes("menu: view.id ? 'figure-list' : undefined"), 'id 가 있으면 카탈로그, 새 도형이면 이름을 대지 않는다')
+})

package/test/preview.test.ts

@@ -9,7 +9,7 @@ import { fileURLToPath } from 'node:url'
 
 import { addFigureBox, createFigureAsset } from '@hatiolab/figure-model'
 
-import { authoredSizeOf, PREVIEW_WAYS, previewClampsOf, previewInstances } from '../client/modeller/preview-model.ts'
+import { authoredSizeOf, PREVIEW_WAYS, previewClampsOf, previewInstances, setupPartOf } from '../client/modeller/preview-model.ts'
 
 const read = (path: string) => readFileSync(fileURLToPath(new URL(path, import.meta.url)), 'utf8')
 
@@ -54,3 +54,41 @@ test('미리보기 — 선언하지 않은 크기를 묻는 변형은 그려지
   const view = readFileSync(fileURLToPath(new URL('../client/modeller/figure-preview.ts', import.meta.url)), 'utf8')
   assert.ok(view.includes("i18next.t('figure.text.preview-clamped'"), '범례에 적는다')
 })
+
+test('미리보기로 가도 고른 부품이 남는다 — 화면에서 빠진 캔버스는 선택을 알리지 않는다(U03, 2026-10-03)', () => {
+  const canvas = read('../client/modeller/canvas.ts')
+  const handler = canvas.slice(canvas.indexOf("root.on('selected'"), canvas.indexOf("root.on('selected'") + 900)
+  assert.ok(handler.includes('if (!this.isConnected) return'), '장면을 치울 때 비워진 선택을 편집기에 알리지 않는다')
+  assert.ok(handler.indexOf('if (!this.isConnected) return') < handler.indexOf("new CustomEvent('part-selected'"), '알리기 전에 거른다')
+})
+
+test('미리보기 크기 안내는 편집에서 고른 부품부터 — 안내에서 고른 것이 먼저, 없는 부품은 건너뛴다', () => {
+  assert.equal(setupPartOf('', 'roller', ['frame', 'roller']), 'roller', '편집에서 고른 부품')
+  assert.equal(setupPartOf('frame', 'roller', ['frame', 'roller']), 'frame', '안내에서 고른 것이 이긴다')
+  assert.equal(setupPartOf('', 'leg', ['frame', 'roller']), 'frame', '크기 규칙이 없는 부품이면 첫 부품')
+  assert.equal(setupPartOf('gone', '', ['frame']), 'frame', '사라진 부품은 건너뛴다')
+  assert.equal(setupPartOf('', '', []), '')
+  const editor = read('../client/modeller/editor.ts')
+  const tag = editor.slice(editor.indexOf('<figure-preview'), editor.indexOf('</figure-preview>'))
+  assert.ok(tag.includes('.selected=${this.selected}'), '편집기가 고른 부품을 넘긴다')
+})
+
+test('미리보기 아래의 크기 안내와 조작값은 한 줄에서 줄을 바꾼다 — 좁은 폭에서 겹치지 않는다(1024 폭, 2026-10-03)', () => {
+  const preview = read('../client/modeller/figure-preview.ts')
+  const style = (sel: string) => preview.slice(preview.indexOf(sel + ' {'), preview.indexOf('}', preview.indexOf(sel + ' {')))
+  assert.match(style('div[foot]'), /position: absolute/)
+  assert.match(style('div[foot]'), /flex-wrap: wrap-reverse/)
+  assert.doesNotMatch(style('div[setup]'), /position: absolute/, '안내가 제 모서리에 따로 서지 않는다')
+  assert.doesNotMatch(style('div[clips]'), /position: absolute/, '조작값이 제 모서리에 따로 서지 않는다')
+  const foot = preview.slice(preview.indexOf('<div foot>'))
+  assert.ok(foot.indexOf('<div setup>') < foot.indexOf('this.renderDrivers('), '둘 다 한 줄 안에')
+})
+
+test('미리보기 재생 속도는 실제로 도는 값을 보인다 — 움직이기 전에는 0(멈춤), 1.00 으로 보이며 서 있지 않는다(2026-10-03)', () => {
+  const preview = read('../client/modeller/figure-preview.ts')
+  const drivers = preview.slice(preview.indexOf('clips.map(clip =>'))
+  assert.ok(drivers.includes('this.driving[clip] ?? 0'), '아무것도 보내지 않은 clip 은 0 으로 그린다')
+  assert.ok(!drivers.slice(0, 600).includes('this.driving[clip] ?? 1'))
+  const drive = preview.slice(preview.indexOf('private drive('), preview.indexOf('private give('))
+  assert.ok(drive.includes("this.tellInstances('clips'"), '속도는 drive 에서만 보낸다 — 그래서 보이는 값도 보낸 값뿐이다')
+})

package/test/section-panel.test.ts

@@ -91,7 +91,7 @@ test('벽이 단면을 다 채우거나 모서리가 변의 절반을 넘으면,
 test('편집기는 단면 칸의 명령을 세션의 이력 하나로 돌리고, 치는 동안의 값은 그리기만 한다', () => {
   has(editor, /<figure-section-panel[\s\S]*?@command=\$\{\(e: CustomEvent\) => this\.linkCommand\(e\.detail\.action\)\}/)
   has(editor, /@command-live=\$\{\(e: CustomEvent\) => this\.holdAction\(e\.detail\.action\)\}/)
-  has(editor, /private linkCommand\(action: FigureAuthoringAction\) \{\s*\/\*[^*]*\*\/\s*this\.holdAction\(null\)/, 'a command sent lets go of the one in hand')
+  has(editor, /private linkCommand\(action: FigureAuthoringAction, from: 'section-editor' \| 'panel' = 'panel'\): boolean \{\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 + drawing).matchAll(/'(figure\.(?:label|text)\.section-[\w-]+|figure\.label\.group-section)'/g)].map(m => m[1]!))]

package/translations/en.json

@@ -959,5 +959,11 @@
   "figure.text.summary-size-input": "Its {axes} follows {field}.",
   "figure.text.summary-size-worked-out": "Its {axes} is worked out from other measures.",
   "figure.text.held-by-fastening": "It is fastened: its place and turn are set in 붙이기.",
-  "figure.text.held-worked-out": "{group} are worked out from other values and cannot be typed here."
+  "figure.text.held-worked-out": "{group} are worked out from other values and cannot be typed here.",
+  "figure.text.face-mapping-lost": "Faces this takes away: {faces}. Choose where what stands on them goes.",
+  "figure.label.face-mapping-to": "Where {part} goes",
+  "figure.label.face-mapping-choose": "Choose",
+  "figure.label.face-mapping-detach": "Let go (stays where it is)",
+  "figure.button.face-mapping-cancel": "Cancel",
+  "figure.button.face-mapping-apply": "Move and apply"
 }

package/translations/ja.json

@@ -959,5 +959,11 @@
   "figure.text.summary-size-input": "{axes}は{field}に従います。",
   "figure.text.summary-size-worked-out": "{axes}は他の寸法から計算されます。",
   "figure.text.held-by-fastening": "取り付けられているため、位置と回転は取り付けで決めます。",
-  "figure.text.held-worked-out": "{group}は他の値から計算されるため、ここでは変更できません。"
+  "figure.text.held-worked-out": "{group}は他の値から計算されるため、ここでは変更できません。",
+  "figure.text.face-mapping-lost": "なくなる面: {faces}。そこに付いているものの移動先を選びます。",
+  "figure.label.face-mapping-to": "{part} の移動先",
+  "figure.label.face-mapping-choose": "移動先",
+  "figure.label.face-mapping-detach": "外しておく(今の位置のまま)",
+  "figure.button.face-mapping-cancel": "やめる",
+  "figure.button.face-mapping-apply": "移して適用"
 }

package/translations/ko.json

@@ -959,5 +959,11 @@
   "figure.text.summary-size-input": "{axes} {field} 값을 따릅니다.",
   "figure.text.summary-size-worked-out": "{axes} 다른 치수에서 계산됩니다.",
   "figure.text.held-by-fastening": "붙어 있어서 위치와 회전은 붙이기에서 정합니다.",
-  "figure.text.held-worked-out": "{group}는 다른 값에서 계산되어 여기서 고칠 수 없습니다."
+  "figure.text.held-worked-out": "{group}는 다른 값에서 계산되어 여기서 고칠 수 없습니다.",
+  "figure.text.face-mapping-lost": "없어지는 면: {faces}. 거기 붙은 것을 옮길 곳을 고릅니다.",
+  "figure.label.face-mapping-to": "{part}을(를) 옮길 곳",
+  "figure.label.face-mapping-choose": "옮길 곳",
+  "figure.label.face-mapping-detach": "떼어 두기(지금 자리에 그대로)",
+  "figure.button.face-mapping-cancel": "그만두기",
+  "figure.button.face-mapping-apply": "옮기고 적용"
 }

package/translations/ms.json

@@ -959,5 +959,11 @@
   "figure.text.summary-size-input": "{axes} mengikut {field}.",
   "figure.text.summary-size-worked-out": "{axes} dikira daripada ukuran lain.",
   "figure.text.held-by-fastening": "Ia dipasang: kedudukan dan putaran ditetapkan dalam pemasangan.",
-  "figure.text.held-worked-out": "{group} dikira daripada nilai lain dan tidak boleh diubah di sini."
+  "figure.text.held-worked-out": "{group} dikira daripada nilai lain dan tidak boleh diubah di sini.",
+  "figure.text.face-mapping-lost": "Muka yang akan hilang: {faces}. Pilih ke mana benda padanya dialihkan.",
+  "figure.label.face-mapping-to": "Ke mana {part} dialihkan",
+  "figure.label.face-mapping-choose": "Pilih",
+  "figure.label.face-mapping-detach": "Lepaskan (kekal di tempatnya)",
+  "figure.button.face-mapping-cancel": "Batal",
+  "figure.button.face-mapping-apply": "Alih dan guna"
 }

package/translations/zh.json

@@ -959,5 +959,11 @@
   "figure.text.summary-size-input": "{axes}跟随{field}。",
   "figure.text.summary-size-worked-out": "{axes}由其他尺寸计算得出。",
   "figure.text.held-by-fastening": "已连接，位置和旋转在连接中设定。",
-  "figure.text.held-worked-out": "{group}由其他值计算得出，此处不能修改。"
+  "figure.text.held-worked-out": "{group}由其他值计算得出，此处不能修改。",
+  "figure.text.face-mapping-lost": "将消失的面：{faces}。请选择其上部件的去处。",
+  "figure.label.face-mapping-to": "{part} 的去处",
+  "figure.label.face-mapping-choose": "去处",
+  "figure.label.face-mapping-detach": "解除连接（保持原位）",
+  "figure.button.face-mapping-cancel": "取消",
+  "figure.button.face-mapping-apply": "移动并应用"
 }