sonamu 0.9.11 → 0.9.13

package/src/database/__tests__/puri.test.ts

@@ -0,0 +1,35 @@
+import { knex } from "knex";
+import { afterAll, describe, expect, it } from "vitest";
+
+import { Puri } from "../puri";
+
+type TestSchema = {
+  users: {
+    id: number;
+    name: string;
+  };
+};
+
+const db = knex({ client: "pg" });
+
+function usersQuery(): Puri<TestSchema, { users: TestSchema["users"] }, TestSchema["users"]> {
+  return new Puri(db, "users");
+}
+
+afterAll(async () => {
+  await db.destroy();
+});
+
+describe("Puri locking methods", () => {
+  it("adds FOR UPDATE to select queries", () => {
+    const query = usersQuery().where("id", 1).forUpdate().first().toQuery();
+
+    expect(query).toBe('select * from "users" where "id" = 1 limit 1 for update');
+  });
+
+  it("adds FOR SHARE to select queries", () => {
+    const query = usersQuery().where("id", 1).forShare().first().toQuery();
+
+    expect(query).toBe('select * from "users" where "id" = 1 limit 1 for share');
+  });
+});

package/src/database/puri.ts

@@ -852,6 +852,16 @@ export class Puri<TSchema, TTables extends Record<string, any>, TResult> {
     return this;
   }
 
