@things-factory/figure-service 10.1.116 → 10.1.121

package/server/service/figure/figure-rename.test.ts

@@ -12,7 +12,7 @@ import { createFigureAsset, parseFigureAsset, serializeFigureAsset } from '@hati
 import { FigureRenameRefused, renameDraftType } from './figure-rename'
 
 const draft = (over: Record<string, unknown> = {}) => ({
-  type: 'FIGURE_MU6RJH47',
+  type: 'figure-mu6rjh47',
   source: serializeFigureAsset(createFigureAsset('새 Figure')),
   ...over
 })
@@ -26,26 +26,26 @@ describe('초안의 type 고치기', () => {
   */
   it('★ 행만 바뀌고, 원본은 그대로 다시 열린다', () => {
     const source = serializeFigureAsset(createFigureAsset('새 Figure'))
-    const result = renameDraftType({ type: 'FIGURE_ABCDEF12', source }, 'ROLLER_CONVEYOR', never)
+    const result = renameDraftType({ type: 'figure-abcdef12', source }, 'roller-conveyor', never)
 
-    expect(result.type).toBe('ROLLER_CONVEYOR')
+    expect(result.type).toBe('roller-conveyor')
     expect(result.source).toBe(source)
     expect(() => parseFigureAsset(result.source)).not.toThrow()
   })
 
   it('앞뒤 공백을 뗀다. 모양은 모델러가 묻는 규칙 그대로 — 대문자로 적지 않으면 거절한다(Q-D3, 2026-09-27)', () => {
-    expect(renameDraftType(draft(), '  ROBOT_ARM  ', never).type).toBe('ROBOT_ARM')
+    expect(renameDraftType(draft(), '  robot-arm  ', never).type).toBe('robot-arm')
     /* It was kept as written; the modeller always sent it upper-cased, and every stored type already is (56/56). */
     expect(() => renameDraftType(draft(), 'Robot_Arm', never)).toThrow(expect.objectContaining({ code: 'malformed-type' }))
   })
 
   it('★ 한 번이라도 발행됐으면 거절한다 — 판 번호로', () => {
-    expect(() => renameDraftType(draft(), 'ROBOT_ARM', { ...never, version: 1 })).toThrow(FigureRenameRefused)
+    expect(() => renameDraftType(draft(), 'robot-arm', { ...never, version: 1 })).toThrow(FigureRenameRefused)
   })
 
   it('★ 판 번호가 도로 0 이어도 이력이 있으면 거절한다 — 되돌리기가 그 자리를 만든다', () => {
     try {
-      renameDraftType(draft(), 'ROBOT_ARM', { ...never, hasHistory: true })
+      renameDraftType(draft(), 'robot-arm', { ...never, hasHistory: true })
       throw new Error('거절하지 않았다')
     } catch (e) {
       expect((e as FigureRenameRefused).code).toBe('already-released')
@@ -54,11 +54,11 @@ describe('초안의 type 고치기', () => {
 
   it('같은 도메인에서 쓰는 이름이면 거절하고, 어느 이름인지 말한다', () => {
     try {
-      renameDraftType(draft(), 'CONVEYOR', { ...never, takenByAnother: true })
+      renameDraftType(draft(), 'conveyor', { ...never, takenByAnother: true })
       throw new Error('거절하지 않았다')
     } catch (e) {
       expect((e as FigureRenameRefused).code).toBe('type-taken')
-      expect((e as Error).message).toContain('CONVEYOR')
+      expect((e as Error).message).toContain('conveyor')
     }
   })
 
@@ -108,10 +108,10 @@ describe('문이 이 규칙을 지난다', () => {
 
 describe('a type being set keeps the shape the modeller asks for (Q-D3, designer 2026-09-27)', () => {
   const free = { version: 0, hasHistory: false, takenByAnother: false }
-  it.each(['lower_case', 'X1', 'A'.repeat(33), '1ABC', 'AB-CD', 'AB__CD', '한글'])('refuses %s as malformed', wanted => {
-    expect(() => renameDraftType({ type: 'OLD', source: '{}' }, wanted, free)).toThrow(expect.objectContaining({ code: 'malformed-type' }))
+  it.each(['UPPER', 'snake_case', 'x', 'a'.repeat(65), '1abc', 'ab--cd', 'ab-', '한글'])('refuses %s as malformed', wanted => {
+    expect(() => renameDraftType({ type: 'old', source: '{}' }, wanted, free)).toThrow(expect.objectContaining({ code: 'malformed-type' }))
   })
-  it.each(['FIG_K3F9A2', 'CONVEYOR', 'LIFT_TABLE_2'])('takes %s', wanted => {
-    expect(renameDraftType({ type: 'OLD', source: '{}' }, wanted, free).type).toBe(wanted)
+  it.each(['fig-k3f9a2', 'conveyor', 'lift-table-2'])('takes %s', wanted => {
+    expect(renameDraftType({ type: 'old', source: '{}' }, wanted, free).type).toBe(wanted)
   })
 })

package/server/service/figure/figure-rename.ts

@@ -65,7 +65,7 @@ export function renameDraftType(
   if (!TYPE_PATTERN.test(next) || next.length < TYPE_LENGTH.min || next.length > TYPE_LENGTH.max) {
     throw new FigureRenameRefused(
       'malformed-type',
-      `type 「${next}」 는 대문자로 시작하고 대문자·숫자·밑줄만 쓰며 ${TYPE_LENGTH.min}~${TYPE_LENGTH.max}자여야 한다`
+      `type 「${next}」 는 소문자로 시작하고 소문자·숫자·하이픈 하나씩만 쓰며 ${TYPE_LENGTH.min}~${TYPE_LENGTH.max}자여야 한다`
     )
   }
 

package/server/service/figure/figure-thumbnail-db.test.ts

@@ -42,6 +42,9 @@ function mapFiles() {
       koa.set('ETag', '"storage-md5"')
       koa.set('Cache-Control', 'public, max-age=31536000')
       koa.body = kept.get(path)
+    },
+    async read(path: string) {
+      return kept.get(path)!
     }
   }
 }

package/server/service/figure/figure-thumbnail-store.ts

@@ -33,6 +33,8 @@ export const sha256Of = (bytes: Buffer) => createHash('sha256').update(bytes).di
 export interface ThumbnailFiles {
   put(bytes: Buffer, mimetype: string, name: string, context: any): Promise<{ id: string; path: string; size: number; contents?: Buffer }>
   send(koa: any, path: string, next: () => Promise<any>): Promise<void>
+  /** The bytes kept at a path -- what a figure package carries. */
+  read(path: string): Promise<Buffer>
 }
 
 export const attachmentFiles: ThumbnailFiles = {
@@ -46,7 +48,8 @@ export const attachmentFiles: ThumbnailFiles = {
     const { id, path, size, contents } = await STORAGE.uploadFile({ file, context })
     return { id, path, size, contents }
   },
-  send: (koa, path, next) => STORAGE.sendFile(koa, path, next)
+  send: (koa, path, next) => STORAGE.sendFile(koa, path, next),
+  read: async path => Buffer.from(await STORAGE.readFile(path))
 }
 
 /*

package/server/service/figure/figure.ts

@@ -77,6 +77,14 @@ export class Figure {
   @Field({ description: 'Component type name. A stored identifier — unique per domain and immutable once created.' })
   type?: string
 
+  /**
+   * The namespace the figure is published under, copied from the domain setting `figure-namespace` when the figure is
+   * made. With the type it forms the full name `{namespace}/{type}` boards store (ADR-0114). Never changes.
+   */
+  @Column({ nullable: true })
+  @Field({ nullable: true, description: 'Namespace of the full name {namespace}/{type}. Copied from the domain setting when created; never changes.' })
+  namespace?: string
+
   @Column()
   @Field({ description: 'Display name shown to authors. Safe to rename.' })
   name?: string

package/translations/en.json

@@ -89,5 +89,14 @@
   "error.figure-release-not-found": "{type} has no release {version}. its latest release is {latest}.",
   "figure.gate.origin-off-centre.message": "The origin is off the middle of the declared room: {off}.",
   "figure.gate.origin-off-centre.why": "A drawing that places figures by the middle of their room puts this one that far from where it is drawn.",
-  "figure.gate.origin-off-centre.how": "Keep it when the figure is fastened there, as a door at its hinge. Move the origin to the middle to place it by its room."
+  "figure.gate.origin-off-centre.how": "Keep it when the figure is fastened there, as a door at its hinge. Move the origin to the middle to place it by its room.",
+  "error.figure-namespace-missing": "this domain has no valid figure namespace ({value}). set {setting} first, for example hatiolab.com.",
+  "error.figure-namespace-changed": "the figure namespace of this domain is {namespace} and cannot change. set {setting} back to {namespace}.",
+  "error.figure-type-malformed": "{type} is not a figure type. use lower-case letters, digits and single hyphens, {min} to {max} characters, starting with a letter.",
+  "error.figure-name-malformed": "{type} is not a full figure name of the form namespace/type.",
+  "error.figure-not-released": "no release is published here.",
+  "error.figure-names-too-many": "at most {max} figure names can be asked at once, not {count}.",
+  "error.figure-package-size": "a package carries 1 to {max} releases, not {count}.",
+  "error.figure-ref-malformed": "{ref} is not a release reference of the form namespace/type@version.",
+  "error.figure-package-release-not-found": "{ref} is not a release this domain can read."
 }

package/translations/ko.json

@@ -89,5 +89,14 @@
   "error.figure-release-not-found": "{type} 에는 {version} 번 발행판이 없습니다. 최신 발행판은 {latest} 번입니다.",
   "figure.gate.origin-off-centre.message": "원점이 차지 공간 가운데에서 비켜 있습니다: {off}.",
   "figure.gate.origin-off-centre.why": "공간 가운데로 도형을 놓는 도면에서는 그린 자리에서 그만큼 떨어져 놓입니다.",
-  "figure.gate.origin-off-centre.how": "문의 경첩처럼 붙이는 자리라면 그대로 둡니다. 공간 가운데로 놓이게 하려면 원점을 가운데로 옮깁니다."
+  "figure.gate.origin-off-centre.how": "문의 경첩처럼 붙이는 자리라면 그대로 둡니다. 공간 가운데로 놓이게 하려면 원점을 가운데로 옮깁니다.",
+  "error.figure-namespace-missing": "이 도메인에 Figure namespace 가 없거나 형식이 맞지 않습니다({value}). 설정 {setting} 에 예를 들어 hatiolab.com 을 먼저 넣어 주세요.",
+  "error.figure-namespace-changed": "이 도메인의 Figure namespace 는 {namespace} 이며 바꿀 수 없습니다. 설정 {setting} 을 {namespace} 로 되돌려 주세요.",
+  "error.figure-type-malformed": "{type} 은 Figure type 이 아닙니다. 소문자로 시작하고 소문자·숫자·하이픈 하나씩만 써서 {min}~{max}자로 정해 주세요.",
+  "error.figure-name-malformed": "{type} 은 namespace/type 형식의 정식 이름이 아닙니다.",
+  "error.figure-not-released": "이 도메인에 발행판이 없습니다.",
+  "error.figure-names-too-many": "Figure 이름은 한 번에 {max}개까지 물을 수 있습니다({count}개).",
+  "error.figure-package-size": "꾸러미에는 발행판을 1~{max}개 담을 수 있습니다({count}개).",
+  "error.figure-ref-malformed": "{ref} 은 namespace/type@버전 형식의 발행판 참조가 아닙니다.",
+  "error.figure-package-release-not-found": "{ref} 은 이 도메인에서 읽을 수 있는 발행판이 아닙니다."
 }