@things-factory/figure-ui 10.1.45 → 10.1.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-ui",
-  "version": "10.1.45",
+  "version": "10.1.46",
   "publishConfig": {
     "access": "public",
     "@things-factory:registry": "https://registry.npmjs.org"
@@ -26,7 +26,7 @@
     "clean": "npm run clean:server && npm run clean:client"
   },
   "dependencies": {
-    "@hatiolab/figure-model": "^0.1.47",
+    "@hatiolab/figure-model": "^0.1.48",
     "@hatiolab/things-scene": "^10.1.26",
     "@material/web": "^2.0.0",
     "@operato/data-grist": "^10.0.0",
@@ -37,8 +37,8 @@
     "@operato/shell": "^10.0.0",
     "@operato/styles": "^10.0.0",
     "@operato/utils": "^10.0.0",
-    "@things-factory/figure-service": "^10.1.45",
+    "@things-factory/figure-service": "^10.1.46",
     "three": "^0.185.1"
   },
-  "gitHead": "d72e1fd1285797fcd7839d97a18e31f5bf076ae3"
+  "gitHead": "d3467cde550453f3348fed0ed6c79a12a6ba0db4"
 }

package/test/v3-links.test.ts

@@ -10,7 +10,7 @@ import assert from 'node:assert/strict'
 import { addV3Box, addV3Primitive, applyV3Authoring, createV3Asset } from '@hatiolab/figure-model'
 import type { V3Asset } from '@hatiolab/figure-model'
 
-import { canFasten, canFollow, fastenedTo, followOf, hasInstanceSize, motionOf, positionsWorkedOut } from '../client/modeller/v3-links.ts'
+import { acceptsOf, canFasten, canFollow, fastenedTo, followOf, hasInstanceSize, holdsThings, motionOf, placeFacesOf, placeIdFor, placesOn, positionsWorkedOut } from '../client/modeller/v3-links.ts'
 
 const pair = (): V3Asset => {
   let asset = createV3Asset('Pair')
@@ -104,7 +104,7 @@ test('세 칸의 말은 다섯 말 모두에 있다', () => {
   const keys = [...links.matchAll(/'(figure\.[a-z.-]*[a-z])'/g)].map(m => m[1])
   for (const lang of ['ko', 'en', 'ja', 'zh', 'ms']) {
     const table = JSON.parse(read(`../translations/${lang}.json`))
-    for (const key of [...keys, 'figure.text.follow-would-loop', 'figure.text.fasten-would-loop', 'figure.label.motion-slide', 'figure.label.motion-turn'])
+    for (const key of [...keys, 'figure.text.follow-would-loop', 'figure.text.fasten-would-loop', 'figure.label.motion-slide', 'figure.label.motion-turn', 'figure.label.place-grip', 'figure.label.place-seat'])
       assert.ok(table[key], `${lang}: ${key}`)
   }
 })
@@ -121,3 +121,43 @@ test('도형 크기를 따라 움직이는 자리를 가려 읽고, 여기에
   assert.deepEqual(positionsWorkedOut(fixed, 'lamp'), [])
   assert.equal(fixed.designInputs['lamp.position.y'], 110, '지금 자리 그대로 — 100 + 10')
 })
