@operato/board 10.20.0 → 10.22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@operato/board",
-  "version": "10.20.0",
+  "version": "10.22.0",
   "description": "Webcomponent for board following open-wc recommendations",
   "author": "heartyoh",
   "type": "module",
@@ -120,19 +120,19 @@
   "dependencies": {
     "@material/web": "^2.0.0",
     "@open-wc/scoped-elements": "^2.1.3",
-    "@operato/app": "^10.20.0",
-    "@operato/data-grist": "^10.19.0",
-    "@operato/font": "^10.20.0",
-    "@operato/graphql": "^10.16.2",
+    "@operato/app": "^10.22.0",
+    "@operato/data-grist": "^10.22.0",
+    "@operato/font": "^10.22.0",
+    "@operato/graphql": "^10.22.0",
     "@operato/i18n": "^10.16.2",
-    "@operato/input": "^10.16.2",
-    "@operato/layout": "^10.20.0",
+    "@operato/input": "^10.22.0",
+    "@operato/layout": "^10.22.0",
     "@operato/markdown": "^10.16.2",
-    "@operato/popup": "^10.16.2",
-    "@operato/property-editor": "^10.20.0",
-    "@operato/property-panel": "^10.20.0",
+    "@operato/popup": "^10.22.0",
+    "@operato/property-editor": "^10.22.0",
+    "@operato/property-panel": "^10.22.0",
     "@operato/styles": "^10.16.2",
-    "@operato/utils": "^10.16.2",
+    "@operato/utils": "^10.22.0",
     "@types/file-saver": "^2.0.4",
     "@types/sortablejs": "^1.10.7",
     "dexie": "^3.2.2",
@@ -144,7 +144,7 @@
   "devDependencies": {
     "@custom-elements-manifest/analyzer": "^0.10.0",
     "@hatiolab/prettier-config": "^1.0.0",
-    "@hatiolab/things-scene": "^10.0.0",
+    "@hatiolab/things-scene": "^10.1.26",
     "@open-wc/eslint-config": "^12.0.3",
     "@open-wc/testing": "^4.0.0",
     "@rollup/plugin-image": "^3.0.3",
@@ -180,5 +180,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "9182a6bf047f467fb3c57f027e3f9d4ca585bc1d"
+  "gitHead": "1da01ac5d48c0b60ec27286d5f9f08d3ad6b971a"
 }

package/test/figure-provider.test.ts

@@ -1,6 +1,6 @@
 import { expect } from '@open-wc/testing'
 
-import { Component, hasFigure, registerTypeResolver, resetFigures, resolveUnknownTypes } from '@hatiolab/things-scene'
+import { Component, hasFigure, hasFigureV3, registerTypeResolver, resetFigures, resetFiguresV3, resolveUnknownTypes } from '@hatiolab/things-scene'
 
 import { createFigureResolver } from '../src/figure-provider.js'
 
@@ -40,6 +40,55 @@ const blueprintOf = (type: string) => ({
   ]
 })
 
