@things-factory/figure-service 10.1.113 → 10.1.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/figure-service",
-  "version": "10.1.113",
+  "version": "10.1.115",
   "publishConfig": {
     "access": "public",
     "@things-factory:registry": "https://registry.npmjs.org"
@@ -25,9 +25,9 @@
     "test:templates": "node --test scripts/templates.test.mts"
   },
   "dependencies": {
-    "@hatiolab/figure-model": "^0.2.10",
+    "@hatiolab/figure-model": "^0.2.15",
     "@operato/typeorm-history": "^10.0.0",
-    "@things-factory/ai-client-base": "^10.1.81",
+    "@things-factory/ai-client-base": "^10.1.114",
     "@things-factory/attachment-base": "^10.1.113",
     "@things-factory/auth-base": "^10.1.113",
     "@things-factory/env": "^10.1.20",
@@ -36,5 +36,5 @@
     "graphql-upload": "^15.0.2",
     "koa-router": "^7.4.0"
   },
-  "gitHead": "9da1e467ddce23e600e64f08454289cb3b806212"
+  "gitHead": "3d1f480028b680a6da3d0ae6a73c3121d644b64a"
 }

package/server/service/figure/event-subscriber.ts

@@ -14,7 +14,7 @@ import { FigureHistory } from './figure-history.js'
  *
  * 발행 메모는 Figure 의 칸이 아니다. `releaseFigure` 가 저장할 엔티티에 `__releaseComment` 로 얹어
  * 두면 여기서 판본의 `comment` 로 옮긴다 — 메모는 그 판의 것이지 도형의 것이 아니다. 정본 형식
- * (`__releaseFormat`), 직전 판에 견준 변경(`__releaseChanges`), 발행 때 잰 값(`__releaseMetrics`)과
+ * (`__releaseFormat`), 잰 커널의 판(`__releaseKernel`, ADR-0109 C1), 직전 판에 견준 변경(`__releaseChanges`), 발행 때 잰 값(`__releaseMetrics`)과
  * 윗모습(`__releaseTopView`)도 같은 길로 옮긴다(ADR-0104).
  */
 /** What `releaseFigure` laid on the entity for this release, moved onto the history row. */
@@ -22,6 +22,7 @@ function releaseRecordOnto(history: FigureHistory, entity: Figure): FigureHistor
   const e = entity as any
   ;(history as any).comment = e.__releaseComment ?? null
   history.assetFormat = e.__releaseFormat ?? null
+  history.kernelVersion = e.__releaseKernel ?? null
   /* [] stays "[]" (nothing changed); null stays null (not compared). */
   history.changes = e.__releaseChanges == null ? null : JSON.stringify(e.__releaseChanges)
   history.metrics = e.__releaseMetrics == null ? null : JSON.stringify(e.__releaseMetrics)

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

@@ -3,7 +3,7 @@
  * board (`consumablePayloadOf`). The format is `figure-asset-1`, and the asset says so in its `version`; a source
  * that does not is refused by name, because a source the server cannot identify is one it must not save.
  */
-import { compileFigureAsset, inspectFigureAsset, isPlaceholderType, parseFigureAsset, serializeFigureAsset, figureContractChanges, figureCostOf, figureOriginCentredOf, figureReleaseMetricsOf, figureScoreOf, figureTopViewOf } from '@hatiolab/figure-model'
+import { FIGURE_KERNEL_VERSION, compileFigureAsset, inspectFigureAsset, isPlaceholderType, parseFigureAsset, serializeFigureAsset, figureContractChanges, figureCostOf, figureOriginCentredOf, figureReleaseMetricsOf, figureScoreOf, figureTopViewOf } from '@hatiolab/figure-model'
 import type { FigureAsset, FigureContractChange, FigureContractError, FigureReleaseMetrics, FigureTopView, FigureViolation } from '@hatiolab/figure-model'
 
 import type { FigureFinding } from './figure-type.js'