+
+test('자리 — 부품의 면에 둔 집는 자리·놓는 자리를 그 부품에서 읽는다', () => {
+  let asset = pair()
+  asset = addV3Primitive(asset, { id: 'drum', kind: 'cylinder', dimensions: { radius: 100, length: 300 }, position: { x: 0, y: 400, z: 0 } } as never)
+  assert.deepEqual(placeFacesOf(asset, 'block'), ['left', 'right', 'bottom', 'top', 'back', 'front'])
+  assert.deepEqual(placeFacesOf(asset, 'drum'), [], '둥근 몸에는 자리를 권하지 않는다 — 명령이 거절할 것이다')
+
+  assert.equal(placeIdFor(asset, 'block', 'grip'), 'block-grip')
+  asset = applyV3Authoring(asset, { kind: 'add-binding', id: placeIdFor(asset, 'block', 'grip'), label: '집는 자리', role: 'grip', part: 'block', face: 'top', accepts: acceptsOf(' BOX, TOTE,, BOX '), capacity: 2 })
+  assert.equal(placeIdFor(asset, 'block', 'grip'), 'block-grip-2', '같은 부품에 둘째 자리는 다른 id')
+  assert.deepEqual(
+    placesOn(asset, 'block').map(p => [p.id, p.role, p.face, p.accepts, p.capacity]),
+    [['block-grip', 'grip', 'top', ['BOX', 'TOTE'], 2]]
+  )
+  assert.deepEqual(placesOn(asset, 'plate'), [], '다른 부품의 자리는 안 섞인다')
+})
+
+test('담는 능력이 없는 도형은 자리가 있어도 보드가 아무것도 넘기지 않는다 — 화면이 그것을 말한다', () => {
+  const asset = pair()
+  assert.equal(holdsThings(asset), false)
+  asset.document.capabilities.names = ['Capacity', 'Holdable']
+  assert.equal(holdsThings(asset), true)
+  asset.document.capabilities.names = ['FlowNode']
+  assert.equal(holdsThings(asset), true, 'FlowNode 는 Capacity 를 품는다')
+
+  const links = read('../client/modeller/figure-v3-links.ts')
+  assert.match(links, /holdsThings\(asset\)/)
+  assert.match(links, /kind: 'set-capabilities', names/)
+  const editor = read('../client/modeller/v3-editor.ts')
+  /* A slice and `includes`, not a lazy regex over the whole editor: that hangs when it does not match. */
+  const start = editor.indexOf('<figure-v3-links')
+  const block = editor.slice(start, editor.indexOf('</figure-v3-links>', start))
+  assert.ok(start >= 0 && block.includes('@v3-part-edit=${(e: CustomEvent) => this.run(() => this.session!.edit(e.detail.edit))}'), '자리 절의 능력 선언이 편집기에 닿는다')
+})
+
+test('받는 종류가 없으면 자리를 만들지 않는다 — 형식에 「아무거나」가 없다', () => {
+  const links = read('../client/modeller/figure-v3-links.ts')
+  assert.match(links, /\?disabled=\$\{this\.locked \|\| !accepts\.length \|\| !capacityOk\}/)
+  assert.deepEqual(acceptsOf(' , ,'), [])
+})

package/translations/en.json

@@ -565,5 +565,19 @@
   "figure.label.state-inputs": "state inputs",
   "figure.label.design-inputs": "design inputs",
   "figure.text.release-blocked": "Release is blocked — {count}",
-  "figure.text.release-ready": "Ready to release"
+  "figure.text.release-ready": "Ready to release",
+  "figure.label.places": "Places",
+  "figure.text.places-need-a-box": "A place sits on a face of a box-shaped part.",
+  "figure.label.place-grip": "Grip",
+  "figure.label.place-seat": "Seat",
+  "figure.label.place-holds": "up to {count}",
+  "figure.button.remove-place": "Remove place",
+  "figure.text.place-explained": "Where a board sets or holds things on this part. When the part moves, what it holds moves with it.",
+  "figure.text.place-needs-holding": "This figure does not declare that it holds things, so a board hands nothing to its places.",
+  "figure.button.declare-holding": "Make it hold things",
+  "figure.label.place-name": "Name",
+  "figure.label.place-accepts": "Takes",
+  "figure.label.place-capacity": "How many",
+  "figure.text.place-accepts-needed": "Name at least one type it takes, separated by commas.",
+  "figure.button.add-place": "Add place"
 }

package/translations/ja.json

@@ -565,5 +565,19 @@
   "figure.button.keep-changed-appearance": "調整したモデル幅で公開",
   "figure.button.restore-released-base": "以前のモデル幅に戻す",
   "figure.text.appearance-choice-explained": "戻すと X と Z を直前の公開値に戻し、Y とほかの編集はそのまま残します。調整した幅で公開すると、今のモデルの外形を残します。",
-  "figure.text.choose-appearance-change": "調整したモデル幅の扱いを選んでください"
+  "figure.text.choose-appearance-change": "調整したモデル幅の扱いを選んでください",
+  "figure.label.places": "置き場所",
+  "figure.text.places-need-a-box": "置き場所は箱形の部品の面に置きます。",
+  "figure.label.place-grip": "つかむ場所",
+  "figure.label.place-seat": "載せる場所",
+  "figure.label.place-holds": "{count}個まで",
+  "figure.button.remove-place": "置き場所を削除",
+  "figure.text.place-explained": "ボード上で物をこの部品のどの面に載せるか、つかむかを決めます。部品が動くと物も一緒に動きます。",
+  "figure.text.place-needs-holding": "この図形は物を保持すると宣言していないため、置き場所を作ってもボードは物を渡しません。",
+  "figure.button.declare-holding": "物を保持する図形にする",
+  "figure.label.place-name": "名前",
+  "figure.label.place-accepts": "受け取る種類",
+  "figure.label.place-capacity": "最大個数",
+  "figure.text.place-accepts-needed": "受け取る種類を一つ以上、カンマ区切りで入力してください。",
+  "figure.button.add-place": "置き場所を追加"
 }

package/translations/ko.json

@@ -565,5 +565,19 @@
   "figure.label.state-inputs": "상태 입력",
   "figure.label.design-inputs": "설계 입력",
   "figure.text.release-blocked": "발행이 막힙니다 — {count}건",
