@operato/board 10.29.27 → 10.29.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@operato/board",
-  "version": "10.29.27",
+  "version": "10.29.29",
   "description": "Webcomponent for board following open-wc recommendations",
   "author": "heartyoh",
   "type": "module",
@@ -120,18 +120,18 @@
   "dependencies": {
     "@material/web": "^2.0.0",
     "@open-wc/scoped-elements": "^2.1.3",
-    "@operato/app": "^10.29.27",
-    "@operato/data-grist": "^10.29.27",
-    "@operato/font": "^10.29.27",
+    "@operato/app": "^10.29.29",
+    "@operato/data-grist": "^10.29.29",
+    "@operato/font": "^10.29.29",
     "@operato/graphql": "^10.29.27",
     "@operato/i18n": "^10.29.27",
-    "@operato/input": "^10.29.27",
-    "@operato/layout": "^10.29.27",
-    "@operato/markdown": "^10.29.23",
-    "@operato/popup": "^10.29.27",
-    "@operato/property-editor": "^10.29.27",
-    "@operato/property-panel": "^10.29.27",
-    "@operato/styles": "^10.29.23",
+    "@operato/input": "^10.29.29",
+    "@operato/layout": "^10.29.29",
+    "@operato/markdown": "^10.29.29",
+    "@operato/popup": "^10.29.29",
+    "@operato/property-editor": "^10.29.29",
+    "@operato/property-panel": "^10.29.29",
+    "@operato/styles": "^10.29.29",
     "@operato/utils": "^10.29.23",
     "@types/file-saver": "^2.0.4",
     "@types/sortablejs": "^1.10.7",
@@ -180,5 +180,5 @@
       "prettier --write"
     ]
   },
-  "gitHead": "aa70087b5929f12cec0506c19f1aec0a83610a79"
+  "gitHead": "807f487e5ba47dac781b343133dc2603e405c845"
 }

package/test/figure-provider.test.ts

@@ -2,14 +2,7 @@ import { expect } from '@open-wc/testing'
 
 import { Component, hasFigure, registerTypeResolver, resetFigures, resolveUnknownTypes } from '@hatiolab/things-scene'
 