@@ -473,9 +473,9 @@ function figureContractWording(change: FigureContractChange, say: Say): Pick<Gat
 export function releaseRecordOf(
   sourceJson: string,
   releasedJson?: string | null
-): { format: string; changes: FigureContractChange[] | null; metrics: FigureReleaseMetrics; topView: FigureTopView } {
+): { format: string; kernel: string; changes: FigureContractChange[] | null; metrics: FigureReleaseMetrics; topView: FigureTopView } {
   const asset = parseFigureAsset(sourceJson)
-  const measured = { format: asset.version, metrics: figureReleaseMetricsOf(asset), topView: figureTopViewOf(asset, null) }
+  const measured = { format: asset.version, kernel: FIGURE_KERNEL_VERSION, metrics: figureReleaseMetricsOf(asset), topView: figureTopViewOf(asset, null) }
   if (!releasedJson) return { ...measured, changes: [] }
   let before: FigureAsset
   try {

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

@@ -124,6 +124,19 @@ export class FigureHistory implements HistoryEntityInterface<Figure> {
   })
   changes?: string
 
+  /*
+   * 이 판을 잰 커널의 판(figure-model `FIGURE_KERNEL_VERSION`). 점수 · 묶음 · metrics 는 그 커널의 규칙으로 센 값이다 —
+   * 규칙이 바뀌어도 발행된 값을 다시 세서 덮지 않고(ADR-0109 C1), 읽는 쪽은 이 칸으로 「남긴 값」과 「지금 규칙의 값」을
+   * 가른다. 이 칸이 생기기 전에 발행된 판은 비어 있다.
+   */
+  @Column({ nullable: true })
+  @Field({
+    nullable: true,
+    description:
+      'The figure-model kernel version that measured this release (score, groups, metrics). null for releases made before releases recorded it.'
+  })
+  kernelVersion?: string
+
   @Column({ nullable: true, ...longTextColumn() })
   @Field({
     nullable: true,

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

@@ -348,9 +348,10 @@ export class FigureMutation {
       version: nextVersion,
       state: 'released',
       updater: user,
-      /* 판본 구독자가 이것들을 판본의 comment · assetFormat · changes 로 옮긴다. Figure 의 칸이 아니다. */
+      /* 판본 구독자가 이것들을 판본의 comment · assetFormat · kernelVersion · changes 로 옮긴다. Figure 의 칸이 아니다. */
       __releaseComment: comment ?? null,
       __releaseFormat: record.format,
+      __releaseKernel: record.kernel,
       __releaseChanges: record.changes,
       __releaseMetrics: record.metrics,
       __releaseTopView: record.topView

package/server/service/figure/figure-release-record-db.test.ts

@@ -7,7 +7,7 @@ import type { DataSource } from 'typeorm'
 const { DataSource: TypeOrmDataSource } = require('typeorm')
 const shell = require('@things-factory/shell')
 const authBase = require('@things-factory/auth-base')
-const { createFigureAsset, addFigureBox, serializeFigureAsset, applyFigureAuthoring, proposeFigureOccupancy } = require('@hatiolab/figure-model')
+const { createFigureAsset, addFigureBox, serializeFigureAsset, applyFigureAuthoring, proposeFigureOccupancy, FIGURE_KERNEL_VERSION } = require('@hatiolab/figure-model')
 
 let dataSource: DataSource | null = null
 let Figure: any
@@ -65,6 +65,8 @@ describe('a release record on its history row', () => {
     expect(row.comment).toBe('first')
     expect(row.metrics).toBeNull()
     expect(row.topView).toBeNull()
+    /* A row the release did not stamp says so: not measured by a known kernel, rather than by today's. */
+    expect(row.kernelVersion).toBeNull()
   })
   it('[] stays nothing changed, null stays not compared', async () => {
     expect((await release({ __releaseFormat: 'figure-asset-1', __releaseChanges: [] })).changes).toBe('[]')
@@ -90,6 +92,8 @@ describe('releaseFigure records it', () => {
     const rows = await dataSource!.getRepository(FigureHistory).find({ where: { originalId: figure.id }, order: { version: 'ASC' } })
     expect(rows.map((r: any) => [r.version, r.assetFormat, r.comment])).toEqual([[1, 'figure-asset-1', 'one'], [2, 'figure-asset-1', 'two']])
     expect(rows[0].changes).toBe('[]')
+    /* Each release names the kernel that measured it (ADR-0109 C1). */
+    expect(rows.map((r: any) => r.kernelVersion)).toEqual([FIGURE_KERNEL_VERSION, FIGURE_KERNEL_VERSION])
     const codes = JSON.parse(rows[1].changes).map((c: any) => c.code)
     expect(codes).toContain('occupancy-changed')
     /* What each release measured, and its plan from above, are on its own row. */