-  "figure.text.release-ready": "발행할 수 있습니다"
+  "figure.text.release-ready": "발행할 수 있습니다",
+  "figure.label.places": "자리",
+  "figure.text.places-need-a-box": "자리는 상자 모양 부품의 면에 둡니다.",
+  "figure.label.place-grip": "집는 자리",
+  "figure.label.place-seat": "놓는 자리",
+  "figure.label.place-holds": "{count}개까지",
+  "figure.button.remove-place": "자리 없애기",
+  "figure.text.place-explained": "보드에서 물건을 이 부품의 어느 면에 놓거나 집을지 정합니다. 부품이 움직이면 물건도 따라갑니다.",
+  "figure.text.place-needs-holding": "이 도형은 물건을 담는다고 선언하지 않아서, 자리를 만들어도 보드가 여기에 물건을 넘기지 않습니다.",
+  "figure.button.declare-holding": "물건을 담는 도형으로",
+  "figure.label.place-name": "이름",
+  "figure.label.place-accepts": "받는 종류",
+  "figure.label.place-capacity": "몇 개까지",
+  "figure.text.place-accepts-needed": "받는 종류를 하나 이상 적어야 자리를 만들 수 있습니다. 쉼표로 나눕니다.",
+  "figure.button.add-place": "자리 추가"
 }

package/translations/ms.json

@@ -565,5 +565,19 @@
   "figure.button.keep-changed-appearance": "terbitkan dengan lebar model yang dilaraskan",
   "figure.button.restore-released-base": "pulihkan lebar model sebelumnya",
   "figure.text.appearance-choice-explained": "Pulihkan mengembalikan X dan Z kepada nilai terbitan sebelumnya dan mengekalkan Y serta semua suntingan lain. Menerbitkan dengan lebar yang dilaraskan mengekalkan garis luar model semasa.",
-  "figure.text.choose-appearance-change": "pilih cara mengendalikan lebar model yang dilaraskan"
+  "figure.text.choose-appearance-change": "pilih cara mengendalikan lebar model yang dilaraskan",
+  "figure.label.places": "Tempat",
+  "figure.text.places-need-a-box": "Tempat diletakkan pada muka bahagian berbentuk kotak.",
+  "figure.label.place-grip": "Tempat cengkam",
+  "figure.label.place-seat": "Tempat letak",
+  "figure.label.place-holds": "sehingga {count}",
+  "figure.button.remove-place": "Buang tempat",
+  "figure.text.place-explained": "Tentukan muka bahagian ini tempat papan meletakkan atau memegang barang. Apabila bahagian bergerak, barang ikut bergerak.",
+  "figure.text.place-needs-holding": "Rajah ini tidak mengisytiharkan bahawa ia memegang barang, jadi papan tidak menyerahkan apa-apa ke tempatnya.",
+  "figure.button.declare-holding": "Jadikan ia memegang barang",
+  "figure.label.place-name": "Nama",
+  "figure.label.place-accepts": "Jenis diterima",
+  "figure.label.place-capacity": "Berapa banyak",
+  "figure.text.place-accepts-needed": "Namakan sekurang-kurangnya satu jenis yang diterima, dipisahkan dengan koma.",
+  "figure.button.add-place": "Tambah tempat"
 }

package/translations/zh.json

@@ -565,5 +565,19 @@
   "figure.button.keep-changed-appearance": "以调整后的模型宽度发布",
   "figure.button.restore-released-base": "恢复为之前的模型宽度",
   "figure.text.appearance-choice-explained": "恢复会把 X 和 Z 还原为上次发布的值，并保留 Y 及其他所有编辑。以调整后的宽度发布则保留当前模型轮廓。",
-  "figure.text.choose-appearance-change": "请选择如何处理调整后的模型宽度"
+  "figure.text.choose-appearance-change": "请选择如何处理调整后的模型宽度",
+  "figure.label.places": "位置",
+  "figure.text.places-need-a-box": "位置设在方盒形部件的面上。",
+  "figure.label.place-grip": "夹持位置",
+  "figure.label.place-seat": "放置位置",
+  "figure.label.place-holds": "最多 {count} 个",
+  "figure.button.remove-place": "删除位置",
+  "figure.text.place-explained": "决定在看板上物品放在或夹在这个部件的哪个面上。部件移动时，物品也随之移动。",
+  "figure.text.place-needs-holding": "这个图形没有声明可以容纳物品，所以即使设了位置，看板也不会把物品交给它。",
+  "figure.button.declare-holding": "设为可容纳物品的图形",
+  "figure.label.place-name": "名称",
+  "figure.label.place-accepts": "接收类型",
+  "figure.label.place-capacity": "最多数量",
+  "figure.text.place-accepts-needed": "至少填写一个接收类型，用逗号分隔。",
+  "figure.button.add-place": "添加位置"
 }