-import {
-  createFigureResolver,
-  FIGURE_TYPE_MAP_CHANGED,
-  figureMapReleaseOfPage,
-  resetFigureMapPage,
-  setFigureMapChoice,
-  type FigureBlueprintsAnswer
-} from '../src/figure-provider.js'
+import { createFigureResolver, type FigureBlueprintsAnswer } from '../src/figure-provider.js'
 
 /**
  * The path a figure takes to a board (ADR-0063 결정 2, ADR-0114): one batch question by full name.
@@ -69,24 +62,18 @@ const figureAssetOf = (type: string) => ({
   }
 })
 
-/** A server that answers from a table, from one map release, and records each question. */
-function serverOf(
-  published: Record<string, unknown>,
-  release: { version: number; revision: number } | null = { version: 1, revision: 1 },
-  refusals: Record<string, string> = {}
-) {
-  const asked: { types: string[]; map: string }[] = []
-  const state = { release }
+/** A server that answers from a table and records each question. */
+function serverOf(published: Record<string, unknown>, refusals: Record<string, string> = {}) {
+  const asked: string[][] = []
   return {
     asked,
-    state,
-    fetch: async (types: readonly string[], map: string): Promise<FigureBlueprintsAnswer> => {
-      asked.push({ types: [...types], map })
+    fetch: async (types: readonly string[]): Promise<FigureBlueprintsAnswer> => {
+      asked.push([...types])
       const items = types.filter(type => published[type]).map(type => ({ type, ref: `${type}@1`, asset: published[type] }))
       const refused = types
         .filter(type => !published[type])
         .map(type => ({ type, code: 'figure-not-in-type-map', message: refusals[type] ?? `${type} is not in the type map` }))
-      return { release: state.release, items, refused }
+      return { items, refused }
     }
   }
 }
@@ -96,7 +83,6 @@ const name = (label: string) => `hatiolab.com/${label}-${Math.random().toString(
 describe('figure 공급자 — 보드가 Figure 를 정식 이름으로 한 번에 묻는다', () => {
   afterEach(() => {
     resetFigures()
-    resetFigureMapPage()
   })
 
   it('등록되지 않은 type 을 대소문자와 관계없이 한 번에 묻는다 — 이미 등록된 것은 묻지 않는다', async () => {
@@ -105,7 +91,7 @@ describe('figure 공급자 — 보드가 Figure 를 정식 이름으로 한 번
 
     await createFigureResolver(fetch)([mixer, 'rect', 'Conveyor', 'text', 'VEH_AGV_01'])
 
-    expect(asked).to.deep.equal([{ types: [mixer, 'Conveyor', 'VEH_AGV_01'], map: 'ACTIVE' }])
+    expect(asked).to.deep.equal([[mixer, 'Conveyor', 'VEH_AGV_01']])
   })
 
   it('이미 등록된 이름은 묻지 않고, figure 가 그 컴포넌트를 덮지 않는다', async () => {
@@ -135,7 +121,7 @@ describe('figure 공급자 — 보드가 Figure 를 정식 이름으로 한 번
     const missing = name('missing')
     const brokenAsset = figureAssetOf(broken)
     brokenAsset.appearance = []
-    const { fetch } = serverOf({ [good]: figureAssetOf(good), [broken]: brokenAsset }, { version: 1, revision: 1 }, { [missing]: '타입 맵에 없습니다' })
+    const { fetch } = serverOf({ [good]: figureAssetOf(good), [broken]: brokenAsset }, { [missing]: '타입 맵에 없습니다' })
 
     const answer = await createFigureResolver(fetch)([good, broken, missing])
 
@@ -158,60 +144,18 @@ describe('figure 공급자 — 보드가 Figure 를 정식 이름으로 한 번
     expect(message).to.contain('no route to the door')
   })
 
-  it('★ 페이지는 처음 받은 맵 릴리스를 기억하고, 후보의 revision 이 바뀐 답은 등록하지 않는다', async () => {
+  it('★ 같은 페이지에서 나중에 묻는 이름도 그때 서버가 준 것으로 등록한다 — 먼저 등록한 것은 그대로다', async () => {
     const first = name('first')
     const later = name('later')
-    const server = serverOf({ [first]: figureAssetOf(first), [later]: figureAssetOf(later) }, { version: 2, revision: 3 })
+    const server = serverOf({ [first]: figureAssetOf(first), [later]: figureAssetOf(later) })
     const resolver = createFigureResolver(server.fetch)
-    setFigureMapChoice('CANDIDATE')
 
     await resolver([first])
-    expect(figureMapReleaseOfPage()).to.deep.equal({ map: 'CANDIDATE', version: 2, revision: 3 })
+    await resolver([first, later])
 
-    let changed: any = null
-    const listen = (e: Event) => (changed = (e as CustomEvent).detail)
-    window.addEventListener(FIGURE_TYPE_MAP_CHANGED, listen)
-    try {
-      server.state.release = { version: 2, revision: 4 }
-      const answer = await resolver([later])
-      expect(hasFigure(later)).to.equal(false)
-      expect(answer!.refused.map(r => r.type)).to.deep.equal([later])
-      expect(changed).to.deep.equal({ was: { map: 'CANDIDATE', version: 2, revision: 3 }, now: { map: 'CANDIDATE', version: 2, revision: 4 } })
-      expect(figureMapReleaseOfPage()).to.deep.equal({ map: 'CANDIDATE', version: 2, revision: 3 })
-    } finally {
-      window.removeEventListener(FIGURE_TYPE_MAP_CHANGED, listen)
-    }
-  })
-
-  it('★ 활성 맵과 후보 맵의 등록을 한 페이지에서 섞지 않는다', async () => {
-    const active = name('active')
-    const preview = name('preview')
-    const server = serverOf({ [active]: figureAssetOf(active), [preview]: figureAssetOf(preview) }, { version: 1, revision: 1 })
-    const resolver = createFigureResolver(server.fetch)
-
-    await resolver([active])
-    expect(figureMapReleaseOfPage()).to.deep.equal({ map: 'ACTIVE', version: 1, revision: 1 })
-
-    setFigureMapChoice('CANDIDATE')
-    const answer = await resolver([preview])
-
-    expect(server.asked.map(a => a.map)).to.deep.equal(['ACTIVE', 'CANDIDATE'])
-    expect(hasFigure(preview)).to.equal(false)
-    expect(answer!.refused.map(r => r.type)).to.deep.equal([preview])
-  })
-
-  it('맵 릴리스가 없는 서버(저작 서버의 최신 정책)는 기억하지 않는다', async () => {
-    const a = name('a')
-    const b = name('b')
-    const server = serverOf({ [a]: figureAssetOf(a), [b]: figureAssetOf(b) }, null)
-    const resolver = createFigureResolver(server.fetch)
-
-    await resolver([a])
-    await resolver([b])
-
-    expect(figureMapReleaseOfPage()).to.equal(null)
-    expect(hasFigure(a)).to.equal(true)
-    expect(hasFigure(b)).to.equal(true)
+    expect(server.asked).to.deep.equal([[first], [later]])
+    expect(hasFigure(first)).to.equal(true)
+    expect(hasFigure(later)).to.equal(true)
   })
 
   it('씬의 자리에 앉아 동작한다 — 받은 것은 그려지고 나머지는 자리표시로 남는다', async () => {