+  forUpdate(): this {
+    this.knexQuery.forUpdate();
+    return this;
+  }
+
+  forShare(): this {
+    this.knexQuery.forShare();
+    return this;
+  }
+
   /**
    * 벡터 유사도 검색 설정
    *

package/src/database/puri.types.test-d.ts

@@ -1,5 +1,6 @@
 import { describe, expectTypeOf, it } from "vitest";
 
+import { type Puri } from "./puri";
 import {
   type AvailableColumns,
   type ExtractColumnType,
@@ -456,3 +457,23 @@ describe("AvailableColumns", () => {
     expectTypeOf(valid2).toExtend<Result>();
   });
 });
+
+describe("Puri locking methods", () => {
+  it("forUpdate 체이닝 후 first 결과 타입을 유지한다", () => {
+    type Query = Puri<MockSchema, { users: MockSchema["users"] }, MockSchema["users"]>;
+    const query = {} as Query;
+
+    const result = query.where("id", 1).forUpdate().first();
+
+    expectTypeOf(result).resolves.toEqualTypeOf<MockSchema["users"]>();
+  });
+
+  it("forShare 체이닝 후 first 결과 타입을 유지한다", () => {
+    type Query = Puri<MockSchema, { users: MockSchema["users"] }, MockSchema["users"]>;
+    const query = {} as Query;
+
+    const result = query.where("id", 1).forShare().first();
+
+    expectTypeOf(result).resolves.toEqualTypeOf<MockSchema["users"]>();
+  });
+});

package/src/skills/sonamu/cone.md

@@ -36,7 +36,7 @@ During fixture generation, the LLM references `cone.note` to produce realistic,
 | `note`             | string | **Highest priority.** Business meaning of the field, concrete examples, value ranges, format constraints. Input the LLM reads to generate data |
 | `fixtureGenerator` | string | **Fallback.** faker.js expression. Fallback when no API key is available                                                                       |
 | `fixtureDefault`   | any    | Fixed default value                                                                                                                            |
-| `fixtureStrategy`  | string | `"sequence"` — used when id is auto-assigned by a DB sequence                                                                                  |
+| `fixtureStrategy`  | string | `"sequence"` — used when a DB sequence auto-assigns the id. Never use on string PK.                                                            |
 | `dataSource`       | object | Strategy for fetching reference data for relation props                                                                                        |
 
 ### Subset cone
@@ -186,31 +186,17 @@ Do not set `fixtureGenerator` on correlated fields. The LLM generates them toget
 }
 ```
 
-### DB sequence PK
+### String PK
 
-```json
-{
-  "name": "id",
-  "type": "string",
-  "cone": {
-    "fixtureStrategy": "sequence",
-    "note": "Sequential number automatically assigned by the DB sequence (stored as string)"
-  }
-}
-```
-
-### better-auth entity PK (Account / Session / Verification)
-
-The id of entities managed by better-auth is a UUID generated via `crypto.randomUUID()`.
-Using `fixtureStrategy: "sequence"` causes a `MAX(id::bigint)` error during fixture sync, so always use `fixtureGenerator: "faker.string.uuid()"`.
+Never set `fixtureStrategy: "sequence"` or `fixtureGenerator` on an id prop with `type: "string"`.
+fixture-generator automatically generates `alphanumeric(32)`.
 
 ```json
 {
   "name": "id",
   "type": "string",
   "cone": {
-    "note": "UUID-format identifier generated by better-auth via crypto.randomUUID()",
-    "fixtureGenerator": "faker.string.uuid()"
+    "note": "Random alphanumeric string ID (32 chars, [a-zA-Z0-9]). Generated by better-auth via generateId()"
   }
 }
 ```

package/src/testing/dev-vitest-manager.ts

@@ -184,6 +184,8 @@ export class DevVitestManager {
       }
     }
 
+    this.eventListeners.clear();
+
     if (this.vitest) {
       await this.vitest.close();
       this.vitest = null;

package/src/testing/fixture-generator.ts

@@ -92,12 +92,20 @@ export class FixtureGenerator {
 
       // id prop 처리
       if (prop.name === "id") {
-        if ("cone" in prop && prop.cone?.fixtureStrategy === "sequence") {
-          // DB sequence가 자동 할당하므로 스킵 (User 등)
+        // DB sequence가 자동 할당: integer/bigInteger이거나, string이지만 dbDefault에 nextval이 있는 경우
+        const hasDbSequence =
+          prop.type === "integer" ||
+          prop.type === "bigInteger" ||
+          (prop.type === "string" &&
+            "dbDefault" in prop &&
+            typeof prop.dbDefault === "string" &&
+            prop.dbDefault.includes("nextval"));
+        if (hasDbSequence) {
+          // generateBatch에서 처리하므로 여기선 스킵
           continue;
         }
         if (prop.type === "string") {
-          // DB DEFAULT 없는 string PK: alphanumeric 32자 생성 (better-auth 스타일)
+          // string PK: alphanumeric 32자 생성 (better-auth 스타일)
           const { faker: _faker } = await import("@faker-js/faker");
           fixture[prop.name] = _faker.string.alphanumeric(32);
           continue;
@@ -107,7 +115,6 @@ export class FixtureGenerator {
           fixture[prop.name] = _faker.string.uuid();
           continue;
         }
-        // integer/bigInteger PK: generateBatch에서 tempId를 넣으므로 여기선 스킵
         continue;
       }
 
@@ -802,7 +809,7 @@ export class FixtureGenerator {
       const llmProps = entity.props.filter((p) => {
         if (isRelationProp(p)) return false;
         if (p.cone?.fixtureGenerator) return false;
-        if (p.name === "id" && p.cone?.fixtureStrategy === "sequence") return false;
+        if (p.name === "id") return false;
         return !!p.cone?.note;
       });
 
@@ -1520,14 +1527,18 @@ Rules:
       const entity = this.entityManager.get(entityName);
 
       // integer/bigInteger PK는 임시 ID 생성 (DB 시퀀스가 실제 ID 할당)
-      // string PK는 generate()에서 이미 생성된 id 값을 그대로 사용
+      // string PK with dbDefault nextval도 동일하게 처리
+      // 그 외 string/uuid PK는 generate()에서 이미 생성된 id 값을 그대로 사용
       // parentId 엔티티는 부모의 실제 id를 그대로 사용 (시퀀스 미사용)
       const idProp = entity.props.find((p) => p.name === "id");
       const usesSequence =
         !explicitId &&
         (idProp?.type === "integer" ||
           idProp?.type === "bigInteger" ||
-          idProp?.cone?.fixtureStrategy === "sequence");
+          (idProp?.type === "string" &&
+            "dbDefault" in (idProp ?? {}) &&
+            typeof (idProp as { dbDefault?: unknown })?.dbDefault === "string" &&
+            ((idProp as { dbDefault?: string })?.dbDefault ?? "").includes("nextval")));
 
       const dataForRecord = usesSequence
         ? { ...data, id: Math.floor(Math.random() * 1000000) }
@@ -1600,7 +1611,10 @@ Rules:
         const usesSequence =
           companionIdProp?.type === "integer" ||
           companionIdProp?.type === "bigInteger" ||
-          companionIdProp?.cone?.fixtureStrategy === "sequence";
+          (companionIdProp?.type === "string" &&
+            "dbDefault" in (companionIdProp ?? {}) &&
+            typeof (companionIdProp as { dbDefault?: unknown })?.dbDefault === "string" &&
+            ((companionIdProp as { dbDefault?: string })?.dbDefault ?? "").includes("nextval"));
         const companionCount = companion.count ?? 1;
 
         // 각 parent result에 대해 companion fixture 생성

package/src/types/types.ts

@@ -329,7 +329,7 @@ export type SonamuFileBase = {
   size: number;
 };
 
-export type SonamuFile = SonamuFileBase & SonamuFileExtend;
+export interface SonamuFile extends SonamuFileBase, SonamuFileExtend {}
 
 /**
  * UploadParams