@things-factory/figure-service 10.1.35 → 10.1.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-service",
-  "version": "10.1.35",
+  "version": "10.1.36",
   "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.32",
+    "@hatiolab/figure-model": "^0.1.35",
     "@operato/typeorm-history": "^10.0.0",
     "@things-factory/ai-client-base": "^10.1.31",
     "@things-factory/auth-base": "^10.1.34",
@@ -33,5 +33,5 @@
     "graphql-upload": "^15.0.2",
     "koa-router": "^7.4.0"
   },
-  "gitHead": "396f43b648b704f1938a2d890ab2f6efa33fdb86"
+  "gitHead": "3942ac0aa4f004b4700e739889e12ffc35d78794"
 }

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

@@ -11,9 +11,47 @@ import { inspectSource } from './figure-gate.js'
 import { renameDraftType, renameFacts } from './figure-rename.js'
 import { parseSource } from './figure-source.js'
 import { ProposeFailure, proposeFigure } from './figure-propose.js'
+import { prepareV3Write, compareAndSwapV3 } from './figure-v3-write.js'
 
 @Resolver(Figure)
 export class FigureMutation {
+  @Directive('@transaction')
+  @Directive('@privilege(category: "figure", privilege: "mutation", domainOwnerGranted: true)')
+  @Mutation(returns => Figure, { description: 'Save a V3 asset draft using an exact-source concurrency check.' })
+  async saveFigureV3(
+    @Arg('source') source: string,
+    @Ctx() context: ResolverContext,
+    @Arg('id', { nullable: true }) id?: string,
+    @Arg('expectedSource', { nullable: true }) expectedSource?: string,
+    @Arg('creationId', { nullable: true }) creationId?: string
+  ): Promise<Figure> {
+    const { domain, user, tx } = context.state
+    const repository = tx.getRepository(Figure)
+    if (!id) {
+      if (!creationId || !/^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i.test(creationId))
+        throw Error('새 모델 저장에는 생성 요청 식별자가 필요합니다.')
+      const prepared = prepareV3Write(source)
+      const previous = await repository.findOne({ where: { id: creationId, domain: { id: domain.id } } })
+      if (previous) {
+        if (previous.source !== prepared.source) throw Error('이 생성 요청은 이미 다른 내용으로 저장되었습니다. 저장된 모델을 다시 열어 주세요.')
+        return previous
+      }
+      // insert, not save: a concurrent retry must never turn into an unchecked overwrite.
+      await repository.insert({ ...prepared, id: creationId, type: `FIGURE_${creationId.replace(/-/g, '').toUpperCase()}`,
+        domain, creator: user, updater: user })
+      return repository.findOneOrFail({ where: { id: creationId, domain: { id: domain.id } } })
+    }
+    // Exact tenant ownership: an inherited catalog entry is not writable in the child domain.
+    const figure = await repository.findOne({ where: { id, domain: { id: domain.id } } })
+    if (!figure) throw Error('편집할 Figure를 찾을 수 없습니다.')
+    const prepared = prepareV3Write(source, figure, expectedSource)
+    // Compare-and-swap in the UPDATE itself: supported by SQLite as well as PostgreSQL.
+    // A pessimistic row lock is not supported by the product's SQLite deployment.
+    await compareAndSwapV3(criteria => repository.update(criteria, { ...prepared, updater: user }),
+      id, domain.id, expectedSource)
+    return repository.findOneOrFail({ where: { id, domain: { id: domain.id } } })
+  }
+
   @Directive('@transaction')
   @Directive('@privilege(category: "figure", privilege: "mutation", domainOwnerGranted: true)')
   @Mutation(returns => FigureSaveResult, { description: 'Creates a figure. Rejects when the source violates the format.' })

package/server/service/figure/figure-v3-write.ts

@@ -0,0 +1,35 @@
+import { parseV3Asset, serializeV3Asset, compileV3Asset } from '@hatiolab/figure-model'
+
+export interface V3WriteCriteria {
+  id: string
+  domain: { id: string }
+  source: string
+}
+export async function compareAndSwapV3(
+  update: (criteria: V3WriteCriteria) => Promise<{ affected?: number | null }>,
+  id: string,
+  domainId: string,
+  expectedSource: string | undefined
+) {
+  if (expectedSource === undefined) throw Error('수정 전 정본이 필요합니다.')
+  const result = await update({ id, domain: { id: domainId }, source: expectedSource })
+  if (result.affected !== 1) throw Error('다른 편집에서 모델이 변경되었습니다. 최신 모델을 다시 열어 주세요.')
+}
+
+/** Early validation only. The repository must also compare expectedSource in its atomic UPDATE. */
+export function prepareV3Write(source: string, existing?: { source?: string }, expectedSource?: string) {
+  if (existing && (expectedSource === undefined || existing.source !== expectedSource)) {
+    throw Error('다른 편집에서 모델이 변경되었습니다. 최신 모델을 다시 연 뒤 적용해 주세요.')
+  }
+  const asset = parseV3Asset(source)
+  const evaluated = compileV3Asset(asset).evaluate()
+  return {
+    source: serializeV3Asset(asset),
+    name: asset.name,
+    // V2 scores are not V3 evidence. Clear them instead of carrying a previous model's score.
+    score: null,
+    triangles: null,
+    groups: evaluated.geometry.length,
+    state: 'draft' as const
+  }
+}