@things-factory/figure-service 10.1.49 → 10.1.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-service",
-  "version": "10.1.49",
+  "version": "10.1.50",
   "publishConfig": {
     "access": "public",
     "@things-factory:registry": "https://registry.npmjs.org"
@@ -23,7 +23,7 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@hatiolab/figure-model": "^0.1.55",
+    "@hatiolab/figure-model": "^0.1.57",
     "@operato/typeorm-history": "^10.0.0",
     "@things-factory/ai-client-base": "^10.1.39",
     "@things-factory/auth-base": "^10.1.47",
@@ -33,5 +33,5 @@
     "graphql-upload": "^15.0.2",
     "koa-router": "^7.4.0"
   },
-  "gitHead": "f9b29dcbdfecbfdd72e33bbcf74aea05331da75f"
+  "gitHead": "4700d39d70eb5fae4ad56cf47ea0b966c8516ae2"
 }

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

@@ -25,7 +25,9 @@ export class FigureMutation {
     @Arg('id', { nullable: true }) id?: string,
     @Arg('expectedSource', { nullable: true }) expectedSource?: string,
     @Arg('creationId', { nullable: true }) creationId?: string,
-    @Arg('thumbnail', { nullable: true }) thumbnail?: string
+    @Arg('thumbnail', { nullable: true }) thumbnail?: string,
+    @Arg('type', { nullable: true, description: 'The type name a new figure is created under. Ignored for an existing one.' })
+    type?: string
   ): Promise<Figure> {
     const { domain, user, tx } = context.state
     const repository = tx.getRepository(Figure)
@@ -44,8 +46,23 @@ export class FigureMutation {
         not match, so a new V3 figure could be published under a machine name that then froze (ADR-0063 decision 4)
         — seen on :3300, 2026-09-24. A retry is still safe: the row id is the creation id, not the name.
       */
+      /*
+        The author names it on the first save, as V2 asked (lost in the move to V3, 2026-09-25): created under that
+        name or not at all -- a taken name refuses the save, rather than saving under the temporary one and failing a
+        rename after. Without a name (a caller that has none to give) it is the temporary one, renamed later.
+      */
+      const named = type?.trim()
+      if (named) {
+        const facts = await renameFacts(
+          { figures: repository, histories: tx.getRepository(FigureHistory) },
+          { id: creationId },
+          domain,
+          named
+        )
+        renameDraftType({ type: named, source: prepared.source }, named, facts)
+      }
       // insert, not save: a concurrent retry must never turn into an unchecked overwrite.
-      await repository.insert({ ...prepared, id: creationId, type: placeholderType(),
+      await repository.insert({ ...prepared, id: creationId, type: named || placeholderType(),
         domain, creator: user, updater: user })
       return repository.findOneOrFail({ where: { id: creationId, domain: { id: domain.id } } })
     }

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

@@ -136,3 +136,48 @@ describe('이름을 바꾸기 전에 읽는 사실', () => {
     expect((await facts(figure, '   ')).takenByAnother).toBe(false)
   })
 })
+
+/*
+ * The first save names the figure (V2 asked for the type on the first save; the V3 modeller lost it, 2026-09-25).
+ * Through the door itself, on sqlite: created under that name or not at all.
+ */
+describe('처음 저장에 타입 이름을 받는다', () => {
+  let FigureMutation: any
+  let V3_SOURCE: string
+  beforeAll(() => {
+    FigureMutation = loadCompiled('service/figure/figure-mutation').FigureMutation
+    const model = require('@hatiolab/figure-model')
+    V3_SOURCE = model.serializeV3Asset(
+      model.addV3Box(model.createV3Asset('상자'), { id: 'box', size: { x: 100, y: 100, z: 100 }, position: { x: 0, y: 50, z: 0 } })
+    )
+  })
+
+  const save = (creationId: string, type?: string) =>
+    new FigureMutation().saveFigureV3(
+      V3_SOURCE,
+      { state: { domain: DOMAIN, user: undefined, tx: dataSource!.manager } },
+      undefined,
+      undefined,
+      creationId,
+      undefined,
+      type
+    )
+  const ids = ['8a1f2c3d-4b5e-4f60-8a71-92b3c4d5e6f7', '9b2e3d4c-5a6f-4e71-9b82-a3c4d5e6f708']
+
+  it('준 이름으로 만든다 — 앞뒤 빈칸은 뺀다', async () => {
+    const saved = await save(ids[0], '  ROBOT_ARM ')
+    expect(saved.type).toBe('ROBOT_ARM')
+  })
+
+  it('★ 이미 쓰는 이름이면 저장하지 않는다 — 임시 이름으로 남기지 않는다', async () => {
+    await seedFigure({ type: 'CONVEYOR', name: '컨베이어' })
+    await expect(save(ids[1], 'CONVEYOR')).rejects.toThrow(/이미 쓰고 있다/)
+    expect(await dataSource!.getRepository(Figure).count({ where: { id: ids[1] } })).toBe(0)
+  })
+
+  it('이름 없이 부르면 종전대로 임시 이름 — 나중에 고친다', async () => {
+    const model = require('@hatiolab/figure-model')
+    const saved = await save(ids[0])
+    expect(model.isPlaceholderType(saved.type)).toBe(true)
+  })
+})

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

@@ -110,13 +110,7 @@ describe('문이 이 규칙을 지난다', () => {
     V3 저장이 임시 이름을 스스로 지었다(`FIGURE_<32 hex>`). 형식의 `isPlaceholderType` 이 그것을 못 알아봐서
     발행 판정이 기계 이름을 통과시켰다. 짓는 쪽과 알아보는 쪽이 한 규칙이어야 한다.
   */
-  it('새 V3 도형의 임시 이름은 형식의 규칙으로 짓는다 — 판정이 알아보는 그 규칙', () => {
-    const mutation = readFileSync(join(__dirname, 'figure-mutation.ts'), 'utf8')
-    const save = mutation.slice(mutation.indexOf('async saveFigureV3'), mutation.indexOf('async createFigure'))
-
-    expect(save).toContain('type: placeholderType()')
-    expect(save).not.toMatch(/type: `FIGURE_/)
-  })
+  /* 새 V3 도형의 임시 이름이 판정이 알아보는 그 규칙인지는 문을 실제로 불러 본다 — figure-rename-db.test.ts 「이름 없이 부르면」. */
 
   it('문이 type 을 받는 칸을 갖는다', () => {
     const type = source('figure-type.ts')

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

@@ -92,7 +92,7 @@ export function renameDraftType(
  */
 export async function renameFacts(
   repositories: {
-    figures: { findOne(options: any): Promise<{ id: string } | null> }
+    figures: { findOne(options: any): Promise<{ id?: string } | null> }
     histories: { count(options: any): Promise<number> }
   },
   figure: { id?: string; version?: number },