+/**
+ * The other thing the door can hand over: a V3 asset under a `format` tag (ADR-0087 decision 5).
+ *
+ * Written out rather than built with figure-model, for the same reason the blueprint above is: this package
+ * does not read either payload, it passes each to the scene's own registration, and a fixture that drifts from
+ * the format should fail loudly here rather than draw nothing at runtime. One box standing on the floor, with
+ * the volume it takes up declared.
+ */
+const v3AssetOf = (type: string) => ({
+  version: 'figure-v3-asset-1',
+  name: type,
+  document: {
+    version: 'figure-v3-prototype-1',
+    model: {
+      version: 'r3-spatial-1',
+      inputs: [],
+      constants: [
+        { id: 'w', unit: 'mm', value: 100 },
+        { id: 'half', unit: 'mm', value: 50 },
+        { id: 'minusHalf', unit: 'mm', value: -50 },
+        { id: 'zero', unit: 'mm', value: 0 },
+        { id: 'a0', unit: 'deg', value: 0 }
+      ],
+      nodes: [
+        { id: 'body.shape', op: 'box-shape@1', args: ['w', 'w', 'w'], outputs: { shape: 'body.s' }, params: { frame: 'body.local' } },
+        {
+          id: 'body.pose',
+          op: 'rigid@1',
+          args: ['zero', 'half', 'zero', 'a0', 'a0', 'a0'],
+          outputs: { pose: 'body.p' },
+          params: { from: 'body.local', to: 'asset' }
+        },
+        { id: 'body', op: 'place@1', args: ['body.s', 'body.p'], outputs: { placed: 'body.placed' } }
+      ]
+    },
+    capabilities: { version: 'r3-capability-3', assetFrame: 'asset', bindings: [] }
+  },
+  designInputs: {},
+  stateDefaults: {},
+  palette: { 'palette.primary': '#477b9e' },
+  appearance: [{ target: 'body', material: { token: 'palette.primary' } }],
+  occupancy: {
+    bounds: { x: { min: 'minusHalf', max: 'half' }, y: { min: 'zero', max: 'w' }, z: { min: 'minusHalf', max: 'half' } },
+    placement: 'floor'
+  }
+})
+
+const v3PayloadOf = (type: string) => ({ format: 'v3' as const, type, asset: v3AssetOf(type) })
+
 /** Records what was asked for, and answers from a table. */
 function fetcherOf(published: Record<string, unknown>, failing: string[] = []) {
   const asked: string[] = []
@@ -59,6 +108,7 @@ function fetcherOf(published: Record<string, unknown>, failing: string[] = []) {
 describe('figure 공급자 — 보드가 발행된 Figure 를 받는 길', () => {
   afterEach(() => {
     resetFigures()
+    resetFiguresV3()
   })
 
   it('대문자 이름만 서버에 묻는다 — 씬의 기본 type 과 오타는 문을 지나지 않는다', async () => {
@@ -91,6 +141,43 @@ describe('figure 공급자 — 보드가 발행된 Figure 를 받는 길', () =>
     expect(Component.register('EQ_REGISTERED')).to.not.equal(undefined)
   })
 
+  it('V3 자산은 V3 문으로 등록한다 — 보드는 그것을 읽지 않고 씬에 넘긴다', async () => {
+    const { fetch } = fetcherOf({ EQ_V3: v3PayloadOf('EQ_V3') })
+
+    await createFigureResolver(fetch)(['EQ_V3'])
+
+    expect(hasFigureV3('EQ_V3')).to.equal(true)
+    expect(hasFigure('EQ_V3')).to.equal(false)
+    /* 도면은 판을 모른다 — 두 판 다 type 하나만 적으면 그려진다. */
+    expect(Component.register('EQ_V3')).to.not.equal(undefined)
+  })
+
+  it('한 도면에 두 판이 섞여 있어도 각자의 문으로 들어간다', async () => {
+    const { fetch } = fetcherOf({ EQ_OLD: blueprintOf('EQ_OLD'), EQ_NEW: v3PayloadOf('EQ_NEW') })
+
+    await createFigureResolver(fetch)(['EQ_OLD', 'EQ_NEW'])
+
+    expect(hasFigure('EQ_OLD')).to.equal(true)
+    expect(hasFigureV3('EQ_NEW')).to.equal(true)
+  })
+
+  it('읽을 수 없는 V3 자산은 그 type 만 실패로 남는다', async () => {
+    const broken = v3PayloadOf('EQ_V3_BROKEN')
+    broken.asset.appearance = []
+    const { fetch } = fetcherOf({ EQ_BESIDE_V3: blueprintOf('EQ_BESIDE_V3'), EQ_V3_BROKEN: broken })
+
+    let message = ''
+    try {
+      await createFigureResolver(fetch)(['EQ_BESIDE_V3', 'EQ_V3_BROKEN'])
+    } catch (error) {
+      message = error instanceof Error ? error.message : String(error)
+    }
+
+    expect(message).to.contain('EQ_V3_BROKEN')
+    expect(hasFigure('EQ_BESIDE_V3')).to.equal(true)
+    expect(hasFigureV3('EQ_V3_BROKEN')).to.equal(false)
+  })
+
   it('발행된 것이 없으면 조용히 자리표시로 남는다 — 거절이 아니다', async () => {
     const { fetch } = fetcherOf({})